From 09c63f5ef1764093504830c5c5e2c593c8d4ac71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Sat, 26 Oct 2024 16:30:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=9B=E5=AE=89=E6=96=B0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96-1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/order/pay.vue                              | 15 +++-
 my/setting/index.vue                          |  2 +-
 pages.json                                    | 81 +++++++++++--------
 pages/index/index.vue                         | 12 ++-
 pages/my/index.vue                            | 29 ++++---
 .../liu-goods-swiper/liu-goods-swiper.vue     |  2 +-
 6 files changed, 88 insertions(+), 53 deletions(-)

diff --git a/my/order/pay.vue b/my/order/pay.vue
index dcea47e..ad488e2 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -425,7 +425,7 @@
 							提前结束
 						</u-button>
 						<u-button v-if="order.isSupplement!=2" shape="circle" :plain="true"
-							@tap="saveJZS(order.artificerId)" class="btns">
+							@tap="saveJZS(order)" class="btns">
 							服务升级
 						</u-button>
 						<u-button v-if="order.addNum ==null&&order.ordersMassageList[0].massageType" shape="circle"
@@ -1375,9 +1375,18 @@ export default {
         }
       })
     },
-    saveJZS(artificerId) {//升级查询技师项目
+    saveJZS(order) {//升级查询技师项目
+		let classifyId = 0;
+		if(order.ordersMassageList!=null){
+			if(order.ordersMassageList[0].userPackageDetail!=null){
+				classifyId = order.ordersMassageList[0].userPackageDetail.classifyId;
+			}else{
+				classifyId = order.ordersMassageList[0].massageType.classifyId;
+			}
+		}
       let data = {
-        artificerId: artificerId,
+        artificerId: order.artificerId,
+		classifyId: classifyId,
         status: 0
       }
       let that = this;
diff --git a/my/setting/index.vue b/my/setting/index.vue
index b404429..453c669 100644
--- a/my/setting/index.vue
+++ b/my/setting/index.vue
@@ -27,7 +27,7 @@
 					{url:'/pages/public/pwd',text:'修改密码',imgUrl:'../../static/shezhi1.png'},
 					{url:'/my/order/tousuList',text:'我的投诉',imgUrl:'../../static/shezhi2.png'},
 					{url:'/my/help/feedbackIndex',text:'帮助中心',imgUrl:'../../static/shezhi3.png'},
-					{url:'/my/feedback/index',text:'意见反馈',imgUrl:'../../static/shezhi4.png'},
+					/* {url:'/my/feedback/index',text:'意见反馈',imgUrl:'../../static/shezhi4.png'}, */
 					{url:'/my/setting/xieyi',text:'用户协议',imgUrl:'../../static/shezhi5.png'},
 					{url:'/my/setting/mimi',text:'隐私政策',imgUrl:'../../static/shezhi6.png'},
 					{url:'/my/setting/zhuxiao',text:'注销账号',imgUrl:'../../static/shezhi7.png'},
diff --git a/pages.json b/pages.json
index 9e96688..bcacbae 100644
--- a/pages.json
+++ b/pages.json
@@ -16,8 +16,8 @@
 				}
 			}
 		},
