Merge branch 'dev'

pages/index/shopList.vue

@@ -2,7 +2,7 @@
 	<view class="box">
 		<view class="sstop">
 			<image src="../../static/timg/icon_search@2x.png" mode="" class="sstopimg"></image>
-			<input type="text" v-model="shopName" placeholder="请输入门店名称" class="sstopInput" @confirm="getqueryShopList2">
+			<input type="text" v-model="shopName" placeholder="请输入门店名称、门店地址" class="sstopInput" @confirm="getqueryShopList2">
 			<image src="../../static/img/icon_close.png" mode="" @click="empty" v-if="inputChShow" class="inputCh"></image>
 		</view>
         <view class="regionBox">