diff --git a/api/person.js b/api/person.js index d0f88da..dedf901 100644 --- a/api/person.js +++ b/api/person.js @@ -7,7 +7,7 @@ let personInfo = {// 用户信息模块 person_deleteUserBank: "/user/bank/deleteUserBank",// 解除绑定银行卡 person_addUserBank: "/user/bank/addUserBank",// 绑定银行卡 get_creator_tel: "/yishoudan/agency/getCreatorTel",// 获取创建人手机号(能获取到说明是创建人) - + get_infoByLogin: "/assistant/circle/agency/apply/infoByLogin",// 获取用户信息ByLogin } diff --git a/pages/person/index.vue b/pages/person/index.vue index 7dc0c95..f381212 100644 --- a/pages/person/index.vue +++ b/pages/person/index.vue @@ -31,7 +31,7 @@ - + @@ -66,6 +66,7 @@ @clickItem="goPage('/root/bind/fensi')" /> + @@ -246,6 +248,8 @@ export default { onReady() {}, data() { return { + appdatas:{}, + agencyCode:'', applystatys:null, isJm:uni.getStorageSync("apply-userinfo") && uni.getStorageSync("apply-userinfo").agencyId && uni.getStorageSync("apply-userinfo").agencyId == '114827', themeColor: getApp().globalData.themeColor, @@ -343,7 +347,7 @@ export default { that.setUserInfo(); that.getResumeInfo(); that.getData(); - // that.getinfoByLogin(); + that.getinfoByLogin(); }); } else { that.pageSpeed = 1; @@ -362,7 +366,14 @@ export default { let that = this; that.G.Get(that.api.get_infoByLogin + '/' + uni.getStorageSync("AGENCY_ID"), {}, (res) => { console.log("getinfoByLogin", res); - that.applystatys = res; + if(res){ + that.applystatys = res.recordStatus; + that.agencyCode = res.agencyCode; + that.appdatas = res; + }else{ + that.applystatys = ''; + that.agencyCode = ''; + } }); }, getResumeInfo() { @@ -391,6 +402,14 @@ export default { that.userInfo.teamType = userInfo.teamType; console.log("that.userInfo", that.userInfo); }, + goPaga($path){ + let that = this; + console.log("goPaga $path", $path); + uni.setStorageSync("applyfoemdata", JSON.stringify(that.appdatas)); + uni.navigateTo({ + url: $path, + }); + }, goPage($path) { this.G.isLogin(); if (this.G.isLogin()) { diff --git a/root/bind/applyForm.vue b/root/bind/applyForm.vue index 3409225..27c4c47 100644 --- a/root/bind/applyForm.vue +++ b/root/bind/applyForm.vue @@ -13,9 +13,9 @@
{{ info.agencyName }}
-
- {{ info.agencyName }}{{ info.agencyName }}{{ info.agencyName }} -
+
@@ -116,7 +116,7 @@ hover-class="thover" @click="handleSubmit" > - {{ info.recordStatus == 1 ? "已申请" : info.recordStatus == 2 ? "已关注" : "申请关注" }} + {{ info.recordStatus == 1 ? "已提交" : info.recordStatus == 2 ? "已关注" : "申请关注" }} @@ -160,11 +160,12 @@ export default { }, btnSpeed: -1, // -1 默认 0 按下 1请求中 2请求后 + foa:2 }; }, onLoad(options) { console.log("申请关注页面:", options); - + let that = this; if (options.scene) { var sceneStr = decodeURIComponent(options.scene); var sceneJson = this.G.sceneToJson(sceneStr); @@ -177,11 +178,35 @@ export default { } else { this.wxCode = options.code; this.form = options.form; + that.foa = options.foa; + + if(options.foa == 1 && uni.getStorageSync("applyfoemdata")){ + let _datas = JSON.parse(uni.getStorageSync("applyfoemdata")); + if(_datas){ + that.newForm = { + wxname:_datas.nickName || '微信昵称', + wxavatar:_datas.avatar || 'https://bocai-cms.oss-cn-beijing.aliyuncs.com/web-resource/pugongying/default.svg', + companyName: _datas.agencyName, + phone: _datas.tel, + remark:_datas.remark, + }; + that.info.logo = _datas.logo; + that.info.recordStatus = 1; + that.info.agencyName = _datas.agencyName; + } + }else{ + this.wxCode = options.code; + this.form = options.form; + } } }, onShow() { let that = this; - that.init(); + if(that.foa != 1){ + that.init(); + }else{ + that.isloading = false; + } }, methods: { getUserInfo(e) {