From d66d79147de0b98aed4d8ec5adf1c4e2a8eb7674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Fri, 19 Jul 2024 15:19:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/order/pay.vue              | 14 ++++++--------
 my/order/payShengji.vue       |  8 ++++----
 my/order/payding.vue          |  9 ++++-----
 pages/order/index.vue         | 12 +++++++-----
 pages/therapist/therapist.vue |  4 ++--
 5 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/my/order/pay.vue b/my/order/pay.vue
index 129b4ae..1d8e526 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -177,8 +177,7 @@
 						</view>
 						<view class="flex justify-between add-lin" >
 							<view class="add-con-title">出行费用</view>
-							<view class="add-con-cont" v-if="order.taxiMoney">￥{{order.taxiMoney}}</view>
-							<view class="add-con-cont" v-else>-</view>
+							<view class="add-con-cont">￥{{order.taxiMoney}}</view>
 						</view>
 						<view class="jusitify-line-end add-lin"></view>
 						<view class="justify-title-nav">
@@ -197,13 +196,12 @@
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">订单费用：</view>
-							<view class="add-con-cont">￥<text style=" font-weight: bold;">{{order.priceMarkup}}</text></view>
+							<view class="add-con-cont">￥<text style=" font-weight: bold;">{{order.massageMoney}}</text></view>
 
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">出行费用：</view>
-							<view class="add-con-cont" v-if="order.taxiMoney">￥<text>{{order.taxiMoney}}</text></view>
-							<view class="add-con-cont" v-else>-</view>
+							<view class="add-con-cont">￥<text>{{order.taxiMoney}}</text></view>
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">优惠券：</view>
@@ -361,14 +359,14 @@
 					class="dingshi">
 					修改订单
 				</u-button> -->
-				<u-button @click="zhifu(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
+				<u-button @click="zhifu(order)" :custom-style="customStyle2" shape="circle" :plain="true"
 					class="btns">立即支付
 				</u-button>
-				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
+				<u-button @click="goChat" :custom-style="customStyle2" shape="circle" :plain="true" 
 					class="btns">联系客服</u-button>
 			</view>
 			<view class="showBtn tabber" v-if="order.status ==2">
-				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
+				<u-button @click="cancelOrder(order)" :custom-style="customStyle" shape="circle" :hair-line="false">
 					取消订单
 				</u-button>
 				<u-button
diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue
index 93e9a0c..1be0adc 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -267,10 +267,10 @@
 						</view>
 						<view class="flex justify-between jusitify-line">
 							<view class="line-word">订单费用：</view>
-							<view class="line-word-r" v-if="order.oldPriceMarkup==null">￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{order.priceMarkup}}</text></view>
+							<view class="line-word-r" v-if="order.oldMassageMoney==null">￥<text
+									style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
 							<view class="line-word-r" v-else>￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{order.oldPriceMarkup}}</text></view>
+									style="font-size: 26rpx;font-weight: bold;">{{order.oldMassageMoney}}</text></view>
 
 							
 						</view>
@@ -550,7 +550,7 @@
 							class="btns">
 							提前结束
 						</u-button>
-						<u-button
+						<u-button v-if="order.addNum==null"
 							shape="circle" :plain="true"
 							@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
 							class="btns">
diff --git a/my/order/payding.vue b/my/order/payding.vue
index c5e2b88..258fc20 100644
--- a/my/order/payding.vue
+++ b/my/order/payding.vue
@@ -177,8 +177,8 @@
 							<view class="add-con-title">全程距离</view>
 							<view class="add-con-cont">{{order.km}}km</view>
 						</view>
-						<view class="flex justify-between add-lin" v-if="order.taxiMoney">
-							<view class="add-con-title">出行交通费用</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">出行费用</view>
 							<view class="add-con-cont">￥{{order.taxiMoney}}</view>
 						</view>
 						<view class="jusitify-line-end"></view>
@@ -210,10 +210,9 @@
 							<text style="font-weight: bold;">{{order.massageMoney}}</text>
 						</view>
 						</view>
-						<view class="flex justify-between add-lin" v-if="order.taxiMoney">
+						<view class="flex justify-between add-lin">
 							<view class="add-con-title">出行费用：</view>
-							<view class="add-con-cont" v-if="order.taxiMoney">￥<text style="font-weight: bold;">{{order.taxiMoney}}</text></view>
-							<view class="add-con-cont" v-else>-</view>
+							<view class="add-con-cont">￥<text style="font-weight: bold;">{{order.taxiMoney}}</text></view>
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">优惠券：</view>
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 8f1dac0..8a11dc0 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -132,12 +132,13 @@
 						</view>
 						<view class="gengduoShow">
 							<u-button
-								v-if="item.addNum==null&&item.oldOrdersId==null"
+								v-if="item.addNum==null&&item.isSupplement==null&&item.isSupplement!=2"
 								:custom-style="customStyle" shape="circle" :plain="true"
 								 class="btns"
-								@click="cancelOrder(item)">
-								取消订单
+								@click="goNav('/my/order/pay?ordersId='+item.ordersId)">
+								服务升级
 							</u-button>
+							
 							<u-button :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
 									@click="goNav('/my/wallet/index?artificerId='+item.artificerId+'&ordersId='+item.ordersId,item)">
 								充值
@@ -153,8 +154,9 @@
 							<view @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="gengduoBtn">
 								联系客服
 							</view>
-							<view @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="gengduoBtn">
-								服务升级
+							<view v-if="item.addNum==null&&item.oldOrdersId==null"
+								@click="cancelOrder(item)" class="gengduoBtn">
+								取消订单
 							</view>
 							<view @click="goToushu('/my/order/complain?ordersId='+item.ordersId + '&byUserId=' + item.artificerUserId + '&byuserName=' + item.artificerName)" class="gengduoBtn">
 								去投诉
diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue
index 997aaf8..114e63b 100644
--- a/pages/therapist/therapist.vue
+++ b/pages/therapist/therapist.vue
@@ -252,12 +252,12 @@ import permision from "@/components/permission.js";
 					{
 						id: 4,
 						name: "",
-						value: "资深",
+						value: "专家",
 					},
 					{
 						id: 5,
 						name: "",
-						value: "专家",
+						value: "资深",
 					},
 				],
 				technicianType:3,