Merge branch 'dev' of http://139.224.139.2:9091/chaosun/CFFP into dev

pages/invitationRegister/invitationRegister.vue

@@ -31,7 +31,7 @@
 		methods:{
 		methods:{
 			getqueryById(id){
 			getqueryById(id){
 				console.log(id)
 				console.log(id)
-				api.queryById(id).then(res =>{
+				api.queryById({id}).then(res =>{
 					console.log(res, 77414)
 					console.log(res, 77414)
 					this.areaName = res.data.data.areaName
 					this.areaName = res.data.data.areaName
 					this.invitationName = res.data.data.invitationName
 					this.invitationName = res.data.data.invitationName

pages/inviteJoin/inviteJoin.vue

@@ -97,7 +97,7 @@
 						<text v-else-if="item.approvalStatus=='3'" class="success">邀请成功</text>
 						<text v-else-if="item.approvalStatus=='3'" class="success">邀请成功</text>
 						<text v-else class="fail">邀请失败</text>
 						<text v-else class="fail">邀请失败</text>
 					</view>
 					</view>
-					<view class="liBox-footer" v-if="item.approvalStatus == 0 || item.approvalStatus== '2'" @click="reinvite()">
+					<view class="liBox-footer" v-if="item.approvalStatus == 0 || item.approvalStatus== '2'" @click="reinvite(item.id)">
 						<text>重新邀请</text>
 						<text>重新邀请</text>
 					</view>
 					</view>
 				</view>
 				</view>
@@ -191,8 +191,17 @@
 
 
 			// 发起邀请事件
 			// 发起邀请事件
 			shareToggle() {
 			shareToggle() {
-				if (this.isCross == true && this.dataForm.areaName == '') {
-					if (this.dataForm.name == "" || this.dataForm.mobileNumber == ""|| this.dataForm.areaName =='') {
+				this.dataForm.partnerLevel = this.applyIdentity == 0 ? 'B1' : 'A1'
+				this.dataForm.hasCrossDistrict = this.isCross == true ? '1' : '0'
+				this.dataForm.areaId = this.queryorgList[this.index].areaId
+				this.dataForm.areaName = this.isCross == false ? this.queryorgList[this.index].areaName : this.dataForm.areaName
+				// this.dataForm.b1Name = this.applyIdentity == 'B1' ? this.dataForm.b1Name : null
+				// if(this.applyIdentity == 'B1'){
+				// 	if(this.dataForm.b1Name ==''){
+						
+				// 	}
+				// }
+					if (this.dataForm.name == "" || this.dataForm.mobileNumber == "" || this.dataForm.areaName =='' ||  this.applyIdentity == 'B1' && this.dataForm.b1Name =='') {
 						uni.showToast({
 						uni.showToast({
 							title: '请将信息补充完整',
 							title: '请将信息补充完整',
 							duration: 2000,
 							duration: 2000,
@@ -200,11 +209,7 @@
 						});
 						});
 						return false
 						return false
 					}
 					}
-				}
-				this.dataForm.partnerLevel = this.applyIdentity == 0 ? 'B1' : 'A1'
-				this.dataForm.hasCrossDistrict = this.isCross == true ? '1' : '0'
-				this.dataForm.areaId = this.queryorgList[this.index].areaId
-				this.dataForm.areaName = this.isCross == false ? this.queryorgList[this.index].areaName : ''
+
 				api.saveApplyInfo(this.dataForm).then(res => {
 				api.saveApplyInfo(this.dataForm).then(res => {
 					if (res['success']) {
 					if (res['success']) {
 					 // this.switchTab(2)
 					 // this.switchTab(2)
@@ -224,10 +229,12 @@
 			closeShare() {
 			closeShare() {
 				this.$refs.share.close()
 				this.$refs.share.close()
 			},
 			},
-			reinvite(){
+			reinvite(id){
+				 this.shareId = id
 				this.$refs.share.open()
 				this.$refs.share.open()
 			},
 			},
 			uniShare(type) {
 			uniShare(type) {
+				console.log(type, 4455)
 				if (type === 1) {
 				if (type === 1) {
 					uni.share({
 					uni.share({
 						provider: "weixin",
 						provider: "weixin",