From b7f3b90b5640ad4f25b0ec1d3f1cbff59020d738 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Thu, 8 Aug 2024 14:53:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E9=A2=84=E7=BA=A6=20?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=AC=A1=E6=95=B0=20=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/gird/shoucang.vue          | 100 +++++++++++++++++-----------------
 my/order/payModifyCi.vue      |  17 +++---
 my/order/payModifyLiao.vue    |  17 +++---
 my/order/payModifyMs.vue      |  17 +++---
 my/order/payModifyPt.vue      |  17 +++---
 my/order/payModifyQy.vue      |  18 +++---
 my/order/paydingTc.vue        |   2 +-
 pages/shop/index.vue          |   6 +-
 pages/shop/qiyeDatail.vue     |  14 ++---
 pages/shop/qiyeListMy.vue     |  27 ++-------
 pages/therapist/therapist.vue |  49 ++++++++++++++---
 11 files changed, 147 insertions(+), 137 deletions(-)

diff --git a/my/gird/shoucang.vue b/my/gird/shoucang.vue
index ca1d0ec..1cd7794 100644
--- a/my/gird/shoucang.vue
+++ b/my/gird/shoucang.vue
@@ -30,50 +30,32 @@
 							<image class="touxiang-frame" style="width: 100rpx;height: 38rpx;"  :src="item.technicianType=='3'?'../../static/vip/grade1.gif':item.technicianType=='4'?'../../static/vip/grade2.gif':'../../static/vip/grade3.gif'"></image>
 							
 						</view>
-						<view class="keyuyue">
+						<view class="keyuyue keyuyue-lan" v-if="item.status == 1">
 								<view class="flex">
-									<view class="timea-fu">{{item.status == 1?"可服务":"休息中"}}</view>
-									<view class="timea-time" v-if="item.status == 1">{{item.time}}</view>
+									<view class="timea-fu">可服务</view>
+									<view class="timea-time">{{item.time}}</view>
 								</view>
 						</view>
-						<!--
-						<view class="keyuyue">
-							<view class="[item.state == 1 || item.state == 2?'kfw_view':'byy_view']">
-								{{item.state == 1?'可服务':item.state == 2?'可预约':'休息中'}}
+						<view class="keyuyue keyuyue-hui" v-else>
+							<view class="flex">
+								<view class="timea-hui">休息中</view>
 							</view>
-							<view v-if="item.status == 1 && item.time">
-								{{item.time}}
-							</view>
-						</view>-->
+						</view>
 					</view>
 					<view class="therapist-mian-top">
 						<view class="therap-pin">
-							<!--<image style="width: 33rpx; height: 33rpx; margin-right: 3rpx;" src="../../static/dituzhaoren3.png" mode="">
-							</image>-->
 							<span>评论</span>
 							<span class="therapist-mian-view-text">
 								{{ item.commentCount ? item.commentCount : 0 }}
 							</span>
 						</view>
 						<view class="therap-pin">
-							<!--<image style="width: 32rpx; height: 32rpx; margin-right: 3rpx;" src="../../static/dituzhaoren4.png" mode="">
-							</image>-->
 							<span>收藏</span>
 							<span class="therapist-mian-view-text">
 								{{ item.collectCount ? item.collectCount : 0 }}
 							</span>
 						</view>
 					</view>
-					<!-- <view style="width: 100%;display: flex;justify-content: start;align-items: center;">
-						<view class="flex flex-wrap align-center" style="width: 120rpx;">
-							<image src="../../static/images/shangjia.png" style="width: 24rpx;height: 24rpx;"></image>
-							<view style="margin-left: 10rpx;color: #999;font-size: 26rpx;">商家</view>
-						</view>
-						
-						<view class="flex" style="font-size: 24rpx;color: #f49650;font-weight: bold;" v-if="item.tripWay == 3">
-							免出行费
-						</view>
-					</view> -->
 					<view class="list-right-top-bottom">
 						正规绿色服务!擅长精油SPA、中式推拿，有按摩师证，手法专业，期待正规绿色服务!擅长精油SPA、中式推拿正规绿色服务!擅长精油SPA、中式推拿
 					</view>
