Merge branch 'master' of http://47.98.226.240:3000/twt/operatingCompany

# Conflicts:
#	operatingCompany/pages/entryReport/entryReport.vue

operatingCompany/common/common.js

@@ -2,7 +2,7 @@ const isUserId = function() {
 	var userId = uni.getStorageSync("logInData").uid;
 	// console.log("userId---" + userId)
 	if (!userId) {
-		uni.navigateTo({
+		uni.reLaunch({
 			url: '../logIn/logIn'
 		})
 	}

operatingCompany/pages/AccountSet/AccountSet.vue

@@ -41,7 +41,8 @@
 			return {
 				userInfo: '',
 			}
-		},
+		},
+		
 		onLoad() {
 			this.userInfo = uni.getStorageSync("userInfo");
 		},
@@ -53,7 +54,7 @@
 			},
 			logOut() {
 				uni.clearStorageSync();
-				uni.navigateTo({
+				uni.reLaunch({
 					url:'../logIn/logIn'
 				})
 			},

operatingCompany/pages/entryReport/entryReport.vue

@@ -300,17 +300,16 @@
 					})
 					return false;
 					
-				
-				}else{
+				} else {
 					uni.showToast({
 						title: '未查询到检测套餐信息',
 						icon: 'none',
 						duration: 2000,
 					});
 				}
-		
-				
-				
+
+
+
 			},
 			search(val) {
 				// console.log(val);
@@ -329,7 +328,15 @@
 
 			},
 			goAddress(v) {
-                console.log(v)
+				console.log(v)
+				if (!v.lat) {
+					uni.showToast({
+							title: '该门店未设置定位',
+							icon: 'none',
+							duration: 2000,
+						});
+						return
+				}
 				uni.openLocation({
 					latitude: Number(v.lat),
 					longitude: Number(v.lng),

operatingCompany/pages/reportManage/reportDetail.vue

@@ -378,6 +378,7 @@
 					return false;
 				}
 				uni.openLocation({
+					
 					latitude:Number(that.info.shopInfo.lat),
 					longitude:Number(that.info.shopInfo.lng),
 					name:that.info.shopInfo.shopName,

operatingCompany/pages/shop/shopIndex/index.vue

@@ -201,7 +201,7 @@
 			},
 			logOut() {
 				uni.clearStorageSync();
-				uni.navigateTo({
+				uni.reLaunch({
 					url: '../../logIn/logIn'
 				})
 			},

operatingCompany/pages/team/manageStore.vue

@@ -129,7 +129,15 @@
 				})
 			},
 
-			goAddress(v) {
+			goAddress(v) {
+				if (!v.lat) {
+					uni.showToast({
+							title: '该门店未设置定位',
+							icon: 'none',
+							duration: 2000,
+						});
+						return
+				}
 				uni.openLocation({
 					latitude: Number(v.lat),
 					longitude: Number(v.lng),

operatingCompany/pages/teamStore/teamStore.vue

@@ -181,8 +181,16 @@
 					url:'../entryReport/historyReport?shopId=' + item.shopId
 				})
 			},
-			goAddress(v) {
-
+			goAddress(v) {
+				console.log(v);
+				if (!v.lat) {
+					uni.showToast({
+							title: '该门店未设置定位',
+							icon: 'none',
+							duration: 2000,
+						});
+						return
+				}
 				uni.openLocation({
 					latitude: Number(v.lat),
 					longitude: Number(v.lng),