Revert "Merge branch 'dev' into ats2"

This reverts commit c8eed1e7ce986d97ec5f97040eeb9de8d1980d60, reversing
changes made to 309e4e65b8f19305684bcd9daadf9ff733796f66.

pages.json

@@ -1,5 +1,6 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		
 		{
 			"path": "pages/index/index",
 			"style": {

pages/activity/jkDetail.vue

@@ -758,12 +758,10 @@
 							 icon:'none',
 							 duration: 2000
 						 });
-						    setTimeout(function() {
-						    	uni.redirectTo({
-						    		url: "../user/myOrder/activityOrderDetail?id=" + that.orderData.id +"&SheetType=" + that.orderData.sheetType
-						    	})
-						    }, 300);
-						  	
+						 
+						  	uni.redirectTo({
+						  		url: "../user/myOrder/activityOrderDetail?id=" + that.orderData.id +"&SheetType=" + that.orderData.sheetType
+						  	})
 						  
 						
 				    },
@@ -1045,21 +1043,6 @@
 		   		   openId:this.wxOpenData.openid
 		   		  },'POST').then(res => {
 		   			var data = res.data;
-					if(data.newCustomer){
-						uni.showModal({
-							title: '提示',
-							content: data.newCustomerMsg,
-							success: function(resTK) {
-								
-							}
-						});
-						
-						var token=res.data.token
-						data.loginInfo={}
-						data.loginInfo.token=token
-						this.$store.commit('mutationswxOpenData', data);
-						return false;
-					}
 		   			if(data.loginInfo){
 		   				this.userInfo=data.loginInfo.openUser;
 		   				this.wxOpenData=data.loginInfo;

pages/index/confirmRescue.vue

@@ -1,104 +1,104 @@
 <template>
 <view class="box">
-  <view class="top-box" :style="{background:'#'+themeColor}">
-	  <view class="topTis"><!-- 需提前2小时取消订单，不足2小时需联系门 --></view>
-  </view>
-  <view class="topTime">
-	  <img src="../../static/timg/icon_shijian.png" alt="" class="topTimeImg">
-	  <view class="topTimeNum">{{opt.time}}</view>
-  </view>
-  <!-- 救援拖车框 -->
-  <view class="tcBox" v-if="opt.type==2">
-	  <view class="tcLeft">
-		  <view class="tcStart"> 
-		    <view class="tcStartYq"></view>	
-			<view class="tcStartTitle">起点</view>
-			<view class="tcStartTxt">{{opt.currentAddress}}</view>
-		  </view>
-		  <view class="tcEnd">
-			  <view class="tcEndYq"></view>
-			  <view class="tcStartTitle">终点</view>
-			  <view class="tcStartTxt">{{opt.endAddress}}</view>
-		  </view>
-	  </view>
-	  <view class="tcRight">约{{distance}}km</view>
-  </view>
-  <view class="tcBox" v-else>
-  	  <view class="tcLeft2">
-  		  <view class="tcStart"> 
-  		    <view class="tcStartYq"></view>	
-  			<view class="tcStartTitle">位置</view>
-  			<view class="tcStartTxt2">{{opt.currentAddress}}</view>
-  		  </view>
-  	  </view>
-  </view>
-   <!-- 救援拖车框 -->
-  <view class="contBox">
-	  <view class="kkline">
-		  <view class="kklineLeft">
-			<span>服务门店</span>
-		  </view>
-		  <view class="kklineRight">{{shopName}}</view>
-	  </view>
-	  <view class="kkline">
-		  <view class="kklineLeft">
-			<span>救援项目</span>
-		  </view>
-		  <view class="kklineRight" v-if="opt.type==1">搭电</view>
-		  <view class="kklineRight" v-if="opt.type==2">拖车</view>
-		  <view class="kklineRight" v-if="opt.type==3">换胎</view>
-		  <view class="kklineRight" v-if="opt.type==4">未知原因</view>
-	  </view>
-	  <view class="kkline">
-		  <view class="kklineLeft2">
-			<span class="stars">*</span> <span>救援场景</span>
-		  </view>
-		  <view class="kklineRight2">
-			  <view class="jyKK " :class="{jyKKActive:jykkNum==1}" @click="jykk(1)">地面</view>
-			  <view class="jyKK" :class="{jyKKActive:jykkNum==2}" @click="jykk(2)">车库</view>
-			  <view class="jyKK" :class="{jyKKActive:jykkNum==3}" @click="jykk(3)">其他</view>
-		  </view>
-	  </view>
-<!-- 	  <view class="kkline" >
-		  <view class="kklineLeft">
-			<span class="stars">*</span> <span>车牌号</span>
-		  </view>
-		  <view class="kklineRight3" @click="goCarlist">
-			  <span>{{carInfo.plateNumber?carInfo.plateNumber:'请选择'}}</span>
-			  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
-		  </view>
-	  </view>
-	  <view class="kkline" >
-	  		  <view class="kklineLeft">
-	  			<span class="stars">*</span> <span>车型</span>
-	  		  </view>
-	  		  <view class="kklineRight3" @click="goCarlist">
-	  			  <span>{{carInfo.carModel?carInfo.carModel:'请选择'}}</span>
-	  			  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
-	  		  </view>
-	  </view>
-	  <view class="kkline" >
-	  		  <view class="kklineLeft">
-	  			<span class="stars">*</span><span>救援联系人</span>
-	  		  </view>
-	  		  <view class="kklineRight">
-				  <input type="text" placeholder="请输入" v-model="customerName">
-			  </view>
-	  </view> -->
-	  <view class="kkline">
-	  		  <view class="kklineLeft">
-	  			<span class="stars">*</span><span>联系人手机号</span>
-	  		  </view>
-	  		  <view class="kklineRight"><input type="text" placeholder="请输入" v-model="mobilePhone"></view>
-	  </view>
+  <view class="top-box" :style="{background:'#'+themeColor}">
+	  <view class="topTis">需提前2小时取消订单，不足2小时需联系门</view>
   </view>
+  <view class="topTime">
+	  <img src="../../static/timg/icon_shijian.png" alt="" class="topTimeImg">
+	  <view class="topTimeNum">{{opt.time}}</view>
+  </view>
+  <!-- 救援拖车框 -->
+  <view class="tcBox" v-if="opt.type==2">
+	  <view class="tcLeft">
+		  <view class="tcStart"> 
+		    <view class="tcStartYq"></view>	
+			<view class="tcStartTitle">起点</view>
+			<view class="tcStartTxt">{{opt.currentAddress}}</view>
+		  </view>
+		  <view class="tcEnd">
+			  <view class="tcEndYq"></view>
+			  <view class="tcStartTitle">终点</view>
+			  <view class="tcStartTxt">{{opt.endAddress}}</view>
+		  </view>
+	  </view>
+	  <view class="tcRight">约{{distance}}km</view>
+  </view>
+  <view class="tcBox" v-else>
+  	  <view class="tcLeft2">
+  		  <view class="tcStart"> 
+  		    <view class="tcStartYq"></view>	
+  			<view class="tcStartTitle">位置</view>
+  			<view class="tcStartTxt2">{{opt.currentAddress}}</view>
+  		  </view>
+  	  </view>
+  </view>
+   <!-- 救援拖车框 -->
+  <view class="contBox">
+	  <view class="kkline">
+		  <view class="kklineLeft">
+			<span>服务门店</span>
+		  </view>
+		  <view class="kklineRight">{{shopName}}</view>
+	  </view>
+	  <view class="kkline">
+		  <view class="kklineLeft">
+			<span>救援项目</span>
+		  </view>
+		  <view class="kklineRight" v-if="opt.type==1">搭电</view>
+		  <view class="kklineRight" v-if="opt.type==2">拖车</view>
+		  <view class="kklineRight" v-if="opt.type==3">换胎</view>
+		  <view class="kklineRight" v-if="opt.type==4">未知原因</view>
+	  </view>
+	  <view class="kkline">
+		  <view class="kklineLeft2">
+			<span class="stars">*</span> <span>救援场景</span>
+		  </view>
+		  <view class="kklineRight2">
+			  <view class="jyKK " :class="{jyKKActive:jykkNum==1}" @click="jykk(1)">地面</view>
+			  <view class="jyKK" :class="{jyKKActive:jykkNum==2}" @click="jykk(2)">车库</view>
+			  <view class="jyKK" :class="{jyKKActive:jykkNum==3}" @click="jykk(3)">其他</view>
+		  </view>
+	  </view>
+	  <view class="kkline">
+		  <view class="kklineLeft">
+			<span class="stars">*</span> <span>车牌号</span>
+		  </view>
+		  <view class="kklineRight3" @click="goCarlist">
+			  <span>{{carInfo.plateNumber?carInfo.plateNumber:'请选择'}}</span>
+			  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
+		  </view>
+	  </view>
+	  <view class="kkline">
+	  		  <view class="kklineLeft">
+	  			<span class="stars">*</span> <span>车型</span>
+	  		  </view>
+	  		  <view class="kklineRight3" @click="goCarlist">
+	  			  <span>{{carInfo.carModel?carInfo.carModel:'请选择'}}</span>
+	  			  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
+	  		  </view>
+	  </view>
+	  <view class="kkline">
+	  		  <view class="kklineLeft">
+	  			<span class="stars">*</span><span>救援联系人</span>
+	  		  </view>
+	  		  <view class="kklineRight">
+				  <input type="text" placeholder="请输入" v-model="customerName">
+			  </view>
+	  </view>
+	  <view class="kkline">
+	  		  <view class="kklineLeft">
+	  			<span class="stars">*</span><span>手机号</span>
+	  		  </view>
+	  		  <view class="kklineRight"><input type="text" placeholder="请输入" v-model="mobilePhone"></view>
+	  </view>
+  </view>
   
 	<view style="height: 120rpx;"></view>
 	<view class="bottom-container">
 		<view class="heji">
 		  <!-- <span>合计</span> <span  style="font-size: 22rpx;color: #FF0000;">￥</span> <span style="font-size: 32rpx;color: #FF0000;" >759</span> -->
 		</view>
-	  <view  class="newyyBotbutton" :style="{background:'#'+themeColor}" @click="submitOrder">提交订单</view>
+	  <view  class="newyyBotbutton" :style="{background:'#'+themeColor}" @click="submitOrder">提交订单</view>
 	  <!-- yuyue 老预约-->
 	</view>
 	
@@ -120,171 +120,125 @@
 				timedata:'',
 				billDate:'',
 				yuyueData:'',
-				carInfo:'',
-				yyshopInfo:'',
-				themeColor:'',
-				shopName:'',
-				opt:'',
-				distance:'',
-				jykkNum:1,
-				customerName:'',
-				mobilePhone:'',
-				isGoing:false,
+				carInfo:'',
+				yyshopInfo:'',
+				themeColor:'',
+				shopName:'',
+				opt:'',
+				distance:'',
+				jykkNum:1,
+				customerName:'',
+				mobilePhone:'',
+				isGoing:false,
 				orderId:'',
-				ext:'',
 			}
 		},
-		onLoad(opt) {
+		onLoad(opt) {
 			this.themeColor = uni.getStorageSync("themeColor");
-			//this.userInfo = uni.getStorageSync("userInfo");
-			
-		
-			this.ext=this.$common.getExtStoreId();
-			this.shopName=opt.shopName;
-			this.opt=opt;
-			if(this.opt.type==2){
-				this.calculateDistance()
-			}
-			
-			this.userInfo = this.$store.state.userInfo;
-			console.log("this.userInfo")
-			console.log(this.userInfo)
-			if(this.userInfo){
-				//var customerInfo=uni.getStorageSync("wxOpenData").loginInfo.customerInfo;
-				var customerInfo=this.$store.state.wxOpenData.loginInfo.customerInfo
-				this.customerName=customerInfo.customerName;
-				this.mobilePhone=customerInfo.mobilePhone;
-			}
-			
+			//this.userInfo = uni.getStorageSync("userInfo");
+			var customerInfo=uni.getStorageSync("wxOpenData").loginInfo.customerInfo;
+			this.customerName=customerInfo.customerName;
+			this.mobilePhone=customerInfo.mobilePhone;
+			this.userInfo = this.$store.state.userInfo;
+			this.shopName=opt.shopName;
+			this.opt=opt;
+			if(this.opt.type==2){
+				this.calculateDistance()
+			}
+			console.log(opt)
 		},
-		onShow() {
-			this.carInfo=this.$store.state.carInfo;
-			console.log(this.carInfo)
+		onShow() {
+			this.carInfo=this.$store.state.carInfo;
+			console.log(this.carInfo)
 		},
-		methods: {
-			jykk(num){
-				this.jykkNum=num;
-			},
-			goCarlist(){
-				uni.navigateTo({
-					url:'../user/addCar/cailist'
-				})
-			},
-			submitOrder(){
-				if(this.isGoing){
-					return false;
-				}
-				/* if(!this.carInfo.carModel){
-					uni.showToast({
-						title: '请输选择车型',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				} */
-				/* if(!this.customerName){
-					uni.showToast({
-						title: '请输入救援联系人',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				} */
-				var reg = /^1[3|4|5|7|8][0-9]\d{8}$/;
-				if(reg.test(this.mobilePhone) == false ){
-				    console.log("手机号码格式不正确");
-				     uni.showToast({
-				     	title: '请输入正确的手机号',
-				     	icon: 'none',
-				     	duration: 3000
-				     });
-				     return false;   
-				}
-				if(!this.mobilePhone){
-					uni.showToast({
-						title: '请输入手机号',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
-				this.isGoing=true;
-				this.$http('openShopHelpSheetOrder/submitOrder', {
-				  helpType:this.opt.type,
-				  //customerName: this.customerName,
-				  mobilePhone: this.mobilePhone,
-				  //orderItem: this.yuyueData.map(item => item.ID).join(),
-				  shopID: this.opt.shopId,
-				  //plateNumber: this.carInfo ? this.carInfo.plateNumber :'',
-				 // carModel:this.carInfo?.carModel||'',
-				  hEndAddress:this.opt.endAddress,
-				  hStartAddress:this.opt.currentAddress,
-				  orderType:this.opt.orderType,
-				  hTime:this.opt.time,
-				  hscene:this.jykkNum,
-				  startLng:this.opt.lng,
-				  startLat:this.opt.lat,
-				  endLng:this.opt.endLng,
-				  endLat:this.opt.endLat,
-				 },'POST').then(res => {
-					console.log(res)
-					var id=res.data
-					console.log(id)
-					 if(res.code==0){
-						 if(this.userInfo){
-							 uni.showModal({
-							     title: '提示',
-							     content: '救援信息提交成功',
-							 	confirmText:'返回首页',
-							 	cancelText:'查看订单',
-							     success: function (res) {
-							 								  this.isGoing=false;
-							 								
-							         if (res.confirm) {
-							            // console.log('用户点击确定');
-							 		   uni.switchTab({
-							 		   	url:'index'
-							 		   })
-							         } else if (res.cancel) {
-							 									// uni.hideLoading();
-							           uni.redirectTo({
-							           		url:'../subPack/rescueOrderOrderDetail?id='+id
-							           }) 
-							 		   
-							         }
-							     }
-							 });
-						 }else{
-							 uni.showModal({
-							     title: '提示',
-							     content: '救援信息提交成功',
-							 	confirmText:'返回首页',
-							 	showCancel:false,
-							     success: function (res) {
-							 		 this.isGoing=false;
-							 								
-							         if (res.confirm) {
-							            // console.log('用户点击确定');
-							 		   uni.switchTab({
-							 		   	url:'index'
-							 		   })
-							         } else if (res.cancel) {
-							 									// uni.hideLoading();
-							           uni.redirectTo({
-							           		url:'../subPack/rescueOrderOrderDetail?id='+id
-							           }) 
-							 		   
-							         }
-							     }
-							 });
-						 }
-						
-					 }else{
-						 this.isGoing=false;
-					 }
-				 })
+		methods: {
+			jykk(num){
+				this.jykkNum=num;
+			},
+			goCarlist(){
+				uni.navigateTo({
+					url:'../user/addCar/cailist'
+				})
+			},
+			submitOrder(){
+				if(this.isGoing){
+					return false;
+				}
+				if(!this.carInfo.carModel){
+					uni.showToast({
+						title: '请输选择车型',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if(!this.customerName){
+					uni.showToast({
+						title: '请输入救援联系人',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if(!this.mobilePhone){
+					uni.showToast({
+						title: '请输入手机号',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				this.isGoing=true;
+				this.$http('openShopHelpSheetOrder/submitOrder', {
+				  helpType:this.opt.type,
+				  customerName: this.customerName,
+				  mobilePhone: this.mobilePhone,
+				  //orderItem: this.yuyueData.map(item => item.ID).join(),
+				  shopID: this.opt.shopId,
+				  plateNumber: this.carInfo.plateNumber,
+				  carModel:this.carInfo.carModel,
+				  hEndAddress:this.opt.endAddress,
+				  hStartAddress:this.opt.currentAddress,
+				  orderType:this.opt.orderType,
+				  hTime:this.opt.time,
+				  hscene:this.jykkNum,
+				  startLng:this.opt.lng,
+				  startLat:this.opt.lat,
+				  endLng:this.opt.endLng,
+				  endLat:this.opt.endLat,
+				 },'POST').then(res => {
+					console.log(res)
+					var id=res.data
+					console.log(id)
+					 if(res.code==0){
+						 uni.showModal({
+						     title: '提示',
+						     content: '救援信息提交成功',
+						 	confirmText:'返回首页',
+						 	cancelText:'查看订单',
+						     success: function (res) {
+								  this.isGoing=false;
+								
+						         if (res.confirm) {
+						            // console.log('用户点击确定');
+						 		   uni.switchTab({
+						 		   	url:'index'
+						 		   })
+						         } else if (res.cancel) {
+									// uni.hideLoading();
+						           uni.redirectTo({
+						           		url:'../subPack/rescueOrderOrderDetail?id='+id
+						           }) 
+						 		   
+						         }
+						     }
+						 });
+					 }else{
+						 this.isGoing=false;
+					 }
+				 })
 			},
-			yuyue(){
+			yuyue(){
 				var that=this;
 				if(!this.billDate){
 					uni.showToast({
@@ -293,10 +247,10 @@
 						duration: 3000
 					});
 					return false;
-				}
-				if(!this.isGoing){
-					return false;
-				}
+				}
+				if(!this.isGoing){
+					return false;
+				}
 				this.isGoing=true;
 				this.$http('openreservation/saveOrderSheet', {
 				  billDate: this.billDate,
@@ -305,62 +259,35 @@
 				  orderItem: this.yuyueData.map(item => item.ID).join(),
 				  shopId: this.yyshopInfo.id,
 				  unionId: this.userInfo.unionId
-				 },'POST').then(res => {
-					    console.log(res)
-						console.log(res.data)
-					    that.orderId=res.data
+				 },'POST').then(res => {
+					    console.log(res)
+						console.log(res.data)
+					    that.orderId=res.data
 						this.isGoing=false;
 						if(res.code==0){
-							if(this.userInfo){
-								uni.showModal({
-								    title: '提示',
-								    content: '预约成功',
-									confirmText:'返回首页',
-									
-								    success: function (res) {
-								        if (res.confirm) {
-								           // console.log('用户点击确定');
-										   uni.switchTab({
-										   	url:'index'
-										   })
-								        } else if (res.cancel) {
-								           // console.log('用户点击取消');
-										   // uni.reLaunch({
-											  //  url:'../user/bespeakDetail?id='+id
-										   // })
-										   uni.redirectTo({
-										   		url:'../subPack/rescueOrderOrderDetail?id='+that.orderId
-										   })
-										   
-								        }
-								    }
-								});
-							}else{
-								uni.showModal({
-								    title: '提示',
-								    content: '预约成功',
-									confirmText:'返回首页',
-									showCancel:false,
-								    success: function (res) {
-								        if (res.confirm) {
-								           // console.log('用户点击确定');
-										   uni.switchTab({
-										   	url:'index'
-										   })
-								        } else if (res.cancel) {
-								           // console.log('用户点击取消');
-										   // uni.reLaunch({
-											  //  url:'../user/bespeakDetail?id='+id
-										   // })
-										   uni.redirectTo({
-										   		url:'../subPack/rescueOrderOrderDetail?id='+that.orderId
-										   })
-										   
-								        }
-								    }
-								});
-							}
-						
+							uni.showModal({
+							    title: '提示',
+							    content: '预约成功',
+								confirmText:'返回首页',
+								cancelText:'查看订单',
+							    success: function (res) {
+							        if (res.confirm) {
+							           // console.log('用户点击确定');
+									   uni.switchTab({
+									   	url:'index'
+									   })
+							        } else if (res.cancel) {
+							           // console.log('用户点击取消');
+									   // uni.reLaunch({
+										  //  url:'../user/bespeakDetail?id='+id
+									   // })
+									   uni.redirectTo({
+									   		url:'../subPack/rescueOrderOrderDetail?id='+that.orderId
+									   })
+									   
+							        }
+							    }
+							});
 
 						}else{
 							uni.showToast({
@@ -377,173 +304,170 @@
 			},
 			cktime(){
 				 this.$refs.timeSelect.open();
-			},
-			//计算距离
-			calculateDistance(){
-			//调用距离计算接口
-				var that=this;
-				const tMap = new QQMapWX({
-					key: 'L2GBZ-CIS6J-HRFFV-K5LO6-QROT7-BQFXZ' //开发者密钥 //这里要换成自己的key
-				});
-				
-				tMap.calculateDistance({
-					mode: 'driving',//可选值：'driving'（驾车）、'walking'（步行），不填默认：'walking',可不填
-					//from参数不填默认当前地址
-					//获取表单提交的经纬度并设置from和to参数（示例为string格式）
-					from: {
-						latitude:  that.opt.lat,
-						longitude: that.opt.lng,
-					}, //若起点有数据则采用起点坐标，若为空默认当前地址
-					to:[
-					{
-						latitude: that.opt.endLat,
-						longitude: that.opt.endLng
-					}	
-					] , //终点坐标
-					success: function(res) {//成功后的回调
-					  console.log(res);
-					  that.distance=res.result.elements[0].distance/1000;
-                      //that.distance=that.distance.tofixed(2)
-					},
-
-				});
-
+			},
+			//计算距离
+			calculateDistance(){
+			//调用距离计算接口
+				var that=this;
+				const tMap = new QQMapWX({
+					key: 'L2GBZ-CIS6J-HRFFV-K5LO6-QROT7-BQFXZ' //开发者密钥 //这里要换成自己的key
+				});
+				
+				tMap.calculateDistance({
+					mode: 'driving',//可选值：'driving'（驾车）、'walking'（步行），不填默认：'walking',可不填
+					//from参数不填默认当前地址
+					//获取表单提交的经纬度并设置from和to参数（示例为string格式）
+					from: {
+						latitude:  that.opt.lat,
+						longitude: that.opt.lng,
+					}, //若起点有数据则采用起点坐标，若为空默认当前地址
+					to:[
+					{
+						latitude: that.opt.endLat,
+						longitude: that.opt.endLng
+					}	
+					] , //终点坐标
+					success: function(res) {//成功后的回调
+					  console.log(res);
+					  that.distance=res.result.elements[0].distance/1000;
                      //that.distance=that.distance.tofixed(2)
+					},
+				});
 		},
 			
 		}
 	}
 </script>
 
-<style scoped lang="less">
-	.topTis{
-		font-weight: 400;
-		color: #FFFFFF;
-		font-size: 26rpx;
-		text-align: center;
-		padding-top: 24rpx;
-	}
-.tcBox{
-	width: 702rpx;
-    margin-top: 20rpx;
-	margin-left: 24rpx;
-	background: #FFFFFF;
-	border-radius: 10rpx;
-	display: flex;
-	
-}
-.heji{
-	font-weight: 500;
-	color: #666666;
-	padding-left: 30rpx;
-	line-height: 120rpx;
-}
+<style scoped lang="less">
+	.topTis{
+		font-weight: 400;
+		color: #FFFFFF;
+		font-size: 26rpx;
+		text-align: center;
+		padding-top: 24rpx;
+	}
+.tcBox{
+	width: 702rpx;
+    margin-top: 20rpx;
+	margin-left: 24rpx;
+	background: #FFFFFF;
+	border-radius: 10rpx;
+	display: flex;
+	
+}
+.heji{
+	font-weight: 500;
+	color: #666666;
+	padding-left: 30rpx;
+	line-height: 120rpx;
+}
 .rightJt{
 	width: 30rpx;
 	height: 30rpx;
 	margin-top: 4rpx;
-}
-.kklineRight3{
-  display: flex;
-  color: #3c3c3c;
-  font-size: 28rpx;
-  
-}
-.kklineRight2{
-	display: flex;
-}
-.jyKK{
-	width: 108rpx;
-	height: 56rpx;
-	border-radius: 6rpx;
-	border: 2rpx solid #CCCCCC;
-	color: #666666;
-	font-size: 24rpx;
-	text-align: center;
-	line-height: 56rpx;
-	margin-left: 20rpx;
-}
-.jyKKActive{
-	background: #FF0000;
-	border: none;
-	height: 60rpx;
-	color: #FFFFFF;
-}
-.kklineLeft2{
-	line-height: 60rpx;
-}
-.contBox{
-	width: 662rpx;
-	margin-top: 20rpx;
-	margin-left: 24rpx;
-	background: #FFFFFF;
-	border-radius: 10rpx;
-	padding: 0 20rpx;
-}
+}
+.kklineRight3{
+  display: flex;
+  color: #3c3c3c;
+  font-size: 28rpx;
+  
+}
+.kklineRight2{
+	display: flex;
+}
+.jyKK{
+	width: 108rpx;
+	height: 56rpx;
+	border-radius: 6rpx;
+	border: 2rpx solid #CCCCCC;
+	color: #666666;
+	font-size: 24rpx;
+	text-align: center;
+	line-height: 56rpx;
+	margin-left: 20rpx;
+}
+.jyKKActive{
+	background: #FF0000;
+	border: none;
+	height: 60rpx;
+	color: #FFFFFF;
+}
+.kklineLeft2{
+	line-height: 60rpx;
+}
+.contBox{
+	width: 662rpx;
+	margin-top: 20rpx;
+	margin-left: 24rpx;
+	background: #FFFFFF;
+	border-radius: 10rpx;
+	padding: 0 20rpx;
+}
 .stars{
 	color: #FF2400;
-}
-.tcLeft{
-   width: 524rpx;padding-left: 20rpx;
-}
-.tcStartTxt2{
-	width: 550rpx;
-}
-.tcLeft2{
-	padding-left: 13rpx;
-}
-.tcStart{
-	border-bottom: 1px solid #EEEEEE;
-	display: flex;
-	padding: 29rpx 0;
-	font-size: 28rpx;
-	color: #333333;
-	line-height: 40rpx;
-}
-.tcEnd{
-	display: flex;
-	padding: 29rpx 0;
-	font-size: 28rpx;
-	color: #333333;
-	line-height: 40rpx;
-}
-.tcStartYq{
-	width: 14rpx;
-	height: 14rpx;
-	background: #3F90F7;
-	margin-top: 13rpx;
-	border-radius: 50%;
-}
-.tcStartTxt{
-	width: 396rpx;
-}
-.tcEndYq{
-	width: 14rpx;
-	height: 14rpx;
-	background: #FF0000;
-	margin-top: 13rpx;
-	border-radius: 50%;
-}
-.tcStartTitle{
-	color: #666666;
-	padding: 0 30rpx 0 20rpx;
-}
-.tcRight{
-	color: #FF0000;
-	line-height: 33rpx;
-	font-size: 24rpx;
-	padding-top: 30rpx;
-	padding-left: 10rpx;
-	display: flex;
-	align-items: center;
-}
+}
+.tcLeft{
+   width: 524rpx;padding-left: 20rpx;
+}
+.tcStartTxt2{
+	width: 550rpx;
+}
+.tcLeft2{
+	padding-left: 13rpx;
+}
+.tcStart{
+	border-bottom: 1px solid #EEEEEE;
+	display: flex;
+	padding: 29rpx 0;
+	font-size: 28rpx;
+	color: #333333;
+	line-height: 40rpx;
+}
+.tcEnd{
+	display: flex;
+	padding: 29rpx 0;
+	font-size: 28rpx;
+	color: #333333;
+	line-height: 40rpx;
+}
+.tcStartYq{
+	width: 14rpx;
+	height: 14rpx;
+	background: #3F90F7;
+	margin-top: 13rpx;
+	border-radius: 50%;
+}
+.tcStartTxt{
+	width: 396rpx;
+}
+.tcEndYq{
+	width: 14rpx;
+	height: 14rpx;
+	background: #FF0000;
+	margin-top: 13rpx;
+	border-radius: 50%;
+}
+.tcStartTitle{
+	color: #666666;
+	padding: 0 30rpx 0 20rpx;
+}
+.tcRight{
+	color: #FF0000;
+	line-height: 33rpx;
+	font-size: 24rpx;
+	padding-top: 30rpx;
+	padding-left: 10rpx;
+	display: flex;
+	align-items: center;
+}
 .kkline{
 	display: flex;
 	padding: 30rpx 0;
 	border-bottom: 1px solid #EEEEEE;
 	color: #666666;
-	font-size: 28rpx;
+	font-size: 28rpx;
 	justify-content: space-between;
-}
+}
 .kkline2{
 	display: flex;
 	justify-content: space-between;
@@ -551,12 +475,12 @@
 	border-bottom: 1px solid #EEEEEE;
 	color: #666666;
 	font-size: 28rpx;
-}
+}
 .kklineRight{
 	color: #3c3c3c;
 	font-size: 28rpx;
 	
-	width: 450rpx;
+	width: 450rpx;
 	text-align: right;
 }
 .kklineLeft {
@@ -565,34 +489,34 @@
 .box{
 	background: #F4F5F7;
 	min-height: 100vh;
-}
-.topTime{
-	width: 702rpx;
-    margin-left: 24rpx;
-	background: #FFFFFF;
-	border-radius: 10rpx;
-	display: flex;
-	justify-content: center;
-	padding: 37rpx 0;
-	margin-top: -70rpx;
-	
-}
-.topTimeImg{
-	width: 36rpx;
-	height: 36rpx;
-}
-.topTimeNum{
-	font-weight: 500;
-	font-size: 32rpx;
-	line-height: 36rpx;
-	color: #333333;
-	padding-left: 18rpx;
-}
-.top-box{
-	width: 750rpx;
-	height: 164rpx;
-	background: #FF0000;
-	border-radius: 0 0 10% 10%;
+}
+.topTime{
+	width: 702rpx;
+    margin-left: 24rpx;
+	background: #FFFFFF;
+	border-radius: 10rpx;
+	display: flex;
+	justify-content: center;
+	padding: 37rpx 0;
+	margin-top: -70rpx;
+	
+}
+.topTimeImg{
+	width: 36rpx;
+	height: 36rpx;
+}
+.topTimeNum{
+	font-weight: 500;
+	font-size: 32rpx;
+	line-height: 36rpx;
+	color: #333333;
+	padding-left: 18rpx;
+}
+.top-box{
+	width: 750rpx;
+	height: 164rpx;
+	background: #FF0000;
+	border-radius: 0 0 10% 10%;
 }
 .bottom-container{
 	width: 750rpx;

pages/index/confirmYuyue.vue

@@ -1,8 +1,8 @@
 <template>
 <view class="box">
-	<!-- <view class="yuyuCheckTis" :style="{background:'#'+themeColor}">
-	   温馨提示：该报价仅为参考价格，实际以门店为准（不同品牌和车型费用不同） 
-	</view> -->
+	<view class="yuyuCheckTis">
+	  温馨提示：该报价仅为参考价格，实际以门店为准（不同品牌和车型费用不同）
+	</view>
 	<view class="cont">
 		<view class="contkk">
 		  <view class="kkline">
@@ -11,7 +11,7 @@
 			  </view>
 			  <view class="kklineRight">{{yyshopInfo.shopName}}</view>
 		  </view>
-		<!--  <view class="kkline">
+		  <view class="kkline">
 			  <view class="kklineLeft">
 				<span class="stars">*</span> <span>预约车辆</span>
 			  </view>
@@ -19,8 +19,8 @@
 				  <span>{{carInfo.plateNumber?carInfo.plateNumber:'请选择'}}</span>
 				  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
 			  </view>
-		  </view> -->
-		  <view class="kkline ">
+		  </view>
+		  <view class="kkline lineborderNo">
 			  <view class="kklineLeft">
 				<span class="stars">*</span> <span>预约时间</span>
 			  </view>
@@ -29,13 +29,6 @@
 				  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
 			  </view>
 		  </view>
-		  <view class=" lineborderNo" >
-		  	<view class="bzline">
-		  		<view class="beiz"><span class="stars">*</span>手机号</view>
-		  		<input type="number" v-model="mobilePhone" placeholder="请输入手机号" class="beizInput" placeholder-style="color:#cccccc;">
-		  	</view>
-		  	
-		  </view> 
 		</view>
 		
 		<view class="contkk" style="margin-top: 20rpx;">
@@ -90,8 +83,6 @@
 				themeColor:'',
 				isgo:true,
 				stationID:'',
-				mobilePhone:'',
-				ext:'',
 			}
 		},
 		onLoad(opt) {
@@ -104,13 +95,7 @@
 			//this.userInfo = uni.getStorageSync("userInfo");
 			this.userInfo = this.$store.state.userInfo;
 			this.yyshopInfo=uni.getStorageSync("yyshopInfo")
-			this.ext=this.$common.getExtStoreId();
 			//this.getOrderTimes()
-			if(this.userInfo){
-				console.log(this.userInfo)
-				//var customerInfo=uni.getStorageSync("wxOpenData").loginInfo.customerInfo;
-				this.mobilePhone=this.userInfo.mobilePhone;
-			}
 			
 		},
 		onShow() {
@@ -124,7 +109,7 @@
 				})
 			},
 			yuyue(){
-				/* if(!this.carInfo){
+				if(!this.carInfo){
 					uni.showToast({
 						title: '请选择车辆',
 						icon: 'none',
@@ -139,18 +124,7 @@
 						duration: 3000
 					});
 					return false;
-				} */
-				var reg = /^1[3|4|5|7|8][0-9]\d{8}$/;
-				if(reg.test(this.mobilePhone) == false ){
-				    console.log("手机号码格式不正确");
-				     uni.showToast({
-				     	title: '请输入正确的手机号',
-				     	icon: 'none',
-				     	duration: 3000
-				     });
-				     return false;   
 				}
-				
 				if(!this.billDate){
 					uni.showToast({
 						title: '请选择预约时间',
@@ -159,14 +133,6 @@
 					});
 					return false;
 				}
-				if(!this.mobilePhone){
-					uni.showToast({
-						title: '请填写手机号',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
 				if(!this.isgo){
 					return false
 				}
@@ -174,58 +140,38 @@
 				this.$http('openreservation/saveOrderSheet', {
 				  billDate: this.billDate,
 				  comment: this.comment,
-				//  carID: this.carInfo?.id || '',
-				  carID: '',
+				  carID: this.carInfo.id,
 				  orderItem: this.yuyueData.map(item => item.ID).join(),
 				  shopId: this.yyshopInfo.id,
-				  unionId: this.ext.unionId,
-				  stationID:this.stationID,
-				  mobilePhone:this.mobilePhone
+				  unionId: this.userInfo.unionId,
+				  stationID:this.stationID
 				 },'POST').then(res => {
 					    this.isgo=true;
 					    var id=res.data
 						if(res.code==0){
-							if(this.userInfo){
-								uni.showModal({
-								    title: '提示',
-								    content: '预约订单提交成功',
-									confirmText:'返回首页',
-									cancelText:'查看订单',
-								    success: function (res) {
-								        if (res.confirm) {
-								           // console.log('用户点击确定');
-										   uni.switchTab({
-										   	url:'index'
-										   })
-								        } else if (res.cancel) {
-								           // console.log('用户点击取消');
-										   // uni.reLaunch({
-											  //  url:'../user/bespeakDetail?id='+id
-										   // })
-										   uni.redirectTo({
-										   		url:'../user/bespeakDetail?id='+id
-										   })
-										   
-								        }
-								    }
-								});
-							}else{
-								uni.showModal({
-								    title: '提示',
-								    content: '预约订单提交成功',
-									confirmText:'返回首页',
-									showCancel:false,
-								    success: function (res) {
-								        if (res.confirm) {
-								           // console.log('用户点击确定');
-										   uni.switchTab({
-										   	url:'index'
-										   })
-								        } 
-								    }
-								});
-							}
-						
+							uni.showModal({
+							    title: '提示',
+							    content: '预约订单提交成功',
+								confirmText:'返回首页',
+								cancelText:'查看订单',
+							    success: function (res) {
+							        if (res.confirm) {
+							           // console.log('用户点击确定');
+									   uni.switchTab({
+									   	url:'index'
+									   })
+							        } else if (res.cancel) {
+							           // console.log('用户点击取消');
+									   // uni.reLaunch({
+										  //  url:'../user/bespeakDetail?id='+id
+									   // })
+									   uni.redirectTo({
+									   		url:'../user/bespeakDetail?id='+id
+									   })
+									   
+							        }
+							    }
+							});
 
 						}else{
 							uni.showToast({

pages/index/couponShare.vue

@@ -239,21 +239,6 @@
 					   openId:this.wxOpenData.openid
 					  },'POST').then(res => {
 						var data = res.data;
-						if(data.newCustomer){
-							uni.showModal({
-								title: '提示',
-								content: data.newCustomerMsg,
-								success: function(resTK) {
-									
-								}
-							});
-							
-							var token=res.data.token
-							data.loginInfo={}
-							data.loginInfo.token=token
-							this.$store.commit('mutationswxOpenData', data);
-							return false;
-						}
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;

pages/index/index.vue

@@ -8,23 +8,20 @@
 		<view style="height: 43px;"></view>
 		<view class="topBox" :style="{background:'#'+themeColor}" v-if="getwxLoing"></view>
 		<view class="yuanhu" :style="{background:'#'+themeColor}" v-if="getwxLoing"></view>
-		<view class="shoptopbox2"  v-if="!userInfo&&getwxLoing">
+		<view class="shoptopbox2"  v-if="!carInfo">
 		  <view class="carinfoBox2">
 		    <view class="carinfoBoxNocar" @click="addCar">
-		        <!-- <img src="../../static/timg/addcar.png" alt="" class="carinfonocarIcon">
+		        <img src="../../static/timg/addcar.png" alt="" class="carinfonocarIcon">
 		        <view class="carinfoBoxNocarRight">
 		          <view class="carinfoBoxNocarRightTitle">添加我的爱车</view>
 		          <view class="carinfoBoxNocarRightMS">按照车型推荐合适的商品</view>
-		        </view> -->
-				<image src="../../static/timg/pic_def_ava@2x.png" mode="" class="carinfonocarIcon"></image>
-				<view class="loginTitle">请先登录</view>
-				<view>{{userInfo}}</view>
+		        </view>
 		    </view>
 		
 		  </view>
 		</view>
-		<view class="shoptopbox" v-if="userInfo&&getwxLoing">
-		  <view class="carinfoBox"  v-if="carInfo" >
+		<view class="shoptopbox"  v-if="carInfo">
+		  <view class="carinfoBox" >
 		      <view class="carinfoBoxTop">
 		        <img :src="carInfo.brandLogo" alt="" class="carLogo" v-if="carInfo.brandLogo">
 		        <img src="../../static/timg/nocar.png" alt="" class="carLogo" v-else>
@@ -311,7 +308,6 @@
 				qrimg:'',
 				qrSHow:false,
 				customerInfo:'',
-				userInfo:'',
 				exitNum:'',
 			}
 		},
@@ -374,12 +370,10 @@
 				this.themeColor=themeColor
 			}
 			this.getwxLoing=true;
-			
 			this.exitNum=this.$store.state.exitNum;
 			if(this.exitNum==1){
 				this.carInfo=''
 			}else{
-               if(this.userInfo){
 				if(indexaddcar==1){
 					uni.removeStorageSync('indexaddcar');
 					this.getCarList();
@@ -391,8 +385,7 @@
 						this.getCarList();
 					}
 					this.jsTime()
-				  }
-			  }
+				}
 			}
 			
 		    
@@ -606,21 +599,6 @@
 				
 			},
 			goRoter(item){
-               if(item.bizType==7){ //7门店列表
-					uni.navigateTo({
-						url:'shopList'
-					})
-				}else  if(item.bizType==1){ //紧急救援
-						 uni.navigateTo({
-						 	url:'rescue'
-						 })
-						/* uni.showToast({
-							 title: '敬请期待',
-							 icon:'none',
-							 duration: 3000
-						}); */
-						
-					}else 
 				if(!this.userInfo){
 					if(this.exitNum!=1){
 						this.authorizShow=true;
@@ -676,6 +654,16 @@
 								 duration: 3000
 							});
 						}
+					}else if(item.bizType==1){ //紧急救援
+						 uni.navigateTo({
+						 	url:'rescue'
+						 })
+						/* uni.showToast({
+							 title: '敬请期待',
+							 icon:'none',
+							 duration: 3000
+						}); */
+						
 					}else if(item.bizType==2){ //钣金喷漆
 						 uni.navigateTo({
 							url:'paint'
@@ -697,6 +685,10 @@
 					}else if(item.bizType==6){ //联系本店
 					    this.getShopinfo(6,item.orShopId)
 						
+					}else if(item.bizType==7){ //7门店列表
+						uni.navigateTo({
+							url:'shopList'
+						})
 					}else if(item.bizType==8){ //我的会员卡
 						uni.navigateTo({
 							url:'vipCard'
@@ -891,8 +883,6 @@
 					if(this.wxOpenData.loginInfo){
 						this.$store.commit('mutationsuserInfo', that.wxOpenData.loginInfo.openUser)
 						this.userInfo=that.wxOpenData.loginInfo.openUser
-						console.log("this.userInfo")
-						console.log(this.userInfo)
 						that.queryManagerInfo()
 						uni.setStorage({
 							key: 'userInfo',
@@ -941,21 +931,6 @@
 				    shareId:this.shareID
 				  },'POST').then(res => {
 				 	var data = res.data;
-					if(data.newCustomer){
-						uni.showModal({
-							title: '提示',
-							content: data.newCustomerMsg,
-							success: function(resTK) {
-								
-							}
-						});
-						
-						var token=res.data.token
-						data.loginInfo={}
-						data.loginInfo.token=token
-						this.$store.commit('mutationswxOpenData', data);
-						return false;
-					}
 					if(data.loginInfo){
 						this.userInfo=data.loginInfo.openUser;
 						this.customerInfo=data.loginInfo.customerInfo
@@ -1574,13 +1549,6 @@
 		color: #3C3C3C;
 		font-size: 30rpx;
 	}
-	.loginTitle{
-		font-weight: 600;
-		color: #3C3C3C;
-		font-size: 30rpx;
-		padding-left: 20rpx;
-		line-height: 72rpx;
-	}
 	.carinfoBoxNocarRightMS{
 		color: #666666;
 		font-size: 26rpx;

pages/index/onlineBooking.vue

@@ -232,7 +232,7 @@
 					}
 					if(!this.userInfo){
 						uni.hideLoading();
-						//this.authorizShow=true
+						this.authorizShow=true
 					}
 					
 				})
@@ -276,21 +276,6 @@
 					   openId:this.wxOpenData.openid
 					  },'POST').then(res => {
 						var data = res.data;
-						if(data.newCustomer){
-							uni.showModal({
-								title: '提示',
-								content: data.newCustomerMsg,
-								success: function(resTK) {
-									
-								}
-							});
-							
-							var token=res.data.token
-							data.loginInfo={}
-							data.loginInfo.token=token
-							this.$store.commit('mutationswxOpenData', data);
-							return false;
-						}
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;
@@ -341,8 +326,7 @@
 				if(this.naUnionId){
 					var unionId=this.naUnionId
 				}else{
-					//var unionId=this.userInfo.unionId
-					var unionId=this.ext.unionId
+					var unionId=this.userInfo.unionId
 				}
 				
 				//openreservation/listBigTags
@@ -452,23 +436,22 @@
 					});
 					return false
 				}
-				if (!this.selectedItems.length) {
-					uni.showToast({
-						title: '请选择预约项目',
-						icon: 'none',
-						duration: 3000
-					});
-				} else {
-					this.$store.commit('mutationsyuyueData', this.selectedItems)
-					uni.navigateTo({
-						url: 'confirmYuyue?totalPrice='+this.totalPrice
-					})
-				}
-				/* if(!this.userInfo){
+				if(!this.userInfo){
 					this.authorizShow=true
 				}else{
-					
-				} */
+					if (!this.selectedItems.length) {
+						uni.showToast({
+							title: '请选择预约项目',
+							icon: 'none',
+							duration: 3000
+						});
+					} else {
+						this.$store.commit('mutationsyuyueData', this.selectedItems)
+						uni.navigateTo({
+							url: 'confirmYuyue?totalPrice='+this.totalPrice
+						})
+					}
+				}
 				
 				
 			}

pages/index/receiveCoupon.vue

@@ -128,21 +128,6 @@
              		   openId:this.wxOpenData.openid
              		  },'POST').then(res => {
              			var data = res.data;
-						if(data.newCustomer){
-							uni.showModal({
-								title: '提示',
-								content: data.newCustomerMsg,
-								success: function(resTK) {
-									
-								}
-							});
-							
-							var token=res.data.token
-							data.loginInfo={}
-							data.loginInfo.token=token
-							this.$store.commit('mutationswxOpenData', data);
-							return false;
-						}
              			if(data.loginInfo){
              				this.userInfo=data.loginInfo.openUser;
              				this.wxOpenData=data.loginInfo;

pages/index/rescue.vue

@@ -162,10 +162,9 @@
 				this.$common.automaticlogin().then(val => {
 					this.userInfo=this.$store.state.userInfo;
 					this.wxOpenData=this.$store.state.wxOpenData;
-					/* if(!this.userInfo){
+					if(!this.userInfo){
 						this.authorizShow=true
-					} */
-					this.getsetting()
+					}
 				})
 			}
 			//this.queryRescue()
@@ -234,12 +233,11 @@
 							showCancel:false,
 						    success: function (res) {
 																	
-						        /* if (res.confirm) {
+						        if (res.confirm) {
 								   uni.switchTab({
 								   	url:'index'
 								   })
-						        } */
-								/* else if (res.cancel) {
+						        } /* else if (res.cancel) {
 															// uni.hideLoading();
 						          uni.redirectTo({
 						          		url:'../subPack/rescueOrderOrderDetail?id='+id
@@ -321,8 +319,8 @@
 				if (this.userInfo) {
 					
 				} else {
-					//this.authorizShow = true;
-					//return false;
+					this.authorizShow = true;
+					return false;
 				}
 				if(this.tabIndex==0){
 					const yy = new Date().getFullYear()

pages/index/shopList.vue

@@ -147,7 +147,7 @@
 				 	this.init()
 					if(!this.userInfo){
 						uni.hideLoading();
-						//this.authorizShow=true
+						this.authorizShow=true
 					}
 				 })
 			 }
@@ -188,21 +188,6 @@
 					   openId:this.wxOpenData.openid
 					  },'POST').then(res => {
 						var data = res.data;
-						if(data.newCustomer){
-							uni.showModal({
-								title: '提示',
-								content: data.newCustomerMsg,
-								success: function(resTK) {
-									
-								}
-							});
-							
-							var token=res.data.token
-							data.loginInfo={}
-							data.loginInfo.token=token
-							this.$store.commit('mutationswxOpenData', data);
-							return false;
-						}
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;
@@ -438,17 +423,17 @@
 			},
 
 			goDetail(item) {
-				uni.navigateTo({
-					url:'onlineBooking?naShopId='+item.shopId+'naUnionId='+item.unionId
-				})
-				/* if (this.userInfo) {
+				// uni.navigateTo({
+				// 	url: '../shop/shopDetail?id=' + item.shopId
+				// })
+				if (this.userInfo) {
 					uni.navigateTo({
 						url:'onlineBooking?naShopId='+item.shopId+'naUnionId='+item.unionId
 					})
 				} else {
 					this.authorizShow = true;
 					return false;
-				} */
+				}
 				
 			}
 		},

pages/index/vipCard.vue

@@ -478,21 +478,6 @@
 					   openId:this.wxOpenData.openid
 					  },'POST').then(res => {
 						var data = res.data;
-						if(data.newCustomer){
-							uni.showModal({
-								title: '提示',
-								content: data.newCustomerMsg,
-								success: function(resTK) {
-									
-								}
-							});
-							
-							var token=res.data.token
-							data.loginInfo={}
-							data.loginInfo.token=token
-							this.$store.commit('mutationswxOpenData', data);
-							return false;
-						}
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;

pages/integral/integral.vue

@@ -152,21 +152,6 @@
 					   openId:this.wxOpenData.openid
 					  },'POST').then(res => {
 						var data = res.data;
-						if(data.newCustomer){
-							uni.showModal({
-								title: '提示',
-								content: data.newCustomerMsg,
-								success: function(resTK) {
-									
-								}
-							});
-							
-							var token=res.data.token
-							data.loginInfo={}
-							data.loginInfo.token=token
-							this.$store.commit('mutationswxOpenData', data);
-							return false;
-						}
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;

pages/integral/integralgoodsDetail.vue

@@ -381,21 +381,6 @@
 					   openId:this.wxOpenData.openid
 					  },'POST').then(res => {
 						var data = res.data;
-						if(data.newCustomer){
-							uni.showModal({
-								title: '提示',
-								content: data.newCustomerMsg,
-								success: function(resTK) {
-									
-								}
-							});
-							
-							var token=res.data.token
-							data.loginInfo={}
-							data.loginInfo.token=token
-							this.$store.commit('mutationswxOpenData', data);
-							return false;
-						}
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;

pages/partner/bonus.vue

@@ -111,21 +111,6 @@
 					   openId:this.wxOpenData.openid
 					  },'POST').then(res => {
 						var data = res.data;
-						if(data.newCustomer){
-							uni.showModal({
-								title: '提示',
-								content: data.newCustomerMsg,
-								success: function(resTK) {
-									
-								}
-							});
-							
-							var token=res.data.token
-							data.loginInfo={}
-							data.loginInfo.token=token
-							this.$store.commit('mutationswxOpenData', data);
-							return false;
-						}
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;

pages/partner/people.vue

@@ -109,21 +109,6 @@
 					   openId:this.wxOpenData.openid
 					  },'POST').then(res => {
 						var data = res.data;
-						if(data.newCustomer){
-							uni.showModal({
-								title: '提示',
-								content: data.newCustomerMsg,
-								success: function(resTK) {
-									
-								}
-							});
-							
-							var token=res.data.token
-							data.loginInfo={}
-							data.loginInfo.token=token
-							this.$store.commit('mutationswxOpenData', data);
-							return false;
-						}
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;

pages/shop/confirm.vue

@@ -247,12 +247,9 @@
 							 duration: 2000
 						 });
 						  if((that.orderData.sheetType==1)||(that.orderData.sheetType==2)||(that.orderData.sheetType==3)){
-							  setTimeout(function() {
-							  	uni.redirectTo({
-							  		url: "../user/myOrder/mallOrderDetail?id=" + that.orderData.id +"&SheetType=" + that.orderData.sheetType
-							  	})
-							  }, 300);
-						  	
+						  	uni.redirectTo({
+						  		url: "../user/myOrder/mallOrderDetail?id=" + that.orderData.id +"&SheetType=" + that.orderData.sheetType
+						  	})
 						  }
 						
 				    },

pages/shop/goodsDetail.vue

@@ -489,21 +489,6 @@
 					   openId:this.wxOpenData.openid
 					  },'POST').then(res => {
 						var data = res.data;
-						if(data.newCustomer){
-							uni.showModal({
-								title: '提示',
-								content: data.newCustomerMsg,
-								success: function(resTK) {
-									
-								}
-							});
-							
-							var token=res.data.token
-							data.loginInfo={}
-							data.loginInfo.token=token
-							this.$store.commit('mutationswxOpenData', data);
-							return false;
-						}
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;

pages/shop/shop.vue

@@ -266,21 +266,6 @@
 					   openId:this.wxOpenData.openid
 					  },'POST').then(res => {
 						var data = res.data;
-						if(data.newCustomer){
-							uni.showModal({
-								title: '提示',
-								content: data.newCustomerMsg,
-								success: function(resTK) {
-									
-								}
-							});
-							
-							var token=res.data.token
-							data.loginInfo={}
-							data.loginInfo.token=token
-							this.$store.commit('mutationswxOpenData', data);
-							return false;
-						}
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;

pages/shop/wp.vue

@@ -21,7 +21,7 @@
 	export default {
 		data() {
 			return {
-				mpWxQr: "https://img.qdbtl.cn/thFiles//material/85996BA2-24C5-4251-937D-2BFBCF19E6DD.png",
+				mpWxQr: "https://apidms.66km.com/static/third/jialian.ico",
 				canvasW: 0,
 				canvasH: 0,
 				invest_areas: [{id: 1, name: "儿童教育"}, {id: 1, name: "大数据"}],
@@ -38,7 +38,7 @@
 				mpWxQr2:'',
 				mpWxQr3:'',
 				mpWxQr4:'',
-				ptImg:'https://img.qdbtl.cn/thFiles//material/85996BA2-24C5-4251-937D-2BFBCF19E6DD.png',
+				ptImg:'https://dmsimg.66km.com/marketing//accompany/4E6F0009-EC54-4387-8DDC-2B7389065B49.png',
 				ptImg2:'',
 				groupType:'',
 			}

pages/subPack/chooseCity.vue

@@ -239,7 +239,6 @@
 </script>
 
 <style scoped>
-	
 	.zhimubox{
 		position: fixed;
 		right: 25rpx;

pages/subPack/oldhistoryDetail.vue

@@ -127,12 +127,12 @@
 				<view class="detailedTitle">费用明细</view>
 				
 				<view class="goodscostLine" v-if="TotalDiscountMoney">
-					<view class="goodscostTxt">整单优惠</view>
+					<view class="goodscostTxt">优惠总计</view>
 					<view class="goodsCostNum">￥{{orderData.discountMoney?orderData.discountMoney:0}}</view>
 				</view>
 				
 				<view class="goodscostLine" v-if="ReceiptsMoney">
-					<view class="goodscostTxt">金额</view>
+					<view class="goodscostTxt">支付金额</view>
 					<view class="goodsCostNum">￥{{orderData.checkoutMoney?orderData.checkoutMoney:0}}</view>
 				</view>
 			</view>
@@ -278,9 +278,11 @@
 						if (item.fieldValue == 'ReceiptsMoney') {
 							this.ReceiptsMoney = item.isChecked
 						}
-                        if (item.fieldValue == 'TotalDiscountMoney') {
-                        	this.TotalDiscountMoney = item.isChecked
-                        }
+						if (item.fieldValue == 'TotalDiscountMoney') {
+							this.TotalDiscountMoney = item.isChecked
+						}
+
+
 
 
 					})
@@ -324,21 +326,6 @@
 					openId: this.wxOpenData.openid
 				}, 'POST').then(res => {
 					var data = res.data;
-					if(data.newCustomer){
-						uni.showModal({
-							title: '提示',
-							content: data.newCustomerMsg,
-							success: function(resTK) {
-								
-							}
-						});
-						
-						var token=res.data.token
-						data.loginInfo={}
-						data.loginInfo.token=token
-						this.$store.commit('mutationswxOpenData', data);
-						return false;
-					}
 					if (data.loginInfo) {
 						this.userInfo = data.loginInfo.openUser;
 						this.wxOpenData = data.loginInfo;

pages/subPack/rescueOrderOrderDetail.vue

@@ -85,11 +85,7 @@
 				<view class="informationNum2" v-if="orderData.openShopHelpSheet.hscene==2">车库</view>
 				<view class="informationNum2" v-if="orderData.openShopHelpSheet.hscene==3">其他</view>
 			</view>
-			<view class="informationLine">
-				<view class="informationTxt">救援手机号：</view>
-				<view class="informationNum" >{{orderData.openShopHelpSheet.mobilePhone}}</view>
-			</view>
-		<!-- 	<view class="informationLine" v-if="orderData.openShopHelpSheet.plateNumber">
+			<view class="informationLine" v-if="orderData.openShopHelpSheet.plateNumber">
 				<view class="informationTxt">车牌号：</view>
 				<view class="informationNum">{{orderData.openShopHelpSheet.plateNumber}}</view>
 			</view>
@@ -100,7 +96,7 @@
 			<view class="informationLine">
 				<view class="informationTxt">救援联系人：</view>
 				<view class="informationNum">{{orderData.openShopHelpSheet.customerName}}/{{orderData.openShopHelpSheet.mobilePhone}}</view>
-			</view> -->
+			</view>
 			
 			<view class="informationLine" >
 				<view class="informationTxt">起点：</view>
@@ -122,12 +118,10 @@
 				<view class="informationTxt">下单时间：</view>
 				<view class="informationNum" >{{orderData.openShopHelpSheet.createTime}}</view>
 			</view>
-			
 			<view class="informationLine">
-				<view class="informationTxt">下单人手机：</view>
-				<!-- <view class="informationNum" > <span v-if="orderData.customerInfo.customerName">{{orderData.customerInfo.customerName|| '未知'}}/</span> {{orderData.openUser.mobilePhone}}</view> -->
-			    <view class="informationNum" > <span v-if="orderData.openShopHelpSheet.customerName">{{orderData.openShopHelpSheet.customerName|| '未知'}}/</span> {{orderData.openUser.mobilePhone}}</view>
-			 </view>
+				<view class="informationTxt">下单人：</view>
+				<view class="informationNum" >{{orderData.openUser.nickName|| '未知'}}/{{orderData.openUser.mobilePhone}}</view>
+			</view>
 			
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.confirmTime">
 				<view class="informationTxt">确认时间：</view>
@@ -426,21 +420,6 @@
 					   openId:this.wxOpenData.openid
 					  },'POST').then(res => {
 						var data = res.data;
-						if(data.newCustomer){
-							uni.showModal({
-								title: '提示',
-								content: data.newCustomerMsg,
-								success: function(resTK) {
-									
-								}
-							});
-							
-							var token=res.data.token
-							data.loginInfo={}
-							data.loginInfo.token=token
-							this.$store.commit('mutationswxOpenData', data);
-							return false;
-						}
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;
@@ -1216,12 +1195,11 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	.informationNum {
 		color: #333333;
 		font-size: 26rpx;
-		width: 470rpx;
+		width: 500rpx;
 	}
 .informationNum2{
 	color: #333333;
 	font-size: 26rpx;
-	
 }
 	.codeCopy {
 		width: 77rpx;

pages/user/addCar/addCar.vue

@@ -289,7 +289,6 @@
 					});
 					return false;
 				}
-
 				if(!this.carModelInfo.value){
 					uni.showToast({
 						title: '请选择车型',
@@ -298,7 +297,6 @@
 					});
 					return false;
 				}
-
 				if (this.isEditCar == 'true') {
 					this.updateTMemberCar()
 				} else {

pages/user/addCar/cailist.vue

@@ -53,7 +53,7 @@
 					</view>
 				</view>
 				<view class="lineBottom">
-					 <!-- <view class="lineDel" @click.stop="editCar(item.id)">编辑</view> -->
+					 <view class="lineDel" @click.stop="editCar(item.id)">编辑</view>
 					<view class="lineDel"  @click.stop="maintain(item)">保养信息</view>
 				</view>
 				<view class="DefaultIcon2"  v-show="item.isDefault==1">默认</view>
@@ -68,11 +68,11 @@
 
 
 
-		<!-- <view class="bottomView">
+		<view class="bottomView">
 			<view class="saveCar" :style="{background:'#'+themeColor}" @click="addBtn">
 				<view>添加爱车</view>
 			</view>
-		</view> -->
+		</view> 
 
 	</view>
 </template>
@@ -89,7 +89,7 @@
 				loding: false,
 				type: '',
 				carId: '',
-				fromMe: false,
+				fromMe: false,
 				themeColor:'',
 				iStatusBarHeight:'',
 				openMCar:'',
@@ -100,8 +100,8 @@
 			this.$common.isUserId()
 			this.type = opt.type;
 			// console.log(this.type)
-			this.fromMe = opt.fromMe
-			 this.themeColor = uni.getStorageSync("themeColor");
+			this.fromMe = opt.fromMe
+			 this.themeColor = uni.getStorageSync("themeColor");
             this.openMCar=uni.getStorageSync("openMCar");
 		},
 		onShow() {
@@ -110,9 +110,9 @@
 		},
 		methods: {
 			maintain(item){
-				uni.navigateTo({
-					
-					url:'../../index/handbook?mileage='+item.milage+'&liyangId='+item.nLevelID
+				uni.navigateTo({
+					
+					url:'../../index/handbook?mileage='+item.milage+'&liyangId='+item.nLevelID
 				})
 			},
 			getqueryMyBMemberCar() {
@@ -128,11 +128,11 @@
 					this.loding = true;
 				})
 			},
-			addBtn() {
-				uni.navigateTo({
-					url: 'addCar'
-				})
-				
+			addBtn() {
+				uni.navigateTo({
+					url: 'addCar'
+				})
+				
 				
 	
 
@@ -154,16 +154,16 @@
 			},
 			
 			
-		},
-		
-		// 下拉刷新
-		onPullDownRefresh() {
-			// this.page = 1
-			this.getqueryMyBMemberCar()
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
+		},
+		
+		// 下拉刷新
+		onPullDownRefresh() {
+			// this.page = 1
+			this.getqueryMyBMemberCar()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		
 	}
 </script>
@@ -210,7 +210,7 @@
 	}
 	.box {
 		min-height: 100vh;
-		background: #F4F5F7;
+		background: #F4F5F7;
 		padding-bottom: 120rpx;
 	}
 
@@ -373,4 +373,4 @@
 		color: #FFFFFF;
 		font-size: 22rpx;
 	}
-</style>
+</style>

pages/user/bespeakDetail.vue

@@ -42,10 +42,10 @@
 		<!-- 订单信息 -->
 		<view class="information">
 			<view class="detailedTitle">基本信息</view>
-		    <view class="informationLine" v-if="orderData.orderSheet.plateNumber"> 
+			<view class="informationLine">
 				<view class="informationTxt">车牌号：</view>
 				<view class="informationNum">{{orderData.orderSheet.plateNumber}}</view>
-			</view> 
+			</view>
 			<view class="informationLine">
 				<view class="informationTxt">手机号：</view>
 				<view class="informationNum">{{orderData.orderSheet.mobilePhone}}</view>

pages/user/myOrder/activityOrderDetail.vue

@@ -517,21 +517,6 @@
 					   openId:this.wxOpenData.openid
 					  },'POST').then(res => {
 						var data = res.data;
-						if(data.newCustomer){
-							uni.showModal({
-								title: '提示',
-								content: data.newCustomerMsg,
-								success: function(resTK) {
-									
-								}
-							});
-							
-							var token=res.data.token
-							data.loginInfo={}
-							data.loginInfo.token=token
-							this.$store.commit('mutationswxOpenData', data);
-							return false;
-						}
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;
@@ -594,9 +579,7 @@
 							 icon:'none',
 							 duration: 2000
 						 });
-						setTimeout(function() {
-							that.getData()
-						}, 1000);
+						that.getData()
 				    },
 				    fail: function (err) {
 					  console.log(err)

pages/user/myOrder/mallOrderDetail.vue

@@ -478,21 +478,6 @@
 					   openId:this.wxOpenData.openid
 					  },'POST').then(res => {
 						var data = res.data;
-						if(data.newCustomer){
-							uni.showModal({
-								title: '提示',
-								content: data.newCustomerMsg,
-								success: function(resTK) {
-									
-								}
-							});
-							
-							var token=res.data.token
-							data.loginInfo={}
-							data.loginInfo.token=token
-							this.$store.commit('mutationswxOpenData', data);
-							return false;
-						}
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;
@@ -541,10 +526,7 @@
 							 icon:'none',
 							 duration: 2000
 						 });
-						 setTimeout(function() {
-						 	that.getData()
-						 }, 1000);
-						
+						that.getData()
 				    },
 				    fail: function (err) {
 					  console.log(err)

pages/user/myOrder/paintOrderDetail.vue

@@ -457,21 +457,6 @@
 					   openId:this.wxOpenData.openid
 					  },'POST').then(res => {
 						var data = res.data;
-						if(data.newCustomer){
-							uni.showModal({
-								title: '提示',
-								content: data.newCustomerMsg,
-								success: function(resTK) {
-									
-								}
-							});
-							
-							var token=res.data.token
-							data.loginInfo={}
-							data.loginInfo.token=token
-							this.$store.commit('mutationswxOpenData', data);
-							return false;
-						}
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;
@@ -520,9 +505,7 @@
 							 icon:'none',
 							 duration: 2000
 						 });
-						setTimeout(function() {
-							that.getData()
-						}, 1000);
+						that.getData()
 				    },
 				    fail: function (err) {
 					  console.log(err)

pages/user/reportUni.vue

@@ -291,21 +291,6 @@
 					openId: this.wxOpenData.openid
 				}, 'POST').then(res => {
 					var data = res.data;
-					if(data.newCustomer){
-						uni.showModal({
-							title: '提示',
-							content: data.newCustomerMsg,
-							success: function(resTK) {
-								
-							}
-						});
-						
-						var token=res.data.token
-						data.loginInfo={}
-						data.loginInfo.token=token
-						this.$store.commit('mutationswxOpenData', data);
-						return false;
-					}
 					if (data.loginInfo) {
 						this.userInfo = data.loginInfo.openUser;
 						this.wxOpenData = data.loginInfo;

pages/user/user.vue

@@ -206,13 +206,13 @@
 
 		<!-- 我的 相关 -->
 		<view class="rowBoxBg">
-			<!-- <view class="rowBox" @click="gonavigateTo('../user/expertServices')">
+			<view class="rowBox" @click="gonavigateTo('../user/expertServices')">
 				<view class="leftView">
 					<image src="../../static/img/icon_me1.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">服务专家</view>
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
-			</view> -->
+			</view>
 			<view class="rowBox" @click="gonavigateTo('./addCar/cailist?type=3')">
 				<view class="leftView">
 					<image src="../../static/img/icon_me2.png" mode="" class="liftIcon"></image>
@@ -242,14 +242,14 @@
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
 
-		   <view class="rowBox" @click="gonavigateTo('../subPack/depositList')">
+		   <!-- <view class="rowBox" @click="gonavigateTo('../subPack/depositList')">
 
 				<view class="leftView">
 					<image src="../../static/timg/icon_jydd.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">我的寄存</view>
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
-			</view> 
+			</view> -->
 			 <view class="rowBox" @click="gonavigateTo('../subPack/rescueOrder')">
 				<view class="leftView">
 					<image src="../../static/timg/sos.png" mode="" class="liftIcon"></image>
@@ -257,13 +257,13 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view> 
-			<!-- <view class="rowBox" @click="gonavigateTo('../subPack/luckList')">
+			<view class="rowBox" @click="gonavigateTo('../subPack/luckList')">
 				<view class="leftView">
 					<image src="../../static/timg/icon_jydd.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">中奖记录</view>
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
-			</view> -->
+			</view>
 			
 		</view>
 		<view class="rowBoxBg">
@@ -663,21 +663,6 @@
 					openId: this.wxOpenData.openid
 				}, 'POST').then(res => {
 					var data = res.data;
-					if(data.newCustomer){
-						uni.showModal({
-							title: '提示',
-							content: data.newCustomerMsg,
-							success: function(resTK) {
-								
-							}
-						});
-						
-						var token=res.data.token
-						data.loginInfo={}
-						data.loginInfo.token=token
-						this.$store.commit('mutationswxOpenData', data);
-						return false;
-					}
 					if (data.loginInfo) {
 						this.userInfo = data.loginInfo.openUser;
 						this.wxOpenData = data.loginInfo;
@@ -693,9 +678,9 @@
 							that.queryMyDetail()
                         }, 1000); */
 						that.queryMyDetail()
-						 if(!data.loginInfo.customerInfo.wxMiniV2OpenID){
-						 	this.seeQr()
-						 }
+						if(!data.loginInfo.customerInfo.wxMiniV2OpenID){
+							this.seeQr()
+						}
 						if(this.numList.customerInfo.pState==1&&this.numList.shopSettings.partnerDisabled){
 							this.kkshow=true
 						}
@@ -704,6 +689,7 @@
 						}
 						
 					}
+					
 				})
 			},
 			map() {
@@ -881,7 +867,7 @@
 .cardNameBOx{
 	background: linear-gradient(327deg, #FEA917 0%, #FFC635 100%);
 	border-radius: 16rpx;display: flex;
-	line-height: 30rpx;font-weight: 500;
+	line-height: 30rpx;font-weight: 500;
 color: #764700;font-size: 22rpx;
 margin-left: 15rpx;
 padding-right: 10rpx;
@@ -1486,4 +1472,4 @@ padding-right: 10rpx;
 		margin-top: 62rpx;
 		margin-left: 71rpx;
 	}
-</style>
+</style>

utils/common.js

@@ -13,7 +13,7 @@ const automaticlogin = function() {
 	//console.log($store.state.userInfo)
 	var that=this;
 	var extConfig = uni.getExtConfigSync();
-	 /*  extConfig={
+	 /* extConfig={
 		"shopId": "23173848-292E-4AEA-B590-73AC9A763F1D",
 		"url":"https://store-api.qdbtl.cn/",
 		"unionId":"C3748B46-B778-40AA-8C60-A9B0F2FA23A7",
@@ -84,19 +84,19 @@ function noMultipleClicks(methods, info) {
 function getExtStoreId(type){
 	try{
 	 var extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {shopId:'默认的门店id'};
-		/*  extConfig={
-		  	"shopId": "23173848-292E-4AEA-B590-73AC9A763F1D",
-		  	"url":"https://store-api.qdbtl.cn/",
-		  	"unionId":"C3748B46-B778-40AA-8C60-A9B0F2FA23A7",
-		  	"appId":"wxc023ff04deb28f2d"
-	      } */
-		  /* 
+
+		  /* extConfig={
 		  "shopId": "E37BB296-5A08-4534-859D-B351BA611AF9",
-		  "url":"http://api.dms.66km.com.cn",
-		  "unionId":"EEADACCD-8A19-499D-8AD7-6975D2C93243",
-		  "appId":"wx33053a645546ec31"
-		  */
-		 
+		  "url":"https://apidms.66km.com",
+		  "unionId":"EF7981B9-2D1D-4006-9C0A-66CE7177134D",
+		  "appId":"wx2c6f04c0dcd15984"
+		  } */
+		  /* extConfig={
+				 "shopId": "23173848-292E-4AEA-B590-73AC9A763F1D",
+				 "url":"https://store-api.qdbtl.cn/",
+				 "unionId":"C3748B46-B778-40AA-8C60-A9B0F2FA23A7",
+				 "appId":"wxc023ff04deb28f2d"
+		  } */
 		  
 		console.log(extConfig,'extJson对象');
 		//return extConfig[type];

utils/request.js

@@ -10,7 +10,8 @@ const extConfig = uni.getExtConfigSync();
 console.log(extConfig)
 const baseUrl=extConfig.url+'/'
 
-//const baseUrl='http://192.168.0.176:20187/'
+//const baseUrl='http://dms.66km.com.cn/'
+//const baseUrl='http://192.168.0.174:20187/'
 //const baseUrl='https://store-api.qdbtl.cn/'
 //const baseUrl='https://apidms.66km.com/'
 
@@ -28,12 +29,8 @@ const http = (url = '', date = {}, type = 'POST', header = {
 		console.log($store.state.wxOpenData.loginInfo)
 		//const wxOpenData = uni.getStorageSync("wxOpenData");
 		var wxOpenData=$store.state.wxOpenData
-		if(wxOpenData.token){
-			header['token']=wxOpenData.token ;
-		}else if(wxOpenData.loginInfo?.token){
-			header['token']=wxOpenData.loginInfo.token;
-		}
 		if(wxOpenData.loginInfo){
+			header['token']=wxOpenData.loginInfo.token;
 			header['uid']=wxOpenData.loginInfo.uid; 
 		}
 		//console.log($store.state.carInfo)