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 |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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 6e426c2..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>
@@ -233,6 +234,14 @@
             }
     }
 
+    function miniQuery(value, row, index) {
+        if(row.validFlag==1){
+            return "已开启"
+        }else{
+            return "已关闭";
+        }
+    }
+
 
         function loodFlow(){
             var id=myGrid.getSelectItemId();
@@ -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() {

--
Gitblit v1.9.1