安徒生修改授权，不授权预约 救援

pages/index/confirmRescue.vue

@@ -59,7 +59,7 @@
 			  <view class="jyKK" :class="{jyKKActive:jykkNum==3}" @click="jykk(3)">其他</view>
 		  </view>
 	  </view>
-	  <view class="kkline">
+	  <view class="kkline" v-if="this.userInfo">
 		  <view class="kklineLeft">
 			<span class="stars">*</span> <span>车牌号</span>
 		  </view>
@@ -68,7 +68,7 @@
 			  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
 		  </view>
 	  </view>
-	  <view class="kkline">
+	  <view class="kkline" v-if="this.userInfo">
 	  		  <view class="kklineLeft">
 	  			<span class="stars">*</span> <span>车型</span>
 	  		  </view>
@@ -77,7 +77,7 @@
 	  			  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
 	  		  </view>
 	  </view>
-	  <view class="kkline">
+	  <view class="kkline" v-if="this.userInfo">
 	  		  <view class="kklineLeft">
 	  			<span class="stars">*</span><span>救援联系人</span>
 	  		  </view>
@@ -131,21 +131,28 @@
 				mobilePhone:'',
 				isGoing:false,
 				orderId:'',
+				ext:'',
 			}
 		},
 		onLoad(opt) {
 			this.themeColor = uni.getStorageSync("themeColor");
 			//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.ext=this.$common.getExtStoreId();
 			this.shopName=opt.shopName;
 			this.opt=opt;
 			if(this.opt.type==2){
 				this.calculateDistance()
 			}
 			console.log(opt)
+			this.userInfo = this.$store.state.userInfo;
+			if(this.userInfo){
+				var customerInfo=uni.getStorageSync("wxOpenData").loginInfo.customerInfo;
+				this.customerName=customerInfo.customerName;
+				this.mobilePhone=customerInfo.mobilePhone;
+			}
+			
 		},
 		onShow() {
 			this.carInfo=this.$store.state.carInfo;
@@ -164,22 +171,22 @@
 				if(this.isGoing){
 					return false;
 				}
-				if(!this.carInfo.carModel){
+				/* if(!this.carInfo.carModel){
 					uni.showToast({
 						title: '请输选择车型',
 						icon: 'none',
 						duration: 3000
 					});
 					return false;
-				}
-				if(!this.customerName){
+				} */
+				/* if(!this.customerName){
 					uni.showToast({
 						title: '请输入救援联系人',
 						icon: 'none',
 						duration: 3000
 					});
 					return false;
-				}
+				} */
 				if(!this.mobilePhone){
 					uni.showToast({
 						title: '请输入手机号',
@@ -211,28 +218,54 @@
 					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
-						           }) 
-						 		   
-						         }
-						     }
-						 });
+						 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;
 					 }
