From a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 19 Dec 2020 15:53:24 +0800
Subject: [PATCH] Merge branch 'ty_urgent' into test
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html | 5 +----
1 files changed, 1 insertions(+), 4 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 79a7972..001b3c0 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
@@ -115,7 +115,7 @@
<el-button type="primary" @click="searchVipInfo">查询</el-button>
</el-col>
</el-col>
- <el-col :span="6" style="float: right; margin-right: 20px;">
+ <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>
@@ -384,7 +384,6 @@
<el-tab-pane label="服务单" name="serviceOrder">
<el-row style="line-height: 40px;">
<el-col :span="11">
- <span>选择时间:</span>
<el-date-picker v-model="serviceOrderTab.selectTime"
type="datetimerange"
range-separator="至" format="yyyy-MM-dd HH:mm"
@@ -476,7 +475,6 @@
<el-tab-pane label="订单" name="order">
<el-row style="line-height: 40px;">
<el-col :span="11">
- <span>选择时间:</span>
<el-date-picker v-model="orderTab.selectTime"
type="datetimerange"
range-separator="至"
@@ -572,7 +570,6 @@
<el-tab-pane label="皮肤检测" name="skinCheck">
<el-row style="line-height: 40px;">
<el-col :span="11">
- <span>选择时间:</span>
<el-date-picker v-model="skinTab.selectTime"
type="daterange"
range-separator="至"
--
Gitblit v1.9.1