diff --git a/app/shop/view/goods/goods/add.html b/app/shop/view/goods/goods/add.html
index b24968ca..8f31eae8 100755
--- a/app/shop/view/goods/goods/add.html
+++ b/app/shop/view/goods/goods/add.html
@@ -197,19 +197,18 @@
- | 商家利润比例 |
- 商品让利比例 |
- 商品全返比例 |
+ 商家折扣比例 |
+ 商品最高返补比例 |
| ${subsidy.profit} |
- ${subsidy.discount} |
${subsidy.subsidy} |
+ 选择此条件是商家折扣比例
`
$("#goods_subsidy_table").html(h);
$("#subsidy_id").val(subsidy.id)
@@ -222,25 +221,24 @@
,content: '{:url("goods.Goods/goodsSubsidy")}'
,area: ['90%', '90%']
,btn: ['确认', '取消']
- ,yes: function(index, layero){
+ ,yes: function(index){
var data = window["layui-layer-iframe" + index].callbackdata();
const html = `
- | 商家利润比例 |
- 商品让利比例 |
- 商品全返比例 |
+ 商家折扣比例 |
+ 商品最高返补比例 |
| ${data[0].profit} |
- ${data[0].discount} |
${data[0].subsidy} |
+ 选择此条件是商家折扣比例
`
$("#goods_subsidy_table").html(html);
$("#subsidy_id").val(data[0]['id'])
diff --git a/app/shop/view/goods/goods/goods_subsidy.html b/app/shop/view/goods/goods/goods_subsidy.html
index b657a96e..dbe301a2 100755
--- a/app/shop/view/goods/goods/goods_subsidy.html
+++ b/app/shop/view/goods/goods/goods_subsidy.html
@@ -46,9 +46,9 @@
, url: '{:url("goods.Goods/goodsSubsidy")}' //模拟接口
, cols: [[
{type: 'radio'}
- , {field: 'profit', title: '商家利润比例', align: "center"}
- , {field: 'discount', title: '商品让利比例', align: "center"}
- , {field: 'subsidy', title: '商品全返比例', align: "center"}
+ , {field: 'profit', title: '商家折扣比例', align: "center"}
+ // , {field: 'discount', title: '商品让利比例', align: "center"}
+ , {field: 'subsidy', title: '商品最高返补比例', align: "center"}
]]
, page: true
, text: {none: '暂无数据!'}