From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict

---
 zq-erp/src/main/resources/templates/views/admin/shop/shopUser-list.html |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/shopUser-list.html b/zq-erp/src/main/resources/templates/views/admin/shop/shopUser-list.html
index 6011fb9..108bb79 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/shopUser-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/shop/shopUser-list.html
@@ -130,7 +130,7 @@
                         <th data-field="totalScore" data-align="center">获得总积分</th>
                         <th data-field="currentScore" data-align="center">可兑换积分</th>
                         <th data-field="isSales" data-align="center" data-formatter="buildIsSales">是否为销售员</th>
-                        <th data-align="center"  data-width="195px" data-field="userId" data-formatter="buildOperate">操作</th>
+                        <th data-align="center"  data-width="195px" data-field="userId" data-formatter="buildOperation">操作</th>
                     </tr>
                     </thead>
                 </table>
@@ -189,13 +189,18 @@
     var btns = [];
     btns[0] = "", btns[1] = "";
 
-    function buildOperate(value, row, index){
+    function buildOperation(value, row, index) {
         var html = "";
-        html += '<div class="btn-group">'
-        html += '</div>';
+        html += '<a class="text-info" href="javascript:void(0)" onClick="setSalesMan(\''+row.id+'\')">设置推广员</a>&nbsp;&nbsp;'
         return html;
     }
 
+    function setSalesMan(val) {
+        MTools.handleItem(basePath + "/fenXiao/fenXiaoUser/setSaleMan?id=" + val, "确定将该用户设置为推广员?",
+            function () {
+                myGrid.serchData();
+            });
+    }
 
 
 

--
Gitblit v1.9.1