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

---
 my/address/address.vue       |  2 +-
 my/order/payModify.vue       |  2 +-
 my/order/payModifyCi.vue     |  2 +-
 my/order/payModifyDzhifu.vue | 17 +++++++++++++----
 my/order/payModifyLiao.vue   |  2 +-
 my/order/payModifyMs.vue     |  6 +++++-
 my/order/payModifyQy.vue     |  2 +-
 my/order/payModifyTc.vue     |  6 +++++-
 my/order/payShengji.vue      |  2 +-
 my/order/paydingMs.vue       |  6 +++++-
 my/order/paydingPt.vue       |  6 +++++-
 my/order/paydingTc.vue       |  6 +++++-
 pages/my/fuwuGengduo.vue     | 31 +++++++++++++++++++++++++------
 pages/my/fuwuxiangm.vue      | 29 +++++++++++++++++++++++------
 pages/order/index.vue        | 10 ++++++++++
 15 files changed, 102 insertions(+), 27 deletions(-)

diff --git a/my/address/address.vue b/my/address/address.vue
index 93c522b..3165668 100644
--- a/my/address/address.vue
+++ b/my/address/address.vue
@@ -87,7 +87,7 @@
 				// console.log("addressId",addressId)
 				this.$queue.setData('EditAddress', addressId);
 				if (this.isfa == 0) {
-					console.log('1111111')
+
 				}else if (this.isfa ==1 ) {
 					this.updateaddress()
 				}else if (this.isfa == 2) {
diff --git a/my/order/payModify.vue b/my/order/payModify.vue
index 5dbcbf3..6e03f80 100644
--- a/my/order/payModify.vue
+++ b/my/order/payModify.vue
@@ -608,7 +608,7 @@
 					});
 				} else {
 					uni.navigateTo({
-						url: '../address/address?id=' + 2
+						url: '../address/address?id=' + 2 +'&pageName=payModify'
 					})
 				}
 
diff --git a/my/order/payModifyCi.vue b/my/order/payModifyCi.vue
index fcbc753..7d99f3a 100644
--- a/my/order/payModifyCi.vue
+++ b/my/order/payModifyCi.vue
@@ -494,7 +494,7 @@
 					});
 				} else {
 					uni.navigateTo({
-						url: '../address/address?id=' + 2
+						url: '../address/address?id=' + 2 +'&pageName=payModifyCi'
 					})
 				}
 
diff --git a/my/order/payModifyDzhifu.vue b/my/order/payModifyDzhifu.vue
index f5602ff..ed1c993 100644
--- a/my/order/payModifyDzhifu.vue
+++ b/my/order/payModifyDzhifu.vue
@@ -56,15 +56,23 @@
 					</view>
 				</view>
 
-				<view class="add-content"  @click="getAddressList()" >
-					<view v-if="!detailaddress">请选择地址</view>
+				
+				<!-- <view class="add-content" @click="getAddressList()" > 修改订单时先不让修改地址，客户要求修改时再放开，同时支付时后台修改订单接口要调整-->
+					<!-- <view v-if="!detailaddress">请选择地址</view>
 					<view  class="Service-Address">
 						{{province}}/{{city}}/{{district}}/{{detailaddress}}
 					</view>
 					<view class="Service-name">
 						<span>{{name}}</span>
 						<span>{{mobile}}</span>
+					</view> -->
+				<view class="add-content">	
+					<view class="Service-Address">{{orderXm.address}}</view>
+					<view class="Service-name" >
+						<span>{{orderXm.userName}}</span>
+						<span>{{orderXm.phone ? orderXm.phone.substring(0,3) + '****' + orderXm.phone.substring(7,11) : ''}}</span>
 					</view>
+					
 					<!-- <view class="margin-right-xs">
 						<view class="flex justify-between margin-top-lg">
 							<view class="header-view-text">联系人</view>
@@ -123,7 +131,8 @@
 					</view> -->
 				</view>
 				<view class="padding margin-top-sm header-view">
-					<view class="jusitify-line" @click="liliaoshi">
+					<!-- <view class="jusitify-line" @click="liliaoshi"> 修改订单时先不让修改技师，客户有要求时再打开-->
+					<view class="jusitify-line">
 					 	<view  class="title-font" >
 							<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
 							<span>技师</span>
@@ -131,7 +140,7 @@
 						<view>
 							<span class="line-word-r value-font" v-if="jishiName">{{jishiName.artificerName?jishiName.artificerName:jishiName.artificer.artificerName}}</span>
 							<span class="line-word-r value-font" v-else>选择不同技师价格可能不一样哦~</span>
-							<span class="view-more"></span>
+							<!-- <span class="view-more"></span> 修改订单时先不让修改技师，客户有要求时再打开-->
 						</view>
 					</view>
 					<!--<view class="liliao">
