From 35cea8fd3552a048ed49d0596b647c983e148644 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 29 Jul 2021 20:39:39 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-list.html | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 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 b6f51f1..2ad4dad 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
@@ -116,12 +116,12 @@
<button matrix:btn="vipInfo-projTaocan" onclick="openTc()" type="button" class="btn btn-info btn-sm"><i class="fa fa-cubes"></i> 套餐管理</button>
<button matrix:btn="vipInfo-projTaocan" onclick="openMoneyCard()" type="button" class="btn btn-info btn-sm"><i class="fa fa-credit-card"></i> 充值卡管理</button>
- <button onclick="importProjUse()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 导入项目</button>
+ <button onclick="importProjUse()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 导入项目</button>
<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="staffName" data-formatter="buildOperation">操作</th>
</tr>
</thead>
</table>
@@ -168,6 +169,34 @@
});
});
+
+ var btns=[];
+ btns[0]="";
+ function buildOperation(value, row, index) {
+ var html = "";
+ html += '<a class="text-info" href="javascript:void(0)" onClick="openVipDetail(\''+row.phone+'\')">查看详情</a> '
+ return html;
+ }
+
+ function openVipDetail(value) {
+ layer.full(layer.open({
+ type : 2,
+ title : "会员详情",
+ area : [ MUI.SIZE_L, '450px' ],
+ maxmin : true,
+ content : [ basePath+'/admin/redirect/hive/beautySalon/vip?vipPhone=' + value ]
+ }));
+ }
+
+ function openVipDetail2(value) {
+ layer.full(layer.open({
+ type : 2,
+ title : "会员详情",
+ area : [ MUI.SIZE_L, '450px' ],
+ maxmin : true,
+ content : [ basePath+'/admin/redirect/hive/beautySalon/vip_detail?vipPhone=' + value ]
+ }));
+ }
function updateVipInfos() {
if(myGrid.getSelectItemsIds()==""){
layer.msg("请至少选择一名会员!", {
@@ -373,20 +402,10 @@
}
//导出
- 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;
+ }
</script>
--
Gitblit v1.9.1