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] 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 @@
 		
 		<u-popup v-model="createData.isShow" mode="center" border-radius="14" width="80%" :closeable='true'>
 			<view style="max-height: calc(100vh - 200px);overflow-y: auto;">
-				<view class="g_flex_c g_h_40 g_fs_16">安全验证</view>
+				<view class="g_flex_c g_h_60 g_fs_16">安全验证</view>
 				<view>
 					<view>
-						<view class="g_flex_row_start">
-							<view class="g_flex_1 g_flex_column_center">
-								<u-input v-model="createData.code"
-											   placeholder="请输入"
-												 type="number"
-												 maxlength="11"
-												 style="width: calc(100% - 64px); z-index: 0;background-color: #ededed;border-radius: 6px;margin: 0 auto;padding: 0 16px;"
-								></u-input>
-							</view>
-							<view class="g_flex_none g_flex_column_center g_mr_16">
-								<g-button type='primary' size='mini' btnText='获取验证码' @clickBtn='handleSearch'></g-button>
-							</view>
+						<view class="g_fs_14 g_mb_12" style="padding: 0 12px;">
+							<text class="g_fw_600">[申请合并]</text>属于高敏感权限，基于账户安全考虑，请验证创建人手机号:{{createData.telEncrypt}}
 						</view>
+						<g-panel-form-slot
+							:list="[
+								{
+									icon: '',
+									label: '验证码',
+									result: '',
+									path: '',
+									tip: 'slot-code',
+									value: createData.code,
+									tel: createData.tel,
+									type: 'slot',
+									placeholder: '输入验证码',
+									pColumn: 12,
+								},
+							]"
+							@changeCode="getCode"
+						>
+						</g-panel-form-slot>
 					</view>
-					<view class="g_flex_row_center g_p_16">
+					<view class="g_flex_row_center g_p_16" style="padding-bottom: 0;">
 						<view class="g_flex_row_center" style="width: 50%;">
 							<g-button type='default' class="g_w_all" size='small' btnText='取消' @clickBtn='createData.isShow = false'></g-button>
 						</view>
 						<view class="g_flex_row_center" style="width: 50%;">
-							<g-button type='primary' size='small' btnText='确定'></g-button>
+							<g-button type='primary' size='small' btnText='确定' @clickBtn='submitValidate'></g-button>
 						</view>
 					</view>
 					<view class="g_h_20"></view>
@@ -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)
+			})
 		}
 	},
 };