From ae9f26afab5114761cb737898e6fa4554d48b631 Mon Sep 17 00:00:00 2001 From: donqi Date: Sun, 13 Nov 2022 23:23:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=95=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/request.js | 4 +- .../common-card/horizontal-name-card.vue | 4 +- pages.json | 2 + pages/index/my-home.vue | 2 +- pages/my/my-operator.vue | 95 ++++++++++++------- pages/my/my-team-member.vue | 6 +- 6 files changed, 71 insertions(+), 42 deletions(-) diff --git a/common/js/request.js b/common/js/request.js index 4a28a3e..46e4193 100644 --- a/common/js/request.js +++ b/common/js/request.js @@ -11,9 +11,9 @@ export default { title: '加载中' }) // request 触发前拼接 url - // args.url = 'https://www.opsoul.com:8881' + args.url; + args.url = 'https://www.opsoul.com:8881' + args.url; // args.url = 'http://192.168.2.60:80' + args.url; - args.url = 'http://127.0.0.1:80' + args.url; + // args.url = 'http://127.0.0.1:80' + args.url; if (args.data && Object.prototype && Object.prototype.toString.call(args.data) === '[object Object]') { args.data.deptId = globalData.deptId; args.data.from = globalData.from; diff --git a/components/common-card/horizontal-name-card.vue b/components/common-card/horizontal-name-card.vue index 0c73a59..036d416 100644 --- a/components/common-card/horizontal-name-card.vue +++ b/components/common-card/horizontal-name-card.vue @@ -3,7 +3,9 @@ - + + + diff --git a/pages.json b/pages.json index 34acd43..0d46427 100644 --- a/pages.json +++ b/pages.json @@ -34,6 +34,8 @@ "path": "edit-address" }, { "path": "apply-operator" + }, { + "path": "my-operator" }, { "path": "my-team-member" }, { diff --git a/pages/index/my-home.vue b/pages/index/my-home.vue index 5fc0883..e5e03bf 100644 --- a/pages/index/my-home.vue +++ b/pages/index/my-home.vue @@ -414,7 +414,7 @@ if (bindBankCardInfo && bindBankCardInfo.bankNum) { // 分销资格审核通过 uni.navigateTo({ - url: '/pages/my/my-team-member' + url: '/pages/my/my-operator' }) } else { // 跳转到银行卡绑定页面 diff --git a/pages/my/my-operator.vue b/pages/my/my-operator.vue index 5a977f0..155f5ba 100644 --- a/pages/my/my-operator.vue +++ b/pages/my/my-operator.vue @@ -3,54 +3,65 @@ 返回 - {{myOperator.level.name}}运营商 + {{myOperator.level.name ? myOperator.level.name : '城市'}}运营商 - - - - - - - - 实名认证 - - - - 公告 - + + + + + + + {{myOperator.name}} + + 角色：合伙人 + + + + + + + + + 公告 + - - 客户数 - {{myOperator.customerNums}} - - - 本月绑定 - {{myOperator.customerBindCurMonth}} - - - 团队 - {{myOperator.teamNums}} - - - 本月绑定 - {{myOperator.teamBindCurMonth}} + + {{item.title}} + + ￥{{item.value}} + + + {{item.value}}{{item.unit}} + - + {{item.title}} - ￥{{item.num}} + ￥{{item.value}} - {{item.num}}{{item.unit}} + {{item.value}}{{item.unit}} + + + {{item.title}} + + ￥{{item.value}} + + + {{item.value}}{{item.unit}} + @@ -128,8 +139,22 @@ this.loadData(); }, methods: { - async loadData() { - this.myOperator = await this.$api.data('myOperator'); + async loadData() { + this.curUserInfo = this.$request.getCurUserInfo(); + // this.myOperator = await this.$api.data('myOperator'); + this.loadMyInfo({ + customerId: this.curUserInfo.customerId + }); + }, + async loadMyInfo(params) { + let res = await this.$request.qryCustomerList(params); + if (res && res.rows && res.rows.length == 1) { + this.myOperator = res.rows[0]; + this.myOperator.extraInfos = [{ + name: '角色：', + desc: '合伙人' + }]; + } }, hideModal(e) { this.isShowShieldSet = false diff --git a/pages/my/my-team-member.vue b/pages/my/my-team-member.vue index 3cf61e1..d0be502 100644 --- a/pages/my/my-team-member.vue +++ b/pages/my/my-team-member.vue @@ -27,8 +27,8 @@ - - + + {{item.title}} ￥{{item.value}} @@ -39,7 +39,7 @@ - + {{item.title}} ￥{{item.value}}