1.修改了一些Bug

pages/application-process/education.vue

@@ -78,7 +78,7 @@
 				dataForm:{
 				dataForm:{
 					loginId: uni.getStorageSync('cffp_userId'),
 					loginId: uni.getStorageSync('cffp_userId'),
 					targetType: "5",
 					targetType: "5",
-					targetId: uni.getStorageSync('cffp_userId'),
+					targetId: '',
 					targetNo: "4",
 					targetNo: "4",
 					targetUseFor: "12",
 					targetUseFor: "12",
 					targetSeq: "0"
 					targetSeq: "0"
@@ -122,6 +122,7 @@
 			},
 			},
 			upLoadPhoto(event){
 			upLoadPhoto(event){
 				if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){
 				if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){
+					this.dataForm.targetId = this.applyParam.id
 					CommonUpload(this.dataForm).then(res => {
 					CommonUpload(this.dataForm).then(res => {
 						this.applyParam.lastGraduateCertificationOssPath = res.data.filePath;
 						this.applyParam.lastGraduateCertificationOssPath = res.data.filePath;
 					});
 					});

pages/application-process/id-card.vue

@@ -72,7 +72,8 @@
 				dataForm:{
 				dataForm:{
 					loginId: uni.getStorageSync('cffp_userId'),
 					loginId: uni.getStorageSync('cffp_userId'),
 					targetType: "5",
 					targetType: "5",
-					targetId: uni.getStorageSync('cffp_userId'),
+					targetId: '',
+					// uni.getStorageSync('cffp_userId')
 					targetNo: "",
 					targetNo: "",
 					targetUseFor: "12",
 					targetUseFor: "12",
 					targetSeq: "0"
 					targetSeq: "0"
@@ -106,6 +107,7 @@
 					if(type == 'back'){
 					if(type == 'back'){
 						this.dataForm.targetNo = 3;
 						this.dataForm.targetNo = 3;
 					}
 					}
+					this.dataForm.targetId = this.applyParam.id
 					CommonUpload(this.dataForm).then(res => {
 					CommonUpload(this.dataForm).then(res => {
 						if(type == 'front'){
 						if(type == 'front'){
 							this.applyParam.idFrontPageOssPath = res.data.filePath;
 							this.applyParam.idFrontPageOssPath = res.data.filePath;

pages/inviteJoin/inviteJoin.vue

@@ -166,6 +166,7 @@
 			this.getqueryOrgList()
 			this.getqueryOrgList()
 			let dataForm = uni.getStorageSync('userinfodataForm')
 			let dataForm = uni.getStorageSync('userinfodataForm')
 			this.realName = dataForm.realName
 			this.realName = dataForm.realName
+			console.log(dataForm, 1125)
 		},
 		},
 		methods: {
 		methods: {
 			queryorgchange(e) {
 			queryorgchange(e) {
@@ -205,19 +206,21 @@
 			changeorgkey() {
 			changeorgkey() {
 				let that = this
 				let that = this
 				let orgKey = that.applyIdentity == 0 ? 'B1' : 'A1'
 				let orgKey = that.applyIdentity == 0 ? 'B1' : 'A1'
-				that.orgdataList = []
+				// that.orgdataList = []
 			
 			
 				console.log(that.orgList, 1115)
 				console.log(that.orgList, 1115)
-				const list = that.orgList.map(item => {
+				const list = that.orgList.map((item) => {
 					if(item.partnerLevel == orgKey || item.partnerLevel == 'ALL'){
 					if(item.partnerLevel == orgKey || item.partnerLevel == 'ALL'){
 						return item
 						return item
 					}
 					}
-				});
-				for (var i = 0; i < list.length; i++) {
-					if (list[i] == undefined) {
-						list.splice(i,1)
-					}
-				}
+				}).filter(item2 => item2 != undefined)
+				// console.log(list, 41745)
+				// for (var i = 0; i < list.length; i++) {
+				// 	if (list[i] == undefined) {
+				// 		list.splice(i,1)
+				// 	}
+				// }
+				// console.log(list, 551)
 				that.orgdataList = list.map((x) => x.areaName)
 				that.orgdataList = list.map((x) => x.areaName)
 			},
 			},
 			// 发起邀请事件
 			// 发起邀请事件

pages/personalCenter/personalCenter.vue

@@ -9,7 +9,7 @@
 				<view class="firstLineBox">
 				<view class="firstLineBox">
 					<view>
 					<view>
 						<strong>{{customerBasicInfo.realName}}</strong>
 						<strong>{{customerBasicInfo.realName}}</strong>
-						<text class="csTag">{{customerBasicInfo.partnerType || 'CFFP财富中心'}}</text>
+						<text class="csTag" v-if="customerBasicInfo.partnerType">{{customerBasicInfo.partnerType}}</text>
 					</view>
 					</view>
 					<view class="personalInfoBtn" @click="userinfo()">
 					<view class="personalInfoBtn" @click="userinfo()">
 						<text>个人资料</text>
 						<text>个人资料</text>
@@ -112,7 +112,7 @@
 					{id:'04',categoryName:'团队管理',
 					{id:'04',categoryName:'团队管理',
 						children:[
 						children:[
 							{title:'我的团队',icon:'team',link:'/pages/personalCenter/myTeam',isOpen:true,isShow:true},
 							{title:'我的团队',icon:'team',link:'/pages/personalCenter/myTeam',isOpen:true,isShow:true},
-							{title:'邀请加盟',icon:'shareJoin',link:'/pages/inviteJoin/inviteJoin',isOpen:true,isShow:true}
+							{title:'邀请加盟',icon:'shareJoin',link:'/pages/inviteJoin/inviteJoin',isOpen:true,isShow:true,identity: true}
 						],
 						],
 					}
 					}
 				],
 				],
@@ -150,14 +150,28 @@
 					if(item.title==='我的邀请码'){
 					if(item.title==='我的邀请码'){
 						this.$refs.popup1.open('bottom');
 						this.$refs.popup1.open('bottom');
 					}else{
 					}else{
-						uni.navigateTo({
-							url: item.link
-						});
+						this.ckidentity(item)
 					}
 					}
 				}else{
 				}else{
 					common.errorDialog(2,'该模块正在开发中，敬请期待！','提示');
 					common.errorDialog(2,'该模块正在开发中，敬请期待！','提示');
 				}
 				}
 			},
 			},
+			ckidentity(item){
+				if(item.identity == true && this.customerBasicInfo.partnerType ==null){
+					console.log('运行到了这里')
+					uni.showToast({
+						title: "您本人尚未加盟，您加盟后可邀请加盟",
+						duration: 2000,
+						icon: 'none'
+					});
+					return false
+				}else{
+					uni.navigateTo({
+						url: item.link
+					});
+				}
+			},
+		
 			userinfo(){
 			userinfo(){
 				uni.navigateTo({
 				uni.navigateTo({
 					url:`/pages/personalCenter/user-information?customerBasicInfo=` + JSON.stringify(this.customerBasicInfo)
 					url:`/pages/personalCenter/user-information?customerBasicInfo=` + JSON.stringify(this.customerBasicInfo)