diff --git a/api/person.js b/api/person.js index d1b0271..b68a2c4 100644 --- a/api/person.js +++ b/api/person.js @@ -9,6 +9,8 @@ let personInfo = {// 用户信息模块 person_applyTrue:'/yishoudan/agency/merge/agree',// 通过 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 14227c9..940d84d 100644 --- a/root/person/marge.vue +++ b/root/person/marge.vue @@ -157,6 +157,46 @@ + + + 安全验证 + + + + [申请合并]属于高敏感权限,基于账户安全考虑,请验证创建人手机号:{{createData.telEncrypt}} + + + + + + + + + + + + + + + + + @@ -195,6 +235,12 @@ export default { }, applysRecord:[], recivesRecord:[], + createData:{ + isShow:false, + code:'', + tel: "", + telEncrypt: "" + } }; }, onShow() { @@ -220,12 +266,21 @@ export default { }, openApply(){ let that = this; - that.modalApplyData = { - isShow:true, - tel:'', - desp:'', - resultList:[], - selectResult:'' + 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(){ @@ -313,6 +368,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) + }) } }, };