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 @@