diff --git a/my/order/payModifyLiao.vue b/my/order/payModifyLiao.vue
index 3df0f8b..02916e9 100644
--- a/my/order/payModifyLiao.vue
+++ b/my/order/payModifyLiao.vue
@@ -495,7 +495,7 @@
 					});
 				} else {
 					uni.navigateTo({
-						url: '../address/address?id=' + 2
+						url: '../address/address?id=' + 2 +'&pageName=payModifyLiao'
 					})
 				}
 
diff --git a/my/order/payModifyMs.vue b/my/order/payModifyMs.vue
index 59361e3..5337b90 100644
--- a/my/order/payModifyMs.vue
+++ b/my/order/payModifyMs.vue
@@ -528,8 +528,12 @@
 						// uni.hideLoading();
 					});
 				} else {
+					let pageUrl = '../address/address?id=' + this.orderXm.type
+					if(this.orderXm.type == 2){
+						pageUrl = pageUrl +'&pageName=payModifyMs'
+					}
 					uni.navigateTo({
-						url: '../address/address?id=' + this.orderXm.type
+						url: pageUrl
 					})
 				}
 
diff --git a/my/order/payModifyQy.vue b/my/order/payModifyQy.vue
index 02b3b4d..89068f8 100644
--- a/my/order/payModifyQy.vue
+++ b/my/order/payModifyQy.vue
@@ -496,7 +496,7 @@
 					});
 				} else {
 					uni.navigateTo({
-						url: '../address/address?id=' + 2
+						url: '../address/address?id=' + 2 +'&pageName=payModifyQy'
 					})
 				}
 
diff --git a/my/order/payModifyTc.vue b/my/order/payModifyTc.vue
index 9e5bfcf..f9ecc6b 100644
--- a/my/order/payModifyTc.vue
+++ b/my/order/payModifyTc.vue
@@ -549,8 +549,12 @@
 						// uni.hideLoading();
 					});
 				} else {
+					let pageUrl = '../address/address?id=' + this.orderXm.type
+					if(this.orderXm.type == 2){
+						pageUrl = pageUrl +'&pageName=payModifyTc'
+					}
 					uni.navigateTo({
-						url: '../address/address?id=' + this.orderXm.type
+						url: pageUrl
 					})
 				}
 
diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue
index fa60c0c..d9e98d0 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -232,7 +232,7 @@
 							</view>
 							<view class="flex justify-between jusitify-line">
 								<view class="line-word title-font">升级差额</view>
-								<view class="line-word-r value-font" style="color: #019c88;">￥{{(order.priceMarkup - order.oldPriceMarkup).toFixed(0)}}</view>
+								<view class="line-word-r value-font" style="color: #019c88;">￥{{(order.priceMarkup - order.oldPriceMarkup).toFixed(2)}}</view>
 							</view>
 							<view class="flex justify-between jusitify-line">
 								<view class="line-word title-font">会员减免</view>
diff --git a/my/order/paydingMs.vue b/my/order/paydingMs.vue
index c950e40..0532c86 100644
--- a/my/order/paydingMs.vue
+++ b/my/order/paydingMs.vue
@@ -288,8 +288,12 @@
 						// uni.hideLoading();
 					});
 				} else {
+					let pageUrl = '../address/address?id=' + this.orderXm.type
+					if(this.orderXm.type == 2){
+						pageUrl = pageUrl +'&pageName=paydingMs'
+					}
 					uni.navigateTo({
-						url: '../address/address?id=' + this.orderXm.type
+						url: pageUrl
 					})
 				}
 
diff --git a/my/order/paydingPt.vue b/my/order/paydingPt.vue
index 1cc72e9..6ddaf41 100644
--- a/my/order/paydingPt.vue
+++ b/my/order/paydingPt.vue
@@ -288,8 +288,12 @@
 						// uni.hideLoading();
 					});
 				} else {
+					let pageUrl = '../address/address?id=' + this.orderXm.type
+					if(this.orderXm.type == 2){
+						pageUrl = pageUrl +'&pageName=paydingPt'
+					}
 					uni.navigateTo({
-						url: '../address/address?id=' + this.orderXm.type
+						url: pageUrl
 					})
 				}
 				
diff --git a/my/order/paydingTc.vue b/my/order/paydingTc.vue
index e06c01a..2e1103b 100644
--- a/my/order/paydingTc.vue
+++ b/my/order/paydingTc.vue
@@ -298,8 +298,12 @@
 						// uni.hideLoading();
 					});
 				} else {
+					let pageUrl = '../address/address?id=' + this.orderXm.type
+					if(this.orderXm.type == 2){
+						pageUrl = pageUrl +'&pageName=paydingTc'
+					}
 					uni.navigateTo({
-						url: '../address/address?id=' + this.orderXm.type
+						url: pageUrl
 					})
 				}
 
