wanma-benteng
/
new-mshop-view
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加：省公司门店 - 移动管理端 

修复：移动端 - 商品编辑 - 提交后佣金设置类型自动变更为默认设置的问题
修复：移动端 - 商品编辑 - 提交后酒卡额度及菜卡额度相关额度全部丢失的问题
修复：进货 - 供应商商品列表分页失败，导致供应商商品超出20个时不显示超出的商品，仅显示最前面的20个商品
This commit is contained in:
wuhui_zzw 2024-04-18 18:07:25 +08:00
parent 2da3d2ea13
commit 26c761bc2d
5 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ export default {
icon: 'iconfont icon-kefujilu'
});
}
if(this.service.is_verify && [0,3,4].includes(Number(merchantInfo.merchant_type))){
if(this.service.is_verify && [0,3,4,5].includes(Number(merchantInfo.merchant_type))){
list.push({
title: '订单核销',
url: '/pages/admin/order_cancellation/index?mer_id=' + merId,
@ -92,14 +92,14 @@ export default {
icon: 'iconfont icon-daihexiao'
});
}
if(this.service.customer && [0,1,3,4].includes(Number(merchantInfo.merchant_type))){
if(this.service.customer && [0,1,3,4,5].includes(Number(merchantInfo.merchant_type))){
list.push({
title: '订单管理',
url: '/pages/admin/order/index?mer_id=' + merId,
icon: 'iconfont icon-dingdanguanli'
});
}
if(this.service.is_goods && [0].includes(Number(merchantInfo.merchant_type))){
if(this.service.is_goods && [0,5].includes(Number(merchantInfo.merchant_type))){
list.push({
title: '商品管理',
url: '/pages/product/list/index?mer_id=' + merId,
@ -144,7 +144,7 @@ export default {
icon: 'iconfont icon-erweima1'
});
}
if(this.service.purchase_permission && [1,3,4].includes(Number(merchantInfo.merchant_type))){
if(this.service.purchase_permission && [1,3,4,5].includes(Number(merchantInfo.merchant_type))){
list.push({
title: '进货',
url: '/pages/supplier/stock/with_goods',
@ -171,6 +171,8 @@ export default {
if(this.is_sys == 1) this.pageTitle = '平台管理';
if(this.is_sys == 2) this.pageTitle = '酒道馆管理';
else if(this.is_sys == 3) this.pageTitle = '烟酒店管理';
else if(this.is_sys == 4) this.pageTitle = '超市管理';
else if(this.is_sys == 5) this.pageTitle = '省公司门店管理';
uni.setNavigationBarTitle({
title: this.pageTitle
})

9
pages/product/addGoods/index.vue
View File

@ -456,9 +456,14 @@ export default {
delivery_way: [], // 配送方式 1 到店核销 2 快递配送
delivery_free: '0', // 是否包邮 0不包邮 1包邮
temp_id: '', // 运费模板ID
tempName: '' // 运费模板名称
tempName: '', // 运费模板名称
extension_type: 0,// 佣金设置 0.系统，1.自定义
// 赠送酒卡额度
is_give_quota: 0,
give_quota_num: 0,
is_give_dish: 0,
give_dish_num: 0,
};
if(getStorage('editGoodsDetils')) {
removeStorage('editGoodsDetils');
}

4
pages/supplier/stock/with_goods.vue
View File

@ -269,12 +269,12 @@ export default {
// 数据合并
let list = res.data.list || {};
if (Object.values(list).length > 0) {
oldList = _this.$util.SplitArray(list, oldList);
oldList = Object.values(oldList).concat(list);
_this.search.page++;
}
_this.$set(_this, 'list', oldList);
}).catch(err => {
console.log('错误', err)
this.$util.Tips({title: err});
});
},

14
pages/user/index.vue
View File

@ -177,7 +177,7 @@
</view>
</view>
<!-- 运营中心 -->
<view class="user-menus" v-if="isLogin && (identityShow || userInfo.service || userInfo.shopMerService || userInfo.smokeMerService)" style="margin-top: 20rpx;">
<view class="user-menus" v-if="isLogin && (identityShow || userInfo.service || userInfo.shopMerService || userInfo.smokeMerService || userInfo.supermarketService || userInfo.provinceService)" style="margin-top: 20rpx;">
<view class="title skeleton-rect">运营中心</view>
<view class="menu-box operation-center">
<view class="item" @click="clickOperationCenterMenu('headquarters')" v-if="Object.keys(identity.headquarters_list).length > 0">
@ -192,7 +192,7 @@
<text>{{ operation_center.province_title }}</text>
</view>
</view>
<view class="item" @click="clickOperationCenterMenu('county')" v-if="Object.keys(identity.county_list).length > 0 || userInfo.service || userInfo.shopMerService">
<view class="item" @click="clickOperationCenterMenu('county')" v-if="Object.keys(identity.county_list).length > 0 || userInfo.service || userInfo.shopMerService || userInfo.supermarketService || userInfo.provinceService">
<view class="item-count">
<image :src="operation_center.county_image"></image>
<text>{{ operation_center.county_title }}</text>
@ -299,6 +299,12 @@
<view class="tag-list-item">超市管理中心</view>
</view>
</view>
<view class="_list-item" v-if="userInfo.provinceService" @click="toService(5)">
<view class="top">省公司门店管理</view>
<view class="tag-list">
<view class="tag-list-item">省公司门店管理中心</view>
</view>
</view>
</template>
<template v-if="identityCurrentName == 'wine'">
<view class="_list-item" v-if="userInfo.smokeMerService" @click="toService(3)">
@ -550,7 +556,7 @@
},
toService(is_sys){
// 判断：如果为0 || 2 清除商户登录状态
if(is_sys == 0 || is_sys == 2 || is_sys == 3 || is_sys == 4){
if([0,2,3,4,5].includes(Number(is_sys))){
// 商户 || 酒道馆 直接进入登录页面
this.$store.commit("SHOP_LOGIN", {
'token': null,
@ -818,7 +824,7 @@
// 根据数据进行对应的操作
if(len <= 0){
// 不存在列表
if(type == 'county' && (this.userInfo.service || this.userInfo.shopMerService)) this.$refs.agentIdentitySelect.open('bottom');
if(type == 'county' && (this.userInfo.service || this.userInfo.shopMerService || this.userInfo.supermarketService || this.userInfo.provinceService)) this.$refs.agentIdentitySelect.open('bottom');
else if(type == 'wine' && this.userInfo.smokeMerService) this.$refs.agentIdentitySelect.open('bottom');
}else{
// 存在列表