From 4c3abc36129e07ee37354134ed5034234eda7cdf Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Thu, 4 Jul 2024 19:13:27 +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         | 2 +-
 my/order/payShengji.vue  | 4 ++--
 my/wallet/index.vue      | 2 +-
 pages/index/index.vue    | 3 ++-
 pages/my/fuwuGengduo.vue | 5 +++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/my/order/pay.vue b/my/order/pay.vue
index a889059..f0dfc62 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -795,7 +795,7 @@
 				  classifyId:item.classifyId,
 				  ordersId:that.order.ordersId,
 				  massageTypeId:that.order.massageTypeId,
-				  userPackageDetailId:that.order.userPackageDetailId,
+				  // userPackageDetailId:that.order.userPackageDetailId,
 				  ordersMassageList:[
 				    {massageId: item.massageTypeId,num: 1},
 				  ],
diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue
index b9d355a..cca7765 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -4,13 +4,13 @@
 			<view style="color: red;font-size:26rpx">(订单已超时)</view>
 		</view>
 		<view class="padding-bottom u-skeleton">
-			<view class="bgImg u-skeleton-fillet" v-if="order.ordersMassageList && order.ordersMassageList.length > 0"
+			<view class="bgImg u-skeleton-fillet"
 				style="padding: 0 29rpx;">
 				<view class="head-top">
 					<view class="pay-title" style="">服务项目</view>
 					<view class="flex justify-around">
 						<view class="" style="width: 160upx;height: 160upx;">
-							<image :src="order.oldOrdersMassageList[0].massageType.massageImg"
+							<image :src="order.oldOrdersMassageList[0].massageType?order.oldOrdersMassageList[0].massageType.massageImg:order.oldOrdersMassageList[0].userPackageDetail.massageImg"
 								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
 						</view>
 						<view class="u-flex-1  margin-left-sm">
diff --git a/my/wallet/index.vue b/my/wallet/index.vue
index a2396cd..7cbfdd3 100644
--- a/my/wallet/index.vue
+++ b/my/wallet/index.vue
@@ -608,7 +608,7 @@
 				if(that.getList.text=='my'&&that.getList.artificerId){
 					that.textMoney='是否确定为技师'+ that.getJishi.artificerName +'充值'+'吗？'
 				}else{
-					that.textMoney='是否确定为充值!'
+					that.textMoney='是否确定充值!'
 				}
 				uni.showModal({
 					title: '提示',
diff --git a/pages/index/index.vue b/pages/index/index.vue
index cf98321..840f04e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -227,6 +227,7 @@
 				</swiper>
 			</view>
 		</view>
+		<view style="width: 100%;height: 700px;"></view>
 		<!-- 经验筛选 -->
 		<u-select v-model="Cityshow" style="height: auto;" :list="cityList" @confirm="getCity"></u-select>
 	</view>
@@ -1343,7 +1344,7 @@
 		display: flex;
 		flex-direction: column;
 		background: linear-gradient(180deg,rgba(238, 250, 246,0.6),rgba(255, 255, 255,0.9));
-		margin: 20rpx 0px 230px 0px;
+		margin: 20rpx 0px 0px 0px;
 	}
 	.index-fujin-jie-id{
 		height: 30rpx;
diff --git a/pages/my/fuwuGengduo.vue b/pages/my/fuwuGengduo.vue
index 930d7ba..710f575 100644
--- a/pages/my/fuwuGengduo.vue
+++ b/pages/my/fuwuGengduo.vue
@@ -169,14 +169,14 @@
 
 <style scoped>
 	/deep/.refresh-body{
-		height: 100% !important;
+		height: 845px !important;
 		background-color: #f7f7f7;
 		margin-top: 35px;
 	}
 	.content-view{
 		width: 100%;
 		height: 100vh;
-		overflow: auto;
+		overflow: hidden;
 	}
 	.item-view-bottom-btn{
 		text-align: center;
@@ -426,6 +426,7 @@
 		justify-content: space-between;
 		position: fixed;
 		background-color: #fff;
+		z-index: 999;
 	}
 	
 </style>