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 | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 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 eb9ef2a..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
@@ -121,7 +121,7 @@
<button matrix:fn="orderClub" onclick="openOrder()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 消费订单</button>
<button matrix:fn="serviceClub" onclick="openServiceOrder()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 服务单</button>
<button matrix:btn="vipInfo-add" onclick="openAdd()" type="button" class="btn btn-info btn-sm"><i class="fa fa-plus" ></i> 新增</button>
- <button matrix:btn="vipInfo-excelOut" onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
+ <button matrix:btn="vipInfo-exportExcel" onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
<button matrix:btn="vipInfo-allot" onclick="updateVipInfos()" type="button" class="btn btn-info btn-sm"><i class="" ></i>批量设置健康顾问</button>
<button onclick="skinCheck()" type="button" class="btn btn-info btn-sm"><i class="" ></i>皮肤检测管理</button>
<button onclick="importVipInfo()" type="button" class="btn btn-info btn-sm"><i class="" ></i>导入会员</button>
@@ -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>
@@ -174,7 +175,14 @@
btns[0]="";
function buildOperation(value, row, index) {
var html = "";
+ var desc;
+ if (row.validFlag == 1) {
+ desc = "关闭小程序查询权益";
+ } else {
+ desc = "开启小程序查询权益";
+ }
html += '<a class="text-info" href="javascript:void(0)" onClick="openVipDetail(\''+row.phone+'\')">查看详情</a> '
+ + btns[0].replace("VALUE", row.id).replace("FLAG", row.validFlag).replace("DESC", desc);
return html;
}
@@ -224,6 +232,14 @@
}else{
return value;
}
+ }
+
+ function miniQuery(value, row, index) {
+ if(row.validFlag==1){
+ return "已开启"
+ }else{
+ return "已关闭";
+ }
}
@@ -299,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() {
@@ -402,22 +418,27 @@
}
//导出
- function exportExcel() {
- var name = $("#search-text").attr("name");
- var value = $("#search-text").val();
- var vipType = $("#vipType").val();
- var arrivalWay = $("#arrivalWay").val();
- var vipState = $("#vipState").val();
- var staffId = $("#staffId").val();
- window.location.href = basePath+"/admin/vipInfo/exportExcel?vipType="
- + encodeURI(encodeURI(vipType)) + "&arrivalWay="
- + encodeURI(encodeURI(arrivalWay)) + "&"+name+"="
- + encodeURI(encodeURI(value)) + "&vipState="
- + encodeURI(encodeURI(vipState))
- + "&staffId=" + staffId;
+ function exportExcel() {
+ var param=MForm.toUrlParam("#serchform");
+ window.location.href=basePath+"/admin/vipInfo/exportExcel?"+param;
+ }
+
+ function vipInfoValid(id, validFlag) {
+ var desc;
+ if (validFlag == 1) {
+ desc = "确认要关闭小程序查询权益？";
+ } else {
+ desc = "确认要开启小程序查询权益？";
}
+ MTools.handleItem(
+ basePath + '/admin/vipInfo/validFlagChange?id=' + id, desc, function () {
+ myGrid.serchData();
+ });
+ }
</script>
-
+<script matrix:btn="vipInfo-miniQuery">
+ btns[0]='<a class="text-info" href="javascript:void(0)" onClick="vipInfoValid(\'VALUE\', \'FLAG\')" >DESC</a> '
+</script>
</body>
</html>
--
Gitblit v1.9.1