Merge branch 'master' into dev

pages/index/shopList.vue

@@ -127,7 +127,6 @@
 							that.location.lng = res.longitude
 					        that.getAdress();
 							//that.getqueryShopList() //获取全部门店列表
-					
 						},
 						fail(err) {
 							console.log("定位失败")
@@ -246,6 +245,8 @@
 							
 						}else{
 							console.log("接口获取失败")
+							that.cityCode = ''
+							that.getqueryShopList() //获取全部门店列表
 						}
 						
 					}