diff --git a/root/bind/order.vue b/root/bind/order.vue index 7e2e6b9..7b9bcd5 100644 --- a/root/bind/order.vue +++ b/root/bind/order.vue @@ -83,22 +83,22 @@ 个人 - + - 职位 + 职位 {{ item.jobNum ? item.jobNum : "0" }} - 今日更新 + 今日更新 {{ item.jobUpdateNum ? item.jobUpdateNum : "0" }} - 粉丝 + 粉丝 {{ item.downNum ? item.downNum : "0" }} diff --git a/root/bind/search.vue b/root/bind/search.vue index 0baac2f..e20da24 100644 --- a/root/bind/search.vue +++ b/root/bind/search.vue @@ -59,6 +59,7 @@ export default { data() { return { localBaseImg: this.G.store().localBaseImg, + agencyInfo: uni.getStorageSync("agencyInfo"), active: 0, placeholder: "", wxCode: "", @@ -106,7 +107,7 @@ export default { shareForm: "friend", }; console.log("代理id:", that.recommendList); - return this.G.shareFun("/root/detail/user?" + that.G.objToStr(params), this.shareImg, that.agencyName + "邀请您关注他的发单号,快来关注吧!"); + return this.G.shareFun("/root/detail/user?" + that.G.objToStr(params), this.shareImg, that.agencyInfo.fullName + "邀请您关注他的发单号,快来关注吧!"); }, onLoad(options) { console.log(options); @@ -176,7 +177,6 @@ export default { } }, }); - }, }, }; diff --git a/root/person/inviteFollowMe.vue b/root/person/inviteFollowMe.vue index 3534c67..e7da5b6 100644 --- a/root/person/inviteFollowMe.vue +++ b/root/person/inviteFollowMe.vue @@ -6,7 +6,7 @@
- {{ beFllowAgencyInfo.agencyName || "-" }} + {{ beFllowAgencyInfo.fullName || "-" }}
{{ beFllowAgencyInfo.desp || "-" }} @@ -22,7 +22,7 @@
填写企业简称:
- +
设置后系统将自动创建团队并关注该发单号,您作为创建人可在我的页面管理团队。
@@ -92,6 +92,7 @@ export default { } }, onShow() { + let that = this; that.G.Get("/checkUserLogin", {}, (res) => { console.log("checkUserLogin", res); if (res) { @@ -147,25 +148,38 @@ export default { }, getAgencyById() { let that = this; - this.G.Get(this.api.order_getAgencyByIdForApply, { agencyId: that.uid, inviteUserId: this.inviteUserId }, (res) => { - console.log("resresresresresres++++++++++++++", res); - that.beFllowAgencyInfo = res; - if (res.id == that.agencyInfo.id) { - that.isSelf = true; - } - that.numList = [ - { label: "总职位", num: res.jobNum }, - { label: "最近更新", num: res.recruitmentJobNum }, - { label: "粉丝", num: res.downNum }, - ]; + return new Promise((reso, reject) => { + this.G.Get(this.api.order_getAgencyByIdForApply, { agencyId: that.uid, inviteUserId: this.inviteUserId }, (res) => { + console.log("resresresresresres++++++++++++++", res); + that.beFllowAgencyInfo = res; + if (res.id == that.agencyInfo.id) { + that.isSelf = true; + } + that.numList = [ + { label: "总职位", num: res.jobNum }, + { label: "最近更新", num: res.recruitmentJobNum }, + { label: "粉丝", num: res.downNum }, + ]; + reso(); + }); }); }, successLogin(e) { let that = this; console.log("successLogin", e); this.getAgencyInfo().then(() => { - that.getAgencyById(); - that.applyAdd(); + that.getAgencyById().then(() => { + if (that.beFllowAgencyInfo.recordStatus == 3 || that.beFllowAgencyInfo.recordStatus == 4 || that.beFllowAgencyInfo.recordStatus == 6) { + that.applyAdd(); + } else { + if (that.beFllowAgencyInfo.recordStatus == 5) { + uni.showToast({ + title: "已发起关注申请, 正在等待通过", + icon: "none", + }); + } + } + }); }); }, getAgencyInfo() { diff --git a/root/person/memberApplyAdd.vue b/root/person/memberApplyAdd.vue index f89a37a..d675f6c 100644 --- a/root/person/memberApplyAdd.vue +++ b/root/person/memberApplyAdd.vue @@ -5,7 +5,7 @@
- {{ agencyInfo.agencyName || "-" }} + {{ agencyInfo.fullName || "-" }}
{{ agencyInfo.desp || "-" }} diff --git a/root/person/memberApplyQRCode.vue b/root/person/memberApplyQRCode.vue index d8000c7..0a54903 100644 --- a/root/person/memberApplyQRCode.vue +++ b/root/person/memberApplyQRCode.vue @@ -111,11 +111,14 @@ export default { this.G.setNavStyle(); }, onShareAppMessage() { - return this.G.shareFun(); + let that = this; + return this.G.shareFun("/root/person/memberApplyAdd?scene=" + `id=${this.userInfo.agencyId}_${this.userInfo.id}`, this.shareImg, that.agencyInfo.fullName + "邀请您加入他的团队"); }, data() { return { localBaseImg: this.G.store().localBaseImg, + userInfo: uni.getStorageSync("apply-userinfo"), + agencyInfo: uni.getStorageSync("agencyInfo"), cdnBaseImg: this.G.store().cdnBaseImg, wxCode: "", showBg: false, diff --git a/root/person/pwdForget.vue b/root/person/pwdForget.vue index cb0dde9..e7da5b6 100644 --- a/root/person/pwdForget.vue +++ b/root/person/pwdForget.vue @@ -6,7 +6,7 @@
- {{ beFllowAgencyInfo.agencyName || "-" }} + {{ beFllowAgencyInfo.fullName || "-" }}
{{ beFllowAgencyInfo.desp || "-" }}