Merge remote-tracking branch 'origin/dev_store' into dev-plus-max

pages.json

@@ -57,7 +57,7 @@
 			"path": "pages/shop_details/index",
 			"style": {
 				"navigationStyle": "custom",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "门店详情"
 				// #ifdef MP || APP-PLUS	
 				,
 				"navigationBarBackgroundColor": "#F2F2F2"

pages/admin/business/index.vue

@@ -64,6 +64,20 @@
 						icon: 'iconfont icon-shangjiaguanli'
 					});
 				}
+				if(this.service.is_goods){
+					list.push({
+						title: '我要收款',
+						url: '/pages/product/list/index?mer_id=' + merId,
+						icon: 'iconfont icon-shangjiaguanli'
+					});
+				}
+				if(this.service.is_goods){
+					list.push({
+						title: '基本信息',
+						url: '/pages/product/list/index?mer_id=' + merId,
+						icon: 'iconfont icon-shangjiaguanli'
+					});
+				}
 				return list;				
 			}
 		},

pages/shop/index.vue

@@ -62,7 +62,7 @@
 				<view :class="current==0?'action':''" @click="selectCurrent(0)">全部商家</view>
 				<view :class="current==1?'action':''" @click="selectCurrent(1)">附近商家</view>
 			</view>
-			<view class="list-container" v-if="false">
+			<view class="list-container" v-if="true">
 				<view class="list-item" v-for="(item,index) in 20" :key='index'>
 					<view class="list-item-left" v-if="index==1">
 						<image src="@/static/images/shop/1.jpg" mode=""></image>