mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'prod' into main

This commit is contained in:
weipengfei 2023-11-04 17:28:53 +08:00
parent 4f180abff3 6cb8edad60
commit 0b45e6b8de
3 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pages/index/index.vue
View File

@ -427,16 +427,28 @@
name: '订单管理', name: '订单管理',
type: 2, type: 2,
image: require('@/static/images/index1.png') image: require('@/static/images/index1.png')
}, { },
name: '供货采购', // {
type: 3, // name: '供货采购',
image: require('@/static/images/index4.png') // type: 3,
}, // image: require('@/static/images/index4.png')
// },
// {
// name: '进货管理',
// type: 4,
// image: require('@/static/images/index5.png')
// },
{
name: '扫码出库',
type: 11,
image: require('@/static/images/index10.png')
},
{
name: '商户设置',
type: 12,
image: require('@/static/images/index11.png')
},
{ {
name: '进货管理',
type: 4,
image: require('@/static/images/index5.png')
}, {
name: '提现管理', name: '提现管理',
type: 5, type: 5,
image: require('@/static/images/index8.png') image: require('@/static/images/index8.png')
@ -1075,6 +1087,20 @@
.mer_id}&status=-1` .mer_id}&status=-1`
}) })
break; break;
case 11:
uni.navigateTo({
url: `/pages/admin/stockOut/index?mer_id=${this.userInfoData
.service
.mer_id}`
})
break;
case 12:
uni.navigateTo({
url: `/pages/product/basicSet?mer_id=${this.userInfoData
.service
.mer_id}`
})
break;
default: default:
uni.navigateTo({ uni.navigateTo({
url: '/pages/moreProject/moreProject' url: '/pages/moreProject/moreProject'

15
pages/moreProject/moreProject.vue
View File

@ -141,12 +141,12 @@
<image class="icon_img" src="@/static/images/index4.png" mode="aspectFit"></image> <image class="icon_img" src="@/static/images/index4.png" mode="aspectFit"></image>
<text class="text">供货采购</text> <text class="text">供货采购</text>
</view> --> </view> -->
<view class="examine" <view v-if="no_prod" class="examine"
@click="navigator(`/pages/nongKe/supply_chain/supplierA?tit=1&type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)"> @click="navigator(`/pages/nongKe/supply_chain/supplierA?tit=1&type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)">
<image class="icon_img" src="@/static/images/index4.png" mode="aspectFit"></image> <image class="icon_img" src="@/static/images/index4.png" mode="aspectFit"></image>
<text class="text">供货采购</text> <text class="text">供货采购</text>
</view> </view>
<view class="examine" @click="navigator('/pages/users/order_list/indexCopy?status=-1&product_type=98')"> <view v-if="no_prod" class="examine" @click="navigator('/pages/users/order_list/indexCopy?status=-1&product_type=98')">
<image class="icon_img" src="@/static/images/index5.png" mode="aspectFit"></image> <image class="icon_img" src="@/static/images/index5.png" mode="aspectFit"></image>
<text class="text">进货管理</text> <text class="text">进货管理</text>
</view> </view>
@ -199,12 +199,12 @@
<text class="text">押金缴纳</text> <text class="text">押金缴纳</text>
</view> </view>
<view class="examine" @click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)"> <view v-if="no_prod" class="examine" @click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/index16.png" mode="aspectFit"> <image class="icon_img" src="@/static/images/index16.png" mode="aspectFit">
</image> </image>
<text class="text">交易大厅</text> <text class="text">交易大厅</text>
</view> </view>
<view class="examine" @click="navigator(`/pages/commissionedSales/initiateDelegation/index`)"> <view v-if="no_prod" class="examine" @click="navigator(`/pages/commissionedSales/initiateDelegation/index`)">
<image class="icon_img" src="@/static/images/index13.png" mode="aspectFit"> <image class="icon_img" src="@/static/images/index13.png" mode="aspectFit">
</image> </image>
<text class="text">委托销售</text> <text class="text">委托销售</text>
@ -214,17 +214,17 @@
</image> </image>
<text class="text">委托订单</text> <text class="text">委托订单</text>
</view> --> </view> -->
<view class="examine" @click="navigator(`/pages/releaseManagement/index?mer_id=${mer_id}`)"> <view v-if="no_prod" class="examine" @click="navigator(`/pages/releaseManagement/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/index15.png" mode="aspectFit"> <image class="icon_img" src="@/static/images/index15.png" mode="aspectFit">
</image> </image>
<text class="text">发布管理</text> <text class="text">发布管理</text>
</view> </view>
<view v-if="userInfoData.mer_info.type_code === 'TypeTownSupplyChain'" class="examine" @click="navigator(`/pages/wholesale/wholesale/wholesale`)"> <view v-if="no_prod && userInfoData.mer_info.type_code === 'TypeTownSupplyChain'" class="examine" @click="navigator(`/pages/wholesale/wholesale/wholesale`)">
<image class="icon_img" src="@/static/images/index15.png" mode="aspectFit"> <image class="icon_img" src="@/static/images/index15.png" mode="aspectFit">
</image> </image>
<text class="text">供应链批发</text> <text class="text">供应链批发</text>
</view> </view>
<view v-if="userInfoData.mer_info.type_code === 'TypeTownSupplyChain'" class="examine" @click="navigator(`/pages/replace_replenishment/index`)"> <view v-if="no_prod && userInfoData.mer_info.type_code === 'TypeTownSupplyChain'" class="examine" @click="navigator(`/pages/replace_replenishment/index`)">
<image class="icon_img" src="@/static/images/index15.png" mode="aspectFit"> <image class="icon_img" src="@/static/images/index15.png" mode="aspectFit">
</image> </image>
<text class="text">代发补货</text> <text class="text">代发补货</text>
@ -569,6 +569,7 @@
}, },
data() { data() {
return { return {
no_prod: false,
company: '', company: '',
organization_code: '', organization_code: '',
locationArr: ({}), locationArr: ({}),

7
pages/product/basicSet.vue
View File

@ -138,8 +138,8 @@
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>客服电话：</view> <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>客服电话：</view>
<input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话"> <input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话">
</view> </view>
<view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" > <!-- <view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view> <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view>
<u-switch v-model="credit_buy" @change="change"></u-switch> <u-switch v-model="credit_buy" @change="change"></u-switch>
</view> </view>
@ -153,7 +153,8 @@
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算利率：</view> <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算利率：</view>
<input type="number" maxlength="5" v-model="interest_rate" placeholder="请输入 /利率单位为: %"> <input type="number" maxlength="5" v-model="interest_rate" placeholder="请输入 /利率单位为: %">
</view> </view>
<view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view> <view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view> -->
<!-- <view class="item_cell"> <!-- <view class="item_cell">
<view class="if_btn flex_a_c_j_sb"> <view class="if_btn flex_a_c_j_sb">
<text class="sub_title">是否开启商户：</text> <text class="sub_title">是否开启商户：</text>