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-26 18:53:18 +08:00
parent efe30f87cc
commit 149c908352
5 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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,5,6].includes(Number(merchantInfo.merchant_type))){
if(this.service.is_verify && [0,3,4,5,6,7].includes(Number(merchantInfo.merchant_type))){
list.push({
title: '订单核销',
url: '/pages/admin/order_cancellation/index?mer_id=' + merId,
@ -92,7 +92,7 @@ export default {
icon: 'iconfont icon-daihexiao'
});
}
if(this.service.customer && [0,1,3,4,5,6].includes(Number(merchantInfo.merchant_type))){
if(this.service.customer && [0,1,3,4,5,6,7].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,6].includes(Number(merchantInfo.merchant_type))){
if(this.service.purchase_permission && [1,3,4,5,6,7].includes(Number(merchantInfo.merchant_type))){
list.push({
title: '进货',
url: '/pages/supplier/stock/with_goods',
@ -173,6 +173,8 @@ export default {
else if(this.is_sys == 4) this.pageTitle = '超市管理';
else if(this.is_sys == 5) this.pageTitle = '省公司门店管理';
else if(this.is_sys == 6) this.pageTitle = '城市会客厅';
else if(this.is_sys == 7) this.pageTitle = '惠民健康体检馆';
uni.setNavigationBarTitle({
title: this.pageTitle
})

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

@ -99,6 +99,7 @@ export default {
else if(this.is_sys == 4) this.pageTitle = '超市';
else if(this.is_sys == 5) this.pageTitle = '省公司门店';
else if(this.is_sys == 6) this.pageTitle = '城市会客厅';
else if(this.is_sys == 7) this.pageTitle = '惠民健康体检馆';
uni.setNavigationBarTitle({
title: this.pageTitle + '登录'
@ -132,6 +133,7 @@ export default {
else if(this.is_sys == 4) merchantType = '4';
else if(this.is_sys == 5) merchantType = '5';
else if(this.is_sys == 6) merchantType = '6';
else if(this.is_sys == 7) merchantType = '7';
let loginHistory = this.$Cache.get('MER_LOGIN_HISTORY_' + merchantType) || {};
if(typeof loginHistory === 'string') loginHistory = JSON.parse(loginHistory) || {};

9
pages/agent/centerV2.vue
View File

@ -346,6 +346,15 @@ export default {
type: 'hall'
}
});
menuList.push({
title: '惠民健康体检馆邀请码',
type: 'invite_qr_code',
url: '',
icon: 'icon-erweima1',
params: {
type: 'health'
}
});
}
if(Number(agentType) !== 11){
menuList.push({

9
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,5,6].includes(Number(merchant_type))">
<view class="item" v-if="![1,3,4,5,6,7].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,5,6].includes(Number(merchant_type))">
<view class="item" v-if="![1,3,4,5,6,7].includes(Number(merchant_type))">
<view class="uni-list">
<view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle">
@ -237,6 +237,7 @@
else if(this.is_sys == 4) this.pageTitle = '超市';
else if(this.is_sys == 5) this.pageTitle = '省公司门店';
else if(this.is_sys == 6) this.pageTitle = '城市会客厅';
else if(this.is_sys == 7) this.pageTitle = '惠民健康体检馆';
uni.setNavigationBarTitle({
title: this.pageTitle + '申请入驻'
@ -571,7 +572,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,5,6].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,7].includes(Number(this.merchant_type)))) {
if (!that.isShowCode) {
that.validate = true;
} else {
@ -595,7 +596,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,5,6].includes(Number(this.merchant_type))) return that.$util.Tips({title: '请选择商户分类'});
if (!value.classification && ![1,3,4,5,6,7].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: '请填写图片验证码'});

16
pages/user/index.vue
View File

@ -183,7 +183,7 @@
|| userInfo.smokeMerService
|| userInfo.supermarketService
|| userInfo.provinceService
|| userInfo.hallService)" style="margin-top: 20rpx;">
|| userInfo.hallService || userInfo.HealthService)" 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">
@ -204,7 +204,7 @@
|| userInfo.shopMerService
|| userInfo.supermarketService
|| userInfo.provinceService
|| userInfo.hallService">
|| userInfo.hallService || userInfo.HealthService">
<view class="item-count">
<image :src="operation_center.county_image"></image>
<text>{{ operation_center.county_title }}</text>
@ -323,6 +323,12 @@
<view class="tag-list-item">城市会客厅管理中心</view>
</view>
</view>
<view class="_list-item" v-if="userInfo.HealthService" @click="toService(7)">
<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)">
@ -574,7 +580,7 @@
},
toService(is_sys){
// 判断：如果为0 || 2 清除商户登录状态
if([0,2,3,4,5].includes(Number(is_sys))){
if([0,2,3,4,5,6,7].includes(Number(is_sys))){
// 商户 || 酒道馆 直接进入登录页面
this.$store.commit("SHOP_LOGIN", {
'token': null,
@ -840,10 +846,10 @@
this.identityCurrent = this.identity[keyName] || {};
let len = Object.keys(this.identityCurrent).length || 0;
// 根据数据进行对应的操作
if((len == 1 && !this.userInfo.service && !this.userInfo.shopMerService && !this.userInfo.supermarketService && !this.userInfo.provinceService && !this.userInfo.hallService && !this.userInfo.smokeMerService) || type == 'headquarters') {
if((len == 1 && !this.userInfo.service && !this.userInfo.shopMerService && !this.userInfo.supermarketService && !this.userInfo.provinceService && !this.userInfo.hallService && !this.userInfo.HealthService && !this.userInfo.smokeMerService) || type == 'headquarters') {
this.goToAgentCenter(this.identityCurrent[0]);
}else{
if(type == 'county' && (this.userInfo.service || this.userInfo.shopMerService || this.userInfo.supermarketService || this.userInfo.provinceService || this.userInfo.hallService)) this.$refs.agentIdentitySelect.open('bottom');
if(type == 'county' && (this.userInfo.service || this.userInfo.shopMerService || this.userInfo.supermarketService || this.userInfo.provinceService || this.userInfo.hallService || this.userInfo.HealthService)) this.$refs.agentIdentitySelect.open('bottom');
else if(type == 'wine' && this.userInfo.smokeMerService) this.$refs.agentIdentitySelect.open('bottom');
}