From cb075d012689d9173d10a0c81e178efbce47ff5d Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sat, 23 Mar 2024 16:55:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E7=83=9F=E9=85=92?=
=?UTF-8?q?=E9=A6=86=E4=BB=A3=E9=94=80=E5=95=86=E9=82=80=E8=AF=B7=E7=83=9F?=
=?UTF-8?q?=E9=85=92=E9=A6=86=E5=95=86=E6=88=B7=E5=85=A5=E9=A9=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/agent/centerV2.vue | 53 ++++++++++++-------
pages/store/applicationRecord/index.vue | 6 ++-
pages/store/settled/index.vue | 32 +++++++++---
pages/user/index.vue | 69 ++++++++++++++++++++-----
4 files changed, 119 insertions(+), 41 deletions(-)
diff --git a/pages/agent/centerV2.vue b/pages/agent/centerV2.vue
index b6254af..a186e7e 100644
--- a/pages/agent/centerV2.vue
+++ b/pages/agent/centerV2.vue
@@ -4,11 +4,16 @@
- {{ corporate_name || '' }}
-
- {{ agent_info.agent_type_text || '' }}
- 切换
-
+
+ {{ agent_info.agent_type_text || '' }}
+
+
+ {{ corporate_name || '' }}
+
+ {{ agent_info.agent_type_text || '' }}
+ 切换
+
+
@@ -190,6 +198,12 @@
{{ operation_center.county_title }}
+
+
+
+ {{ operation_center.wine_title || '烟酒馆运营商' }}
+
+
@@ -278,6 +292,8 @@
酒道馆管理中心
+
+
烟酒店管理
@@ -296,7 +312,7 @@
-
+
{{ item.agent_type_text }}
{{ merItem.mer_name || '' }}
@@ -446,9 +462,10 @@
// 身份信息
identityShow: false,
identity: {
- county_list: 0,
- headquarters_list: 0,
- province_list: 0
+ county_list: {},
+ headquarters_list: {},
+ province_list: {},
+ wine_list: {},
},
identityCurrent:{},
identityCurrentName: '',
@@ -773,7 +790,8 @@
let headquarters = Object.keys(_this.identity.headquarters_list).length || 0;
let province = Object.keys(_this.identity.province_list).length || 0;
let county = Object.keys(_this.identity.county_list).length || 0;
- let total = Number(headquarters) + Number(province) + Number(county);
+ let wine = Object.keys(_this.identity.wine_list).length || 0;
+ let total = Number(headquarters) + Number(province) + Number(county) + Number(wine);
_this.identityShow = Number(total) > 0;
}
}).catch(err => {
@@ -787,9 +805,17 @@
this.identityCurrent = this.identity[keyName] || {};
let len = Object.keys(this.identityCurrent).length || 0;
// 根据数据进行对应的操作
- if(len <= 0 && (type != 'county' || (type == 'county' && !this.userInfo.service && !this.userInfo.shopMerService))) return false;
- else if((len == 1 || type == 'headquarters') && type != 'county') this.goToAgentCenter(this.identityCurrent[0]);
- else this.$refs.agentIdentitySelect.open('bottom');
+ if(len <= 0){
+ // 不存在列表
+ if(type == 'county' && (this.userInfo.service || this.userInfo.shopMerService)) 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;
},
// 运营中心 - 关闭弹框
closeAgentIdentitySelect(){
@@ -1159,16 +1185,26 @@
.num-wrapper {
z-index: 30;
position: relative;
- display: flex;
- align-items: center;
- justify-content: space-between;
+ //display: flex;
+ //align-items: center;
+ //justify-content: space-between;
margin: 30rpx 20rpx 0;
color: #fff;
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+ flex-direction: row;
+ flex-wrap: wrap;
.num-item {
- width: 25%;
+ width: calc(100% / 3) !important;
text-align: center;
-
+ height: 100rpx;
+ display: inline-flex;
+ flex-direction: column;
+ flex-wrap: nowrap;
+ justify-content: center;
+ align-items: center;
.num {
font-size: 42rpx;
font-weight: bold;
@@ -1630,6 +1666,13 @@
}
}
.operation-center{
+ width: 100%;
+ display: inline-flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ justify-content: flex-start;
+ align-items: center;
+ align-content: flex-start;
.item{
width: calc(100% / 3) !important;
}