~jiangyouyao/beauty-erp.git

			@@ -149,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>
			@@ -159,7 +159,6 @@
			size="small"
			:key="tag.label"
			v-for="tag in tags.tags"
			closable
			:disable-transitions="false"
			@close="handleClose(tag)">
			{{tag.label}}
			@@ -173,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>
			@@ -773,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();
			@@ -1075,8 +1071,8 @@
			params.state = serviceOrderTab.state;
			params.vipId = _this.vipInfo.id;
			if (serviceOrderTab.selectTime) {
			params.beginTime = moment(serviceOrderTab.selectTime[0]).format("YYYY-MM-DD HH:mm");
			params.closureTime = moment(serviceOrderTab.selectTime[1]).format("YYYY-MM-DD HH:mm");
			params.beginTime = serviceOrderTab.selectTime?moment(serviceOrderTab.selectTime[0]).format("YYYY-MM-DD HH:mm"):'';
			params.closureTime = serviceOrderTab.selectTime?moment(serviceOrderTab.selectTime[1]).format("YYYY-MM-DD HH:mm"):'';
			}
			$.AjaxProxy({
			p:params
			@@ -1158,8 +1154,8 @@
			params.statu = orderTab.state;
			params.vipId = _this.vipInfo.id;
			if (orderTab.selectTime) {
			params.beginTimeVo = moment(orderTab.selectTime[0]).format("YYYY-MM-DD HH:mm");
			params.endTimeVo = moment(orderTab.selectTime[1]).format("YYYY-MM-DD HH:mm");
			params.beginTimeVo = orderTab.selectTime?moment(orderTab.selectTime[0]).format("YYYY-MM-DD HH:mm"):'';
			params.endTimeVo = orderTab.selectTime?moment(orderTab.selectTime[1]).format("YYYY-MM-DD HH:mm"):'';
			}
			$.AjaxProxy({
			p:params
			@@ -1233,8 +1229,8 @@
			params.offset = (page.currentPage - 1) * page.pageSize;
			params.userId = _this.vipInfo.id;
			if (skinTab.selectTime) {
			params.beginTime = moment(skinTab.selectTime[0]).format("YYYY-MM-DD");
			params.endTime = moment(skinTab.selectTime[1]).format("YYYY-MM-DD");
			params.beginTime = skinTab.selectTime?moment(skinTab.selectTime[0]).format("YYYY-MM-DD"):'';
			params.endTime = skinTab.selectTime?moment(skinTab.selectTime[1]).format("YYYY-MM-DD"):'';
			}
			$.AjaxProxy({
			p:params
			@@ -1372,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");
			},
			}
			});