From f515da5c9517da26264be1035e5662cd7b999870 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Sat, 6 Jul 2024 17:29:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/order/pay.vue        |  1 +
 my/order/payJaZ.vue     | 19 ++++++++++++++++++-
 my/order/payShengji.vue | 31 ++++++++++++++++++-------------
 pages/my/cika.vue       |  2 +-
 pages/order/index.vue   | 10 +++++++---
 5 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/my/order/pay.vue b/my/order/pay.vue
index e2aff59..f48fae1 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -45,6 +45,7 @@
 										<view class="money-pay-zhen">
 											<span>￥</span>
 											<span>{{order.massagePrice}}</span>
+											<view style="margin-left: 5px;font-size: 12px;color: #999;text-decoration: line-through;" v-if="order.ordersMassageList[0].userPackageDetail">￥{{order.price}}</view>
 										</view>
 										<view>
 											<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue
index 97c82a1..e9f50a8 100644
--- a/my/order/payJaZ.vue
+++ b/my/order/payJaZ.vue
@@ -472,7 +472,7 @@
 				</view>
 			</view>
 			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
-				<view class="showBtn-mian">
+				<view class="showBtn-mian" v-if="order.status=='6'">
 					<view class="showBtn">
 						<view class="gengduo" @click.stop="gengBtn">更多</view>
 						<u-button
@@ -518,6 +518,23 @@
 							class="btns">联系客服</u-button>
 					</view>
 				</view>
+				<view class="showBtn-mian" v-else>
+					<view class="showBtn" style="justify-content: center;">
+						<u-button :custom-style="customStyle2"
+							shape="circle" :plain="true"
+							@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
+							class="dingshi">
+							去投诉
+						</u-button>
+						<u-button :custom-style="customStyle2" shape="circle" :plain="true"
+							@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
+							class="dingshi">
+							去评价
+						</u-button>
+						<u-button shape="circle" :plain="true" @click="goChat"
+							class="btns">联系客服</u-button>
+					</view>
+				</view>
 				
 			</view>
 		</view>
diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue
index c3a2098..0965c33 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -21,16 +21,8 @@
 									{{order.entryName}}
 								</view>
 								<view class="zhuangtai">
-									<view v-if="order.status ==1">待支付</view>
-									<view v-if="order.status ==2">待服务</view>
-									<view v-if="order.status ==5">已完成</view>
-									<view v-if="order.status ==6">服务中</view>
-									<view v-if="order.status ==7">技师出发</view>
-									<view v-if="order.status ==8">技师到达</view>
 									<view v-if="order.status ==3">待评价</view>
-									<view v-if="order.status ==4">已取消</view>
-									<view v-if="order.status ==9">待确认</view>
-									<view v-if="order.status ==10">待补单</view>
+									<view v-if="order.status ==6">服务中</view>
 								</view>
 							</view>
 							<view class="flex align-center">
@@ -244,7 +236,7 @@
 							</view>
 							
 							<view class="flex justify-between jusitify-line">
-								<view class="line-word">升级项目</view>
+								<view class="line-word">服务项目</view>
 								<view class="line-word-r">{{order.entryName}}</view>
 							</view>
 							<view class="flex justify-between jusitify-line">
@@ -473,7 +465,7 @@
 							</view>
 							
 							<view class="flex justify-between jusitify-line">
-								<view class="line-word">升级项目</view>
+								<view class="line-word">服务项目</view>
 								<view class="line-word-r">{{order.entryName}}</view>
 							</view>
 							<view class="flex justify-between jusitify-line">
@@ -562,7 +554,7 @@
 			</view>
 
 			<view style="position: relative;" class="flex tabber padding-top-sm padding-bottom-sm align-center">
-				<view class="showBtn-mian">
+				<view class="showBtn-mian" v-if="order.status=='6'">
 					<view class="showBtn">
 						<view class="gengduo" @click.stop="gengBtn">更多</view>
 						
@@ -584,6 +576,7 @@
 							class="btns">
 							加钟
 						</u-button>
+						
 					</view>
 					<view class="yincang" v-show="btnShow==true">
 						<u-button style="margin:0px !important;" shape="circle" :plain="true" @click="goChat"
@@ -596,7 +589,19 @@
 						</u-button>
 					</view>
 				</view>
-				
+				<view class="showBtn-mian" v-else>
+					<view class="showBtn" style="justify-content: center;">
+						<u-button style="margin:0px !important;" shape="circle" :plain="true" @click="goChat"
+							class="btns">联系客服</u-button>
+						<u-button :custom-style="customStyle2"
+							shape="circle" :plain="true"
+							@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
+							class="dingshi">
+							去投诉
+						</u-button>
+					</view>
+					
+				</view>
 			</view>
 		</view>
 		<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
diff --git a/pages/my/cika.vue b/pages/my/cika.vue
index c034d2e..8140228 100644
--- a/pages/my/cika.vue
+++ b/pages/my/cika.vue
@@ -339,7 +339,7 @@
 	}
 	/deep/.zp-paging-container-content{
 		width: 95%;
-		margin: 0 auto;
+		margin: 50px auto 0px auto;
 	}
 	.fenlei{
 		display: flex;
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 665191a..1565eb5 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -103,7 +103,7 @@
 							待评价
 						</u-button>	
 						<u-button :custom-style="customStyle1" shape="circle"  class="btns xianshi" :plain="true" 
-							@click="goNav('/my/order/complain?id='+item.ordersId,item)" >
+							@click="goToushu('/my/order/complain?ordersId='+item.ordersId + '&byUserId=' + item.artificerUserId + '&byuserName=' + item.artificerName)" >
 							去投诉
 						</u-button>
 						<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@@ -153,7 +153,7 @@
 							<view @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="gengduoBtn">
 								服务升级
 							</view>
-							<view @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="gengduoBtn">
+							<view @click="goToushu('/my/order/complain?ordersId='+item.ordersId + '&byUserId=' + item.artificerUserId + '&byuserName=' + item.artificerName)" class="gengduoBtn">
 								去投诉
 							</view>
 							<view @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="gengduoBtn">
@@ -460,7 +460,11 @@
 					url:url
 				})
 			},
-			
+			goToushu(url){//去投诉
+				uni.navigateTo({
+					url:url
+				})
+			},
 			goNav(url,item,text) {
 				this.$queue.setData('xiangmu',item);
 				if(item.isSupplement=='2'&&item.status==6){//如果有订单有升级 那就去升级订单详情