From 6fb0d9786c5cc9549fb485670ccb37bb0815aad2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 19 Jul 2023 10:44:27 +0800
Subject: [PATCH] 商城商品修改
---
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html | 2 +-
src/main/resources/application-dev.yml | 4 ++--
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html | 4 ++--
src/main/resources/templates/febs/views/modules/goods/goodsList.html | 14 +++++++++++---
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 1e8a6a3..5d8132b 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -72,8 +72,8 @@
xcx_appid: wx052716b1a388b13c
xcx_secret: e7cf355e7234f035d8fea6a3a19513b9
debug: false
- wecharPaynotifyUrl: http://ywgpz.csxuncong.com/api/xcxPay/wxpayCallback
- wecharRechargePaynotifyUrl: http://ywgpz.csxuncong.com/api/xcxPay/rechargeCallBack
+ wecharPaynotifyUrl: https://ywgpzapi.meiao.biz/api/xcxPay/wxpayCallback
+ wecharRechargePaynotifyUrl: https://ywgpzapi.meiao.biz/api/xcxPay/rechargeCallBack
certLocalPath: /home/qianayiCert/apiclient_cert.p12
wecharpayMchid: 1638095860
wecharpaySecret: QIANAYIZONGZI1234567899876543212
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
index 3c32390..ea89db7 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -101,7 +101,7 @@
<option value="2">购买积分商品</option>
<option value="3">普通商品商品</option>
<option value="4">课程卷商品</option>
- <option value="5">名宿卷商品</option>
+ <option value="5">民宿卷商品</option>
</select>
</div>
</div>
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsList.html b/src/main/resources/templates/febs/views/modules/goods/goodsList.html
index 518d7a3..f7ede30 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsList.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsList.html
@@ -79,11 +79,19 @@
<span>否</span>
{{# } }}
</script>
-<script type="text/html" id="goodsTypeFormat">
+<script type="text/html" id="isNormalFormat">
{{# if(d.isNormal == 1) { }}
+ <span>积分兑换商品</span>
+ {{# else if(d.isNormal == 2) { }}
+ <span>购买积分商品</span>
+ {{# else if(d.isNormal == 3) { }}
<span>普通商品</span>
+ {{# else if(d.isNormal == 4) { }}
+ <span>课程卷商品</span>
+ {{# else if(d.isNormal == 5) { }}
+ <span>民宿卷商品</span>
{{# } else { }}
- <span>套餐</span>
+ <span></span>
{{# } }}
</script>
<style>
@@ -239,7 +247,7 @@
{field: 'categaryName', title: '分类', minWidth: 140,align:'left'},
{field: 'isSale', title: '是否上架', templet: '#upOrDownSwitch', minWidth: 100,align:'center'},
{field: 'isHot', title: '是否主推', templet: '#isHotSwitch', minWidth: 100,align:'center'},
- {templet:"#goodsTypeFormat", title: '商品类型', minWidth: 140,align:'left'},
+ {templet:"#isNormalFormat", title: '商品类型', minWidth: 140,align:'left'},
{templet:"#isSkuFormat", title: '是否多规格', minWidth: 100,align:'left'},
{field: 'presentPrice', title: '现价', minWidth: 100,align:'left'},
{field: 'originalPrice', title: '原价', minWidth: 100,align:'left'},
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
index 41e0088..7cad1de 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -108,9 +108,9 @@
lay-filter="goods-type-select">
<option value="1">积分兑换商品</option>
<option value="2">购买积分商品</option>
- <option value="3">普通商品商品</option>
+ <option value="3">普通商品</option>
<option value="4">课程卷商品</option>
- <option value="5">名宿卷商品</option>
+ <option value="5">民宿卷商品</option>
</select>
</div>
</div>
--
Gitblit v1.9.1