From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0

---
 zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-list.html |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-list.html
index 38879ce..f6d43a4 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-list.html
@@ -142,6 +142,7 @@
                 <th data-field="vipState">会员活跃度</th>
                 <th data-field="arrivalWay">到店途径</th>
                 <th data-field="staffName">健康顾问</th>
+                <th data-field="validFlag" data-formatter="miniQuery">小程序查询权限</th>
                 <th data-field="staffName" data-formatter="buildOperation">操作</th>
             </tr>
             </thead>
@@ -176,9 +177,9 @@
         var html = "";
         var desc;
         if (row.validFlag == 1) {
-            desc = "失效";
+            desc = "关闭小程序查询权益";
         } else {
-            desc = "生效";
+            desc = "开启小程序查询权益";
         }
         html += '<a class="text-info" href="javascript:void(0)" onClick="openVipDetail(\''+row.phone+'\')">查看详情</a>&nbsp;&nbsp;'
         + btns[0].replace("VALUE", row.id).replace("FLAG", row.validFlag).replace("DESC", desc);
@@ -231,6 +232,14 @@
             }else{
                 return value;
             }
+    }
+
+    function miniQuery(value, row, index) {
+        if(row.validFlag==1){
+            return "已开启"
+        }else{
+            return "已关闭";
+        }
     }
 
 
@@ -306,7 +315,7 @@
             title : "会员跟进记录",
             area :  MUI.SIZE_M,
             maxmin : true,
-            content : [ basePath+'/admin/serviceRecord/toServicefollowList?id=' + id ]
+            content : [ basePath+'/admin/redirect/hive/vip/followu-list?vipId=' + id ]
         });
     }
     function createDateDictionary() {
@@ -417,9 +426,9 @@
     function vipInfoValid(id, validFlag) {
         var desc;
         if (validFlag == 1) {
-            desc = "确认要设置用户为失效吗？";
+            desc = "确认要关闭小程序查询权益？";
         } else {
-            desc = "确认要设置用户为生效吗？";
+            desc = "确认要开启小程序查询权益？";
         }
         MTools.handleItem(
             basePath + '/admin/vipInfo/validFlagChange?id=' + id, desc, function () {
@@ -428,7 +437,7 @@
     }
 
 </script>
-<script matrix:btn="vipInfo-youxiao">
+<script matrix:btn="vipInfo-miniQuery">
     btns[0]='<a class="text-info" href="javascript:void(0)" onClick="vipInfoValid(\'VALUE\', \'FLAG\')" >DESC</a>&nbsp;&nbsp;'
 </script>
 </body>

--
Gitblit v1.9.1