From bb5be7a8a6ac24fbf66f03f070751577b87c95ca Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 15 Apr 2021 17:56:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html
index d36bf8a..2b3de69 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html
@@ -11,6 +11,7 @@
<!-- 本框架基本脚本和样式 -->
<script type="text/javascript" th:src="@{/js/systools/MBaseVue.js}"></script>
<link rel="stylesheet" th:href="@{/plugin/element-ui/index.css}">
+ <script type="text/javascript" th:src="@{/plugin/moment.min.js}"></script>
<link th:href="@{/css/styleOne/style.min.css}" rel="stylesheet" type="text/css"/>
<!-- 富文本编辑器 -->
@@ -123,8 +124,8 @@
</el-tab-pane>
<el-tab-pane label="套餐" name="tab2">
- <template v-for="item in taocanList" >
- <p class="el-big-title">【{{item.isCourse=='N'?'固定套餐':'任选套餐'}}】{{item.projName}}
+ <template v-for="(item,index) in taocanList" v-if="index > 3 ? tcIsOpen : true">
+ <p class="el-big-title">{{index}}【{{item.isCourse=='N'?'固定套餐':'任选套餐'}}】{{item.projName}}
<span style="float: right" v-if="item.failTime != null">有效期:{{item.failTime}}</span>
<code v-if="item.projInfo.isCourse=='Y'" > 剩余次数：<span v-if="item.projInfo.isInfinite == 'Y'">无限次</span><span v-else>{{item.surplusCount}}</span> </code>
</p>
@@ -164,7 +165,10 @@
</el-table-column>
</el-table>
</template>
-
+ <el-row style="text-align: center; margin-top: 5px;">
+ <el-link type="primary" v-if="!tcIsOpen && taocanList.length > 0" @click="tcIsOpen = true">点击展开</el-link>
+ <el-link type="primary" v-if="tcIsOpen" @click="tcIsOpen = false">点击隐藏</el-link>
+ </el-row>
</el-tab-pane>
</el-tabs>
@@ -177,6 +181,7 @@
<el-date-picker
v-model="yyTime"
type="date"
+ value-format="yyyy-MM-dd HH:mm"
placeholder="选择预约时间">
</el-date-picker>
@@ -236,6 +241,7 @@
orderItemList:[],
projList:[],
taocanList:[],
+ tcIsOpen : false,
yyTime:new Date(),
--
Gitblit v1.9.1