diff --git a/pages/guestEditSignUpinfo/guestEditSignUpInfo.js b/pages/guestEditSignUpinfo/guestEditSignUpInfo.js index e18624c..9b175de 100644 --- a/pages/guestEditSignUpinfo/guestEditSignUpInfo.js +++ b/pages/guestEditSignUpinfo/guestEditSignUpInfo.js @@ -74,6 +74,11 @@ Page({ 'guestType_dictText': '合作伙伴' }); break + case 5: + this.setData({ + 'guestType_dictText': '参展商' + }); + break } }, // 表单的显示隐藏 @@ -83,14 +88,16 @@ Page({ 'info.speechPpt':record.speechPpt }) } + // 不是合作伙伴和参展商 + let isCoopOrExint = record.guestType !== 4 && record.guestType !== 5 // 是否用餐 - if (record.haveMeals !== null) { + if (isCoopOrExint && record.haveMeals !== null) { this.setData({ haveMeal: record.haveMeals }) } // 是否住酒店 - if (record.checkInHotel !== null) { + if (isCoopOrExint && record.checkInHotel !== null) { this.setData({ needHotel: record.checkInHotel }) @@ -107,7 +114,7 @@ Page({ } // 是否接站 - if (record.pickUp !== null) { + if (isCoopOrExint && record.pickUp !== null) { this.setData({ needPick: record.pickUp }) @@ -118,7 +125,7 @@ Page({ } } // 是否送站 - if (record.deliveryStation !== null) { + if (isCoopOrExint && record.deliveryStation !== null) { this.setData({ needSend: record.deliveryStation }) @@ -144,7 +151,7 @@ Page({ formData.speechPpt = this.data.info.speechPpt } console.log(formData) - if(this.data.info.guestType !== 4){ + if(this.data.info.guestType !== 4 && this.data.info.guestType !== 5){ // 不是合作伙伴的需要校验 if(!formData.haveMeals){ wx.showToast({ diff --git a/pages/guestEditSignUpinfo/guestEditSignUpInfo.wxml b/pages/guestEditSignUpinfo/guestEditSignUpInfo.wxml index 96f32ce..9f14836 100644 --- a/pages/guestEditSignUpinfo/guestEditSignUpInfo.wxml +++ b/pages/guestEditSignUpinfo/guestEditSignUpInfo.wxml @@ -3,7 +3,7 @@
- + 参会单位: @@ -221,7 +221,7 @@ - + 抵达时间: diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml index 28c3eb0..b09596b 100644 --- a/pages/meetingDetailSigned/meetingDetailSigned.wxml +++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml @@ -465,12 +465,12 @@ - + 抵达时间 {{singInPersonInfo.arrivalTime}} - + 离开时间 {{singInPersonInfo.departureTime}} diff --git a/pages/signUpPageGuoji/signUpPageGuoji.js b/pages/signUpPageGuoji/signUpPageGuoji.js index 8f49062..9c1eb68 100644 --- a/pages/signUpPageGuoji/signUpPageGuoji.js +++ b/pages/signUpPageGuoji/signUpPageGuoji.js @@ -33,7 +33,7 @@ Page({ vipBool: false, // 演讲嘉宾的表单显示 speakerBool: false, - // 合作伙伴的表单显示 + // 合作伙伴或者参展商的表单显示 cooperatieBool: false, // 特邀嘉宾的显示 guestBool: false, @@ -414,6 +414,13 @@ Page({ validateBtnBool: false }) break + case '5': + console.log('666') + this.setData({ + cooperatieBool: true, + validateBtnBool: false + }) + break } } @@ -546,7 +553,8 @@ Page({ vipInvitationCode, speakerInvitationCode, guestInvitationCode, - cooperativeInvitationCode + cooperativeInvitationCode, + exhibitorInvitationCode } = obj return [{ type: '1', @@ -563,6 +571,10 @@ Page({ { type: '4', code: cooperativeInvitationCode + }, + { + type: '5', + code: exhibitorInvitationCode } ] }, @@ -708,7 +720,7 @@ Page({ return } // 是否用餐 - if (this.data.guestType !== '4' && this.data.identity === '1' && (formData.haveMeals == '' || formData.haveMeals === undefined)) { + if (this.data.guestType !== '4' && this.data.guestType !== '5' && this.data.identity === '1' && (formData.haveMeals == '' || formData.haveMeals === undefined)) { wx.showToast({ title: '请选择是否用餐', icon: 'none', @@ -717,7 +729,7 @@ Page({ return } // 是否回民 选择了是否用餐才去校验 - if (this.data.guestType !== '4' && this.data.haveMeal === '1' && (formData.huiPeople == '' || formData.huiPeople === undefined)) { + if (this.data.guestType !== '4' && this.data.guestType !== '5' && this.data.haveMeal === '1' && (formData.huiPeople == '' || formData.huiPeople === undefined)) { wx.showToast({ title: '请选择是否回民', icon: 'none', diff --git a/pages/signUpPageGuoji/signUpPageGuoji.wxml b/pages/signUpPageGuoji/signUpPageGuoji.wxml index f9958d1..bb9814e 100644 --- a/pages/signUpPageGuoji/signUpPageGuoji.wxml +++ b/pages/signUpPageGuoji/signUpPageGuoji.wxml @@ -109,36 +109,6 @@ placeholder="请输入邮编" /> - - - 是否住酒店: - - - - - - - - - - 抵达时间: - - - {{arrivalTime}} - - - - - - 离开时间: - - - {{departureTime}} - - - 费用合计: