Merge branch 'cyl/master-0804'

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;

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;
 		}
 	}
 }

root/person/marge.vue

@@ -157,6 +157,46 @@
 			</view>
 		</u-popup>
 		
+		<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_60 g_fs_16">安全验证</view>
+				<view>
+					<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" 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='确定' @clickBtn='submitValidate'></g-button>
+						</view>
+					</view>
+					<view class="g_h_20"></view>
+				</view>
+			</view>
+		</u-popup>
+		
 	</view>
 </template>
 
@@ -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 = {
+			if(that.applysRecord && that.applysRecord.length < 1){
+				that.G.Get(that.api.person_getCreatorTel,{},(createRes)=>{
+					console.log('创建人手机号：',createRes)
+					that.createData = {
 						isShow:true,
-				tel:'',
-				desp:'',
-				resultList:[],
-				selectResult:''
+						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)
+			})
 		}
 	},
 };