diff --git a/pages/admin/business/index.vue b/pages/admin/business/index.vue
index 9ba6170..6b6f604 100644
--- a/pages/admin/business/index.vue
+++ b/pages/admin/business/index.vue
@@ -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
})
diff --git a/pages/admin/business/login.vue b/pages/admin/business/login.vue
index 3991e03..6d8d2f0 100644
--- a/pages/admin/business/login.vue
+++ b/pages/admin/business/login.vue
@@ -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) || {};
diff --git a/pages/agent/centerV2.vue b/pages/agent/centerV2.vue
index 5c8b7e3..30379d8 100644
--- a/pages/agent/centerV2.vue
+++ b/pages/agent/centerV2.vue
@@ -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({
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 0b0c517..f55aac4 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -63,7 +63,7 @@
-
+
@@ -76,7 +76,7 @@
-
+
@@ -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: '请填写图片验证码'});
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 9248478..685ce12 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -183,7 +183,7 @@
|| userInfo.smokeMerService
|| userInfo.supermarketService
|| userInfo.provinceService
- || userInfo.hallService)" style="margin-top: 20rpx;">
+ || userInfo.hallService || userInfo.HealthService)" style="margin-top: 20rpx;">
运营中心