From 65718152778f922ef421f9b6000c1a01f63bd0db Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Sun, 17 Nov 2024 16:22:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=95=86=E5=93=81=E8=AE=A9?=
 =?UTF-8?q?=E5=88=A9=E6=AF=94=E4=BE=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/shop/view/goods/goods/add.html           | 16 +++++++---------
 app/shop/view/goods/goods/goods_subsidy.html |  6 +++---
 2 files changed, 10 insertions(+), 12 deletions(-)

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 @@
                 <table class="layui-table">
                     <thead>
                         <tr>
-                            <th>商家利润比例</th>
-                            <th>商品让利比例</th>
-                            <th>商品全返比例</th>
+                            <th>商家折扣比例</th>
+                            <th>商品最高返补比例</th>
                         </tr>
                     </thead>
                     <tbody>
                         <tr>
                           <td>${subsidy.profit}</td>
-                          <td>${subsidy.discount}</td>
                           <td>${subsidy.subsidy}</td>
                         </tr>
                     </tbody>
                 </table>
+                <div style="font-weight: bold">选择此条件是商家折扣比例</div>
             `
             $("#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 = `
                         <table class="layui-table">
                             <thead>
                                 <tr>
-                                    <th>商家利润比例</th>
-                                    <th>商品让利比例</th>
-                                    <th>商品全返比例</th>
+                                    <th>商家折扣比例</th>
+                                    <th>商品最高返补比例</th>
                                 </tr>
                             </thead>
                             <tbody>
                                 <tr>
                                   <td>${data[0].profit}</td>
-                                  <td>${data[0].discount}</td>
                                   <td>${data[0].subsidy}</td>
                                 </tr>
                             </tbody>
                         </table>
+                        <div style="font-weight: bold">选择此条件是商家折扣比例</div>
                     `
                     $("#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: '暂无数据！'}