faiz
/
Huanyuyuehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
yangtao 2024-03-25 16:25:37 +08:00
parent 0ba2d31e1e c9f08e2243
commit a7e9281785
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages.json
View File

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

14
pages/admin/business/index.vue
View File

@ -64,6 +64,20 @@
icon: 'iconfont icon-shangjiaguanli' 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; return list;
} }
}, },

2
pages/shop/index.vue
View File

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