-		
-		// #endif 
+
+		// #endif
 		// #ifndef H5
 		{
 			"path": "pages/index/index",
@@ -324,7 +324,7 @@
 			"path": "pages/my/myMsOderDrtail",
 			"style": {
 				"navigationBarTitleText": "秒杀订单详情",
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom",
 				"app-plus": {
 					"titleNView": false
@@ -335,7 +335,7 @@
 			"path": "pages/my/miaoShaOderDrtail",
 			"style": {
 				"navigationBarTitleText": "秒杀详情",
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom",
 				"app-plus": {
 					"titleNView": false
@@ -357,7 +357,7 @@
 			"path": "pages/my/newseckill",
 			"style": {
 				"navigationBarTitleText": "秒杀",
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom",
 				"app-plus": {
 					"titleNView": false
@@ -368,7 +368,7 @@
 			"path": "pages/my/newseckilldetails",
 			"style": {
 				"navigationBarTitleText": "秒杀详情",
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom",
 				"app-plus": {
 					"titleNView": false
@@ -379,7 +379,7 @@
 			"path": "pages/my/newTeaml",
 			"style": {
 				"navigationBarTitleText": "团购列表",
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom",
 				"app-plus": {
 					"titleNView": false
@@ -412,7 +412,7 @@
 			"path": "pages/shop/index",
 			"style": {
 				"navigationBarTitleText": "约到店",
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom",
 				"app-plus": {
 					"titleNView": false
@@ -615,7 +615,18 @@
 				"navigationBarTitleText": "服务疗程",
 				"navigationBarBackgroundColor": "#096f4b",
 				"navigationBarTextStyle": "white",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/fuwudajiachangmai",
+			"style": {
+				"navigationBarTitleText": "大家常买",
+				"navigationBarBackgroundColor": "#096f4b",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -625,7 +636,7 @@
 				"navigationBarBackgroundColor": "#096f4b",
 				"navigationBarTextStyle": "white",
 				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -635,7 +646,7 @@
 				"navigationBarBackgroundColor": "#096f4b",
 				"navigationBarTextStyle": "white",
 				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -645,7 +656,7 @@
 				"navigationBarBackgroundColor": "#096f4b",
 				"navigationBarTextStyle": "white",
 				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -673,7 +684,8 @@
 				"navigationBarTitleText": "项目次卡",
 				"navigationBarBackgroundColor": "#096f4b",
 				"navigationBarTextStyle": "white",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -691,7 +703,8 @@
 				"navigationBarTitleText": "服务套餐",
 				"navigationBarBackgroundColor": "#096f4b",
 				"navigationBarTextStyle": "white",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -773,7 +786,7 @@
 				"app-plus": {
 					"titleNView": false
 				}
-		
+
 			}
 		},
 		{
@@ -825,7 +838,7 @@
 				}
 			}
 		},
-		
+
 		{
 			"path": "pages/publicThree/loginphone",
 			"style": {
@@ -859,7 +872,7 @@
 			"style": {
 				"navigationBarTitleText": "注册"
 			}
-		}, 
+		},
 		// #ifdef H5
 		{
 			"path": "pages/publicTwo/login",
@@ -900,7 +913,7 @@
 				}
 			}
 		},
-		
+
 		{
 			"path": "pages/publicTwo/loginphone",
 			"style": {
@@ -934,7 +947,7 @@
 			"style": {
 				"navigationBarTitleText": "注册"
 			}
-		}, 
+		},
 		// #ifdef H5
 		{
 			"path": "pages/public/login",
@@ -1009,8 +1022,8 @@
 			"style": {
 				"navigationBarTitleText": "注册"
 			}
-		}, 
-		
+		},
+
 		// #ifdef H5
 		{
 			"path": "pages/order/index",
@@ -1021,7 +1034,7 @@
 					"titleNView": false
 				}
 			}
-		}, 
+		},
 		// #endif
 		// #ifndef H5
 		{
@@ -1029,7 +1042,7 @@
 			"style": {
 				"navigationBarTitleText": "我的订单"
 			}
-		}, 
+		},
 		// #endif
 		// #ifdef H5
 		{
@@ -1041,7 +1054,7 @@
 					"titleNView": false
 				}
 			}
-		}, 
+		},
 		// #endif
 		// #ifndef H5
 		{
@@ -1053,7 +1066,7 @@
 					"titleNView": false
 				}
 			}
-		}, 
+		},
 		// #endif
 		{
 			"path": "pages/therapist/therapistShou",
@@ -1062,7 +1075,7 @@
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
-		}, 
+		},
 		{
 			"path": "pages/therapist/therapistList",
 			"style": {
@@ -1074,7 +1087,7 @@
 			"path": "pages/therapist/orderDetail",
 			"style": {
 				"navigationBarTitleText": "技师详情",
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"app-plus": {
 					"titleNView": false
 				}
@@ -1619,7 +1632,7 @@
 			{
 				"path": "publish/editor",
 				"style": {
-					
+
 					"navigationBarTitleText": "个人发布",
 					"app-plus": {
 						"titleNView": false
@@ -1721,7 +1734,7 @@
 					"navigationBarTitleText": "修改手机号"
 				}
 			},
-			
+
 			{
 				"path": "order/feedback",
 				"style": {
@@ -1811,9 +1824,9 @@
 							"buttons": [{
 								"type": "menu"
 							}]
-	
+
 						}
-	
+
 					}
 				}
 			},
@@ -1826,7 +1839,7 @@
 					}
 				}
 			},
-	
+
 			{
 				"path": "pages/zysc/index/commodityList",
 				"style": {
@@ -1853,7 +1866,7 @@
 					}
 				}
 			},
