From fa791f7796c1546b1329b52a3de8d753915cb4d5 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:24:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yyServiceAddForm.html |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yyServiceAddForm.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yyServiceAddForm.html
index 6720171..d01ee11 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yyServiceAddForm.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yyServiceAddForm.html
@@ -75,6 +75,9 @@
 			padding-left: 10px;
 			margin-left:10px ;
 		}
+		.openOrClose {
+			 cursor:pointer
+		}
 	</style>
 </head>
 <body>
@@ -124,14 +127,17 @@
 
 				</el-tab-pane>
 				<el-tab-pane label="套餐" name="tab2">
-					<template v-for="(item,index) in taocanList" v-if="index > 3 ? tcIsOpen : true">
-						<p class="el-big-title">【{{item.isCourse=='N'?'固定套餐':'任选套餐'}}】{{item.projName}}
+					<template v-for="(item,index) in taocanList">
+						<p class="el-big-title">
+							<span class="openOrClose" v-if="!item.openOrClose" @click="openOrCloseTc(item, index, 1)"><i class="el-icon-arrow-down"></i></span>
+							<span class="openOrClose" v-if="item.openOrClose" @click="openOrCloseTc(item, index, 2)"><i class="el-icon-arrow-up"></i></span>
+							【{{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>
 						<el-table
 								:data="item.taocanProjUse"
-								style="width: 98%">
+								style="width: 98%" v-show="item.openOrClose">
 							<el-table-column
 									prop="projName"
 									label="项目">
@@ -165,10 +171,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-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>
@@ -336,7 +342,14 @@
 			closeFram: function () {
 				parent.layer.close(parent.layer.getFrameIndex(window.name));
 			},
-
+			openOrCloseTc : function (item, index, value) {
+				if (value == 1) {
+					item.openOrClose = true;
+				} else {
+					item.openOrClose = false;
+				}
+				Vue.set(this.taocanList, index, item);
+			}
 		}
 
 	})

--
Gitblit v1.9.1