盛安新版本问题优化-1

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;

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'},

pages.json

@@ -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
 			}
 		},
 		{
@@ -1074,7 +1087,7 @@
 			"path": "pages/therapist/orderDetail",
 			"style": {
 				"navigationBarTitleText": "技师详情",
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"app-plus": {
 					"titleNView": false
 				}

pages/index/index.vue

@@ -572,7 +572,7 @@
 				}
 				// #endif
 				that.getIsVip()
-				that.getHomeArtificerList();
+				// that.getHomeArtificerList();
 				that.getHomeNearbyList();
 			}else{
 				// uni.navigateTo({
@@ -1020,7 +1020,6 @@
 					wx.requestSubscribeMessage({
 						tmplIds: this.arr,
 						success(re) {
-							console.log(JSON.stringify(re), 111111111111)
 							var datas = JSON.stringify(re);
 							if (datas.indexOf("accept") != -1) {
 								console.log(re)
@@ -1044,7 +1043,7 @@
 
 			},
 			goOrder(e) {
-				console.log('授权', uni.getStorageSync('sendMsg'))
+				// console.log('授权', uni.getStorageSync('sendMsg'))
 				if (uni.getStorageSync('sendMsg')) {
 					console.log('授权+1')
 					wx.requestSubscribeMessage({
@@ -1163,69 +1162,72 @@
 				}
 				return status;
 			},
-			getHomeNearbyList(){//附近技师
+			getHomeNearbyList(){//附近技师和明星技师
 				var data={
-						  isStart: 1,
+					isStart: 1,
-						  status: 1,
+					status: 1,
-						  // city:this.cityname,
+					// city:this.cityname,
-						  longitude:this.longitude,
+					longitude:this.longitude,
-						  latitude:this.latitude,
+					latitude:this.latitude,
-						  page: 1,
+					page: 1,
-						  limit: 3
+					limit: 3
-						}
+				}
 				this.$Request.get("/app/artificer/getHomeArtificerList",data).then(res => {
 					if (res.code == 0) {
-							this.nearbyTechnician=res.nearData.list;
+						this.starTechnician = res.startData.list;
-							// const myLatitude = this.latitude; // 当前位置纬度
+						this.nearbyTechnician=res.nearData.list;
-							// const myLongitude = this.longitude; // 当前位置经度
+						// const myLatitude = this.latitude; // 当前位置纬度
-							// const targetLatitude = 39.919; // 目标位置纬度
+						// const myLongitude = this.longitude; // 当前位置经度
-							// const targetLongitude = 116.486; // 目标位置经度
+						// const targetLatitude = 39.919; // 目标位置纬度
-							// const targetLatitude = ''; // 目标位置纬度
+						// const targetLongitude = 116.486; // 目标位置经度
-							// const targetLongitude =''; // 目标位置经度
+						// const targetLatitude = ''; // 目标位置纬度
-							 for(var i=0;i<this.nearbyTechnician.length;i++){
+						// const targetLongitude =''; // 目标位置经度
-								 const distance = this.calculateDistance(
+						 for(var i=0;i<this.nearbyTechnician.length;i++){
-										 this.latitude,
+							 const distance = this.calculateDistance(
-										 this.longitude,
+									 this.latitude,
-										 this.nearbyTechnician[i].latitude,
+									 this.longitude,
-										 this.nearbyTechnician[i].longitude
+									 this.nearbyTechnician[i].latitude,
-									 );
+									 this.nearbyTechnician[i].longitude
-									this.nearbyTechnician[i].dingwei= distance.toFixed(1)
+								 );
-								 console.log(`距离为: ${distance.toFixed(1)} km`);
+								this.nearbyTechnician[i].dingwei= distance.toFixed(1)
-							 }
+							 console.log(`距离为: ${distance.toFixed(1)} km`);
-							 this.nearbyTechnician.sort((a, b) => a.dingwei - b.dingwei);
+						 }
-							// this.classifyId = res.data[0].id;
+						 this.nearbyTechnician.sort((a, b) => a.dingwei - b.dingwei);
-							// this.getorderlist('')
+						// this.classifyId = res.data[0].id;
-					}
+						// this.getorderlist('')
-				});
-			},
-			getHomeArtificerList(){//明星技师
-				var data={
-						  isStart: 1,
-						  status: 1,
-						  // city:this.cityname,
-						  longitude:this.longitude,
-						  latitude:this.latitude,
-						  page: 1,
-						  limit: 3
-						}
-				this.$Request.get("/app/artificer/getHomeArtificerList",data).then(res => {
-					if (res.code == 0) {
-							this.starTechnician = res.startData.list;
-							 // for(var i=0;i<this.starTechnician.length;i++){
-								//  const distance = this.calculateDistance(
-								// 		 this.latitude,
-								// 		 this.longitude,
-								// 		 this.starTechnician[i].latitude,
-								// 		 this.starTechnician[i].longitude
-								// 	 );
-								// 	this.starTechnician[i].dingwei= distance.toFixed(1)
-								//  console.log(`距离为: ${distance.toFixed(1)} km`);
-							 // }
-							// this.classifyId = res.data[0].id;
-							// this.getorderlist('')
 					}
 				});
 			},
+			// getHomeArtificerList(){//明星技师
+			// 	var data={
+			// 			  isStart: 1,
+			// 			  status: 1,
+			// 			  // city:this.cityname,
+			// 			  longitude:this.longitude,
+			// 			  latitude:this.latitude,
+			// 			  page: 1,
+			// 			  limit: 3
+			// 			}
+			// 	this.$Request.get("/app/artificer/getHomeArtificerList",data).then(res => {
+			// 		console.log(res);
+			// 		if (res.code == 0) {
+						
+			// 				this.starTechnician = res.startData.list;
+			// 				 // for(var i=0;i<this.starTechnician.length;i++){
+			// 					//  const distance = this.calculateDistance(
+			// 					// 		 this.latitude,
+			// 					// 		 this.longitude,
+			// 					// 		 this.starTechnician[i].latitude,
+			// 					// 		 this.starTechnician[i].longitude
+			// 					// 	 );
+			// 					// 	this.starTechnician[i].dingwei= distance.toFixed(1)
+			// 					//  console.log(`距离为: ${distance.toFixed(1)} km`);
+			// 				 // }
+			// 				// this.classifyId = res.data[0].id;
+			// 				// this.getorderlist('')
+			// 		}
+			// 	});
+			// },
 			//获取轮播图
 			getBannerList() {
 
@@ -1277,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) {

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>
@@ -195,19 +207,10 @@
 					<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('/pages/my/fuwuGengduo?text='+'index')">
+				<view class="my-use-list" @click="useToUrl('/my/feedback/index')">
-					<image style="padding: 3rpx;" src="../../static/my-gong-10.png" mode=""></image>
+					<image style="padding: 3rpx;" src="../../static/shezhi4.png" mode=""></image>
-					<span class="my-use-list-text">项目推荐</span>
+					<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)">

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> -->