【开发】国际研讨会增加参展商 参会人内部企业去掉行程信息

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({

pages/guestEditSignUpinfo/guestEditSignUpInfo.wxml

@@ -3,7 +3,7 @@
 
   <form bindsubmit="formSubmit">
     <!-- 不是合作伙伴的beign -->
-    <view class="form-wrap" wx:if="{{info.guestType !== 4}}">
+    <view class="form-wrap" wx:if="{{info.guestType !== 4 && info.guestType !== 5}}">
 
       <view class="form-item">
         <text>参会单位：</text>
@@ -221,7 +221,7 @@
     <!-- 不是合作伙伴的显示end -->
 
     <!-- 合作伙伴begin -->
-    <view class="form-wrap" wx:if="{{info.guestType === 4}}">
+    <view class="form-wrap" wx:if="{{info.guestType === 4 || info.guestType === 5}}">
 
       <view class="form-item">
         <text class="item-label flex-1">抵达时间：</text>

pages/meetingDetailSigned/meetingDetailSigned.wxml

@@ -465,12 +465,12 @@
 
 		<!-- 合作伙伴begin -->
 
-		<view wx:if="{{singInPersonInfo.guestType == 4 }}">
+		<view wx:if="{{singInPersonInfo.guestType == 4 || singInPersonInfo.guestType == 5 }}">
 			<text>抵达时间</text>
 			<text>{{singInPersonInfo.arrivalTime}}</text>
 		</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 4 }}">
+		<view wx:if="{{singInPersonInfo.guestType == 4 || singInPersonInfo.guestType == 5  }}">
 			<text>离开时间</text>
 			<text>{{singInPersonInfo.departureTime}}</text>
 		</view>

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',

pages/signUpPageGuoji/signUpPageGuoji.wxml

@@ -109,36 +109,6 @@
             placeholder="请输入邮编" />
         </view>
 
-        <view class="form-item-radio">
-          <view class="radio-label">
-            <text class="item-label flex-1">是否住酒店：</text>
-          </view>
-          <view>
-            <radio-group name='checkInHotel' bindchange="needHotelNot">
-              <label class="radio radio-item" wx:for="{{need}}" wx:key="item">
-                <radio class="radio-scale" value="{{item.value}}" color="#069F99"/>{{item.name}}
-              </label>
-            </radio-group>
-          </view>
-        </view>
-
-        <view class="form-item">
-          <text class="item-label flex-1">抵达时间：</text>
-          <picker name='arrivalTime' mode="date" value="{{date}}" bindchange="bindDateChangeArriveTime">
-            <view class="picker">
-              {{arrivalTime}}
-            </view>
-          </picker>
-        </view>
-
-        <view class="form-item">
-          <text class="item-label flex-1">离开时间：</text>
-          <picker name='departureTime' mode="date" value="{{date}}" bindchange="bindDateChangeLeaveTime">
-            <view class="picker">
-              {{departureTime}}
-            </view>
-          </picker>
-        </view>
 
         <view class="form-item">
           <text class="item-label flex-1">费用合计：</text>