bug修改

pages/index/index.vue

@@ -241,7 +241,7 @@
 		
 		<view style="height: 60rpx;"></view>
 		<!-- 手机号授权 -->
-		<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
+		<view class="authorizBox" v-if="authorizShow" @click="authorizShowHide">
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
 				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
@@ -362,6 +362,9 @@
 			}, 1000);
 		},
 		methods: {
+			authorizShowHide(){
+				this.authorizShow=false
+			},
 			UpdateManager(){
 				const updateManager = uni.getUpdateManager();
 				updateManager.onCheckForUpdate(function (res) {

pages/index/shopList.vue

@@ -94,6 +94,8 @@
 				<image src="../../static/timg/icon_guanbi@2x.png"  @click="authorizShowno" mode="" class="authorizCloseImg"></image>
 			</view>
 		</view>
+		<!-- <view>lng:{{location.lng}}</view>
+		<view>lat:{{location.lat}}</view> -->
 	</view>
 </template>
 
@@ -172,11 +174,11 @@
 				this.authorizShow=false
 			},
 			decryptPhoneNumber: function(e) {
-						  console.log(e);
-						  this.code=e.detail.code
-						  this.wxPhoneLogin()
-						  this.authorizShow=false;
-						},
+				  console.log(e);
+				  this.code=e.detail.code
+				  this.wxPhoneLogin()
+				  this.authorizShow=false;
+			},
 			wxPhoneLogin(){
 					 var that=this;
 					 this.$http('miniApp2/sys/wxPhoneLogin', {
@@ -191,7 +193,7 @@
 							this.wxOpenData=data.loginInfo;
 							this.$store.commit('mutationswxOpenData', data)
 							this.$store.commit('mutationsuserInfo', this.userInfo)
-						    this.getInfo()
+						    this.init()
 						}	
 					  })
 			},
@@ -222,12 +224,54 @@
 					}})
 			},
 			quCilck(){
-				this.$refs.popup.open("right")
-				this.popupShow=true;
+				console.log(this.cityName)
+				if(this.cityName){	
+					this.$refs.popup.open("right")
+					//this.popupShow=true;
+					if(this.areaList.length==0){
+						/* uni.showToast({
+							title: '当前城市下无区域，请切换城市查看',
+							icon: 'none',
+							duration: 4000
+						}); */
+						uni.showModal({
+						        title: '提示',
+						        content: '当前城市下无区域，请切换城市查看',
+						        success: function(res) {
+						        if (res.confirm) {
+						            // 执行确认后的操作
+									uni.navigateTo({
+										url:'/pages/subPack/chooseCity?type=1'
+									})
+						        } 
+						        else {
+						            // 执行取消后的操作
+						        }
+						    }
+						})
+					}
+				}else{
+					uni.showModal({
+					        title: '提示',
+					        content: '当前城市暂无门店，请切换城市查看',
+					        success: function(res) {
+					        if (res.confirm) {
+					            // 执行确认后的操作
+								uni.navigateTo({
+									url:'/pages/subPack/chooseCity?type=1'
+								})
+					        } 
+					        else {
+					            // 执行取消后的操作
+					        }
+					    }
+					})
+				}
+				
 			},
 			gocity(){
 				uni.navigateTo({
-					url:'/pages/subPack/chooseCity'
+					url:'/pages/subPack/chooseCity?type=1'
 				})
 			},
 			checkarea(item){
@@ -286,6 +330,8 @@
 				var that=this;
 				var location = this.location.lng + ',' + this.location.lat
 				console.log('location'+location)
+				//location='117.29249484592015,39.026727973090274'
+				
 				uni.request({
 					url: 'https://restapi.amap.com/v3/geocode/regeo',
 					data: {
@@ -299,7 +345,13 @@
 							console.log("城市名称")
 							 console.log(res.data.regeocode.addressComponent.city)
 							// console.log(res.data.pois[0].cityname)
-							let cityname = res.data.regeocode.addressComponent.city;
+							if(res.data.regeocode.addressComponent.city.length!=0){
+								var cityname = res.data.regeocode.addressComponent.city;
+								
+							}else{
+								var cityname = res.data.regeocode.addressComponent.province;
+							}
+							
 							var cityCode = res.data.regeocode.addressComponent.adcode
 							cityCode = cityCode.slice(0, -2)
 							cityCode = cityCode + '00'
@@ -340,11 +392,26 @@
 					this.loading=true;
 					//console.log('list+=', this.queryShopList);
 					if(this.queryShopList.length==0){
-						uni.showToast({
+						/* uni.showToast({
 							title: '当前城市暂无门店，请切换城市查看',
 							icon: 'none',
 							duration: 4000
-						});
+						}); */
+						uni.showModal({
+						        title: '提示',
+						        content: '当前城市暂无门店，请切换城市查看',
+						        success: function(res) {
+						        if (res.confirm) {
+						            // 执行确认后的操作
+									uni.navigateTo({
+										url:'/pages/subPack/chooseCity?type=1'
+									})
+						        } 
+						        else {
+						            // 执行取消后的操作
+						        }
+						    }
+						})
 					}
 
 				})