Merge branch 'dev' into 'master'

Dev

See merge request !128

myPackageA/applyFranchise/applyFranchise.vue

@@ -87,7 +87,7 @@
 	import dataHandling from "@/util/dataHandling";
 	import dataHandling from "@/util/dataHandling";
 	import { initJssdkShare, setWechatShare } from '@/util/fiveshare';
 	import { initJssdkShare, setWechatShare } from '@/util/fiveshare';
 	import restrictedTip from '@/components/commonPopup/restrictedTip.vue';
 	import restrictedTip from '@/components/commonPopup/restrictedTip.vue';
-	
+	import wx from 'weixin-js-sdk'
 	export default {
 	export default {
 		components: {
 		components: {
 			everyJoinPopup,
 			everyJoinPopup,
@@ -120,7 +120,7 @@
 				restrictedOrCanelContent: '', //禁用/注销展示文本
 				restrictedOrCanelContent: '', //禁用/注销展示文本
 				sharePosterObj: { invitationCode: '', inviteUserId: '' }, //通过分享海报进来
 				sharePosterObj: { invitationCode: '', inviteUserId: '' }, //通过分享海报进来
 				showVerificationCode: false, //验证码是否展示，
 				showVerificationCode: false, //验证码是否展示，
-
+				miniShare:''//是否通过小程序分享邀请加盟进入
 			}
 			}
 		},
 		},
 
 
@@ -132,6 +132,9 @@
 			if (options.inviteUserId) {
 			if (options.inviteUserId) {
 				this.inviteUserId = options.inviteUserId
 				this.inviteUserId = options.inviteUserId
 			}
 			}
+			if (options.miniShare) {
+				this.miniShare = options.miniShare
+			}
 			if (options.invitationCode) {
 			if (options.invitationCode) {
 				this.invitationCode = options.invitationCode
 				this.invitationCode = options.invitationCode
 			}
 			}
@@ -222,7 +225,6 @@
 						this.showVerificationCode = true
 						this.showVerificationCode = true
 						uni.setStorageSync('loginType', 'visitor')
 						uni.setStorageSync('loginType', 'visitor')
 						this.loginType = 'visitor'
 						this.loginType = 'visitor'
-
 						return
 						return
 					}
 					}
 					if (res.data.data.isPartner && this.loginType == 'codelogin') {
 					if (res.data.data.isPartner && this.loginType == 'codelogin') {
@@ -362,6 +364,11 @@
 							uni.setStorageSync('cffp_userId', this.userId);
 							uni.setStorageSync('cffp_userId', this.userId);
 							uni.setStorageSync('uni-token', res.data['token']);
 							uni.setStorageSync('uni-token', res.data['token']);
 							uni.setStorageSync('visitorUuid', res.data['visitorUuid']);
 							uni.setStorageSync('visitorUuid', res.data['visitorUuid']);
+							// if (dataHandling.h5RuntimeEnv() == 'wechat-miniprogram'&&this.miniShare) {
+								
+							// 	wx.miniProgram.reLaunch({url:`/pages/launch/index?token=${res.data['token']}&backUrl=cffpApply`})
+							// 	return
+							// }
 							this.queryInfo()
 							this.queryInfo()
 							// 禁用和注销状态并存，以禁用为准  
 							// 禁用和注销状态并存，以禁用为准  
 							// 已经进行过注销操作的， 弹窗提示90天内不可再次申请加盟为合伙人
 							// 已经进行过注销操作的， 弹窗提示90天内不可再次申请加盟为合伙人
@@ -373,6 +380,7 @@
 							// 	this.$refs.restrictedOrCanelTip.open()
 							// 	this.$refs.restrictedOrCanelTip.open()
 							// 	return
 							// 	return
 							// }
 							// }
+							
 							// 是合伙人就不让在加盟
 							// 是合伙人就不让在加盟
 							if (res.data.isPartner && res.data.partnerIsActive == 1) {
 							if (res.data.isPartner && res.data.partnerIsActive == 1) {
 								this.$refs.everyJoinPopup.open()
 								this.$refs.everyJoinPopup.open()

pages/inviteJoin/inviteJoin.vue

@@ -126,6 +126,7 @@
 	import ShareGuide from '@/components/ShareGuide/ShareGuide.vue';
 	import ShareGuide from '@/components/ShareGuide/ShareGuide.vue';
 	import wx from 'weixin-js-sdk'
 	import wx from 'weixin-js-sdk'
 	import restrictedTip from '@/components/commonPopup/restrictedTip.vue';
 	import restrictedTip from '@/components/commonPopup/restrictedTip.vue';
+	import { nanoid } from 'nanoid';
 	export default {
 	export default {
 		components: {
 		components: {
 			sharePosterPop,
 			sharePosterPop,
@@ -302,8 +303,8 @@
 				if (common.mobileNoValid(this.dataForm.mobileNumber)) {
 				if (common.mobileNoValid(this.dataForm.mobileNumber)) {
 					api.saveApplyInfo(this.dataForm).then(res => {
 					api.saveApplyInfo(this.dataForm).then(res => {
 						if (res['success']) {
 						if (res['success']) {
+							this.shareId = ''
 							this.shareId = res.data.id;
 							this.shareId = res.data.id;
-
 							// #ifdef APP-PLUS
 							// #ifdef APP-PLUS
 							this.$refs.share.open()
 							this.$refs.share.open()
 							// #endif
 							// #endif
@@ -354,6 +355,7 @@
 					this.realName = ""
 					this.realName = ""
 				}
 				}
 				if (dataHandling.h5RuntimeEnv() == 'wechat-miniprogram') {
 				if (dataHandling.h5RuntimeEnv() == 'wechat-miniprogram') {
+					
 					let shareInfo = {
 					let shareInfo = {
 						title: '银盾家办家庭财务策划师联盟邀您加入',
 						title: '银盾家办家庭财务策划师联盟邀您加入',
 						desc: `${this.realName}邀您加入【家庭财策师联盟】，资源+伙伴，共赢未来！`,
 						desc: `${this.realName}邀您加入【家庭财策师联盟】，资源+伙伴，共赢未来！`,
@@ -364,12 +366,14 @@
 						// 	.userId, //分享链接
 						// 	.userId, //分享链接
 						imgUrl: this.ydLogoShare, //图片
 						imgUrl: this.ydLogoShare, //图片
 						commonId:this.invitationCode,
 						commonId:this.invitationCode,
-						sharePage:'applyFranchise'//分享出去得页面
+						sharePage:'applyFranchise',//分享出去得页面,
+						
 					}
 					}
 					wx.miniProgram.postMessage({
 					wx.miniProgram.postMessage({
 						data: {
 						data: {
 							type: 'share',
 							type: 'share',
-							shareData: JSON.stringify(shareInfo)
+							shareData: JSON.stringify(shareInfo),
+							messageId:nanoid()
 						}
 						}
 				
 				
 					})
 					})