mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.excellentkk.cn/C.C/nk-shop2.0

Browse Source 
# Conflicts:
#	pages/nongKe/supply_chain/supplier.vue
#	pages/supply_chains/supply_chains.vue
This commit is contained in:
cc_zbp 2023-05-19 15:21:33 +08:00
commit 86868b3957
3 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pages/gather/gather.vue
View File

@ -4,8 +4,8 @@
<u-empty :show="jurisdiction" marginTop="260" mode="permission" :text="emptyText"
icon="http://cdn.uviewui.com/uview/empty/permission.png"></u-empty>
<block v-if="isLogin">
<!-- <view class="special_work com" v-if="userInfoData.mer_info.type_id === 12"> -->
<view class="special_work com" v-if="true">
<view class="special_work com" v-if="userInfoData.mer_info.type_id === 12">
<!-- <view class="special_work com" v-if="true"> -->
<view class="title">市级供应链</view>
<view class="content">
<view class="examine" @click="navigator(`/pages/nongKe/supply_chain/goods_list?merid=${mer_id}`)">
@ -38,8 +38,8 @@
</view>
</view>
<!-- <view class="business com" v-if="userInfoData.mer_info.type_id === 10"> -->
<view class="business com" v-if="true">
<view class="business com" v-if="userInfoData.mer_info.type_id === 10">
<!-- <view class="business com" v-if="true"> -->
<view class="special_work com">
<view class="title">我的店铺</view>
<view class="content ">
@ -100,8 +100,8 @@
<!-- <gatherBusiness :userInfoData="userInfoData" /> -->
</view>
<!-- <view class="business com" v-if="userInfoData.mer_info.type_id === 11"> -->
<view class="business com" v-if="true">
<view class="business com" v-if="userInfoData.mer_info.type_id === 11">
<!-- <view class="business com" v-if="true"> -->
<view class="special_work com">
<view class="title">里海云仓</view>
<view class="content ">

34
pages/nongKe/supply_chain/supplier.vue
View File

@ -155,17 +155,19 @@
</view>
</view>
<view class="pro-box" :class="'styleType'+store_street_theme">
<navigator :url="`/pages/goods_details/index?id=${itemn.product_id}`" hover-class="none"
class="pro-item" v-for="(itemn,indexn) in item.recommend.slice(0,3)" :key='indexn'>
<view class="picture">
<image :src="itemn.image"></image>
<view v-if="itemn.border_pic" :style="{ backgroundImage: `url(${itemn.border_pic})` }"
class="border-picture"></view>
<view class="pro-item" v-for="(itemn,indexn) in item.recommend.slice(0,3)" :key='indexn'
v-if="indexn<=2">
<view @click="go_details(itemn.product_type,itemn.product_id)">
<view class="picture">
<image :src="itemn.image"></image>
<view v-if="itemn.border_pic" :style="{ backgroundImage: `url(${itemn.border_pic})` }"
class="border-picture"></view>
</view>
<view class="price">
<text>￥</text>{{itemn.price}}
</view>
</view>
<view class="price">
<text>￥</text>{{itemn.price}}
</view>
</navigator>
</view>
</view>
</view>
</block>
@ -305,6 +307,18 @@
}, mapGetters(['viewColor'])),
},
methods: {
go_details: function(product_type, product_id) {
if (product_type == 98) {
uni.navigateTo({
url: `/pages/admin/goods_details/index?product_id=${product_id}&product_type=${product_type}`
})
}
if (product_type == 0) {
uni.navigateTo({
url: `/pages/goods_details/index?id=${product_id}`
})
}
},
// 获取商户分类
getClassfication: function() {
let temp = []

6
pages/store/home/index.vue
View File

@ -674,6 +674,12 @@
this.getCategory();
break;
case 3:
this.where={
order: '',
keyword: '',
page: 1,
limit: 30
};
this.getGoods();
break;
case 4: