From cf955aaa918244fdf1f2fd8367e01d2535f0c108 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 09 Jan 2021 16:08:07 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 001b3c0..62c1dd3 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
@@ -95,6 +95,14 @@
.el-autocomplete {
display: block !important;
}
+
+ .vip-info {
+ padding: 30px 20px;
+ }
+
+ .vip-info p {
+ line-height: 30px;
+ }
</style>
</head>
@@ -182,7 +190,7 @@
<el-main style="background-color: white; margin-right: 15px; padding: 20px 30px;">
<el-tabs v-model="activeName" type="card" @tab-click="tabHandleClick">
<el-tab-pane label="会员信息" name="vipInfo">
- <el-row>
+ <el-row class="vip-info">
<el-col :span="10">
<p>生日 : {{vipInfo.birthday1}}</p>
<p>会员状态 : {{vipInfo.vipState}}</p>
@@ -452,7 +460,7 @@
<el-button matrix:btn="serviceClub-paidan" type="text" size="small" v-if="scope.row.state=='预约成功待处理'" @click="giveServiceOrder(scope.$index, scope.row)">派单</el-button>
<el-button matrix:btn="serviceClub-edit" type="text" size="small" v-if="scope.row.state=='预约成功待处理'" @click="modifyServiceOrder(scope.$index, scope.row)">修改</el-button>
<el-button matrix:btn="serviceClub-peiliao" type="text" size="small" v-if="scope.row.state=='需配料'" @click="peiliao(scope.$index, scope.row)">配料</el-button>
- <el-button matrix:btn="serviceClub-huakou" type="text" size="small" v-if="scope.row.state=='服务完成'" @click="openHKService(scope.$index, scope.row)">划扣</el-button>
+ <el-button matrix:btn="serviceClub-huakou" type="text" size="small" v-if="scope.row.state=='服务完成'" @click="hkService(scope.$index, scope.row)">划扣</el-button>
<el-button matrix:btn="serviceClub-edit" type="text" size="small" @click="modifyTime(scope.$index, scope.row)">修改时间</el-button>
<el-button matrix:btn="serviceClub-del" type="text" size="small" v-if="scope.row.state!='预约取消'" @click="cancelServiceOrder(scope.$index, scope.row)">取消</el-button>
</template>
@@ -734,6 +742,9 @@
// 请求会员信息
vipInfoFn(key) {
let _this = this;
+ if (!key) {
+ key = _this.vipInfo.phone;
+ }
// 请求用户信息
$.AjaxProxy({
p: {
@@ -763,6 +774,10 @@
_this.tags.tags = data.labels;
_this.projTableQueryFn();
+ _this.serviceOrderTableQueryFn();
+ _this.orderTableDataQueryFn();
+ _this.skinCheckTableDataQueryFn();
+ _this.refreshTable();
});
},
addLabelFn(key) {
@@ -1081,7 +1096,7 @@
}));
},
// 划扣
- openHkService(index, row) {
+ hkService(index, row) {
openHkServcie(row.id);
},
// 取消
--
Gitblit v1.9.1