From fc075e30b94a89da94670f953d482f89878b6744 Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Fri, 8 Aug 2025 09:58:34 +0800 Subject: [PATCH 01/12] no message --- api/person.js | 1 + root/person/marge.vue | 65 +++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 59 insertions(+), 7 deletions(-) diff --git a/api/person.js b/api/person.js index d1b0271..4bb1f9f 100644 --- a/api/person.js +++ b/api/person.js @@ -9,6 +9,7 @@ let personInfo = {// 用户信息模块 person_applyTrue:'/yishoudan/agency/merge/agree',// 通过 person_applyFalse:'/yishoudan/agency/reject',// 驳回 person_applyNum:'/yishoudan/agency/merge/countApply',// 查询待处理数量 + person_getCreatorTel:'/yishoudan/agency/getCreatorTel',// 获取创建人手机号 } export default personInfo; \ No newline at end of file diff --git a/root/person/marge.vue b/root/person/marge.vue index 14227c9..7765385 100644 --- a/root/person/marge.vue +++ b/root/person/marge.vue @@ -157,6 +157,38 @@ + + + 安全验证 + + + + + + + + + + + + + + + + + + + + + + + + @@ -195,6 +227,12 @@ export default { }, applysRecord:[], recivesRecord:[], + createData:{ + isShow:false, + code:'', + tel: "", + telEncrypt: "" + } }; }, onShow() { @@ -220,13 +258,26 @@ export default { }, openApply(){ let that = this; - that.modalApplyData = { - isShow:true, - tel:'', - desp:'', - resultList:[], - selectResult:'' - } + that.G.Get(that.api.person_getCreatorTel,{},(createRes)=>{ + console.log('创建人手机号：',createRes) + that.createData = { + isShow:true, + code:'', + tel: createRes.tel, + telEncrypt: createRes.telEncrypt + }; + }) + + + + + // that.modalApplyData = { + // isShow:true, + // tel:'', + // desp:'', + // resultList:[], + // selectResult:'' + // } }, handleSearch(){ let that = this; From 01a5fe6821a25f04bba8688890acb627fb8cdec5 Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Fri, 8 Aug 2025 10:21:15 +0800 Subject: [PATCH 02/12] no message --- api/person.js | 1 + components/panel/formSlot.vue | 3 +- root/person/marge.vue | 84 +++++++++++++++++++++++++++++-------------- 3 files changed, 61 insertions(+), 27 deletions(-) diff --git a/api/person.js b/api/person.js index 4bb1f9f..b68a2c4 100644 --- a/api/person.js +++ b/api/person.js @@ -10,6 +10,7 @@ let personInfo = {// 用户信息模块 person_applyFalse:'/yishoudan/agency/reject',// 驳回 person_applyNum:'/yishoudan/agency/merge/countApply',// 查询待处理数量 person_getCreatorTel:'/yishoudan/agency/getCreatorTel',// 获取创建人手机号 + person_validateMsgCode:'/yishoudan/commons/validateMsgCode',// 校验短信 } export default personInfo; \ No newline at end of file diff --git a/components/panel/formSlot.vue b/components/panel/formSlot.vue index fb1ae48..82b6d0e 100644 --- a/components/panel/formSlot.vue +++ b/components/panel/formSlot.vue @@ -741,7 +741,7 @@ export default { } .btn-text { - background-color: #ededed; + background-color: #00b666; text-align: center; border-radius: 126px; .btn-con { @@ -751,6 +751,7 @@ export default { border-radius: 0; height: 40rpx; line-height: 40rpx; + color: #fff; } } } diff --git a/root/person/marge.vue b/root/person/marge.vue index 7765385..29e2dfb 100644 --- a/root/person/marge.vue +++ b/root/person/marge.vue @@ -159,29 +159,37 @@ - 安全验证 + 安全验证 - - - - - - - + + [申请合并]属于高敏感权限，基于账户安全考虑，请验证创建人手机号:{{createData.telEncrypt}} + + - + - + @@ -267,17 +275,6 @@ export default { telEncrypt: createRes.telEncrypt }; }) - - - - - // that.modalApplyData = { - // isShow:true, - // tel:'', - // desp:'', - // resultList:[], - // selectResult:'' - // } }, handleSearch(){ let that = this; @@ -364,6 +361,41 @@ export default { } }) } + }, + getCode(e) { + this.createData.code = e; + console.log(e); + }, + submitValidate(){ + let that = this; + if(!that.createData.code){ + uni.showToast({ + icon:'none', + title:'请输入验证码' + }) + return false; + } + that.G.Post(that.api.person_validateMsgCode,{ + tel: that.createData.tel, + code: that.createData.code, + },(res)=>{ + console.log('res',res) + that.createData = { + isShow:false, + code:'', + tel: '', + telEncrypt: '' + }; + that.modalApplyData = { + isShow:true, + tel:'', + desp:'', + resultList:[], + selectResult:'' + } + },(err)=>{ + console.log('err',err) + }) } }, }; From 84a926cac4dc52b37507a984ddc305070586bcf9 Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Fri, 8 Aug 2025 10:26:23 +0800 Subject: [PATCH 03/12] no message --- root/person/marge.vue | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/root/person/marge.vue b/root/person/marge.vue index 29e2dfb..940d84d 100644 --- a/root/person/marge.vue +++ b/root/person/marge.vue @@ -266,15 +266,22 @@ export default { }, openApply(){ let that = this; - that.G.Get(that.api.person_getCreatorTel,{},(createRes)=>{ - console.log('创建人手机号：',createRes) - that.createData = { - isShow:true, - code:'', - tel: createRes.tel, - telEncrypt: createRes.telEncrypt - }; - }) + if(that.applysRecord && that.applysRecord.length < 1){ + that.G.Get(that.api.person_getCreatorTel,{},(createRes)=>{ + console.log('创建人手机号：',createRes) + that.createData = { + isShow:true, + code:'', + tel: createRes.tel, + telEncrypt: createRes.telEncrypt + }; + }) + }else{ + uni.showToast({ + icon:'none', + title:'只能有一个审核中的合并申请' + }) + } }, handleSearch(){ let that = this; From f9e008caa96254c2e0309b994709d68c12bfcd49 Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Fri, 8 Aug 2025 10:50:22 +0800 Subject: [PATCH 04/12] no message --- components/panel/formSlot.vue | 6 +++++- root/person/marge.vue | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/components/panel/formSlot.vue b/components/panel/formSlot.vue index 82b6d0e..dce0d29 100644 --- a/components/panel/formSlot.vue +++ b/components/panel/formSlot.vue @@ -72,7 +72,11 @@
-
+
diff --git a/root/person/marge.vue b/root/person/marge.vue index 940d84d..d9d4f62 100644 --- a/root/person/marge.vue +++ b/root/person/marge.vue @@ -38,7 +38,7 @@ - {{item.targetAgency.agencyName}} + {{item.sourceAgency.agencyName}} {{item.desp || '-'}} From 84649713665c6ade5dc971af3873d7eb8bcefa0a Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Fri, 8 Aug 2025 10:55:43 +0800 Subject: [PATCH 05/12] no message --- components/panel/formSlot.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/panel/formSlot.vue b/components/panel/formSlot.vue index dce0d29..c14885b 100644 --- a/components/panel/formSlot.vue +++ b/components/panel/formSlot.vue @@ -74,7 +74,7 @@
@@ -255,7 +255,7 @@ export default { // 短信倒计时 code: "", btnText: "获取验证码", // 6s - countdown: 0, + countdown: -1, timer: null, }, nationData: { @@ -456,7 +456,7 @@ export default { type: "assistant", }, (res) => { - that.msgCode.countdown = 60; + that.msgCode.countdown = 59; that.msgCode.btnText = that.msgCode.countdown + "s"; clearInterval(that.msgCode.timer); that.msgCode.timer = setInterval(() => { From 9bc0bb9d25f6cede5e601c455e2e34b4af545999 Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Fri, 8 Aug 2025 11:05:00 +0800 Subject: [PATCH 06/12] no message --- api/person.js | 2 +- root/person/loginIndex.vue | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/api/person.js b/api/person.js index b68a2c4..5562b2b 100644 --- a/api/person.js +++ b/api/person.js @@ -7,7 +7,7 @@ let personInfo = {// 用户信息模块 person_getGroup:'/yishoudan/agency/getAgencyByAdminTel',// 根据管理员手机号查团队 person_addApply:'/yishoudan/agency/merge/add',// 申请合并 person_applyTrue:'/yishoudan/agency/merge/agree',// 通过 - person_applyFalse:'/yishoudan/agency/reject',// 驳回 + person_applyFalse:'/yishoudan/agency/merge/reject',// 驳回 person_applyNum:'/yishoudan/agency/merge/countApply',// 查询待处理数量 person_getCreatorTel:'/yishoudan/agency/getCreatorTel',// 获取创建人手机号 person_validateMsgCode:'/yishoudan/commons/validateMsgCode',// 校验短信 diff --git a/root/person/loginIndex.vue b/root/person/loginIndex.vue index 4e71e61..35a3771 100644 --- a/root/person/loginIndex.vue +++ b/root/person/loginIndex.vue @@ -406,5 +406,13 @@ export default { border-radius: 48rpx; opacity: 0; } + + .u-input__right-icon{ + display: flex; + display: -webkit-flex; + flex-direction: column; + flex-wrap: wrap; + justify-content: center; + } } From 6893ad031ff5c8fee5a8e430dc2fc88829482418 Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Fri, 8 Aug 2025 11:09:20 +0800 Subject: [PATCH 07/12] no message --- root/person/marge.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/person/marge.vue b/root/person/marge.vue index d9d4f62..8739347 100644 --- a/root/person/marge.vue +++ b/root/person/marge.vue @@ -359,7 +359,7 @@ export default { if(res.confirm){ that.G.Get(that.api.person_applyFalse + '/' + $data.id,{},()=>{ uni.showToast({ - icon:'error', + icon:'success', title:'已拒绝' }); that.getList(); From 84166e52362b090212d36d9048e1abdcceb99ccc Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Fri, 8 Aug 2025 11:17:01 +0800 Subject: [PATCH 08/12] no message --- root/person/marge.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/root/person/marge.vue b/root/person/marge.vue index 8739347..23f9ddf 100644 --- a/root/person/marge.vue +++ b/root/person/marge.vue @@ -46,8 +46,12 @@ - - + + From 9184347a37655e1d0117a76e668b2db3600c5b27 Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Fri, 8 Aug 2025 11:23:09 +0800 Subject: [PATCH 09/12] no message --- root/person/marge.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/root/person/marge.vue b/root/person/marge.vue index 23f9ddf..3820b6c 100644 --- a/root/person/marge.vue +++ b/root/person/marge.vue @@ -47,11 +47,13 @@ + 已通过 + 已驳回 From 547baa6850740527360bf3e89aea7e952e0dbdaa Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Fri, 8 Aug 2025 11:27:45 +0800 Subject: [PATCH 10/12] no message --- root/person/marge.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/root/person/marge.vue b/root/person/marge.vue index 3820b6c..c5a33d6 100644 --- a/root/person/marge.vue +++ b/root/person/marge.vue @@ -319,13 +319,13 @@ export default { }) return false; } - if(!that.modalApplyData.desp){ - uni.showToast({ - icon:'none', - title:'请输入备注' - }) - return false; - } + // if(!that.modalApplyData.desp){ + // uni.showToast({ + // icon:'none', + // title:'请输入备注' + // }) + // return false; + // } that.G.Post(that.api.person_addApply,{ sourceAgencyId:uni.getStorageSync("apply-userinfo").agencyId, targetAgencyId:that.modalApplyData.selectResult, From 61616c94d0b0a6c9e36876127bc5c1c0325a3147 Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Fri, 8 Aug 2025 11:31:44 +0800 Subject: [PATCH 11/12] no message --- root/person/marge.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/person/marge.vue b/root/person/marge.vue index c5a33d6..9960879 100644 --- a/root/person/marge.vue +++ b/root/person/marge.vue @@ -40,7 +40,7 @@ {{item.sourceAgency.agencyName}} - + {{item.desp || '-'}} @@ -90,7 +90,7 @@ {{item.targetAgency.agencyName}} - + {{item.desp || '-'}} From 37d75d46feef9a59502b62e91166c73d11b93a7b Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Fri, 8 Aug 2025 11:40:41 +0800 Subject: [PATCH 12/12] no message --- pages/person/index.vue | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pages/person/index.vue b/pages/person/index.vue index b85e60e..81fe902 100644 --- a/pages/person/index.vue +++ b/pages/person/index.vue @@ -22,11 +22,18 @@ - + {{ agencyInfo.agencyName || agencyInfo.fullName || "-" }} - + + + + {{ waitNus }} + + @@ -164,6 +171,7 @@ export default { }, data() { return { + waitNus:0, agencyInfo: {}, addMemberShow: false, scrollTop: 0, @@ -335,13 +343,13 @@ export default { this.getAuthInfo(); this.getData(); this.getNum(); + this.getWait(); that.isCreator = uni.getStorageSync("IS_CREATOR") == 1 ? true : false; that.agencyInfo = uni.getStorageSync("agencyInfo"); if (uni.getStorageSync("apply-userinfo").agencyStatus == 1) { this.getCompanyInfo(); } }); - // that.userInfo = uni.getStorageSync("apply-userinfo"); } else { that.waitNum_ups = 0; @@ -362,6 +370,12 @@ export default { } }, methods: { + getWait(){ + let that = this; + that.G.Get(that.api.person_applyNum,{},(res)=>{ + that.waitNus = res; + }) + }, setUserInfo() { let that = this; let defaultList = [