@@ -255,7 +237,47 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+	.keyuyue{
+		padding: 0rpx 10rpx;
+		height: 44rpx;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		border-radius:  30rpx 20rpx 20rpx 30rpx ;
+		font-size: 24rpx;
+	}
+	.keyuyue-lan{
+		background: #eefdf8;
+	}
+	.keyuyue-hui{
+		background: #d9d9d9;
+	}
+	.timea-fu{
+		color: #2dbe93;
+		font-size: 24rpx;
+		line-height: 44rpx;
+		margin-left: 8rpx;
+		margin-right: 5rpx;
+	}
+	.timea-hui{
+		color: #ffffff;
+		font-size: 24rpx;
+		line-height: 44rpx;
+		margin-left: 8rpx;
+		margin-right: 5rpx;
+	}
+	.therapist-mian-bottom-text{
+		font-weight: bold;
+		font-size: 26rpx;
+		color: #222222;
+		white-space: pre-wrap;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		overflow: hidden;
+		width: 60px;
+	}
 	.therap-pin{
 		font-size: 24rpx;
 		display: flex;
@@ -274,17 +296,7 @@
 		display: flex;
 		flex-direction:row;
 	}
-	.keyuyue{
-		padding: 0rpx 10rpx;
-		height: 44rpx;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		background: #eefdf8;
-		border-radius:  30rpx 20rpx 20rpx 30rpx ;
-		color:#8d500f;
-		font-size: 24rpx;
-	}
+
 	.timea-img{
 		background:#2dbe93 url('../../static/timea.png') 2rpx 1rpx;
 		background-size: 28rpx 28rpx;
@@ -294,13 +306,7 @@
 		border-radius:8rpx;
 		margin-top: 8rpx;
 	}
-	.timea-fu{
-		font-size: 24rpx;
-		color: #2dbe93;
-		line-height: 44rpx;
-		margin-left: 8rpx;
-		margin-right: 5rpx;
-	}
+	
 	.timea-time{
 		font-size: 25rpx;
 		color: #2dbe93;
@@ -358,11 +364,7 @@
 		height: 30rpx;
 		margin-right:3px;
 	}
