From c818c2c8be92981fa44bc6c71aaf1fc84cbce558 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Wed, 17 Jul 2024 17:18:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/order/payModifyDzhifu.vue |  6 +++---
 my/order/payding.vue         | 24 ++++++++++++++++--------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/my/order/payModifyDzhifu.vue b/my/order/payModifyDzhifu.vue
index d9ef14d..eb17207 100644
--- a/my/order/payModifyDzhifu.vue
+++ b/my/order/payModifyDzhifu.vue
@@ -363,7 +363,7 @@
 				this.jishiName=this.orderXm;
 				this.technicianRate=Math.ceil(this.orderXm.price+(this.orderXm.price*(this.orderXm.technicianRate/100)))
 			}
-			console.log("jishiName",this.jishiName)
+			console.log("orderXm",this.orderXm)
 			// this.getOrder()
 		},
 		
@@ -412,7 +412,7 @@
 					  address:that.province+that.city+that.district+that.detailaddress,
 					  artificerId:that.jishiName.artificerId,
 					  ordersMassageList:[
-					    {massageId: that.orderXm.massageTypeId,num: that.number},
+					    {massageId: that.orderXm.userPackageDetailId?that.orderXm.userPackageDetailId:that.orderXm.massageTypeId,num: that.number},
 					  ],
 					  city:that.city,
 					  serveTime:that.startTime,
@@ -426,7 +426,7 @@
 					  longitude:that.longitude,
 					  ordersId:that.orderXm.ordersId,
 					  couponId: that.couponId,
-					  massageTypeId:that.orderXm.massageTypeId,
+					  massageTypeId:that.orderXm.userPackageDetailId?that.orderXm.userPackageDetailId:that.orderXm.massageTypeId,
 					  userPackageDetailId:that.orderXm.userPackageDetailId,
 					}
 					that.$Request.postJson("/app/artificer/updateOrders", data).then(res => {
diff --git a/my/order/payding.vue b/my/order/payding.vue
index 3d3facf..7f48476 100644
--- a/my/order/payding.vue
+++ b/my/order/payding.vue
@@ -10,8 +10,11 @@
 					<view class="pay-title">服务项目</view>
 					<view class="flex justify-around">
 						<view class="" style="width: 160upx;height: 160upx;">
-							<image :src="order.ordersMassageList[0].massageType.massageImg"
-								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+							
+								<image v-if="order.userPackageDetailId==null" :src="order.ordersMassageList[0].massageType.massageImg"
+									style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+								<image v-else :src="order.ordersMassageList[0].userPackageDetail.massageImg"
+									style="width: 100%;height: 100%;border-radius: 19upx;"></image>
 						</view>
 						<view class="u-flex-1  margin-left-sm">
 							<view class="flex head-title-right">
@@ -40,10 +43,13 @@
 									</view>
 										
 									<view class="money-pay" style="justify-content: space-between;">
-										<view class="money-pay-zhen">
+										<view class="money-pay-zhen" v-if="order.userPackageDetailId==null">
 											<span>￥</span>
 											<span>{{order.priceMarkup}} </span>
-											<!-- <span style="color: #666;font-size: 12px;margin-left: 3px;"> x{{order.massageNum}}</span> -->
+										</view>
+										<view class="money-pay-zhen" v-else>
+											<span>￥</span>
+											<span>{{order.massagePrice}} </span>
 										</view>
 										<view>
 											<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
@@ -142,9 +148,10 @@
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">项目价格</view>
-							<view class="add-con-cont">￥{{order.priceMarkup}}</view>
+							<view class="add-con-cont" v-if="order.userPackageDetailId==null">￥{{order.priceMarkup}}</view>
+							<view class="add-con-cont" v-else>￥{{order.massagePrice}}</view>
 						</view> 
-						<view class="flex justify-between add-lin" >
+						<view class="flex justify-between add-lin" v-if="order.userPackageDetailId==null">
 							<view class="add-con-title">会员减免</view>
 							<view class="add-con-cont">-￥{{order.vipReductionMoney}}</view>
 						</view>
@@ -197,8 +204,9 @@
 					<view class="fei-view">
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">订单费用：</view>
-							<view class="add-con-cont">￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{order.priceMarkup}}</text></view>
+							<view class="add-con-cont">￥
+							<text style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text>
+						</view>
 						</view>
 						<view class="flex justify-between add-lin" v-if="order.taxiMoney">
 							<view class="add-con-title">出行费用：</view>