-	
+
 			{
 				"path": "pages/zysc/my/pinglun",
 				"style": {
@@ -1987,7 +2000,7 @@
 				//"pagePath": "pages/index/index",
 				//"iconPath": "static/tabbar/tabrNav.png",
 				//"selectedIconPath": "static/tabbar/tabrNav.png",
-				
+
 				"pagePath": "pages/index/index",
 				"iconPath": "static/tabbar/bottom5_1.png",
 				"selectedIconPath": "static/tabbar/bottom5_2.png",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4fe5f42..c2ecf1a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1279,7 +1279,17 @@
 			chengFel(item){//大家常买。。。 导航切换
 				this.currentTabFl=item.id;
 				if(this.currentTabFl=='1'){//大家常买
-					this.remen()
+					// this.remen()
+					let userId = uni.getStorageSync('userId')
+					if (userId) {
+						uni.navigateTo({
+							url:'/pages/my/fuwudajiachangmai?text='+'index'
+						})
+					}else{
+						uni.navigateTo({
+							url: '/pages/public/login'
+						})
+					}
 				}else if(this.currentTabFl=='2'){// 全部项目
 				let userId = uni.getStorageSync('userId')
 				if (userId) {
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 63bb7f0..81b8ec1 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -143,6 +143,18 @@
 					<image style="padding: 3rpx;" src="../../static/my-gong-7.png" mode=""></image>
 					<span class="my-use-list-text">设置中心</span>
 				</view>
+				<view class="my-use-list" @click="useToUrl('/my/help/feedbackIndex')">
+					<image style="padding: 3rpx;" src="../../static/my-gong-6.png" mode=""></image>
+					<span class="my-use-list-text">帮助中心</span>
+				</view>
+				<view class="my-use-list" @click="useToUrl('/pages/my/fuwuGengduo?text='+'index')">
+					<image style="padding: 3rpx;" src="../../static/my-gong-10.png" mode=""></image>
+					<span class="my-use-list-text">项目推荐</span>
+				</view>
+				<view class="my-use-list" @click="useToUrl('/pages/my/invitationUser')">
+					<image style="padding: 3rpx;" src="../../static/my-gong-3.png" mode=""></image>
+					<span class="my-use-list-text">分享好友</span>
+				</view>
 				<view class="my-use-list" @click="useToUrl('/pages/my/hehuo')">
 					<image style="padding: 3rpx;" src="../../static/my-gong-2.png" mode=""></image>
 					<span class="my-use-list-text">申请合作技师</span>
@@ -194,20 +206,11 @@
 				<view class="my-use-list" @click="useToUrl('/pages/my/myteam')">
 					<image style="padding: 3rpx;" src="../../static/my-gong-9.png" mode=""></image>
 					<span class="my-use-list-text">我的团队</span>
+				</view>	
+				<view class="my-use-list" @click="useToUrl('/my/feedback/index')">
+					<image style="padding: 3rpx;" src="../../static/shezhi4.png" mode=""></image>
+					<span class="my-use-list-text">我要投诉</span>
 				</view>
-				<view class="my-use-list" @click="useToUrl('/pages/my/fuwuGengduo?text='+'index')">
-					<image style="padding: 3rpx;" src="../../static/my-gong-10.png" mode=""></image>
-					<span class="my-use-list-text">项目推荐</span>
-				</view>
-				<view class="my-use-list" @click="useToUrl('/pages/my/invitationUser')">
-					<image style="padding: 3rpx;" src="../../static/my-gong-3.png" mode=""></image>
-					<span class="my-use-list-text">分享好友</span>
-				</view>
-				<view class="my-use-list" @click="useToUrl('/my/help/feedbackIndex')">
-					<image style="padding: 3rpx;" src="../../static/my-gong-6.png" mode=""></image>
-					<span class="my-use-list-text">帮助中心</span>
-				</view>
-				
 			</view>
 		</view>
 		<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
diff --git a/uni_modules/liu-goods-swiper/components/liu-goods-swiper/liu-goods-swiper.vue b/uni_modules/liu-goods-swiper/components/liu-goods-swiper/liu-goods-swiper.vue
index 5a80575..dcdca39 100644
--- a/uni_modules/liu-goods-swiper/components/liu-goods-swiper/liu-goods-swiper.vue
+++ b/uni_modules/liu-goods-swiper/components/liu-goods-swiper/liu-goods-swiper.vue
@@ -3,7 +3,7 @@
 		<scroll-view scroll-x="true" class="scroll-box" style="height: 100%;">
 			<view :class="'item-box'+' bg'+((index+'').slice(-1))" v-for="(item,index) in goodsList" :key="index"
 				@click="chooseItem(item)">
-				<image style="border-radius: 7px;" :src="item.artificerImg" :style="'width:'+imgWidth+'px;'+'height:'+imgHeight+'px;'" mode=""></image>
+				<image style="border-radius: 7px;border: 1px solid #019c88;" :src="item.artificerImg" :style="'width:'+imgWidth+'px;'+'height:'+imgHeight+'px;'" mode=""></image>
 				<view class="item-name">{{item.artificerName}}</view>
 				<view class="item-descr">{{item.content}}</view>
 				<!-- <view class="xiangshi" v-if="item.bdxsl">相识度：{{item.bdxsl}}%</view> -->