diff --git a/root/components/applyFlow.vue b/root/components/applyFlow.vue index 5c6cbf2..85642da 100644 --- a/root/components/applyFlow.vue +++ b/root/components/applyFlow.vue @@ -82,6 +82,10 @@ export default { type: String, default: "", }, + navNewPage: { + type: Boolean, + default: true, + }, }, // 组件状态值 data() { @@ -89,6 +93,7 @@ export default { joinTeamDrawerShow: false, joinTeamConfirm: false, submitConfirm: false, + btnLoading: false, teamList: [], teamInfo: { tel: "", @@ -220,16 +225,19 @@ export default { } that.btnLoading = true; this.G.Get(this.api.bind_subscribeSubmit + "/" + that.shareAgencyId, { agencyId: that.agencyInfo.id, agencyName: that.agencyInfo.fullName, source: 3, remark: " " }, (res) => { - that.$emit('updateInfo') + that.$emit("updateInfo"); uni.showToast({ - title: "申请成功", + title: "关注成功", icon: "none", }); that.btnLoading = false; that.submitConfirm = false; - uni.navigateTo({ - url: "/root/person/inviteFollowSuccess", - }); + if (that.navNewPage) { + uni.navigateTo({ + url: "/root/person/inviteFollowSuccess", + }); + } + // reso(); // that.checkHasApply(); console.log(res); diff --git a/root/home/shareJob.vue b/root/home/shareJob.vue index a8f72ce..58f2ad2 100644 --- a/root/home/shareJob.vue +++ b/root/home/shareJob.vue @@ -639,7 +639,7 @@ export default { }); }); } else if (type == "setShare") { - this.setShareImg(ctx, canvas, mycenter, { roundRect1, roundRect_yuan, roundRect, fillTextLineBreak }) + this.setShareImg(ctx, canvas, mycenter) .then(function (canvas1) { uni.canvasToTempFilePath({ canvas: canvas1, diff --git a/root/home/shareList.vue b/root/home/shareList.vue index fef9548..c8f50d4 100644 --- a/root/home/shareList.vue +++ b/root/home/shareList.vue @@ -3,11 +3,11 @@ 关注该代理可查看其佣金, 点击直接关注 - + - + @@ -132,7 +132,9 @@ export default { updateInfo() { let that = this; that.getAgencyInfo().then(() => { - that.G.checkToken(); + that.getUserRole().then(() => { + that.G.checkToken(); + }); }); }, @@ -242,6 +244,7 @@ export default { let that = this; this.G.isLogin(); if (this.G.isLogin()) { + console.log("123123123213"); if (that.userInfo.agencyId) { // that.submitConfirm = true; that.$refs.applyFlow.applyFlowConfirm();