门店修改

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>
 
@@ -222,8 +224,50 @@
 					}})
 			},
 			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({
@@ -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 {
+						            // 执行取消后的操作
+						        }
+						    }
+						})
 					}
 
 				})