From af6a6f03d3da1303b6fec2cff5dbd0fd10e8ad5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 27 Jan 2021 09:59:32 +0800
Subject: [PATCH] 1、查询产品bug 2、储值卡使用完成不设置为失效
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 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 94115eb..2a13ba4 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
@@ -127,7 +127,6 @@
<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="danger" plain @click="returnMoney">退款</el-button>
</el-col>
</el-header>
<el-container>
@@ -150,7 +149,7 @@
<el-row style="padding: 10px 20px;">
<p>余额：<span v-if="vipInfo.balance != null">{{vipInfo.balance}}元</span></p>
<p>积分：<span v-if="vipInfo.pointAll != null">{{vipInfo.pointAll}}</span></p>
- <p>累计消费金额：<span v-if="vipInfo.totalMoney != null">{{vipInfo.totalMoney}} 元</span></p>
+ <p>累计消费金额：<span v-if="vipInfo.totalMoney != null">{{vipInfo.totalMoney.toFixed(2)}} 元</span></p>
<p>累计消费次数：<span v-if="vipInfo.totalTimes != null">{{vipInfo.totalTimes}} 次</span></p>
<p>上次消费时间：<span v-if="vipInfo.payTime">{{vipInfo.payTime}}</span></p>
</el-row>
@@ -160,7 +159,6 @@
size="small"
:key="tag.label"
v-for="tag in tags.tags"
- closable
:disable-transitions="false"
@close="handleClose(tag)">
{{tag.label}}
@@ -174,15 +172,12 @@
@keyup.enter.native="handleInputConfirm"
@blur="handleInputConfirm"
></el-input>
- <el-button v-else class="button-new-tag" size="mini" @click="showInput">+</el-button>
+<!-- <el-button v-else class="button-new-tag" size="mini" @click="showInput">+</el-button>-->
</el-row>
<el-row style="padding: 10px 0;">
<h4>消费门店</h4>
<el-row style="text-align: center">
- <el-col :span="10" v-for="item in vipInfo.shopNames">
- <el-avatar size="small" :src="circleUrl"></el-avatar>
- <span class="col-style">{{item}}</span>
- </el-col>
+ <el-tag v-for="item in vipInfo.shopNames" >{{item}}</el-tag>
</el-row>
</el-row>
</el-row>
@@ -648,7 +643,7 @@
var app = new Vue({
el: '#app',
data : {
- circleUrl : "https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png",
+ circleUrl : "",
activeName : 'vipInfo',
tags : {
tags : [],
@@ -763,7 +758,7 @@
let data = loj[0].result.rows[0];
_this.vipInfo = {};
_this.vipInfo = data;
-
+ _this.circleUrl= _this.vipInfo.photo;
if (data.sysOrder != null) {
_this.vipInfo.totalMoney = data.sysOrder.zkTotal;
_this.vipInfo.totalTimes = data.sysOrder.times;
@@ -774,7 +769,7 @@
_this.vipInfo.shopNames = shopNames;
}
}
-
+ _this.vipInfo.payTime = moment(_this.vipInfo.payTime).format("YYYY-MM-DD HH:mm:ss")
_this.tags.tags = data.labels;
_this.projTableQueryFn();
_this.serviceOrderTableQueryFn();
@@ -1373,10 +1368,10 @@
/********** 顶部按钮 start **********/
dateFormat(row, column) {
- return moment(column.yyTime).format("YYYY-MM-DD HH:mm");
+ return moment(row.yyTime).format("YYYY-MM-DD HH:mm");
},
oderTimeFormat(row, column) {
- return moment(column.orderTime).format("YYYY-MM-DD HH:mm:ss");
+ return moment(row.orderTime).format("YYYY-MM-DD HH:mm:ss");
},
}
});
--
Gitblit v1.9.1