diff --git a/api/person.js b/api/person.js
index d1b0271..5562b2b 100644
--- a/api/person.js
+++ b/api/person.js
@@ -7,8 +7,10 @@ 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',// 校验短信
}
export default personInfo;
\ No newline at end of file
diff --git a/components/panel/formSlot.vue b/components/panel/formSlot.vue
index fb1ae48..c14885b 100644
--- a/components/panel/formSlot.vue
+++ b/components/panel/formSlot.vue
@@ -72,7 +72,11 @@
-
@@ -251,7 +255,7 @@ export default {
// 短信倒计时
code: "",
btnText: "获取验证码", // 6s
- countdown: 0,
+ countdown: -1,
timer: null,
},
nationData: {
@@ -452,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(() => {
@@ -741,7 +745,7 @@ export default {
}
.btn-text {
- background-color: #ededed;
+ background-color: #00b666;
text-align: center;
border-radius: 126px;
.btn-con {
@@ -751,6 +755,7 @@ export default {
border-radius: 0;
height: 40rpx;
line-height: 40rpx;
+ color: #fff;
}
}
}
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 = [
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;
+ }
}
diff --git a/root/person/marge.vue b/root/person/marge.vue
index 14227c9..9960879 100644
--- a/root/person/marge.vue
+++ b/root/person/marge.vue
@@ -38,16 +38,22 @@
- {{item.targetAgency.agencyName}}
+ {{item.sourceAgency.agencyName}}
-
+
{{item.desp || '-'}}
-
-
+
+
+ 已通过
+ 已驳回
@@ -84,7 +90,7 @@
{{item.targetAgency.agencyName}}
-
+
{{item.desp || '-'}}
@@ -157,6 +163,46 @@
+
+
+ 安全验证
+
+
+
+ [申请合并]属于高敏感权限，基于账户安全考虑，请验证创建人手机号:{{createData.telEncrypt}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -195,6 +241,12 @@ export default {
},
applysRecord:[],
recivesRecord:[],
+ createData:{
+ isShow:false,
+ code:'',
+ tel: "",
+ telEncrypt: ""
+ }
};
},
onShow() {
@@ -220,12 +272,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(){
@@ -258,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,
@@ -304,7 +365,7 @@ export default {
if(res.confirm){
that.G.Get(that.api.person_applyFalse + '/' + $data.id,{},()=>{
uni.showToast({
- icon:'error',
+ icon:'success',
title:'已拒绝'
});
that.getList();
@@ -313,6 +374,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)
+ })
}
},
};