@@ -265,29 +298,56 @@
 					    that.orderId=res.data
 						this.isGoing=false;
 						if(res.code==0){
-							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
-									   })
-									   
-							        }
-							    }
-							});
+							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
+										   })
+										   
+								        }
+								    }
+								});
+							}
+						
 
 						}else{
 							uni.showToast({

pages/index/confirmYuyue.vue

@@ -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,7 +19,7 @@
 				  <span>{{carInfo.plateNumber?carInfo.plateNumber:'请选择'}}</span>
 				  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
 			  </view>
-		  </view> 
+		  </view> -->
 		  <view class="kkline ">
 			  <view class="kklineLeft">
 				<span class="stars">*</span> <span>预约时间</span>
@@ -29,13 +29,13 @@
 				  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
 			  </view>
 		  </view>
-		  <!-- <view class=" lineborderNo" >
+		  <view class=" lineborderNo" >
 		  	<view class="bzline">
 		  		<view class="beiz">手机号</view>
 		  		<input type="number" v-model="mobilePhone" placeholder="请输入手机号" class="beizInput" placeholder-style="color:#cccccc;">
 		  	</view>
 		  	
-		  </view> -->
+		  </view> 
 		</view>
 		
 		<view class="contkk" style="margin-top: 20rpx;">
@@ -91,6 +91,7 @@
 				isgo:true,
 				stationID:'',
 				mobilePhone:'',
+				ext:'',
 			}
 		},
 		onLoad(opt) {
@@ -103,6 +104,7 @@
 			//this.userInfo = uni.getStorageSync("userInfo");
 			this.userInfo = this.$store.state.userInfo;
 			this.yyshopInfo=uni.getStorageSync("yyshopInfo")
+			this.ext=this.$common.getExtStoreId();
 			//this.getOrderTimes()
 			
 		},
@@ -148,38 +150,57 @@
 				this.$http('openreservation/saveOrderSheet', {
 				  billDate: this.billDate,
 				  comment: this.comment,
-				  carID: this.carInfo.id,
+				  carID: this.carInfo.id || '',
 				  orderItem: this.yuyueData.map(item => item.ID).join(),
 				  shopId: this.yyshopInfo.id,
-				  unionId: this.userInfo.unionId,
-				  stationID:this.stationID
+				  unionId: this.ext.unionId,
+				  stationID:this.stationID,
+				  mobilePhone:this.mobilePhone
 				 },'POST').then(res => {
 					    this.isgo=true;
 					    var id=res.data
 						if(res.code==0){
-							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
-									   })
-									   
-							        }
-							    }
-							});
+							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'
+										   })
+								        } 
+								    }
+								});
+							}
+						
 
 						}else{
 							uni.showToast({

pages/index/index.vue

@@ -486,6 +486,21 @@
 			},
 			goRoter(item){
 				console.log(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){
 					this.authorizShow=true;
 				}else{
@@ -520,16 +535,6 @@
 								 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'
@@ -551,10 +556,6 @@
 					}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'
@@ -797,6 +798,21 @@
 				    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;
 						

pages/index/onlineBooking.vue

@@ -232,7 +232,7 @@
 					}
 					if(!this.userInfo){
 						uni.hideLoading();
-						this.authorizShow=true
+						//this.authorizShow=true
 					}
 					
 				})
@@ -326,7 +326,8 @@
 				if(this.naUnionId){
 					var unionId=this.naUnionId
 				}else{
-					var unionId=this.userInfo.unionId
+					//var unionId=this.userInfo.unionId
+					var unionId=this.ext.unionId
 				}
 				
 				//openreservation/listBigTags
@@ -436,22 +437,23 @@
 					});
 					return false
 				}
-				if(!this.userInfo){
+				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){
 					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/rescue.vue

@@ -162,9 +162,10 @@
 				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()
@@ -233,11 +234,12 @@
 							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
@@ -319,8 +321,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
 					}
 				 })
 			 }
@@ -422,17 +422,17 @@
 			},
 
 			goDetail(item) {
-				// uni.navigateTo({
-				// 	url: '../shop/shopDetail?id=' + item.shopId
-				// })
-				if (this.userInfo) {
+				uni.navigateTo({
+					url:'onlineBooking?naShopId='+item.shopId+'naUnionId='+item.unionId
+				})
+				/* if (this.userInfo) {
 					uni.navigateTo({
 						url:'onlineBooking?naShopId='+item.shopId+'naUnionId='+item.unionId
 					})
 				} else {
 					this.authorizShow = true;
 					return false;
-				}
+				} */
 				
 			}
 		},

utils/request.js

@@ -8,8 +8,8 @@
 import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
-const baseUrl=extConfig.url+'/'
-//const baseUrl='http://192.168.0.176:20187/'
+//const baseUrl=extConfig.url+'/'
+const baseUrl='http://192.168.0.176:20187/'
 //const baseUrl='https://store-api.qdbtl.cn/'
 //const baseUrl='http://dms.66km.com.cn/'
 //wxc023ff04deb28f2d正式  wx33053a645546ec31 E37BB296-5A08-4534-859D-B351BA611AF9 EEADACCD-8A19-499D-8AD7-6975D2C93243 
@@ -26,8 +26,11 @@ 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;
+		}
 		if(wxOpenData.loginInfo){
-			header['token']=wxOpenData.loginInfo.token;
+			//header['token']=wxOpenData.loginInfo.token;
 			header['uid']=wxOpenData.loginInfo.uid; 
 		}
 		//console.log($store.state.carInfo)
@@ -53,7 +56,7 @@ const http = (url = '', date = {}, type = 'POST', header = {
 				//  	 icon:'none',
 				//      duration: 3000,
 				//  });
-				 uni.clearStorageSync()
+				// uni.clearStorageSync()
 				//  uni.navigateTo({
 				// 	url:'../login/login'
 				// })