From b332b5d1d0784b4f6fd4bd97f1fe569ea3742516 Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Thu, 23 Feb 2023 10:48:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BF=90=E8=90=A5=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=8F=8A=E8=B0=83=E6=95=B4=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/index.js | 1 + pages.json | 2 +- pages/account/yunying.vue | 12 +++++------ pages/user/index.vue | 41 +++++++++++++++++++++++++------------- static/imgs/lishu.png | Bin 0 -> 1680 bytes 5 files changed, 35 insertions(+), 21 deletions(-) create mode 100644 static/imgs/lishu.png diff --git a/apis/index.js b/apis/index.js index 0bf4ee8..81c1834 100644 --- a/apis/index.js +++ b/apis/index.js @@ -47,6 +47,7 @@ const request = (parameter, hideLoding = true) => { data : parameter.data || {}, method : parameter.method || 'GET', success : res => { + console.log(config.apiUrl + parameter.url,res) if (res.header.Authorization){ updateToken('token', res.header.Authorization) } diff --git a/pages.json b/pages.json index 7f4e18f..66e0330 100644 --- a/pages.json +++ b/pages.json @@ -225,7 +225,7 @@ "auth": true, "name": "YunYing", "style": { - "navigationBarTitleText": "运营中心", + "navigationBarTitleText": "法务运营中心", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#446EFE", "navigationBarTextStyle": "white" diff --git a/pages/account/yunying.vue b/pages/account/yunying.vue index 06caf7f..3eaad25 100644 --- a/pages/account/yunying.vue +++ b/pages/account/yunying.vue @@ -10,7 +10,7 @@ - 运营中心 + 法务运营中心 @@ -69,13 +69,13 @@ - 修改运营中心 + 修改法务运营中心 - 运营中心 + 法务运营中心 确认修改名称 @@ -541,12 +541,12 @@ .btn { height: 60rpx; - background: #446EFE; + // background: #446EFE; border-radius: 10rpx; - font-size: 24rpx; + // font-size: 24rpx; font-family: PingFang SC; font-weight: 400; - color: #FFFFFF; + // color: #FFFFFF; line-height: 60rpx; text-align: center; padding: 0 20rpx; diff --git a/pages/user/index.vue b/pages/user/index.vue index d4e17d1..695527a 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -10,8 +10,14 @@ 实名认证 - - {{identity.name}} + + + {{identity.name}} + 隶属：{{team_name}} + + + {{team_name}} + @@ -56,12 +62,12 @@ - + 奖金账户 @@ -133,12 +139,12 @@ - 完善运营中心 + 完善法务运营中心 - 运营中心 + 法务运营中心 确认名称 @@ -158,7 +164,8 @@ return { isAuth: false, nickname: '', - identity: '', + identity: '', + team_name:'', avatar: '', certification: '', // 绑定关系 @@ -202,7 +209,7 @@ identity, avatar, certification, - parent,team_status + parent,team_status,team_name } = res this.nickname = nickname this.identity = identity @@ -210,6 +217,7 @@ this.certification = certification this.parent = parent this.team_status = team_status + this.team_name = team_name if(team_status == 1){ this.yunyingShow = true } @@ -429,14 +437,19 @@ height: 40rpx; color: #555; font-weight: 400; - margin-left: $margin - 10; + margin-right: $margin - 10; - &::after { + &::after{ border-radius: 20rpx; } - &:first-child { + &:first-child ,&:nth-child(3) { margin-left: 0; + } + &:nth-child(3){ + margin-top: 10rpx; + // background: #4674DA; + // color: #fff; } .tags-icon { @@ -675,12 +688,12 @@ .btn { height: 60rpx; - background: #4674DA; + // background: #4674DA; border-radius: 10rpx; - font-size: 24rpx; + // font-size: 24rpx; font-family: PingFang SC; font-weight: 400; - color: #FFFFFF; + // color: #FFFFFF; line-height: 60rpx; text-align: center; padding: 0 20rpx; diff --git a/static/imgs/lishu.png b/static/imgs/lishu.png new file mode 100644 index 0000000000000000000000000000000000000000..45fab2a02b96318b95c91fb6d738a7fafe50c05c GIT binary patch literal 1680 zcmV;B25Px*N=ZaPRA@u(S$&9ARS=)K_pQ|S1(BrXR~QENh51j3ngyAe6q*@9M3SVC1-tvs z+`IWlPomv-=I&~s5nE{bMOvr!&0gy`&KEIIy#Vl8^mmzvOhv>= zvG?1E=+1hOs0#sR{s92SMSxxd07FFI#Q|DtmpP6Th{*Z+Ttpu7Ja1#IBx)vLt@RKw zt3bjqoa_7kTjfAmYrjRrD z+!d{@t(r0`inTU_h)=3wDwP`3+}wP)qEQKjS_!-t<$55Z#J<|w+h@71tF}t~me$tR zox??-3jiL8HspBU_kT8dd^bU0n^wjvadk0A?r<5m`B6#E7n@rlw!wz?gX+ z0O-kkarB&t$g2gs+Sas$@`HDDbW9GzP?yEk{Z0}81^}&%J{6Ji0B{`uOw8*e;yPo@ zl3Kynjet5TBvA?+B3fgNUk~tgC7{mQ+S*1oG&C#_kp%!SI|i~>L^e5&v&k6qZoRE6R_6)hKMzlz-2O2#u&4*8U|GnVCLrlU|DQ{ zp8?=NH3JsW)y~C$AmTJ*%j#3B9P5y zuXh~hnf&dm-UO_*V*p@DKJ5a)Vj|j5ar!G2bJp5UM0^kcE-7?|h*f8dLLb>|cADcj zx-@Sp0=7p)HhP|yDMzGa1ekeX$&_)hnTQr8nW;jZAPDA*$cq4QQCWZ$CaNd_X4X!F zb{tgp1He+pak}+K7>2sh^e)_AI*Z6U&-1D(je{UKPek?rz%|hr>s{Af+uPgQ-PqVT zI=XJQ=ZT5P1D@x-RE+2#0?e%0<>g3uClM7b1L6@1!*Gu8``eR7f|;KHfTyDgDQU~h zlApv>DmAmYx%rPlOS$j?Gb?x{al&=oNi8icn)3%qXJ_ZwTrQ`F*g4fkftkP32qNNk zW6YdV#I3b=A>teQ-f^6J(&@A|#7>hz5wO;FYbO~I4;W+m^KvN(f}mSOwClW|i1N#! zY#>&zUOl?6uTM|#{_AJCO{#~S>$(S37ZD#b#;mPKfSLaSfC~U%4-pm14g)@zS&w}E zknuYa4a!u-n8bUdA~N6eyw^)H&SWx;jg5`}L}b&R=XE9_kk39xh)6e7NnvKaxQ_yW z4MeoK?9@ju!eyPRZqR`yv9fJqfOO<@3lS|W=D*ZAa9Y_cB3l7Kzrv`DN5p~8LzUKXDN@Y* zW&Rw{HjIdDN5t<%M4MiE#!SuI9zTBk+)O5OA~As|d;_iXGBf)y5v@-;^M!gr5Ns2X zJIdG})|;O(CjR~HH1)E@To44e0>D$+n96_KiZ!j8jWM4L6@1=~nYFw9Xw>}5Kkh-q z&BmDiZx7`pQ8lU#v~i{X)9Lirm7EUcy_Oe Date: Thu, 23 Feb 2023 16:03:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=A7=E5=8C=BA=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/interfaces/user.js | 3 +- manifest.json | 2 +- pages.json | 2 +- pages/account/yunying.vue | 71 ++++++++++++++++++----------- pages/user/index.vue | 95 +++++++++++++++++++++++++++++---------- 5 files changed, 122 insertions(+), 51 deletions(-) diff --git a/apis/interfaces/user.js b/apis/interfaces/user.js index 685207f..d44b187 100644 --- a/apis/interfaces/user.js +++ b/apis/interfaces/user.js @@ -142,9 +142,10 @@ const submitTeamName = (data) => { }) } // 获取运营中心记录 -const getTeam = () => { +const getTeam = (data) => { return request({ url : 'user/team', + data:data, }) } diff --git a/manifest.json b/manifest.json index e6d773a..6ee09da 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "抖火", "appid" : "__UNI__C305C03", "description" : "纵有疾风起，人生不言弃", - "versionName" : "1.3.1", + "versionName" : "1.3.2", "versionCode" : 103, "transformPx" : false, /* 5+App特有相关 */ diff --git a/pages.json b/pages.json index 66e0330..64b3794 100644 --- a/pages.json +++ b/pages.json @@ -225,7 +225,7 @@ "auth": true, "name": "YunYing", "style": { - "navigationBarTitleText": "法务运营中心", + "navigationBarTitleText": "", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#446EFE", "navigationBarTextStyle": "white" diff --git a/pages/account/yunying.vue b/pages/account/yunying.vue index 3eaad25..f4f4f20 100644 --- a/pages/account/yunying.vue +++ b/pages/account/yunying.vue @@ -10,10 +10,10 @@ - 法务运营中心 + {{defaultTitle}} - + 团队人数 :{{users_count}}人 总业绩 :￥{{all_perf}} @@ -69,13 +69,13 @@ - 修改法务运营中心 + 修改{{defaultTitle}} - 法务运营中心 + {{defaultTitle}} 确认修改名称 @@ -97,18 +97,7 @@ data() { return { type: 'edit', - tabs: [{ - name: '名称修改', - value: 'edit' - }, { - name: '团队人数', - value: 'balance' - }, - { - name: '总业绩', - value: 'withdraws' - }, - ], + tabs:[], total: '0.00', sended: '0.00', frozen: '0.00', @@ -124,21 +113,54 @@ team_name: '', team_status: '', // 状态 1可以申请但是没有完善，2申请完，审核中，3已通过，已修改 users_count: '-', - all_perf: '-', + all_perf: '-', + teamtype:'', // team + id:'', + defaultTitle:'', // 全局名称法务运营中心，大区运营中心 }; + }, + onLoad(e) { + this.teamtype = e.teamtype + this.id = e.id + let title ='' + if(e.teamtype == 'team'){ + title='法务运营中心' + this.tabs = [{ + name: '名称修改', + value: 'edit' + }, { + name: '团队人数', + value: 'balance' + }, + { + name: '总业绩', + value: 'withdraws' + } + ] + } else { + title='大区运营中心' + this.tabs = [{ + name: '名称修改', + value: 'edit' + }] + } + this.defaultTitle =title + uni.setNavigationBarTitle({ + title:title + }) }, onShow() { this.page = { current: 1, has_more: false, } - this.getList() - this.getTeam(); + this.getList() + this.getTeam() }, methods: { // 获取运营中心基本信息 getTeam() { - getTeam().then(res => { + getTeam({identity_id:this.id}).then(res => { this.team_name = res.name this.users_count = res.users_count this.all_perf = res.all_perf @@ -150,7 +172,7 @@ sureYunYing() { if (this.yunying_name == '' || this.yunying_name.length == 0) { uni.showToast({ - title: '请输入运营中心名称', + title: '请输入'+this.defaultTitle+'名称', icon: 'none', mask: true, duration: 2000 @@ -159,12 +181,12 @@ } submitTeamName({ - name: this.yunying_name + name: this.yunying_name,identity_id:this.id }).then(res => { this.showBind = false uni.showModal({ title: '微信提示', - content: '运营中心姓名修改完成，请耐心等待审核！', + content: this.defaultTitle+'姓名修改完成，请耐心等待审核！', showCancel: false, success: res => { this.yunyingShow = false @@ -197,7 +219,6 @@ }, // 获取账户余额 getList() { - // if (this.type === 'balance') this.getBalance() // if (this.type === 'withdraws') this.getWithdraws() if (this.type == 'edit'){ @@ -233,7 +254,7 @@ }, // 获取提现记录 getTeams() { - getTeamLogs({}).then(res => { + getTeamLogs({identity_id:this.id}).then(res => { console.log(res) this.list = res this.pagesShow = false diff --git a/pages/user/index.vue b/pages/user/index.vue index 695527a..6e57c1e 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -62,11 +62,18 @@ - + - 运营中心 + 法务运营中心 + + + + + 大区运营中心 + + @@ -139,12 +146,12 @@ - 完善法务运营中心 + {{team_status == '1'?'完善法务运营中心':'完善大区运营中心'}} - 法务运营中心 + {{team_status == '1'?'法务运营中心':'大区运营中心'}} 确认名称 @@ -190,7 +197,10 @@ invitation: '', yunyingShow:false, // 运营中心是否展示 yunying_name:'', // 运营名称 - team_status:'', // 状态 0 不展示运营中心 1可以申请但是没有完善，2申请完，审核中，3已通过，已修改 + team_status:'', // 状态 0 不展示运营中心 1可以申请但是没有完善，2申请完，审核中，3已通过，已修改 + team_id:'', + region_status:'', // 状态 0 不展示 大区中心 1可以申请但是没有完善，2申请完，审核中，3已通过，已修改 + region_id:'', }; }, onShow() { @@ -209,37 +219,72 @@ identity, avatar, certification, - parent,team_status,team_name - } = res + parent,team_name,teams + } = res this.nickname = nickname this.identity = identity this.avatar = avatar this.certification = certification this.parent = parent - this.team_status = team_status this.team_name = team_name - if(team_status == 1){ + uni.hideLoading() + // team_status:'', // 状态 0 不展示运营中心 1可以申请但是没有完善，2申请完，审核中，3已通过，已修改 + this.team_status = teams.center.status // 运营中心状态 + this.team_id = teams.center.identity_id // 运营中心 + this.region_status = teams.region.status // 大区中心状态 + this.region_id = teams.region.identity_id // 大区中心id + if(teams.center.status == 1){ this.yunyingShow = true + return + } + if(teams.region.status == 1){ + this.yunyingShow = true + return } - uni.hideLoading() }).catch(err => { uni.showToast({ title: err.message, icon: 'none' }) }) + }, + yungying(type,id){ + if(type === 'team'){ + if(this.team_status == 2){ + uni.showToast({ + title:'法务运营中心名称审核中', + icon:'none', + mask:true, + duration:3000, + }) + return + } + if(this.team_status == 1){ + this.yunyingShow = true + return + } + } + if(type == 'region'){ + if(this.region_status == 2){ + uni.showToast({ + title:'大区运营中心名称审核中', + icon:'none', + mask:true, + duration:3000, + }) + return + } + if(this.region_status == 1){ + this.yunyingShow = true + return + } + } + uni.navigateTo({ + url:'/pages/account/yunying?id='+id+'&teamtype='+type + }) }, // 导航 onNav(name) { - if(this.team_status == 2){ - uni.showToast({ - title:'运营中心名称审核中', - icon:'none', - mask:true, - duration:3000, - }) - return - } this.$Router.push({ name }) @@ -345,21 +390,25 @@ }, // 运营中心确认按钮处理 sureYunYing(){ + console.log(this.team_status,this.region_status) if(this.yunying_name == '' || this.yunying_name.length == 0){ uni.showToast({ - title:'请完善运营中心名称', + title:this.team_status == 1?'请完善法务运营中心名称':'请完善大区运营中心名称', icon:'none', mask:true, duration:2000, }) return } - - submitTeamName({name:this.yunying_name}).then(res => { + let pararms = { + name:this.yunying_name, + identity_id:this.team_status ==1 ? this.team_id:this.region_id + } + submitTeamName(pararms).then(res => { this.showBind = false uni.showModal({ title: '微信提示', - content: '运营中心姓名完善完成，请耐心等待审核！', + content: this.team_status ==1?'法务运营中心姓名完善完成，请耐心等待审核！':'大区运营中心姓名完善完成，请耐心等待审核！', showCancel: false, success: res => { this.getUserInfo() From a57be162ff90decf6b6bb124e434448d5404d540 Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Mon, 6 Mar 2023 13:21:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B3=95=E5=8A=A1=E3=80=81=E5=A4=A7?= =?UTF-8?q?=E5=8C=BA=E8=BF=90=E8=90=A5=E4=B8=AD=E5=BF=83=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/index.js | 4 +- pages/account/yunying.vue | 91 ++++++++++++++++++++++++++++++++------- 2 files changed, 78 insertions(+), 17 deletions(-) diff --git a/apis/index.js b/apis/index.js index 0a6a8ca..0bf4ee8 100644 --- a/apis/index.js +++ b/apis/index.js @@ -10,8 +10,8 @@ import router from '../router' // 基础配置 const config = { - apiUrl : 'https://douhuo.douhuofalv.com/api/', - // apiUrl : 'https://api.douhuotest.douhuofalv.com/api/', //测试环境 + // apiUrl : 'https://douhuo.douhuofalv.com/api/', + apiUrl : 'https://api.douhuotest.douhuofalv.com/api/', //测试环境 timeout : 60000 } diff --git a/pages/account/yunying.vue b/pages/account/yunying.vue index f4f4f20..67ad001 100644 --- a/pages/account/yunying.vue +++ b/pages/account/yunying.vue @@ -1,25 +1,48 @@