diff --git a/pages/my/fuwuGengduo.vue b/pages/my/fuwuGengduo.vue
index 9cf2203..e28abd9 100644
--- a/pages/my/fuwuGengduo.vue
+++ b/pages/my/fuwuGengduo.vue
@@ -46,10 +46,10 @@
 					<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
 						<image :src="item.packageImg" mode="" class="item-img"></image>
 						<view class="item-view">
-							<view class="item-view-title">
-								{{item.title}}
+							<view class="view-cata">
+								<view class="item-view-title">{{item.title}}</view>
+								<span v-if="item.levelName" class="xiaoer item-view-biao">{{item.levelName}}</span>
 							</view>
-							
 							<view class="item-view-bottom-qian">
 								<span></span>
 								<span>￥{{item.price}}</span>
@@ -226,8 +226,18 @@
 				this.$Request.get("/app/massage/package/findPackageAndMassagePage", params).then(res => {
 					for (var i = 0; i < res.data.list.length; i++) {
 						res.data.list[i].tagsData = res.data.list[i].labels.split(',');
+						if(res.data.list[i].level == 3){
+							res.data.list[i].levelName = "资深"
+						}
+						if(res.data.list[i].level == 4){
+							res.data.list[i].levelName = "金牌"
+						}
+						if(res.data.list[i].level == 5){
+							res.data.list[i].levelName = "专家"
+						}
 					}
 					this.$refs.paging.complete(res.data.list);
+					console.log(res.data.list);
 				}).catch(res => {
 					this.$refs.paging.complete(false);
 				})
@@ -453,9 +463,11 @@
 		text-overflow: ellipsis;
 	}
 
-	.item-view-biao {
-		padding: 1px 2px;
-		border-radius: 6rpx;
+	.item-view-biao{
+		padding: 1px 5px;
+		border-radius: 15rpx 3rpx 15rpx 3rpx;
+		width: 50px;
+		text-align: center;
 	}
 
 	.tuina {
@@ -684,4 +696,11 @@
 		justify-content: space-between;
 		background: #fff;
 	}
+	
+	.view-cata{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/my/fuwuxiangm.vue b/pages/my/fuwuxiangm.vue
index 7dae879..bf78fe3 100644
--- a/pages/my/fuwuxiangm.vue
+++ b/pages/my/fuwuxiangm.vue
@@ -46,10 +46,10 @@
 					<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
 						<image :src="item.packageImg" mode="" class="item-img"></image>
 						<view class="item-view">
-							<view class="item-view-title">
-								{{item.title}}
+							<view class="view-cata">
+								<view class="item-view-title">{{item.title}}</view>
+								<span v-if="item.levelName" class="xiaoer item-view-biao">{{item.levelName}}</span>
 							</view>
-							
 							<view class="item-view-bottom-qian">
 								<span></span>
 								<span>￥{{item.price}}</span>
@@ -226,6 +226,15 @@
 				this.$Request.get('/app/massage/package/findPackageAndMassagePage', params).then(res => {
 					for (var i = 0; i < res.data.list.length; i++) {
 						res.data.list[i].tagsData = res.data.list[i].labels.split(',');
+						if(res.data.list[i].level == 3){
+							res.data.list[i].levelName = "资深"
+						}
+						if(res.data.list[i].level == 4){
+							res.data.list[i].levelName = "金牌"
+						}
+						if(res.data.list[i].level == 5){
+							res.data.list[i].levelName = "专家"
+						}
 					}
 					this.$refs.paging.complete(res.data.list);
 				}).catch(res => {
@@ -452,9 +461,11 @@
 		text-overflow: ellipsis;
 	}
 
-	.item-view-biao {
-		padding: 1px 2px;
-		border-radius: 6rpx;
+	.item-view-biao{
+		padding: 1px 5px;
+		border-radius: 15rpx 3rpx 15rpx 3rpx;
+		width: 50px;
+		text-align: center;
 	}
 
 	.tuina {
@@ -683,4 +694,10 @@
 		justify-content: space-between;
 		background: #fff;
 	}
+	.view-cata{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/order/index.vue b/pages/order/index.vue
index ca8af44..d38af8a 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -492,6 +492,15 @@
 				})
 			},
 			goNav(url,item,text) {
+				if(item["technicianType"] == 3){
+				  item["technicianTypeName"] = "资深"
+				}
+				if(item["technicianType"] == 4){
+				  item["technicianTypeName"] = "金牌"
+				}
+				if(item["technicianType"] == 5){
+				  item["technicianTypeName"] = "专家"
+				}
 				this.$queue.setData('xiangmu',item);
 				this.$queue.setData('getJishi','')
 				console.log(item);
@@ -545,6 +554,7 @@
 				this.$Request.get('/app/artificer/selectAppOrdersList', data).then(res => {
 
 					if (res.code == 0) {
+						console.log(res.data.list);
 						uni.hideLoading();
 						if (this.page == 1) this.goods = []; //如果是第一页需手动制空列表
 						this.goods = [...this.goods, ...res.data.list]; //追加新数据