-	.therapist-mian-bottom-text{
-		font-weight: bold;
-		font-size: 26rpx;
-		color: #222222;
-	}
+	
 	.therapist-mian-bottom{
 		width: 100%;
 		display: flex;
diff --git a/my/order/payModifyCi.vue b/my/order/payModifyCi.vue
index 4fa7a99..7523a32 100644
--- a/my/order/payModifyCi.vue
+++ b/my/order/payModifyCi.vue
@@ -15,7 +15,7 @@
 								</view>
 							</view>
 							<view class="flex align-center">
-								<view style="width: 100%;">
+								<view class="jiage">
 									<view class="flex justify-between">
 										<view class="money-pay-zhen">
 											<text class="title-font">次卡价格：</text>
@@ -1254,6 +1254,13 @@
 </script>
 
 <style lang="scss" scoped>
+	.jiage{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
 	.header-bottom-money-jia{
 		font-size: 28rpx;
 		color: #848484;
@@ -1298,7 +1305,6 @@
 		margin-left: 5px;
 	}
 	.money-pay{
-		width: 100%;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
@@ -1862,12 +1868,7 @@
 		align-items: flex-end;
 		margin-top:4rpx;
 	}
-	.money-pay{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
+	
 
 	.content{
 		 padding-top: 1px;
diff --git a/my/order/payModifyLiao.vue b/my/order/payModifyLiao.vue
index 4635ea1..c5c44cf 100644
--- a/my/order/payModifyLiao.vue
+++ b/my/order/payModifyLiao.vue
@@ -15,7 +15,7 @@
 								</view>
 							</view>
 							<view class="flex align-center">
-								<view style="width: 100%;">
+								<view class="jiage">
 									<view class="flex justify-between">
 										<view class="money-pay-zhen">
 											<text class="title-font">疗程价格：</text>
@@ -1252,6 +1252,13 @@
 </script>
 
 <style lang="scss" scoped>
+	.jiage{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
 	.detail-foot-taititle{
 		font-weight: bold;
 		font-size: 30rpx;
@@ -1304,7 +1311,6 @@
 		margin-left: 5px;
 	}
 	.money-pay{
-		width: 100%;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
@@ -1882,13 +1888,6 @@
 		align-items: flex-end;
 		margin-top:4rpx;
 	}
-	.money-pay{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-
 	.content{
 		 padding-top: 1px;
 		 width: 100%;
diff --git a/my/order/payModifyMs.vue b/my/order/payModifyMs.vue
index e4ecfdf..ae44fa6 100644
--- a/my/order/payModifyMs.vue
+++ b/my/order/payModifyMs.vue
@@ -15,7 +15,7 @@
 								</view>
 							</view>
 							<view class="flex align-center">
-								<view style="width: 100%;">
+								<view class="jiage">
 									<view class="flex justify-between">
 										<view class="money-pay-zhen">
 											<text class="title-font">秒杀价格：</text>
@@ -1313,6 +1313,13 @@
 </script>
 
 <style lang="scss" scoped>
+	.jiage{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
 	.ske-padding{
 		padding: 5rpx 30rpx 36rpx 30rpx;
 
@@ -1354,7 +1361,6 @@
 		margin-left: 5px;
 	}
 	.money-pay{
-		width: 100%;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
@@ -1924,12 +1930,7 @@
 		align-items: flex-end;
 		margin-top:4rpx;
 	}
-	.money-pay{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
+	
 
 	.content{
 		 padding-top: 1px;
diff --git a/my/order/payModifyPt.vue b/my/order/payModifyPt.vue
index 5a103ee..8041cce 100644
--- a/my/order/payModifyPt.vue
+++ b/my/order/payModifyPt.vue
@@ -16,7 +16,7 @@
 								
 							</view>
 							<view class="flex align-center">
-								<view style="width: 100%;">
+								<view class="jiage">
 									<view class="flex justify-between">
 										<view class="money-pay-zhen">
 											<text class="title-font">拼团价格：</text>
@@ -262,6 +262,13 @@
 </script>
 
 <style lang="scss" scoped>
+	.jiage{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
 	.ske-padding{
 		padding: 5rpx 30rpx 36rpx 30rpx;
 		
@@ -303,7 +310,6 @@
 		margin-left: 5px;
 	}
 	.money-pay{
-		width: 100%;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
@@ -876,12 +882,7 @@
 		align-items: flex-end;
 		margin-top:4rpx;
 	}
-	.money-pay{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
+	
 	
 	.content{
 		 padding-top: 1px;
diff --git a/my/order/payModifyQy.vue b/my/order/payModifyQy.vue
index dc4f9d1..f6d7366 100644
--- a/my/order/payModifyQy.vue
+++ b/my/order/payModifyQy.vue
@@ -15,13 +15,12 @@
 								</view>
 							</view>
 							<view class="flex align-center">
-								<view style="width: 100%;">
+								<view class="jiage">
 									<view class="flex justify-between">
 										<view class="money-pay-zhen">
 											<text class="title-font">项目价格：</text>
 											<span class="money-pay-zhen-a1">￥</span>
 											<span class="money-pay-zhen-a2">{{detailData[0].packagePrice}}</span>
-											<span class="money-pay-zhen-a1">/{{orderXm.serviceCount}}次</span>
 										</view>
 									</view>
 									<view class="money-pay justify-between">
@@ -1257,6 +1256,13 @@
 </script>
 
 <style lang="scss" scoped>
+	.jiage{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
 	.header-bottom-money-jia{
 		font-size: 28rpx;
 		color: #848484;
@@ -1301,7 +1307,6 @@
 		margin-left: 5px;
 	}
 	.money-pay{
-		width: 100%;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
@@ -1865,13 +1870,6 @@
 		align-items: flex-end;
 		margin-top:4rpx;
 	}
-	.money-pay{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-
 	.content{
 		 padding-top: 1px;
 		 width: 100%;
diff --git a/my/order/paydingTc.vue b/my/order/paydingTc.vue
index f43f104..c57fd52 100644
--- a/my/order/paydingTc.vue
+++ b/my/order/paydingTc.vue
@@ -26,7 +26,7 @@
 								<view class="money-pay" style="width: 100%;justify-content: space-between;">
 									<view class="money-pay-zhen" v-if="order.ordersPackageList[0].type =='114'">
 										<span>￥</span>
-										<span>{{order.ordersPackageList[0].packagePrice}}/{{order.ordersPackageList[0].num}}次</span>
+										<span>{{order.ordersPackageList[0].packagePrice}}</span>
 									</view>
 									<view class="money-pay-zhen" v-else>
 										<span>￥</span>
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index f1a46f4..8949552 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -36,11 +36,9 @@
 					<view class="item-view-bottom-qian">
 						<span></span>
 						<span>￥{{item.price}}</span>
-						<span>/ <text v-if="item.type!='104'">{{item.serviceCount}}</text>
-							{{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span>
+						
 						<span></span>
-						<span>￥{{item.oldPrice}}<text
-								v-if="item.type!='104'">/{{item.serviceCount}}</text>{{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span>
+						<span>￥{{item.oldPrice}}</span>
 					</view>
 					<view class="flex" style="margin-top: 10rpx;">
 						<view class="shop_label" v-if="item.tagsData!=''">
diff --git a/pages/shop/qiyeDatail.vue b/pages/shop/qiyeDatail.vue
index f562e71..3874d4d 100644
--- a/pages/shop/qiyeDatail.vue
+++ b/pages/shop/qiyeDatail.vue
@@ -10,9 +10,9 @@
 					<view class="header-bottom-title">
 						<view class="header-bottom-title-text">
 							<span>{{mainData.title}}</span>
-							<span class="header-bottom-title-liao">
-								次卡
-							</span>
+							<!-- <span class="header-bottom-title-liao">
+								项目
+							</span> -->
 						</view>
 						<view class="header-bottom-title-num">
 							<span>{{mainData.sales}}</span>
@@ -25,17 +25,11 @@
 							<view class="header-bottom-money-zhen">
 								<span></span>
 								<span>￥{{mainData.price}}</span>
-								<span v-if="dataList.name=='index'">/{{serviceCount}}次</span>
-								<span v-else>/{{mainData.serviceCount}}次</span>
 							</view>
 							<view v-if="dataList.name=='index'" class="header-bottom-money-jia" style="text-decoration: line-through;">
-								￥{{mainData.oldPrice}}/{{serviceCount}}次
-							</view>
-							<view v-else class="header-bottom-money-jia" style="text-decoration: line-through;">
-								￥{{mainData.oldPrice}}/{{mainData.serviceCount}}次
+								￥{{mainData.oldPrice}}
 							</view>
 						</view>
-						<!-- <view class="xiaoer item-view-biao">{{mainData.levelName}}</view> -->
 					</view>
 				</view>
 				<view class="header-bottom-foot">
diff --git a/pages/shop/qiyeListMy.vue b/pages/shop/qiyeListMy.vue
index fbed225..bea5259 100644
--- a/pages/shop/qiyeListMy.vue
+++ b/pages/shop/qiyeListMy.vue
@@ -52,10 +52,8 @@
 						<span class="xiaoer item-view-biao">{{item.levelName}}</span>
 					</view>
 					<view class="item-view-bottom-qian">
-						<span></span>
 						<span>￥{{item.price}}</span>
-						<span>/{{item.serviceCount}}次</span>
-						<span>￥{{item.oldPrice}}/{{item.serviceCount}}次</span>
+						<span>￥{{item.oldPrice}}</span>
 					</view>
 					<view class="flex" style="margin-top: 10rpx;">
 						<view class="shop_label" v-if="item.tagsData!=''">
@@ -202,33 +200,16 @@
 		color: #FFFFFF;
 	}
 
-	.item-view-bottom-qian span:nth-child(5) {
-		font-size: 28rpx;
-		color: #848484;
-		text-decoration-line: line-through;
-	}
-
-	.item-view-bottom-qian span:nth-child(4) {
-		font-size: 26rpx;
+	.item-view-bottom-qian span:nth-child(2) {
+		font-size: 12px;
 		color: #848484;
 		text-decoration-line: line-through;
 		margin-left: 5px;
 	}
 
-	.item-view-bottom-qian span:nth-child(3) {
-		font-size: 28rpx;
-		color: #FF6000;
-	}
-
-	.item-view-bottom-qian span:nth-child(2) {
-		font-weight: bold;
-		font-size: 36.81rpx;
-		color: #FF6000;
-	}
-
 	.item-view-bottom-qian span:nth-child(1) {
 		font-weight: 400;
-		font-size: 26rpx;
+		font-size: 17px;
 		color: #FF6000;
 	}
 
diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue
index 3bafd7c..72aacd5 100644
--- a/pages/therapist/therapist.vue
+++ b/pages/therapist/therapist.vue
@@ -24,7 +24,7 @@
 		<view class="liebiao" v-show="current === 0">
 			<view v-if="orderList.length" class="flex text-center flex-wrap list-view">
 				<view class="margin-bottom-sm radius touxiang-left">
-					<view class="flex align-center touxiang-left-view" v-if="item.status=='1'" v-for="(item, index) in orderList" :key='index' @click="goOrder(item)">
+					<view class="flex align-center touxiang-left-view" v-for="(item, index) in orderList" :key='index' @click="goOrder(item)">
 						<view class="touxiang-left-content">
 							<image style="border: 2px solid #e2e2e2;" class="touxiang-left-content-img"  :src="item.artificerImg ? item.artificerImg : '../../static/logo.png'" @click.stop="saveImgs(item.artificerImg)" mode="aspectFill"></image>
 							<image  class="touxiang-left-content-img" v-if="item.isHot == 1" src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png"></image>
@@ -37,12 +37,17 @@
 										<view class="list-right-top-name">
 											{{ item.artificerName }}
 										</view>
-										<view class="keyuyue">
+										<view class="keyuyue keyuyue-lan" v-if="item.status == 1">
 												<view class="flex">
-													<view class="timea-fu">{{item.status == 1?"可服务":"休息中"}}</view>
-													<view class="timea-time" v-if="item.status == 1">{{item.time}}</view>
+													<view class="timea-fu">可服务</view>
+													<view class="timea-time">{{item.time}}</view>
 												</view>
 										</view>
+										<view class="keyuyue keyuyue-hui" v-else>
+											<view class="flex">
+												<view class="timea-hui">休息中</view>
+											</view>
+										</view>
 										
 									</view>
 								</view>
@@ -120,15 +125,27 @@
 										<view class="list-right-top-name">
 											{{ getOrderByCurrentMarkerIndex().artificerName }}
 										</view>
-										<view class="timea-fu flex" style="margin-right: 45px;">
+										<!-- <view class="timea-fu flex" style="margin-right: 45px;">
 											<view>
 												 {{getOrderByCurrentMarkerIndex().state == 1?"可服务":getOrderByCurrentMarkerIndex().state == 2?"今日可约":"休息中"}}
 											</view>
 											<view v-if="getOrderByCurrentMarkerIndex().status == 1 && getOrderByCurrentMarkerIndex().time">:{{ getOrderByCurrentMarkerIndex().time}}</view>
+										</view> -->
+										<view class="keyuyue keyuyue-lan" v-if="getOrderByCurrentMarkerIndex().status == 1">
+												<view class="flex">
+													<view class="timea-fu">可服务</view>
+													<view class="timea-time">{{getOrderByCurrentMarkerIndex().time}}</view>
+												</view>
+										</view>
+										<view class="keyuyue keyuyue-hui" v-else>
+											<view class="flex">
+												<view class="timea-hui">休息中</view>
+											</view>
 										</view>
 									</view>
 								</view>
 							</view>
+							
 							<view class="item-view-jianjie">
 								{{getOrderByCurrentMarkerIndex().content}}
 							</view>
@@ -1371,11 +1388,29 @@ import permision from "@/components/permission.js";
 		display: flex;
 		flex-direction: row;
 		align-items: center;
-		background: #eefdf8;
 		border-radius:  30rpx 20rpx 20rpx 30rpx ;
-		color:#8d500f;
 		font-size: 24rpx;
 	}
+	.keyuyue-lan{
+		background: #eefdf8;
+	}
+	.keyuyue-hui{
+		background: #d9d9d9;
+	}
+	.timea-fu{
+		color: #2dbe93;
+		font-size: 24rpx;
+		line-height: 44rpx;
+		margin-left: 8rpx;
+		margin-right: 5rpx;
+	}
+	.timea-hui{
+		color: #ffffff;
+		font-size: 24rpx;
+		line-height: 44rpx;
+		margin-left: 8rpx;
+		margin-right: 5rpx;
+	}
 	.timea-img{
 		background:#2dbe93 url('../../static/timea.png') 2rpx 1rpx;
 		background-size: 28rpx 28rpx;