Merge branch 'dev' into ats

pages/index/shopList.vue

@@ -339,6 +339,13 @@
 					this.queryShopList = res.data.shop;
 					this.loading=true;
 					//console.log('list+=', this.queryShopList);
+					if(this.queryShopList.length==0){
+						uni.showToast({
+							title: '当前城市暂无门店，请切换城市查看',
+							icon: 'none',
+							duration: 4000
+						});
+					}
 
 				})
 			},