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 1/3] 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 2/3] 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 3/3] 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;