同步

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

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,

root/home/shareList.vue

@@ -3,11 +3,11 @@
 		<view class="g_flex_row_between flex_center g_p_12 g_mb_12 g_bg_f" v-if="(userRole.recordStatus == 3 || userRole.recordStatus == 4 || userRole.recordStatus == 5) && from == '短链接'">
 			<view>关注该代理可查看其佣金, 点击直接关注</view>
 			<view>
-				<g-button type="primary" size="mini" fontSize="14" btnText="关注" @btnClick="handleSubmit"></g-button>
+				<g-button type="primary" size="mini" fontSize="14" btnText="关注" @clickBtn="handleSubmit"></g-button>
 			</view>
 		</view>
 		<g-list-job from="shareList" class="g_flex_1" :recordStatus="userRole.recordStatus" :list="query.list" @clickCard="goDetail" :loading="loading" :speed="speed" :query="query" :isShowLoginBtn="isLogin ? false : true" />
-		<applyFlow ref="applyFlow" @updateInfo="updateInfo" :userInfo="userInfo" :shareAgencyId="shareUserInfo.agencyId" :agencyInfo="agencyInfo"></applyFlow>
+		<applyFlow ref="applyFlow" @updateInfo="updateInfo" :navNewPage="false" :userInfo="userInfo" :shareAgencyId="shareUserInfo.agencyId" :agencyInfo="agencyInfo"></applyFlow>
 	</view>
 </template>
 
@@ -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();