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

添加：城市会客厅相关兼容（申请入驻、商户管理、邀请入驻）

This commit is contained in:
wuhui_zzw 2024-04-25 18:21:22 +08:00
parent 98fcab711a
commit 4462549b22
5 changed files with 68 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@ export default {
if(!this.service) return [];
const merId = this.service.mer_id;
const list = [];
// 商户类别：0=普通商户，1=酒道馆，2=供应商，3=烟酒店
// 商户类别：0=普通商户，1=酒道馆，2=供应商，3=烟酒店，4=超市，5=省公司门店，6=城市会客厅
let merchantInfo = this.service.merchant || {};
if(this.service.status && [0].includes(Number(merchantInfo.merchant_type))){
list.push({
@ -73,14 +73,14 @@ export default {
icon: 'iconfont icon-kefujilu'
});
}
if(this.service.is_verify && [0,3,4,5].includes(Number(merchantInfo.merchant_type))){
if(this.service.is_verify && [0,3,4,5,6].includes(Number(merchantInfo.merchant_type))){
list.push({
title: '订单核销',
url: '/pages/admin/order_cancellation/index?mer_id=' + merId,
icon: 'iconfont icon-dingdanhexiao'
});
}
if(this.service.is_verify && [1,3,4].includes(Number(merchantInfo.merchant_type))){
if(this.service.is_verify && [1,3,4,6].includes(Number(merchantInfo.merchant_type))){
list.push({
title: '提货券核销',
url: '/pages/users/write_off/index',
@ -92,7 +92,7 @@ export default {
icon: 'iconfont icon-daihexiao'
});
}
if(this.service.customer && [0,1,3,4,5].includes(Number(merchantInfo.merchant_type))){
if(this.service.customer && [0,1,3,4,5,6].includes(Number(merchantInfo.merchant_type))){
list.push({
title: '订单管理',
url: '/pages/admin/order/index?mer_id=' + merId,
@ -144,7 +144,7 @@ export default {
icon: 'iconfont icon-erweima1'
});
}
if(this.service.purchase_permission && [1,3,4,5].includes(Number(merchantInfo.merchant_type))){
if(this.service.purchase_permission && [1,3,4,5,6].includes(Number(merchantInfo.merchant_type))){
list.push({
title: '进货',
url: '/pages/supplier/stock/with_goods',
@ -152,7 +152,6 @@ export default {
});
}
return list;
},
...mapGetters(['isLogin', 'uid', 'userInfo', 'viewColor', 'shopIsLogin', 'shopMerId'])
@ -173,6 +172,7 @@ export default {
else if(this.is_sys == 3) this.pageTitle = '烟酒店管理';
else if(this.is_sys == 4) this.pageTitle = '超市管理';
else if(this.is_sys == 5) this.pageTitle = '省公司门店管理';
else if(this.is_sys == 6) this.pageTitle = '城市会客厅';
uni.setNavigationBarTitle({
title: this.pageTitle
})

2
pages/admin/business/login.vue
View File

@ -98,6 +98,7 @@ export default {
else if(this.is_sys == 3) this.pageTitle = '烟酒店';
else if(this.is_sys == 4) this.pageTitle = '超市';
else if(this.is_sys == 5) this.pageTitle = '省公司门店';
else if(this.is_sys == 6) this.pageTitle = '城市会客厅';
uni.setNavigationBarTitle({
title: this.pageTitle + '登录'
@ -130,6 +131,7 @@ export default {
else if(this.is_sys == 3) merchantType = '3';
else if(this.is_sys == 4) merchantType = '4';
else if(this.is_sys == 5) merchantType = '5';
else if(this.is_sys == 6) merchantType = '6';
let loginHistory = this.$Cache.get('MER_LOGIN_HISTORY_' + merchantType) || {};
if(typeof loginHistory === 'string') loginHistory = JSON.parse(loginHistory) || {};

10
pages/agent/centerV2.vue
View File

@ -337,6 +337,15 @@ export default {
type: 'supermarket'
}
});
menuList.push({
title: '城市会客厅邀请码',
type: 'invite_qr_code',
url: '',
icon: 'icon-erweima1',
params: {
type: 'hall'
}
});
}
if(Number(agentType) !== 11){
menuList.push({
@ -558,6 +567,7 @@ export default {
else if(merchantType == 3) is_sys = 3;
else if(merchantType == 4) is_sys = 4;
else if(merchantType == 5) is_sys = 5;
else if(merchantType == 6) is_sys = 6;
uni.navigateTo({
url: '/pages/admin/business/index?is_sys=' + is_sys
})

20
pages/store/settled/index.vue
View File

@ -63,7 +63,7 @@
<view class="imageCode" @click="again"><image :src="codeUrl" /></view>
</view>
</view>
<view class="item" v-if="![1,3,4].includes(Number(merchant_type))">
<view class="item" v-if="![1,3,4,5,6].includes(Number(merchant_type))">
<view class="uni-list">
<view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle">
@ -76,7 +76,7 @@
</view>
</view>
</view>
<view class="item" v-if="![1,3,4].includes(Number(merchant_type))">
<view class="item" v-if="![1,3,4,5,6].includes(Number(merchant_type))">
<view class="uni-list">
<view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle">
@ -215,6 +215,7 @@
// 代理邀请入驻
agent_id: 0,
merchant_type: 0,
pageTitle: '',
};
},
beforeDestroy() {
@ -229,6 +230,17 @@
// console.log("接收参数",scene)
_this.agent_id = scene.aid || 0;
_this.merchant_type = scene.mt || 0;
// 商户类别：0=普通商户，1=酒道馆，2=供应商，3=烟酒店，4=超市，5=省公司门店，6=城市会客厅
this.pageTitle = '商户';
if(this.is_sys == 1) 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 = '省公司门店';
else if(this.is_sys == 6) this.pageTitle = '城市会客厅';
uni.setNavigationBarTitle({
title: this.pageTitle + '申请入驻'
})
}
if (this.isLogin) {
@ -559,7 +571,7 @@
validateBtn: function() {
let that = this,
value = that.merchantData;//value.yanzhengma &&
if (value.enterprise_name && value.user_name && value.phone && /^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone) && that.isAgree && (value.classification || [1,3,4].includes(Number(this.merchant_type)))) {
if (value.enterprise_name && value.user_name && value.phone && /^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone) && that.isAgree && (value.classification || [1,3,4,5,6].includes(Number(this.merchant_type)))) {
if (!that.isShowCode) {
that.validate = true;
} else {
@ -583,7 +595,7 @@
if (!value.phone) return that.$util.Tips({title: '请输入手机号'});
if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({title: '请输入正确的手机号码'});
// if (!value.yanzhengma) return that.$util.Tips({title: '请填写验证码'});
if (!value.classification && ![1,3,4].includes(Number(this.merchant_type))) return that.$util.Tips({title: '请选择商户分类'});
if (!value.classification && ![1,3,4,5,6].includes(Number(this.merchant_type))) return that.$util.Tips({title: '请选择商户分类'});
if (!that.isAgree) return that.$util.Tips({title: '请勾选并同意入驻协议'});
if (that.isShowCode && !that.codeVal) return that.$util.Tips({title: '请填写图片验证码'});

43
pages/user/index.vue
View File

@ -177,7 +177,13 @@
</view>
</view>
<!-- 运营中心 -->
<view class="user-menus" v-if="isLogin && (identityShow || userInfo.service || userInfo.shopMerService || userInfo.smokeMerService || userInfo.supermarketService || userInfo.provinceService)" style="margin-top: 20rpx;">
<view class="user-menus" v-if="isLogin && (identityShow
|| userInfo.service
|| userInfo.shopMerService
|| userInfo.smokeMerService
|| userInfo.supermarketService
|| userInfo.provinceService
|| userInfo.hallService)" 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 +198,13 @@
<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 || userInfo.supermarketService || userInfo.provinceService">
<view class="item" @click="clickOperationCenterMenu('county')"
v-if="Object.keys(identity.county_list).length > 0
|| userInfo.service
|| userInfo.shopMerService
|| userInfo.supermarketService
|| userInfo.provinceService
|| userInfo.hallService">
<view class="item-count">
<image :src="operation_center.county_image"></image>
<text>{{ operation_center.county_title }}</text>
@ -305,6 +317,12 @@
<view class="tag-list-item">省公司门店管理中心</view>
</view>
</view>
<view class="_list-item" v-if="userInfo.hallService" @click="toService(6)">
<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)">
@ -822,16 +840,23 @@
this.identityCurrent = this.identity[keyName] || {};
let len = Object.keys(this.identityCurrent).length || 0;
// 根据数据进行对应的操作
if(len <= 0){
// 不存在列表
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');
if((len == 1 && !this.userInfo.service && !this.userInfo.shopMerService && !this.userInfo.supermarketService && !this.userInfo.provinceService && !this.userInfo.hallService && !this.userInfo.smokeMerService) || type == 'headquarters') {
this.goToAgentCenter(this.identityCurrent[0]);
}else{
// 存在列表
if(len == 1 || type == 'headquarters') this.goToAgentCenter(this.identityCurrent[0]);
else this.$refs.agentIdentitySelect.open('bottom');
if(type == 'county' && (this.userInfo.service || this.userInfo.shopMerService || this.userInfo.supermarketService || this.userInfo.provinceService || this.userInfo.hallService)) this.$refs.agentIdentitySelect.open('bottom');
else if(type == 'wine' && this.userInfo.smokeMerService) this.$refs.agentIdentitySelect.open('bottom');
}
// if(len <= 0){
// // 不存在列表
// if(type == 'county' && (this.userInfo.service || this.userInfo.shopMerService || this.userInfo.supermarketService || this.userInfo.provinceService || this.userInfo.hallService)) this.$refs.agentIdentitySelect.open('bottom');
// else if(type == 'wine' && this.userInfo.smokeMerService) this.$refs.agentIdentitySelect.open('bottom');
// }else{
// // 存在列表
// if(len == 1 || type == 'headquarters') this.goToAgentCenter(this.identityCurrent[0]);
// else this.$refs.agentIdentitySelect.open('bottom');
// }
return false;
},
// 运营中心 - 关闭弹框