bug修改

pages/activity/jkDetail.vue

@@ -839,7 +839,7 @@
 		   			if(data.loginInfo){
 		   				this.userInfo=data.loginInfo.openUser;
 		   				this.wxOpenData=data.loginInfo;
-		   				this.$store.commit('mutationswxOpenData', data.loginInfo)
+		   				this.$store.commit('mutationswxOpenData', data)
 		   				this.$store.commit('mutationsuserInfo', this.userInfo)
 		   			    this.getInfo()
 		   			}	

pages/index/vipCard.vue

@@ -358,7 +358,7 @@
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;
-							this.$store.commit('mutationswxOpenData', data.loginInfo)
+							this.$store.commit('mutationswxOpenData', data)
 							this.$store.commit('mutationsuserInfo', this.userInfo)
 						    this.myOrderCoupon()
 						}	

pages/integral/integralgoodsDetail.vue

@@ -353,7 +353,7 @@
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;
-							this.$store.commit('mutationswxOpenData', data.loginInfo)
+							this.$store.commit('mutationswxOpenData', data)
 							this.$store.commit('mutationsuserInfo', this.userInfo)
 						    
 						    this.szShop()

pages/partner/bonus.vue

@@ -110,7 +110,7 @@
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;
-							this.$store.commit('mutationswxOpenData', data.loginInfo)
+							this.$store.commit('mutationswxOpenData', data)
 							this.$store.commit('mutationsuserInfo', this.userInfo)
 							this.list=[]
 						    this.getList()

pages/partner/people.vue

@@ -109,7 +109,7 @@
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;
-							this.$store.commit('mutationswxOpenData', data.loginInfo)
+							this.$store.commit('mutationswxOpenData', data)
 							this.$store.commit('mutationsuserInfo', this.userInfo)
 							this.list=[]
 						    this.getList()

pages/report/complete.vue

@@ -176,7 +176,7 @@
 					if (data.loginInfo) {
 						this.userInfo = data.loginInfo.openUser;
 						this.wxOpenData = data.loginInfo;
-						this.$store.commit('mutationswxOpenData', data.loginInfo)
+						this.$store.commit('mutationswxOpenData', data)
 						this.$store.commit('mutationsuserInfo', this.userInfo)
 						this.getData()
 					}

pages/report/working.vue

@@ -158,7 +158,7 @@
 					if (data.loginInfo) {
 						this.userInfo = data.loginInfo.openUser;
 						this.wxOpenData = data.loginInfo;
-						this.$store.commit('mutationswxOpenData', data.loginInfo)
+						this.$store.commit('mutationswxOpenData', data)
 						this.$store.commit('mutationsuserInfo', this.userInfo)
 						this.getData()
 					}

pages/shop/goodsDetail.vue

@@ -493,7 +493,7 @@
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;
-							this.$store.commit('mutationswxOpenData', data.loginInfo)
+							this.$store.commit('mutationswxOpenData', data)
 							this.$store.commit('mutationsuserInfo', this.userInfo)
 						    this.szShop()
 						}	

pages/shop/shop.vue

@@ -263,7 +263,7 @@
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;
-							this.$store.commit('mutationswxOpenData', data.loginInfo)
+							this.$store.commit('mutationswxOpenData', data)
 							this.$store.commit('mutationsuserInfo', this.userInfo)
 						    this.topIndex=1;
 						    this.list=[];

pages/user/historyDetail.vue

@@ -382,7 +382,7 @@
 					if (data.loginInfo) {
 						this.userInfo = data.loginInfo.openUser;
 						this.wxOpenData = data.loginInfo;
-						this.$store.commit('mutationswxOpenData', data.loginInfo)
+						this.$store.commit('mutationswxOpenData', data)
 						this.$store.commit('mutationsuserInfo', this.userInfo)
 						this.getData()
 					}

pages/user/myOrder/activityOrderDetail.vue

@@ -297,7 +297,7 @@
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;
-							this.$store.commit('mutationswxOpenData', data.loginInfo)
+							this.$store.commit('mutationswxOpenData', data)
 							this.$store.commit('mutationsuserInfo', this.userInfo)
 						    this.getData()
 						}	

pages/user/myOrder/mallOrderDetail.vue

@@ -325,7 +325,7 @@
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;
-							this.$store.commit('mutationswxOpenData', data.loginInfo)
+							this.$store.commit('mutationswxOpenData', data)
 							this.$store.commit('mutationsuserInfo', this.userInfo)
 						    this.getData()
 						}	

pages/user/myOrder/paintOrderDetail.vue

@@ -305,7 +305,7 @@
 						if(data.loginInfo){
 							this.userInfo=data.loginInfo.openUser;
 							this.wxOpenData=data.loginInfo;
-							this.$store.commit('mutationswxOpenData', data.loginInfo)
+							this.$store.commit('mutationswxOpenData', data)
 							this.$store.commit('mutationsuserInfo', this.userInfo)
 						    this.getData()
 						}	

pages/user/reportUni.vue

@@ -277,7 +277,7 @@
 					if (data.loginInfo) {
 						this.userInfo = data.loginInfo.openUser;
 						this.wxOpenData = data.loginInfo;
-						this.$store.commit('mutationswxOpenData', data.loginInfo)
+						this.$store.commit('mutationswxOpenData', data)
 						this.$store.commit('mutationsuserInfo', this.userInfo)
 						this.getDetail()
 					}

pages/user/user.vue

@@ -342,8 +342,8 @@
 			if (this.userInfo) {
 				this.queryMyDetail();
 			} else {
-				console.log("授权")
-				this.authorizShow = true;
+				//console.log("授权")
+				//this.authorizShow = true;
 			}
 			if (wxOpenData) {
 
@@ -360,7 +360,6 @@
 				if (this.userInfo) {
 					
 				} else {
-					
 					this.authorizShow = true;
 					return false;
 				}
@@ -483,11 +482,23 @@
 
 			},
 			call() {
+				if (this.userInfo) {
+					
+				} else {
+					this.authorizShow = true;
+					return false;
+				}
 				uni.makePhoneCall({
 					phoneNumber: this.numList.shopInfo.mobilePhone
 				});
 			},
 			goorder(num) {
+				if (this.userInfo) {
+					
+				} else {
+					this.authorizShow = true;
+					return false;
+				}
 				uni.navigateTo({
 					url: './myOrder/myOrder?num=' + num
 				})
@@ -514,16 +525,16 @@
 				})
 			},
 			gonavigateTo(url) {
-				//   if (this.userInfo) {
-				// 	uni.navigateTo({
-				// 		url: url
-				// 	})
-				// } else {
-				// 	this.authorizShow = true;
-				// }
-				uni.navigateTo({
+				  if (this.userInfo) {
+					uni.navigateTo({
+						url: url
+					})
+				} else {
+					this.authorizShow = true;
+				}
+				/* uni.navigateTo({
 					url: url
-				})
+				}) */
 			},
 			signOut() {
 				//uni.clearStorageSync();

utils/request.js

@@ -76,7 +76,8 @@ const httpBinary = (url = '', date = {}, type = 'POST', header = {
 }) => {
     return new Promise((resolve, reject) => {
 		header={};
-		const wxOpenData = uni.getStorageSync("wxOpenData");
+		//const wxOpenData = uni.getStorageSync("wxOpenData");
+		var wxOpenData=$store.state.wxOpenData
 		if(wxOpenData){	
 			header['token']=wxOpenData.loginInfo.token;
 			header['uid']=wxOpenData.loginInfo.uid;