提交

@@ -55,7 +55,7 @@ Vue.prototype.$request=function(url,data='',type = 1){
 				}
 				if(res.data.code == 401){
 					uni.setStorageSync("token",'')
-					uni.navigateTo({
+					uni.reLaunch({
 						url:"/pages/index/login"
 					})
 				}
@@ -88,7 +88,7 @@ Vue.prototype.$href=function(data,type=1){
 			})
 		}
 	}else{
-		uni.navigateTo({
+		uni.reLaunch({
 			url:"/pages/index/login?backurl="+data
 		})
 	}

@@ -346,19 +346,25 @@
 			})
 		},
 		onShow() {
+			let tempArr = []
+			let param = this.landParam
 			this.scale = 13
 			this.notReadNumber = 0
 			this.getSysNoReadNum()
-			let tempArr = []
 			this.landList = []
 			uni.getLocation({
 			    type: 'wgs84',
 				geocode: true,
 			    success: (res) => {
-					this.cityCode = res.address.cityCode
-					this.latitude = res.latitude
-					this.longitude = res.longitude
 					this.city = res.address.city
+					this.cityCode = res.address.cityCode
+					if(param.latitude != ''){
+						this.latitude = param.latitude
+						this.longitude = param.longitude
+					}else{
+						this.latitude = res.latitude
+						this.longitude = res.longitude
+					}
 			    },
 				fail: (err) => {
 					this.city = '北京市'
@@ -370,11 +376,6 @@
 						longitude: this.longitude,
 						latitude: this.latitude,
 					});
-					let param = this.landParam
-					/* if(param.latitude != ''){
-						this.latitude = param.latitude
-						this.longitude = param.longitude
-					} */
 					let province = ''
 					let city = ''
 					if(param.province == '' && param.city == ''){

@@ -443,7 +443,7 @@
 						/* =================================== 腾讯云即时通讯退出 开始 ==================================== */
 						
 						this.$store.commit('logout') 
-						uni.navigateTo({
+						uni.reLaunch({
 							url:'/pages/index/login'
 						})
 					}else{

@@ -80,7 +80,7 @@
 			this.param.page = 1
 			this.last_page = 0
 			this.current_page = 1
-			this.list = []
+			this.followList = []
 			this.getData()
 		},
 		onLoad(option) {