From 91e4d0c81321f9ccfec7fca41898a00ff6f57001 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 10 Feb 2022 15:03:25 +0800
Subject: [PATCH] merge api_score_merge

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
index 654e4b9..cd96811 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
@@ -124,10 +124,12 @@
                 </el-col>
             </el-col>
             <el-col :span="8" style="float: right; margin-right: 20px;">
+
                 <el-button type="primary" plain @click="recharge">充值</el-button>
                 <el-button type="warning" plain @click="addOrder">开单</el-button>
                 <el-button type="success" plain @click="addServiceOrder">开服务单</el-button>
                 <el-button type="info" plain @click="exportExcel">导出项目</el-button>
+                <el-button type="primary" plain @click="openAdd">会员注册</el-button>
             </el-col>
         </el-header>
         <el-container>
@@ -820,6 +822,14 @@
             }
         },
         methods : {
+            openAdd(){
+                layer.full(layer.open({
+                    type : 2,
+                    title : "添加会员信息",
+                    area : [ MUI.SIZE_L, '450px' ],
+                    content : [ basePath+'/admin/vipInfo/editForm' ]
+                }));
+            },
             //打开订单详情页面
             openOrder(index,row){
                 layer.full(layer.open({
@@ -1107,7 +1117,7 @@
                     title : "充值卡变更记录",
                     area : MUI.SIZE_M,
                     maxmin : true,
-                    content : [ basePath + "/admin/redirect/hive/vip/moneyCardUseFlow-list?vipId=" + row.vipId ]
+                    content : [ basePath + "/admin/redirect/hive/vip/moneyCardUseFlow-list?vipId=" + row.vipId + "&cardId=" + row.id ]
                 });
             },
 
@@ -1243,7 +1253,7 @@
                     title: "修改订单时间",
                     maxmin: true,
                     area: [MUI.SIZE_L, '500px'],
-                    content: [basePath + '/admin/projService/toServiceOrderUpdateTime?id=' + row.id]
+                    content: [basePath + '/admin/redirect/hive/beautySalon/updateServiceOrderTimeV2?id=' + row.id]
                 });
             },
             /********* 服务单tab end ***********/

--
Gitblit v1.9.1