1.修复邀请加盟Bug

pages/application-process/basic-info.vue

@@ -46,11 +46,11 @@
 					<view class="contentItem" v-if="applyParam.partnerLevel == 'B1'">
 						<text>工作室名称</text>
 						<input type="text" class="form-control" v-model="applyParam.b1Name" placeholder="请输入工作室名称"
-							:disabled="this.display"/>
+							/>
 					</view>
 					<view class="contentItem">
 						<text>所属组织</text>
-						<input type="text" v-if="applyParam.hasCrossDistrict == 1" class="form-control" v-model="applyParam.b1Name" placeholder="请输入工作室名称"
+						<input type="text" v-if="applyParam.hasCrossDistrict == 1" class="form-control" v-model="applyParam.areaName" placeholder="请输入工作室名称"
 							:disabled="this.display"/>
 						<picker v-else @change="changeArea" :value="areaIdIdx" :range="cffpAreaQuerys"
 							range-key="areaName"
@@ -161,6 +161,7 @@
 				mobile: null,
 				shareId: null,
 				display: false,
+				hasCrossDistrict:'',
 				cffp_userInfo: {
 					name: '',
 					mobile: ''
@@ -169,16 +170,10 @@
 		},
 		components: {},
 		onLoad(options) {
-			if (options.dataForm) {
-				this.shareId = option.shareId
-				// let dataOneForm = JSON.parse(options.dataForm)
-				// this.applyParam.name = dataOneForm.name
-				// this.applyParam.inviterInvitationCode = dataOneForm.invitationCode
-				// this.applyParam.mobileNumber = dataOneForm.mobile
-				// this.areaName = dataOneForm.areaName
-				// this.applyParam.partnerLevel = dataOneForm.partnerLevel
-				// this.partnerLevelName = dataOneForm.partnerLevel == 'A1' ? '事业伙伴' : '工作室'
-				// this.applyParam.areaId = dataOneForm.areaId
+			console.log( options, 151551)
+			if (options.shareId) {
+				this.hasCrossDistrict = options.hasCrossDistrict
+				this.shareId = options.shareId
 				uni.setStorageSync('applyId', '')
 			} else {
 				this.cffp_userInfo = uni.getStorageSync('cffp_userInfo');
@@ -404,6 +399,7 @@
 						applyType: this.applyParam.inviterInvitationCode? '1': '2',
 						operatStep: 1,
 						userId: uni.getStorageSync('cffp_userId'),
+						hasCrossDistrict: this.hasCrossDistrict?this.hasCrossDistrict: '0'
 					}
 					api.saveApplyInfo(this.applyParam).then((res) => {
 						if (res['success']) {

pages/invitationRegister/invitationRegister.vue

@@ -25,10 +25,12 @@
 				shareId:'',
 				levelaName:'',
 				mobileNumber:'',
-				name:''
+				name:'',
+				hasCrossDistrict:''
             }
         },
 		onLoad(options) {
+			this.hasCrossDistrict = options.hasCrossDistrict
 			this.shareId = options.shareId
 			this.invitationCode = options.invitationCode
 			this.getqueryById()
@@ -53,7 +55,7 @@
 		// 		};'
 				uni.navigateTo({
 					// url:'/pages/invitationRegister/invitationlogin?name=' +  this.name+'&mobile=' +this.mobileNumber + '&id=' + this.shareId
-					url:`/pages/invitationRegister/invitationlogin?name=${this.name}&mobile=${this.mobileNumber}&areaName=${this.areaName}&partnerLevel=${this.partnerLevel}&shareId=${this.shareId}&areaId=${this.areaId}&invitationCode=${this.invitationCode}`
+					url:`/pages/invitationRegister/invitationlogin?name=${this.name}&mobile=${this.mobileNumber}&shareId=${this.shareId}&hasCrossDistrict=${this.hasCrossDistrict}`
 					
 				})
 			}

pages/invitationRegister/invitationlogin.vue

@@ -47,6 +47,7 @@
 				remainTimes:60,
 				sendCodeHtml:'获取验证码',
 				userId: '',
+				hasCrossDistrict:'',
 				form:{
 					name: '',
 					mobile: '',
@@ -55,7 +56,7 @@
 			}
 		},
 		onLoad(options) {
-			console.log(options, 54)
+			this.hasCrossDistrict = options.hasCrossDistrict
 			this.form.name = options.name?options.name:''
 			this.form.mobile = options.mobile? options.mobile: ''
 			this.form.id = options.shareId?options.shareId:''
@@ -123,9 +124,8 @@
 						console.log(res, 5454)
 						this.userId = String(res['data']['userId']);
 						uni.setStorageSync('isLogin','1')
-						uni.setStorageSync('cffp_userId',this.userId);
 						uni.navigateTo({
-							url:'/pages/application-process/basic-info?userId=' + this.userId + '&dataForm=' + JSON.stringify(this.form) + '&shareId=' + this.form.id
+							url:'/pages/application-process/basic-info?userId=' + this.userId  + '&shareId=' + this.form.id + '&hasCrossDistrict=' + this.hasCrossDistrict
 						})
 					}else{
 						uni.showToast({

pages/inviteJoin/inviteJoin.vue

@@ -249,10 +249,11 @@
 					api.saveApplyInfo(this.dataForm).then(res => {
 						if (res['success']) {
 							this.shareId = res.data.id
-							this.$refs.share.open()
-							// uni.navigateTo({
-							// 	url: '/pages/invitationRegister/invitationRegister?shareId=' + this.shareId + '&invitationCode=' + this.invitationCode
-							// })
+							// this.$refs.share.open()
+							uni.navigateTo({
+								url: '/pages/invitationRegister/invitationRegister?shareId=' + this.shareId + 
+								'&invitationCode=' + this.invitationCode + '&hasCrossDistrict=' + this.dataForm.hasCrossDistrict
+							})
 						}
 						uni.showToast({
 							title: res['message'],
@@ -278,7 +279,7 @@
 					scene: type === 1 ? "WXSceneSession" : "WXSceneTimeline",
 					type: 0,
 					href: "https://mdev.zuihuibi.cn/cffp/pages/invitationRegister/invitationRegister?shareId=" +
-						this.shareId + '&invitationCode=' + this.invitationCode,
+						this.shareId + '&invitationCode=' + this.invitationCode+'&hasCrossDistrict=' + this.dataForm.hasCrossDistrict,
 					title: "CFFP家庭财务策划师联盟邀您加入",
 					summary: `我是家庭财务策划师${this.realName}正在使用CFFP财富中心，点击下载即刻加入！`,
 					imageUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg",