diff --git a/pages/guestEditSignUpinfo/guestEditSignUpInfo.js b/pages/guestEditSignUpinfo/guestEditSignUpInfo.js
index 9b175de..51514f7 100644
--- a/pages/guestEditSignUpinfo/guestEditSignUpInfo.js
+++ b/pages/guestEditSignUpinfo/guestEditSignUpInfo.js
@@ -7,6 +7,18 @@ import {
   baseUrl,
   URL_CONFIG
 } from '../../assets/js/project.config.js'
+
+import WasicTopicData from '../../assets/js/wasicStaticData.js'
+const LinkTopicsEnums = {
+  free: {
+    name: '免费专题',
+    index: 6
+  },
+  freeTwo: {
+    name: '免费专题',
+    index: 8
+  }
+}
 Page({
 
   /**
@@ -14,6 +26,11 @@ Page({
    */
   data: {
     info: {}, // 参会人的信息
+    isWasic: false, // 是否是WASIC
+    // 可选课题名称的数组
+    linkTopicsOptionArr: [],
+    // WASIC可选会议的数组-前端写死
+    showTopicsArr: [...WasicTopicData],
     guestType_dictText: '', // 嘉宾类型
     // 抵达时间
     arrivalTime: '请选择抵达时间',
@@ -74,7 +91,7 @@ Page({
           'guestType_dictText': '合作伙伴'
         });
         break
-        case 5:
+      case 5:
         this.setData({
           'guestType_dictText': '参展商'
         });
@@ -83,45 +100,43 @@ Page({
   },
   // 表单的显示隐藏
   initForm(record) {
-    if(record.guestType === 1 && record.speechPpt){
+    // 存储所有需要更新的字段
+    let updateObj = {}
+
+    if (record.guestType === 1 && record.speechPpt) {
       this.setData({
-        'info.speechPpt':record.speechPpt
+        'info.speechPpt': record.speechPpt
       })
     }
+
     // 不是合作伙伴和参展商
     let isCoopOrExint = record.guestType !== 4 && record.guestType !== 5
-    // 是否用餐
-    if (isCoopOrExint &&  record.haveMeals !== null) {
-      this.setData({
-        haveMeal: record.haveMeals
-      })
+    // 是否用餐-vip\演讲嘉宾 管吃饭
+    if ((record.guestType === 1 || record.guestType === 2) && record.haveMeals !== null) {
+      updateObj.haveMeal = record.haveMeals
     }
-    // 是否住酒店
-    if (isCoopOrExint && record.checkInHotel !== null) {
-      this.setData({
-        needHotel: record.checkInHotel
-      })
-      if(record.checkInHotel === 1 && record.inHotelTime){
-        this.setData({
-          'inHotelTime':record.inHotelTime
-        })
+    // 是否住酒店-只有VIP管
+    if (record.guestType === 1 && record.checkInHotel !== null) {
+      updateObj.needHotel = record.checkInHotel
+      if (record.checkInHotel === 1 && record.inHotelTime) {
+        updateObj.inHotelTime = record.inHotelTime
       }
-      if(record.checkInHotel === 1 && record.outHotelTime){
-        this.setData({
-          'outHotelTime':record.outHotelTime
-        })
+      if (record.checkInHotel === 1 && record.outHotelTime) {
+        updateObj.outHotelTime = record.outHotelTime
       }
-   
+
     }
     // 是否接站
     if (isCoopOrExint && record.pickUp !== null) {
-      this.setData({
-        needPick: record.pickUp
-      })
-      if(record.pickUp === 1 && record.arrivalTime){
-        this.setData({
-          'arrivalTime':record.arrivalTime
-        })
+      // this.setData({
+      //   needPick: record.pickUp
+      // })
+      updateObj.needPick = record.pickUp
+      if (record.pickUp === 1 && record.arrivalTime) {
+        // this.setData({
+        //   'arrivalTime':record.arrivalTime
+        // })
+        updateObj.arrivalTime = record.arrivalTime
       }
     }
     // 是否送站
@@ -129,14 +144,19 @@ Page({
       this.setData({
         needSend: record.deliveryStation
       })
+      updateObj.needSend = record.deliveryStation
 
-      if(record.deliveryStation === 1 && record.departureTime){
+      if (record.deliveryStation === 1 && record.departureTime) {
         this.setData({
-          'departureTime':record.departureTime
+          'departureTime': record.departureTime
         })
+        updateObj.departureTime = record.departureTime
       }
-      
+
     }
+    this.setData({
+      ...updateObj
+    })
   },
   formSubmit(e) {
     const formData = JSON.parse(JSON.stringify(e.detail.value))
@@ -146,32 +166,59 @@ Page({
     formData.arrivalTime = this.data.info.arrivalTime
     formData.departureTime = this.data.info.departureTime
     formData.id = this.data.info.id
-    if(this.data.info.guestType === 1 || this.data.info.guestType === 2){
+    if (this.data.info.guestType === 1 || this.data.info.guestType === 2) {
       formData.photo = this.data.info.photo
       formData.speechPpt = this.data.info.speechPpt
     }
-    console.log(formData)
-    if(this.data.info.guestType !== 4 && this.data.info.guestType !== 5){
-      // 不是合作伙伴的需要校验
-      if(!formData.haveMeals){
+    // 如果会议是WASIC 需要对是否选择会议名称做校验
+    if (this.data.isWasic) {
+      let choiceArr = formData.choiceTopic
+      if (formData.radioKey) {
+        choiceArr.push(formData.radioKey)
+        delete formData.radioKey
+      }
+      if (formData.radioKeyTwo) {
+        choiceArr.push(formData.radioKeyTwo)
+        delete formData.radioKeyTwo
+      }
+      // 只选择一个免费参观的不能报名成功
+      let judgeFlag = choiceArr.filter(tt => tt !== LinkTopicsEnums.freeTwo.index + '')
+      if (judgeFlag.length === 0) {
         wx.showToast({
-          title: '请选择是否用餐',
+          title: '请至少选择一个非参观类会议',
           icon: 'none',
           duration: 2000
         })
         return
       }
+      formData.choiceTopic = choiceArr.join(',')
+    }
+    console.log(formData)
+    // VIP || 演讲嘉宾 || 特邀嘉宾的校验
+    if (this.data.info.guestType === 1 || this.data.info.guestType === 2 || this.data.info.guestType === 3) {
+      if(this.data.info.guestType === 1 || this.data.info.guestType === 2) {
+        if (!formData.haveMeals) {
+          wx.showToast({
+            title: '请选择是否用餐',
+            icon: 'none',
+            duration: 2000
+          })
+          return
+        }
+
+        if (formData.haveMeals === "1" && !formData.huiPeople) {
+          wx.showToast({
+            title: '请选择是否回民',
+            icon: 'none',
+            duration: 2000
+          })
+          return
+        }
+      }
 
-      if(formData.haveMeals === "1" && !formData.huiPeople){
-        wx.showToast({
-          title: '请选择是否回民',
-          icon: 'none',
-          duration: 2000
-        })
-        return
-      }
-      if(formData.checkInHotel && formData.checkInHotel === "1" ){
-        if(!formData.inHotelTime){
+
+      if (this.data.info.guestType === 1 && formData.checkInHotel && formData.checkInHotel === "1") {
+        if (!formData.inHotelTime) {
           wx.showToast({
             title: '请选择入住酒店时间',
             icon: 'none',
@@ -179,7 +226,7 @@ Page({
           })
           return
         }
-        if(!formData.outHotelTime){
+        if (!formData.outHotelTime) {
           wx.showToast({
             title: '请选择离店时间',
             icon: 'none',
@@ -187,9 +234,9 @@ Page({
           })
           return
         }
-        if(formData.inHotelTime && formData.outHotelTime){
-          let flag = compareDate(formData.inHotelTime,formData.outHotelTime)
-          if(flag){
+        if (formData.inHotelTime && formData.outHotelTime) {
+          let flag = compareDate(formData.inHotelTime, formData.outHotelTime)
+          if (flag) {
             wx.showToast({
               title: '入住酒店时间不能大于离店时间',
               icon: 'none',
@@ -199,7 +246,7 @@ Page({
           }
         }
 
-        if(!formData.roomLayout){
+        if (!formData.roomLayout) {
           wx.showToast({
             title: '请输入房型',
             icon: 'none',
@@ -209,7 +256,7 @@ Page({
         }
       }
 
-      if(!formData.pickUp){
+      if (!formData.pickUp) {
         wx.showToast({
           title: '请选择是否接站',
           icon: 'none',
@@ -217,8 +264,8 @@ Page({
         })
         return
       }
-      
-      if(formData.pickUp === "1" && !formData.arrivalTime){
+
+      if (formData.pickUp === "1" && !formData.arrivalTime) {
         wx.showToast({
           title: '请选择抵达时间',
           icon: 'none',
@@ -227,7 +274,7 @@ Page({
         return
       }
 
-      if(formData.pickUp === "1" && !formData.destination){
+      if (formData.pickUp === "1" && !formData.destination) {
         wx.showToast({
           title: '请选择抵达站',
           icon: 'none',
@@ -236,7 +283,7 @@ Page({
         return
       }
 
-      if(formData.pickUp === "1" && !formData.arrivalShift){
+      if (formData.pickUp === "1" && !formData.arrivalShift) {
         wx.showToast({
           title: '请输入到达班次',
           icon: 'none',
@@ -245,7 +292,7 @@ Page({
         return
       }
 
-      if(!formData.deliveryStation){
+      if (!formData.deliveryStation) {
         wx.showToast({
           title: '请选择是否送站',
           icon: 'none',
@@ -253,8 +300,8 @@ Page({
         })
         return
       }
-      
-      if(formData.deliveryStation === "1" && !formData.departureTime){
+
+      if (formData.deliveryStation === "1" && !formData.departureTime) {
         wx.showToast({
           title: '请选择离开时间',
           icon: 'none',
@@ -263,9 +310,9 @@ Page({
         return
       }
 
-      if(formData.arrivalTime && formData.departureTime){
-        let flag = compareDate(formData.arrivalTime,formData.departureTime)
-        if(flag){
+      if (formData.arrivalTime && formData.departureTime) {
+        let flag = compareDate(formData.arrivalTime, formData.departureTime)
+        if (flag) {
           wx.showToast({
             title: '抵达时间不能大于离开时间',
             icon: 'none',
@@ -275,7 +322,7 @@ Page({
         }
       }
 
-      if(formData.deliveryStation === "1" && !formData.departureStation){
+      if (formData.deliveryStation === "1" && !formData.departureStation) {
         wx.showToast({
           title: '请输入离开站',
           icon: 'none',
@@ -284,7 +331,7 @@ Page({
         return
       }
 
-      if(formData.deliveryStation === "1" && !formData.departureShift){
+      if (formData.deliveryStation === "1" && !formData.departureShift) {
         wx.showToast({
           title: '请输入离开班次',
           icon: 'none',
@@ -294,7 +341,7 @@ Page({
       }
 
       MeetingApi.editSignUpInfo(formData).then(res => {
-        if(res.success){
+        if (res.success) {
           wx.showToast({
             title: '编辑成功',
             icon: 'none',
@@ -306,7 +353,7 @@ Page({
           wx.navigateBack({
             delta: 1,
           })
-        }else{
+        } else {
           wx.showToast({
             title: res.message,
             icon: 'none',
@@ -315,10 +362,10 @@ Page({
         }
       })
 
-    }else{
-      if(this.data.info.arrivalTime && this.data.info.departureTime){
-        let flag = compareDate(this.data.info.arrivalTime,this.data.info.departureTime)
-        if(flag){
+    } else {
+      if (this.data.info.arrivalTime && this.data.info.departureTime) {
+        let flag = compareDate(this.data.info.arrivalTime, this.data.info.departureTime)
+        if (flag) {
           wx.showToast({
             title: '抵达时间不能大于离开时间',
             icon: 'none',
@@ -328,14 +375,15 @@ Page({
         }
       }
       const param = {
-        arriveTime:this.data.info.arrivalTime,
-        departureTime:this.data.info.departureTime,
-        id:this.data.info.id,
-        guestType: 4
+        arrivalTime: this.data.info.arrivalTime,
+        departureTime: this.data.info.departureTime,
+        id: this.data.info.id,
+        guestType: this.data.info.guestType,
+        choiceTopic: formData.choiceTopic
       }
       // 合作伙伴不需要校验
       MeetingApi.editSignUpInfo(param).then(res => {
-        if(res.success){
+        if (res.success) {
           wx.showToast({
             title: '编辑成功',
             icon: 'none',
@@ -347,7 +395,7 @@ Page({
           wx.navigateBack({
             delta: 1,
           })
-        }else{
+        } else {
           wx.showToast({
             title: res.message,
             icon: 'none',
@@ -362,28 +410,28 @@ Page({
   bindDateChangeArriveTime(e) {
     this.setData({
       arrivalTime: e.detail.value,
-      'info.arrivalTime':e.detail.value
+      'info.arrivalTime': e.detail.value
     })
   },
   // 离开时间选择
   bindDateChangeLeaveTime(e) {
     this.setData({
       departureTime: e.detail.value,
-      'info.departureTime':e.detail.value
+      'info.departureTime': e.detail.value
     })
   },
   // 入住酒店时间
   bindDateChangeInHotelTime(e) {
     this.setData({
       inHotelTime: e.detail.value,
-      'info.inHotelTime':e.detail.value
+      'info.inHotelTime': e.detail.value
     })
   },
   // 离店时间选择
   bindDateChangeOutHotelTime(e) {
     this.setData({
       outHotelTime: e.detail.value,
-      'info.outHotelTime':e.detail.value
+      'info.outHotelTime': e.detail.value
     })
   },
   // 是否用餐
@@ -431,11 +479,15 @@ Page({
           info: res.result,
         })
         this.initForm(this.data.info)
+        if(this.data.isWasic) {
+          // 会议id查询当前绑定的课题信息
+          this.getLinkTopicsOptionArr(res.result.meetingId)
+        }
         // 演讲ppt、
         if (res.result.speechPpt) {
           this.initFileList(res.result.speechPpt).then(res => {
             this.setData({
-              speechPptList:  res 
+              speechPptList: res
             })
           })
         }
@@ -485,11 +537,14 @@ Page({
               backPdfArr.push(fileBackDa)
               wx.hideLoading(); //隐藏提示框
               //上传成功，
-              const fileList = [{name:name,id:'fileBackDa.result.id'}]
+              const fileList = [{
+                name: name,
+                id: 'fileBackDa.result.id'
+              }]
               that.setData({
                 tempFiles: name,
                 'info.speechPpt': fileBackDa.result.id,
-                speechPptList:fileList
+                speechPptList: fileList
               });
             }
           })
@@ -528,12 +583,121 @@ Page({
       return fileList
     }
   },
+  // 取消会议名称的选中
+  cancelChoiceTopic() {
+    let updateObj = {}
+    this.updateCheckboxArr(this.data.showTopicsArr, [], 'all')
+    updateObj.showTopicsArr = this.data.showTopicsArr
+    this.setData({
+      ...updateObj
+    })
+
+  },
+  // 获取国际研讨会-能选择课题的数据字典数据
+  getLinkTopicsOptionArr(meetingId) {
+    MeetingApi.getLinkTopics({
+      id: meetingId
+    }).then(res => {
+      if (res.success) {
+        let arr = res.result || []
+        this.data.showTopicsArr.map(tt => {
+          tt.children.map(item => {
+            let ele = arr.find(a => a.value + '' === item.value)
+            if (ele) {
+              item.text = ele.text
+              item.title = ele.title
+            }
+          })
+          tt.radioChildren && tt.radioChildren.map(item => {
+            let ele = arr.find(a => a.value + '' === item.value)
+            if (ele) {
+              item.text = ele.text
+              item.title = ele.title
+            }
+          })
+        })
+        const updateObj = {
+          showTopicsArr: this.data.showTopicsArr
+        }
+        // 选中的主题
+        const choiceTopic = (this.data.info.choiceTopic || '').split(',')
+        this.updateCheckboxArr(this.data.showTopicsArr, choiceTopic, 'all')
+        updateObj.showTopicsArr = this.data.showTopicsArr
+
+        this.setData({
+          ...updateObj
+        })
+
+      }
+    })
+  },
+  // 选择的课题发生改变
+  changeChoiceTopic(e) {
+    const values = e.detail.value // 是一个数组 ['1', '2']
+    this.updateCheckboxArr(this.data.showTopicsArr, values, 'check')
+    let updateObj = {
+      showTopicsArr: this.data.showTopicsArr
+    }
+    this.setData({
+      ...updateObj
+    })
+  },
+  changeRadioTopic(e) {
+    const value = e.detail.value
+    let keyName = e.currentTarget.dataset.name
+    this[keyName] = value
+    let pIndex = this.data.showTopicsArr.findIndex(tt => tt.radioKey === keyName)
+    if (pIndex > -1) {
+      this.data.showTopicsArr[pIndex].radioChildren.map(radioItem => {
+        radioItem.checked = false
+        if (radioItem.value === value) {
+          radioItem.checked = true
+        }
+      })
+    }
+    let updateObj = {
+      showTopicsArr: this.data.showTopicsArr
+    }
+    this.setData({
+      ...updateObj
+    })
+  },
+  /**
+   * 更新Checkbox对应的选中状态
+   * @param arr-Checkbox对应的数组 和 showTopicsArr 对应的数据格式一致
+   * @param valueArr-选中的值-数组
+   * @param type-类型 ‘all’ 单选多选全都匹配；  ‘check’-匹配多选 ‘radio’匹配单选
+   */
+  updateCheckboxArr(arr, valueArr, type) {
+    arr.map(tt => {
+      if (type === 'all' || type === 'check') {
+        tt.children.map(item => {
+          item.checked = false
+          if (valueArr.indexOf(item.value) > -1) {
+            item.checked = true
+          }
+        })
+      }
+      if (type === 'all' || type === 'radio') {
+        tt.radioChildren && tt.radioChildren.map(item => {
+          item.checked = false
+          if (valueArr.indexOf(item.value) > -1) {
+            item.checked = true
+          }
+        })
+      }
+    })
+  },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
     this.queryPeronInfo(options.situationId)
+    this.data.isWasic = !!options.isWasic
+    this.setData({
+      isWasic: this.data.isWasic
+    })
     // this.queryPeronInfo('1526466713801809921')
   },
 
@@ -585,4 +749,4 @@ Page({
   onShareAppMessage: function () {
 
   }
-})
\ No newline at end of file
+})
diff --git a/pages/guestEditSignUpinfo/guestEditSignUpInfo.wxml b/pages/guestEditSignUpinfo/guestEditSignUpInfo.wxml
index 9f14836..3e1ae95 100644
--- a/pages/guestEditSignUpinfo/guestEditSignUpInfo.wxml
+++ b/pages/guestEditSignUpinfo/guestEditSignUpInfo.wxml
@@ -1,10 +1,7 @@
 <view class="color-f5 wrap">
 
-
   <form bindsubmit="formSubmit">
-    <!-- 不是合作伙伴的beign -->
-    <view class="form-wrap" wx:if="{{info.guestType !== 4 && info.guestType !== 5}}">
-
+    <view class="form-wrap">
       <view class="form-item">
         <text>参会单位：</text>
         <input value="{{info.companyName}}" disabled />
@@ -29,13 +26,46 @@
         <text>嘉宾类型：</text>
         <input value="{{guestType_dictText}}" disabled />
       </view>
+      <!-- 国际研讨会 WASIC 增加会议名称的选择-->
+      <view class="form-item-radio" wx:if="{{isWasic}}">
+        <view class="radio-label">
+          <text class="item-label flex-1 validate">会议名称：</text>
+        </view>
+        <view>
+          <checkbox-group name='choiceTopic' bindchange="changeChoiceTopic">
+            <view wx:for="{{showTopicsArr}}" wx:for-item="item" wx:key="name">
+              <view class="topic-title">{{item.name}}</view>
+              <view class="checkbox-view">
+                <label class="radio checkbox-item" wx:for="{{item.children}}" wx:for-item="checkItem" wx:key="title">
+                  <checkbox class="radio-scale" value="{{checkItem.value}}" color="#069F99" checked="{{checkItem.checked}}" disabled="{{checkItem.disabled}}" />{{checkItem.text}}
+                </label>
+              </view>
+              <!-- 如果有单选的数据 循环单选的数据 -->
+              <view class="radio-div" wx:if="{{item.radioChildren}}">
+                <radio-group name='{{item.radioKey}}' data-name='{{item.radioKey}}' bindchange="changeRadioTopic">
+                  <label class="radio radio-item" wx:for="{{item.radioChildren}}" wx:for-item="radioItem" wx:key="title">
+                    <radio class="radio-scale" value="{{radioItem.value}}" color="#069F99" checked="{{radioItem.checked}}" />{{radioItem.text}}
+                  </label>
+                </radio-group>
+              </view>
+            </view>
 
-      <view class="form-item" wx:if="{{info.guestType === 1 || info.guestType === 2}}">
+          </checkbox-group>
+          <view class="form-item">
+            <button class="validate-btn" bindtap="cancelChoiceTopic">清空会议信息</button>
+          </view>
+        </view>
+      </view>
+    </view>
+    <!-- 演讲信息 VIP || 演讲嘉宾 存在---开始-->
+    <view class="form-wrap" wx:if="{{info.guestType === 1 || info.guestType === 2}}">
+
+      <view class="form-item">
         <text class="item-label flex-1">演讲题目：</text>
         <input placeholder-class="text-right" name="speechTopic" value="{{info.speechTopic}}" placeholder="请输入演讲题目" />
       </view>
 
-      <view class="form-item-radio" wx:if="{{info.guestType === 1 || info.guestType === 2}}">
+      <view class="form-item-radio">
         <text class="item-label flex-1">演讲PPT：</text>
 
         <view class="file-name" wx:for="{{speechPptList}}" wx:key="item">
@@ -50,19 +80,21 @@
       </view>
 
 
-      <view class="form-item-radio" wx:if="{{info.guestType === 1 || info.guestType === 2}}">
+      <view class="form-item-radio">
         <text class="item-label flex-1">照片：</text>
         <image-upload style="margin-top:20rpx" bindgetIds='getImagesId' maxLength='1' initImgsList="{{info.photo}}">
         </image-upload>
 
       </view>
 
-
-      <view class="form-item-radio" wx:if="{{info.guestType === 1 || info.guestType === 2}}">
+      <view class="form-item-radio">
         <text class="item-label flex-1">个人简介：</text>
         <textarea name="profile" placeholder="请输入个人简介" value="{{info.profile}}" name="remark" />
       </view>
-
+    </view>
+    <!-- 演讲信息 VIP || 演讲嘉宾 存在---结束-->
+    <!-- 用餐信息 VIP || 演讲嘉宾 存在---开始 -->
+    <view class="form-wrap" wx:if="{{info.guestType === 1 || info.guestType === 2}}">
       <view class="form-item-radio">
         <view class="radio-label">
           <text class="item-label flex-1 validate">是否用餐：</text>
@@ -70,8 +102,7 @@
         <view>
           <radio-group name='haveMeals' bindchange="needHaveMeal">
             <label class="radio radio-item" wx:for="{{need}}" wx:key="item">
-              <radio class="radio-scale" value="{{item.value}}" checked="{{item.value === info.haveMeals}}"
-                color="#069F99" />{{item.name}}
+              <radio class="radio-scale" value="{{item.value}}" checked="{{item.value === info.haveMeals}}" color="#069F99" />{{item.name}}
             </label>
           </radio-group>
         </view>
@@ -85,29 +116,29 @@
         <view>
           <radio-group name='huiPeople'>
             <label class="radio radio-item" wx:for="{{need}}" wx:key="item">
-              <radio class="radio-scale" value="{{item.value}}" checked="{{item.value === info.huiPeople}}"
-                color="#069F99" />{{item.name}}
+              <radio class="radio-scale" value="{{item.value}}" checked="{{item.value === info.huiPeople}}" color="#069F99" />{{item.name}}
             </label>
           </radio-group>
         </view>
       </view>
-
-
-      <view class="form-item-radio" wx:if="{{info.guestType === 1}}">
+    </view>
+    <!-- 用餐信息 VIP || 演讲嘉宾 存在---结束 -->
+    <!-- 住店信息 VIP  存在---结束 -->
+    <view class="form-wrap" wx:if="{{info.guestType === 1}}">
+      <view class="form-item-radio">
         <view class="radio-label">
           <text class="item-label flex-1 validate">是否住酒店：</text>
         </view>
         <view>
           <radio-group name='checkInHotel' bindchange="needHotel">
             <label class="radio radio-item" wx:for="{{need}}" wx:key="item">
-              <radio class="radio-scale" value="{{item.value}}" checked="{{item.value === info.checkInHotel}}"
-                color="#069F99" />{{item.name}}
+              <radio class="radio-scale" value="{{item.value}}" checked="{{item.value === info.checkInHotel}}" color="#069F99" />{{item.name}}
             </label>
           </radio-group>
         </view>
       </view>
 
-      <view class="form-item" wx:if="{{ needHotel === 1 && info.guestType === 1 }}">
+      <view class="form-item" wx:if="{{ needHotel === 1 }}">
         <text class="item-label flex-1 validate">入住酒店时间：</text>
         <picker name='inHotelTime' mode="date" bindchange="bindDateChangeInHotelTime">
           <view class="picker">
@@ -116,7 +147,7 @@
         </picker>
       </view>
 
-      <view class="form-item" wx:if="{{needHotel === 1 && info.guestType === 1 }}">
+      <view class="form-item" wx:if="{{needHotel === 1 }}">
         <text class="item-label flex-1 validate">离店时间：</text>
         <picker name='outHotelTime' placeholder="请选择离店时间" mode="date" bindchange="bindDateChangeOutHotelTime">
           <view class="picker">
@@ -125,12 +156,16 @@
         </picker>
       </view>
 
-      <view class="form-item" wx:if="{{needHotel === 1 && info.guestType === 1 }}">
+      <view class="form-item" wx:if="{{needHotel === 1 }}">
         <text class="item-label flex-1 validate">房型：</text>
-        <input placeholder-class="text-right" name="roomLayout" value="{{info.roomLayout}}" bindinput="bindInputPhone"
-          placeholder="请输入房型" />
+        <input placeholder-class="text-right" name="roomLayout" value="{{info.roomLayout}}" bindinput="bindInputPhone" placeholder="请输入房型" />
       </view>
 
+    </view>
+    <!-- 住店信息 VIP  存在---结束 -->
+
+    <!-- 行程信息 VIP || 演讲嘉宾 || 特邀嘉宾 存在---开始 -->
+    <view class="form-wrap" wx:if="{{info.guestType === 1 || info.guestType === 2 || info.guestType === 3}}">
       <view class="form-item-radio">
         <view class="radio-label">
           <text class="item-label flex-1 validate">是否需要接站：</text>
@@ -138,8 +173,7 @@
         <view>
           <radio-group name='pickUp' bindchange="needPick">
             <label class="radio radio-item" wx:for="{{need}}" wx:key="item">
-              <radio class="radio-scale" value="{{item.value}}" checked="{{item.value === info.pickUp}}"
-                color="#069F99" />{{item.name}}
+              <radio class="radio-scale" value="{{item.value}}" checked="{{item.value === info.pickUp}}" color="#069F99" />{{item.name}}
             </label>
           </radio-group>
         </view>
@@ -156,16 +190,18 @@
 
       <view class="form-item" wx:if="{{needPick === 1 }}">
         <text class="item-label flex-1 validate">到达站：</text>
-        <input placeholder-class="text-right" name="destination" value="{{info.destination}}" bindinput="bindInputPhone"
-          placeholder="请输入到达站" />
+        <input placeholder-class="text-right" name="destination" value="{{info.destination}}" bindinput="bindInputPhone" placeholder="请输入到达站" />
       </view>
 
       <view class="form-item" wx:if="{{needPick === 1 }}">
         <text class="item-label flex-1 validate">到达班次：</text>
-        <input placeholder-class="text-right" name="arrivalShift" value="{{info.arrivalShift}}"
-          bindinput="bindInputPhone" placeholder="请输入到达班次" />
+        <input placeholder-class="text-right" name="arrivalShift" value="{{info.arrivalShift}}" bindinput="bindInputPhone" placeholder="请输入到达班次" />
+      </view>
+      <!-- 演讲嘉宾、特邀嘉宾存在 -->
+      <view class="form-item" wx:if="{{needPick === 1 && (info.guestType === 2 || info.guestType === 3)}}">
+        <text class="item-label flex-1">目的地</text>
+        <input placeholder-class="text-right" name="destinationHotel" placeholder="请输入目的地" value="{{info.destinationHotel}}" />
       </view>
-
 
       <view class="form-item-radio">
         <view class="radio-label">
@@ -174,8 +210,7 @@
         <view>
           <radio-group name='deliveryStation' bindchange="needSend">
             <label class="radio radio-item" wx:for="{{need}}" wx:key="item">
-              <radio class="radio-scale" value="{{item.value}}" checked="{{item.value === info.deliveryStation}}"
-                color="#069F99" />{{item.name}}
+              <radio class="radio-scale" value="{{item.value}}" checked="{{item.value === info.deliveryStation}}" color="#069F99" />{{item.name}}
             </label>
           </radio-group>
         </view>
@@ -192,35 +227,25 @@
 
       <view class="form-item" wx:if="{{needSend === 1 }}">
         <text class="item-label flex-1 validate">离开站：</text>
-        <input placeholder-class="text-right" name="departureStation" value="{{info.departureStation}}"
-          bindinput="bindInputPhone" placeholder="请输入离开站" />
+        <input placeholder-class="text-right" name="departureStation" value="{{info.departureStation}}" bindinput="bindInputPhone" placeholder="请输入离开站" />
       </view>
 
       <view class="form-item" wx:if="{{needSend === 1 }}">
         <text class="item-label flex-1 validate">离开班次：</text>
-        <input placeholder-class="text-right" name="departureShift" value="{{info.departureShift}}"
-          bindinput="bindInputPhone" placeholder="请输入离开班次" />
+        <input placeholder-class="text-right" name="departureShift" value="{{info.departureShift}}" bindinput="bindInputPhone" placeholder="请输入离开班次" />
       </view>
-
-      <view class="form-item">
-        <text class="item-label flex-1">同行人：</text>
-        <input placeholder-class="text-right" name="peer" bindinput="bindInputPhone" value="{{info.peer}}"
-          placeholder="请输入同行人" />
-      </view>
-
-      <view class="form-item-radio" wx:if="{{info.guestType === 1 || info.guestType === 2 }}">
+      <view class="form-item-radio" wx:if="{{info.guestType === 1 || info.guestType === 2 || info.guestType === 3 }}">
         <text class="item-label flex-1">备注：</text>
-        <textarea name="remark" placeholder="请输入备注" value="{{info.remark}}" name="remark" />
+        <textarea name="remark" placeholder="请输入备注" value="{{info.remark}}" />
       </view>
-
       <view class="btn-wrap">
         <button class="btn-ok" formType="submit">确定</button>
       </view>
-
     </view>
-    <!-- 不是合作伙伴的显示end -->
+    <!-- 行程信息 VIP || 演讲嘉宾 || 特邀嘉宾 存在---结束 -->
+    <!-- 整体结束 -->
 
-    <!-- 合作伙伴begin -->
+    <!-- 合作伙伴 || 参展商类别 begin -->
     <view class="form-wrap" wx:if="{{info.guestType === 4 || info.guestType === 5}}">
 
       <view class="form-item">
@@ -240,7 +265,10 @@
           </view>
         </picker>
       </view>
-
+      <view class="form-item-radio">
+        <text class="item-label flex-1">备注：</text>
+        <textarea name="remark" placeholder="请输入备注" value="{{info.remark}}" />
+      </view>
       <view class="btn-wrap">
         <button class="btn-ok" formType="submit">确定</button>
       </view>
@@ -250,9 +278,4 @@
     <!-- 合作伙伴end -->
   </form>
 
-
-
-
-
-
 </view>
\ No newline at end of file
diff --git a/pages/guestEditSignUpinfo/guestEditSignUpInfo.wxss b/pages/guestEditSignUpinfo/guestEditSignUpInfo.wxss
index 337ed69..7bd539a 100644
--- a/pages/guestEditSignUpinfo/guestEditSignUpInfo.wxss
+++ b/pages/guestEditSignUpinfo/guestEditSignUpInfo.wxss
@@ -91,4 +91,21 @@ page{
 }
 .primary-color {
   color:#069F99!important;
+}
+
+/* 多选组件的样式 */
+.checkbox-item {
+  display: block;
+}
+.topic-title{
+  padding: 15rpx 0;
+}
+.radio-div{
+  border-top: 1px solid rgba(0, 0, 0, 0.2);
+  padding-top: 15rpx;
+  margin-top: 15rpx;
+}
+.radio-div .radio-item {
+  display: block;
+  padding: 15rpx 0;
 }
\ No newline at end of file
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index 77234aa..d6dae73 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/pages/meetingDetailSigned/meetingDetailSigned.js
@@ -425,7 +425,7 @@ Page({
   // 国际研讨会嘉宾编辑个人信息
   editSignupInfo(){
     wx.navigateTo({
-      url: `../guestEditSignUpinfo/guestEditSignUpInfo?&situationId=${this.data.singInPersonInfo.id}`,
+      url: `../guestEditSignUpinfo/guestEditSignUpInfo?&situationId=${this.data.singInPersonInfo.id}&isWasic=${this.data.meetingInfo.isWasic}`,
     })
   },
 
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index 9b8acd5..886b624 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -15,13 +15,10 @@
 		</view>
 		<view class="sign-in" wx:if="{{meetingInfo.meetingType === '3' && meetingInfo.isWasic}}">
 			<text class="basic-label">关联会议</text>
-			<!-- <text> -->
 			<text class="block-text sign-in-text" wx:for="{{wasicLinkTopics}}" wx:for-item="pItem" wx:key="name">
 				<text>{{pItem.name}}</text>
 				<text class="block-text sign-in-text" wx:for="{{pItem.children}}" wx:key="value">{{item.text}}</text>
 			</text>
-			<!-- <text class="block-text" wx:for="{{meetingInfo.linkTopicsArr}}" wx:key="item">{{item}}</text> -->
-			<!-- </text> -->
 		</view>
 		<!-- 国际研讨会的判断-是否WASIC--结束 -->
 		<view>
@@ -303,259 +300,253 @@
 			<text>手机号</text>
 			<text>{{singInPersonInfo.phone}}</text>
 		</view>
+		<!--是否为WASIC字段判断-->
+		<view class="sign-in" wx:if="{{meetingInfo.meetingType === '3' && meetingInfo.isWasic}}">
+			<text class="basic-label">会议名称</text>
+			<text class="block-text sign-in-text" wx:for="{{wasicChoiceTopics}}" wx:for-item="pItem" wx:key="name">
+				<text>{{pItem.name}}</text>
+				<text class="block-text sign-in-text" wx:for="{{pItem.children}}" wx:key="value">{{item.text}}</text>
+			</text>
+		</view>
 
 		<!-- vip显示 begin -->
-		<view wx:if="{{singInPersonInfo.guestType == 1}}" class="sign-in">
-			<text>演讲题目</text>
-			<text class="sign-in-text">{{singInPersonInfo.speechTopic || ''}}</text>
-		</view>
-
-		<view class="meeting-files" wx:if="{{singInPersonInfo.guestType == 1}}">
-			<text>演讲PPT</text>
-			<view class="file-name" wx:for="{{speechPptList}}" wx:key="item">
-				<view>
-					<image src="../../assets/images/pdf.png"></image>
-					<text>{{item.name}}</text>
-				</view>
-				<text class="look-file" bindtap="previewFile" data-file='{{item}}'>查看</text>
+		<view class="inner-box-view" wx:if="{{singInPersonInfo.guestType == 1}}">
+			<view class="sign-in">
+				<text>演讲题目</text>
+				<text class="sign-in-text">{{singInPersonInfo.speechTopic || ''}}</text>
 			</view>
-		</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1 && !!singInPersonInfo.photo}}" style="height:auto">
-			<text>照片</text>
-			<image style='margin-right:30px' class="back-img" src="{{photoSrc}}"></image>
-		</view>
+			<view class="meeting-files">
+				<text>演讲PPT</text>
+				<view class="file-name" wx:for="{{speechPptList}}" wx:key="item">
+					<view>
+						<image src="../../assets/images/pdf.png"></image>
+						<text>{{item.name}}</text>
+					</view>
+					<text class="look-file" bindtap="previewFile" data-file='{{item}}'>查看</text>
+				</view>
+			</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1}}" class="sign-in-text">
-			<text>个人简介</text>
-			<text class="sign-in-text">{{singInPersonInfo.profile || ''}}</text>
-		</view>
+			<view wx:if="{{!!singInPersonInfo.photo}}" style="height:auto">
+				<text>照片</text>
+				<image style='margin-right:30px' class="back-img" src="{{photoSrc}}"></image>
+			</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1}}">
-			<text>是否用餐</text>
-			<text>{{singInPersonInfo.haveMeals_dictText}}</text>
-		</view>
+			<view class="sign-in-text">
+				<text>个人简介</text>
+				<text class="sign-in-text">{{singInPersonInfo.profile || ''}}</text>
+			</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1 && singInPersonInfo.haveMeals === 1}}">
-			<text>是否回民</text>
-			<text>{{singInPersonInfo.huiPeople_dictText}}</text>
-		</view>
+			<view>
+				<text>是否用餐</text>
+				<text>{{singInPersonInfo.haveMeals_dictText}}</text>
+			</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1}}">
-			<text>是否住酒店</text>
-			<text>{{singInPersonInfo.checkInHotel_dictText}}</text>
-		</view>
+			<view wx:if="{{singInPersonInfo.haveMeals === 1}}">
+				<text>是否回民</text>
+				<text>{{singInPersonInfo.huiPeople_dictText}}</text>
+			</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1 &&  singInPersonInfo.checkInHotel == 1}}">
-			<text>入住酒店时间</text>
-			<text>{{singInPersonInfo.inHotelTime}}</text>
-		</view>
+			<view>
+				<text>是否住酒店</text>
+				<text>{{singInPersonInfo.checkInHotel_dictText}}</text>
+			</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1 &&  singInPersonInfo.checkInHotel == 1}}">
-			<text>离店时间</text>
-			<text>{{singInPersonInfo.outHotelTime}}</text>
-		</view>
+			<view wx:if="{{singInPersonInfo.checkInHotel == 1}}">
+				<text>入住酒店时间</text>
+				<text>{{singInPersonInfo.inHotelTime}}</text>
+			</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1 &&  singInPersonInfo.checkInHotel == 1}}">
-			<text>房型</text>
-			<text>{{singInPersonInfo.roomLayout}}</text>
-		</view>
+			<view wx:if="{{singInPersonInfo.checkInHotel == 1}}">
+				<text>离店时间</text>
+				<text>{{singInPersonInfo.outHotelTime}}</text>
+			</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1}}">
-			<text>是否需要接站</text>
-			<text>{{singInPersonInfo.pickUp_dictText}}</text>
-		</view>
+			<view wx:if="{{singInPersonInfo.checkInHotel == 1}}">
+				<text>房型</text>
+				<text>{{singInPersonInfo.roomLayout}}</text>
+			</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1 &&  singInPersonInfo.pickUp == 1}}">
-			<text>抵达时间</text>
-			<text>{{singInPersonInfo.arrivalTime}}</text>
-		</view>
+			<view>
+				<text>是否需要接站</text>
+				<text>{{singInPersonInfo.pickUp_dictText}}</text>
+			</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1 &&  singInPersonInfo.pickUp == 1}}">
-			<text>到达站</text>
-			<text>{{singInPersonInfo.destination}}</text>
-		</view>
+			<view wx:if="{{singInPersonInfo.pickUp == 1}}">
+				<text>抵达时间</text>
+				<text>{{singInPersonInfo.arrivalTime}}</text>
+			</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1 &&  singInPersonInfo.pickUp == 1}}">
-			<text>到达班次</text>
-			<text>{{singInPersonInfo.arrivalShift}}</text>
-		</view>
+			<view wx:if="{{singInPersonInfo.pickUp == 1}}">
+				<text>到达站</text>
+				<text>{{singInPersonInfo.destination}}</text>
+			</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1}}">
-			<text>是否需要送站</text>
-			<text>{{singInPersonInfo.deliveryStation_dictText}}</text>
-		</view>
+			<view wx:if="{{singInPersonInfo.pickUp == 1}}">
+				<text>到达班次</text>
+				<text>{{singInPersonInfo.arrivalShift}}</text>
+			</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1 &&  singInPersonInfo.deliveryStation == 1}}">
-			<text>离开时间</text>
-			<text>{{singInPersonInfo.departureTime}}</text>
-		</view>
+			<view>
+				<text>是否需要送站</text>
+				<text>{{singInPersonInfo.deliveryStation_dictText}}</text>
+			</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1 &&  singInPersonInfo.deliveryStation == 1}}">
-			<text>离开站</text>
-			<text>{{singInPersonInfo.departureStation}}</text>
-		</view>
+			<view wx:if="{{singInPersonInfo.deliveryStation == 1}}">
+				<text>离开时间</text>
+				<text>{{singInPersonInfo.departureTime}}</text>
+			</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1 &&  singInPersonInfo.deliveryStation == 1}}">
-			<text>离开班次</text>
-			<text>{{singInPersonInfo.departureShift}}</text>
-		</view>
+			<view wx:if="{{singInPersonInfo.deliveryStation == 1}}">
+				<text>离开站</text>
+				<text>{{singInPersonInfo.departureStation}}</text>
+			</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1 && !!singInPersonInfo.peer}}" class="sign-in">
-			<text>同行人</text>
-			<text class="sign-in-text">{{singInPersonInfo.peer}}</text>
-		</view>
+			<view wx:if="{{singInPersonInfo.deliveryStation == 1}}">
+				<text>离开班次</text>
+				<text>{{singInPersonInfo.departureShift}}</text>
+			</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 1 && !!singInPersonInfo.remark}}" class="sign-in">
-			<text>备注</text>
-			<text class="sign-in-text">{{singInPersonInfo.remark}}</text>
+			<view wx:if="{{!!singInPersonInfo.remark}}" class="sign-in">
+				<text>备注</text>
+				<text class="sign-in-text">{{singInPersonInfo.remark}}</text>
+			</view>
 		</view>
 
 		<!-- vip显示 end -->
 
 		<!-- 演讲嘉宾显示begin -->
-		<view wx:if="{{singInPersonInfo.guestType == 2}}" class="sign-in">
-			<text>演讲题目</text>
-			<text class="sign-in-text">{{singInPersonInfo.speechTopic}}</text>
-		</view>
+		<view class="inner-box-view" wx:if="{{singInPersonInfo.guestType == 2}}">
+			<view class="sign-in">
+				<text>演讲题目</text>
+				<text class="sign-in-text">{{singInPersonInfo.speechTopic}}</text>
+			</view>
 
-		<view class="meeting-files" wx:if="{{singInPersonInfo.guestType == 2}}">
-			<text>演讲PPT</text>
-			<view class="file-name" wx:for="{{speechPptList}}" wx:key="item">
-				<view>
-					<image src="../../assets/images/pdf.png"></image>
-					<text>{{item.name}}</text>
+			<view class="meeting-files">
+				<text>演讲PPT</text>
+				<view class="file-name" wx:for="{{speechPptList}}" wx:key="item">
+					<view>
+						<image src="../../assets/images/pdf.png"></image>
+						<text>{{item.name}}</text>
+					</view>
+					<text class="look-file" bindtap="previewFile" data-file='{{item}}'>查看</text>
 				</view>
-				<text class="look-file" bindtap="previewFile" data-file='{{item}}'>查看</text>
+			</view>
+
+			<view wx:if="{{!!singInPersonInfo.photo}}" style="height:auto">
+				<text>照片</text>
+				<image style='margin-right:30px' class="back-img" src="{{photoSrc}}"></image>
+			</view>
+
+			<view class="sign-in">
+				<text>个人简介</text>
+				<text class="sign-in-text">{{singInPersonInfo.profile}}</text>
+			</view>
+
+			<view>
+				<text>是否用餐</text>
+				<text>{{singInPersonInfo.haveMeals_dictText}}</text>
+			</view>
+
+			<view wx:if="{{singInPersonInfo.haveMeals === 1}}">
+				<text>是否回民</text>
+				<text>{{singInPersonInfo.huiPeople_dictText}}</text>
+			</view>
+
+			<view>
+				<text>是否需要接站</text>
+				<text>{{singInPersonInfo.pickUp_dictText}}</text>
+			</view>
+
+			<view wx:if="{{singInPersonInfo.pickUp == 1}}">
+				<text>抵达时间</text>
+				<text>{{singInPersonInfo.arrivalTime}}</text>
+			</view>
+
+			<view wx:if="{{singInPersonInfo.pickUp == 1}}">
+				<text>到达站</text>
+				<text>{{singInPersonInfo.destination}}</text>
+			</view>
+
+			<view wx:if="{{singInPersonInfo.pickUp == 1}}">
+				<text>到达班次</text>
+				<text>{{singInPersonInfo.arrivalShift}}</text>
+			</view>
+
+			<view>
+				<text>是否需要送站</text>
+				<text>{{singInPersonInfo.deliveryStation_dictText}}</text>
+			</view>
+
+			<view wx:if="{{singInPersonInfo.deliveryStation == 1}}">
+				<text>离开时间</text>
+				<text>{{singInPersonInfo.departureTime}}</text>
+			</view>
+
+			<view wx:if="{{singInPersonInfo.deliveryStation == 1}}">
+				<text>离开站</text>
+				<text>{{singInPersonInfo.departureStation}}</text>
+			</view>
+
+			<view wx:if="{{singInPersonInfo.deliveryStation == 1}}">
+				<text>离开班次</text>
+				<text>{{singInPersonInfo.departureShift}}</text>
+			</view>
+			<view wx:if="{{!!singInPersonInfo.remark}}" class="sign-in">
+				<text>备注</text>
+				<text class="sign-in-text">{{singInPersonInfo.remark}}</text>
 			</view>
 		</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 2 && !!singInPersonInfo.photo}}" style="height:auto">
-			<text>照片</text>
-			<image style='margin-right:30px' class="back-img" src="{{photoSrc}}"></image>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 2}}" class="sign-in">
-			<text>个人简介</text>
-			<text class="sign-in-text">{{singInPersonInfo.profile}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 2}}">
-			<text>是否用餐</text>
-			<text>{{singInPersonInfo.haveMeals_dictText}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 2 && singInPersonInfo.haveMeals === 1}}">
-			<text>是否回民</text>
-			<text>{{singInPersonInfo.huiPeople_dictText}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 2}}">
-			<text>是否需要接站</text>
-			<text>{{singInPersonInfo.pickUp_dictText}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 2 &&  singInPersonInfo.pickUp == 1}}">
-			<text>抵达时间</text>
-			<text>{{singInPersonInfo.arrivalTime}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 2 &&  singInPersonInfo.pickUp == 1}}">
-			<text>到达站</text>
-			<text>{{singInPersonInfo.destination}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 2 &&  singInPersonInfo.pickUp == 1}}">
-			<text>到达班次</text>
-			<text>{{singInPersonInfo.arrivalShift}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 2}}">
-			<text>是否需要送站</text>
-			<text>{{singInPersonInfo.deliveryStation_dictText}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 2 &&  singInPersonInfo.deliveryStation == 1}}">
-			<text>离开时间</text>
-			<text>{{singInPersonInfo.departureTime}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 2 &&  singInPersonInfo.deliveryStation == 1}}">
-			<text>离开站</text>
-			<text>{{singInPersonInfo.departureStation}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 2 &&  singInPersonInfo.deliveryStation == 1}}">
-			<text>离开班次</text>
-			<text>{{singInPersonInfo.departureShift}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 2 && !!singInPersonInfo.peer}}" class="sign-in">
-			<text>同行人</text>
-			<text class="sign-in-text">{{singInPersonInfo.peer}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 2 &&  !!singInPersonInfo.remark}}" class="sign-in">
-			<text>备注</text>
-			<text class="sign-in-text">{{singInPersonInfo.remark}}</text>
-		</view>
 		<!-- 演讲嘉宾end -->
 
 		<!-- 特邀嘉宾begin -->
-		<view wx:if="{{singInPersonInfo.guestType == 3}}">
-			<text>是否用餐</text>
-			<text>{{singInPersonInfo.haveMeals_dictText}}</text>
+		<view class="inner-box-view" wx:if="{{singInPersonInfo.guestType == 3}}">
+			<view>
+				<text>是否需要接站</text>
+				<text>{{singInPersonInfo.pickUp_dictText}}</text>
+			</view>
+
+			<view wx:if="{{singInPersonInfo.pickUp == 1}}">
+				<text>抵达时间</text>
+				<text>{{singInPersonInfo.arrivalTime}}</text>
+			</view>
+
+			<view wx:if="{{singInPersonInfo.pickUp == 1}}">
+				<text>到达站</text>
+				<text>{{singInPersonInfo.destination}}</text>
+			</view>
+
+			<view wx:if="{{singInPersonInfo.pickUp == 1}}">
+				<text>到达班次</text>
+				<text>{{singInPersonInfo.arrivalShift}}</text>
+			</view>
+			<view wx:if="{{singInPersonInfo.pickUp == 1}}">
+				<text>目的地</text>
+				<text>{{singInPersonInfo.destinationHotel}}</text>
+			</view>
+
+			<view>
+				<text>是否需要送站</text>
+				<text>{{singInPersonInfo.deliveryStation_dictText}}</text>
+			</view>
+
+			<view wx:if="{{singInPersonInfo.deliveryStation == 1}}">
+				<text>离开时间</text>
+				<text>{{singInPersonInfo.departureTime}}</text>
+			</view>
+
+			<view wx:if="{{singInPersonInfo.deliveryStation == 1}}">
+				<text>离开站</text>
+				<text>{{singInPersonInfo.departureStation}}</text>
+			</view>
+
+			<view wx:if="{{singInPersonInfo.deliveryStation == 1}}">
+				<text>离开班次</text>
+				<text>{{singInPersonInfo.departureShift}}</text>
+			</view>
 		</view>
 
-		<view wx:if="{{singInPersonInfo.guestType == 3 && singInPersonInfo.haveMeals === 1}}">
-			<text>是否回民</text>
-			<text>{{singInPersonInfo.huiPeople_dictText}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 3}}">
-			<text>是否需要接站</text>
-			<text>{{singInPersonInfo.pickUp_dictText}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 3 &&  singInPersonInfo.pickUp == 1}}">
-			<text>抵达时间</text>
-			<text>{{singInPersonInfo.arrivalTime}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 3 &&  singInPersonInfo.pickUp == 1}}">
-			<text>到达站</text>
-			<text>{{singInPersonInfo.destination}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 3 &&  singInPersonInfo.pickUp == 1}}">
-			<text>到达班次</text>
-			<text>{{singInPersonInfo.arrivalShift}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 3}}">
-			<text>是否需要送站</text>
-			<text>{{singInPersonInfo.deliveryStation_dictText}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 3 &&  singInPersonInfo.deliveryStation == 1}}">
-			<text>离开时间</text>
-			<text>{{singInPersonInfo.departureTime}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 3 &&  singInPersonInfo.deliveryStation == 1}}">
-			<text>离开站</text>
-			<text>{{singInPersonInfo.departureStation}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 3 &&  singInPersonInfo.deliveryStation == 1}}">
-			<text>离开班次</text>
-			<text>{{singInPersonInfo.departureShift}}</text>
-		</view>
-
-		<view wx:if="{{singInPersonInfo.guestType == 3 && !!singInPersonInfo.peer}}" class="sign-in">
-			<text>同行人</text>
-			<text class="sign-in-text">{{singInPersonInfo.peer}}</text>
-		</view>
 		<!-- 特邀嘉宾end -->
 
 		<!-- 合作伙伴begin -->
diff --git a/pages/signUpPageGuoji/signUpPageGuoji.js b/pages/signUpPageGuoji/signUpPageGuoji.js
index 5f546f6..bd135b7 100644
--- a/pages/signUpPageGuoji/signUpPageGuoji.js
+++ b/pages/signUpPageGuoji/signUpPageGuoji.js
@@ -409,14 +409,24 @@ Page({
         meetingCostSum = this.data.meetingDetailInfo.meetingCostsTwoTopic
       }
     }
-    // let choiceTopicArr = arr.filter(item =>  (item + '') !== (LinkTopicsEnums.freeTwo.index + ''))
-    // if (choiceTopicArr.length > 2) {
-    //   meetingCostSum = this.data.meetingDetailInfo.meetingCostsThreeTopic
-    // } else {
-    //   meetingCostSum = this.data.meetingDetailInfo.meetingCostsTwoTopic
-    // }
     return meetingCostSum
   },
+  // 取消会议名称的选中
+  cancelChoiceTopic() {
+  // this.form.setFieldsValue({
+  //   choiceTopic: [],
+  //   radioKey: undefined,
+  //   radioKeyTwo: undefined,
+  // })
+  let updateObj = {}
+  this.updateCheckboxArr(this.data.showTopicsArr, [], 'all')
+  updateObj.showTopicsArr = this.data.showTopicsArr
+  updateObj.meetingCosts = this.handleMeetingCostSum()
+  this.setData({
+    ...updateObj
+  })
+
+},
   // 获取国际研讨会-能选择课题的数据字典数据
   getLinkTopicsOptionArr(meetingId) {
     MeetingApi.getLinkTopics({
@@ -1031,7 +1041,8 @@ Page({
       return
     }
     // 是否用餐
-    if (this.data.guestType !== '4' && this.data.guestType !== '5' && this.data.identity === '1' && (formData.haveMeals == '' || formData.haveMeals === undefined)) {
+    // VIP 和 演讲嘉宾 需要吃饭
+    if ((this.data.guestType === '1' || this.data.guestType === '2') && this.data.identity === '1' && (formData.haveMeals == '' || formData.haveMeals === undefined)) {
       wx.showToast({
         title: '请选择是否用餐',
         icon: 'none',
@@ -1040,7 +1051,7 @@ Page({
       return
     }
     // 是否回民 选择了是否用餐才去校验
-    if (this.data.guestType !== '4' && this.data.guestType !== '5' && this.data.haveMeal === '1' && (formData.huiPeople == '' || formData.huiPeople === undefined)) {
+    if ((this.data.guestType === '1' || this.data.guestType === '2') && this.data.haveMeal === '1' && (formData.huiPeople == '' || formData.huiPeople === undefined)) {
       wx.showToast({
         title: '请选择是否回民',
         icon: 'none',
@@ -1060,7 +1071,7 @@ Page({
     }
     // 入住酒店时间
 
-    if ((formData.inHotelTime === '' || formData.inHotelTime === null || formData.inHotelTime === undefined) && this.data.needHotel === '1' && this.data.guestType === '1') {
+    if ((formData.inHotelTime === '请选择入住酒店时间' || formData.inHotelTime === '' || formData.inHotelTime === null || formData.inHotelTime === undefined) && this.data.needHotel === '1' && this.data.guestType === '1') {
       wx.showToast({
         title: '请选择入住酒店时间',
         icon: 'none',
@@ -1071,7 +1082,7 @@ Page({
 
     // 离店时间
 
-    if ((formData.outHotelTime === '' || formData.outHotelTime === null || formData.outHotelTime === undefined) && this.data.needHotel === '1' && this.data.guestType === '1') {
+    if ((formData.outHotelTime === '请选择离店时间' || formData.outHotelTime === '' || formData.outHotelTime === null || formData.outHotelTime === undefined) && this.data.needHotel === '1' && this.data.guestType === '1') {
       wx.showToast({
         title: '请选择离店时间',
         icon: 'none',
@@ -1103,7 +1114,7 @@ Page({
     }
 
     // 是否需要接站
-    if (this.data.identity === '1' && this.data.guestType !== '4' && formData.pickUp === '') {
+    if (this.data.identity === '1' && (this.data.guestType === '1' || this.data.guestType === '2' || this.data.guestType === '3') && formData.pickUp === '') {
       wx.showToast({
         title: '请选择是否需要接站',
         icon: 'none',
@@ -1112,7 +1123,7 @@ Page({
       return
     }
     // 抵达时间
-    if (this.data.identity === '1' && this.data.needPick === '1' && this.data.guestType !== '4' && (formData.arrivalTime === '' || formData.arrivalTime === null || formData.arrivalTime === undefined)) {
+    if (this.data.identity === '1' && this.data.needPick === '1' && (this.data.guestType === '1' || this.data.guestType === '2' || this.data.guestType === '3') && (formData.arrivalTime === '请选择抵达时间' || formData.arrivalTime === '' || formData.arrivalTime === null || formData.arrivalTime === undefined)) {
       wx.showToast({
         title: '请选择抵达时间',
         icon: 'none',
@@ -1122,16 +1133,16 @@ Page({
     }
 
     // 到达站
-    if (this.data.identity === '1' && this.data.needPick === '1' && this.data.guestType !== '4' && formData.destination === '') {
+    if (this.data.identity === '1' && this.data.needPick === '1' && (this.data.guestType === '1' || this.data.guestType === '2' || this.data.guestType === '3') && formData.destination === '') {
       wx.showToast({
-        title: '请选择到达站',
+        title: '请输入到达站',
         icon: 'none',
         duration: 2000
       })
       return
     }
     // 到达班次
-    if (this.data.identity === '1' && this.data.needPick === '1' && this.data.guestType !== '4' && formData.arrivalShift === '') {
+    if (this.data.identity === '1' && this.data.needPick === '1' && (this.data.guestType === '1' || this.data.guestType === '2' || this.data.guestType === '3') && formData.arrivalShift === '') {
       wx.showToast({
         title: '请输入到达班次',
         icon: 'none',
@@ -1140,7 +1151,7 @@ Page({
       return
     }
     // 是否需要送站
-    if (this.data.identity === '1' && this.data.guestType !== '4' && formData.deliveryStation === '') {
+    if (this.data.identity === '1' && (this.data.guestType === '1' || this.data.guestType === '2' || this.data.guestType === '3') && formData.deliveryStation === '') {
       wx.showToast({
         title: '请选择是否需要送站',
         icon: 'none',
@@ -1150,7 +1161,7 @@ Page({
     }
 
     // 离开时间
-    if (this.data.identity === '1' && this.data.needSend === '1' && this.data.guestType !== '4' && (formData.departureTime === '' || formData.departureTime === null || formData.departureTime === undefined)) {
+    if (this.data.identity === '1' && this.data.needSend === '1' && (this.data.guestType === '1' || this.data.guestType === '2' || this.data.guestType === '3') && (formData.departureTime === '请选择离开时间' || formData.departureTime === null || formData.departureTime === undefined || formData.departureTime === '')) {
       wx.showToast({
         title: '请选择离开时间',
         icon: 'none',
@@ -1172,7 +1183,7 @@ Page({
       }
     }
     // 离开站
-    if (this.data.identity === '1' && this.data.needSend === '1' && this.data.guestType !== '4' && formData.departureStation === '') {
+    if (this.data.identity === '1' && this.data.needSend === '1' && (this.data.guestType === '1' || this.data.guestType === '2' || this.data.guestType === '3') && formData.departureStation === '') {
       wx.showToast({
         title: '请输入离开站',
         icon: 'none',
@@ -1182,7 +1193,7 @@ Page({
     }
     // 离开班次
 
-    if (this.data.identity === '1' && this.data.needSend === '1' && this.data.guestType !== '4' && formData.departureShift === '') {
+    if (this.data.identity === '1' && this.data.needSend === '1' && (this.data.guestType === '1' || this.data.guestType === '2' || this.data.guestType === '3') && formData.departureShift === '') {
       wx.showToast({
         title: '请输入离开班次',
         icon: 'none',
@@ -1550,6 +1561,7 @@ Page({
 
       this.data.guestInfo.destination = this.model.destination // 到达站
       this.data.guestInfo.arrivalShift = this.model.arrivalShift // 到达班次：
+      this.data.guestInfo.destinationHotel = this.model.destinationHotel // 目的地
 
       this.updateRadioArr(this.data.needDeliveryStationArr, this.model.deliveryStation)
       updateObj.needDeliveryStationArr = this.data.needDeliveryStationArr
@@ -1559,7 +1571,7 @@ Page({
       updateObj.departureTime = this.model.departureTime // 离开时间
       this.data.guestInfo.departureStation = this.model.departureStation // 离开站
       this.data.guestInfo.departureShift = this.model.departureShift // 离开班次
-      this.data.guestInfo.peer = this.model.peer // 同行人
+      // this.data.guestInfo.peer = this.model.peer // 同行人
       this.data.guestInfo.remark = this.model.remark // 备注
 
 
@@ -1613,9 +1625,19 @@ Page({
         nolimitBool: true
       })
     }
+    // const selectedPerson = {
+    //   id: '1512328026601971713',
+    //   name: '冯晨晨'
+    // }
+    // const selectedCompany = {
+    //   id: '1474318633772642306',
+    //   companyName: '天津合众未来科技有限公司'
+    // }
+    // const  phone = '15933298982'
     this.setData({
-      pageTitle: options.id ? '编辑报名信息' : '会议报名'
+      pageTitle: options.id ? '编辑报名信息' : '会议报名',
     })
+
     if (options.id) {
       this.isEdit = options.ope === 'edit'
       this.lastPage = `../${options.page}/${options.page}`
diff --git a/pages/signUpPageGuoji/signUpPageGuoji.wxml b/pages/signUpPageGuoji/signUpPageGuoji.wxml
index 51c6902..7f24e95 100644
--- a/pages/signUpPageGuoji/signUpPageGuoji.wxml
+++ b/pages/signUpPageGuoji/signUpPageGuoji.wxml
@@ -49,6 +49,9 @@
             </view>
 
           </checkbox-group>
+          <view class="form-item">
+            <button class="validate-btn" bindtap="cancelChoiceTopic">清空会议信息</button>
+          </view>
         </view>
 
       </view>
@@ -202,7 +205,6 @@
       <!-- vip显示 -->
       <view wx:if="{{vipBool}}">
 
-
         <view class="form-item">
           <text class="item-label flex-1">演讲题目：</text>
           <input placeholder-class="text-right" name="speechTopic" placeholder="请输入演讲题目" value="{{guestInfo.speechTopic}}" />
@@ -354,11 +356,6 @@
           <input placeholder-class="text-right" name="departureShift" bindinput="bindInputPhone" placeholder="请输入离开班次" value="{{guestInfo.departureShift}}" />
         </view>
 
-        <view class="form-item">
-          <text class="item-label flex-1">同行人：</text>
-          <input placeholder-class="text-right" name="peer" bindinput="bindInputPhone" placeholder="请输入同行人" value="{{guestInfo.peer}}" />
-        </view>
-
         <view class="form-item-radio">
           <text class="item-label flex-1">备注：</text>
           <textarea name="remark" placeholder="请输入备注" name="remark" value="{{guestInfo.remark}}" />
@@ -372,7 +369,6 @@
       <!--  演讲嘉宾显示 -->
       <view wx:if="{{speakerBool}}">
 
-
         <view class="form-item">
           <text class="item-label flex-1">演讲题目：</text>
           <input placeholder-class="text-right" name="speechTopic" placeholder="请输入演讲题目" value="{{guestInfo.speechTopic}}" />
@@ -454,7 +450,10 @@
           <text class="item-label flex-1 validate">到达班次：</text>
           <input placeholder-class="text-right" name="arrivalShift" bindinput="bindInputPhone" placeholder="请输入到达班次" value="{{guestInfo.arrivalShift}}" />
         </view>
-
+        <view class="form-item" wx:if="{{needPick === '1' }}">
+          <text class="item-label flex-1">目的地</text>
+          <input placeholder-class="text-right" name="destinationHotel" placeholder="请输入目的地" value="{{guestInfo.destinationHotel}}" />
+        </view>
 
         <view class="form-item-radio">
           <view class="radio-label">
@@ -488,10 +487,6 @@
           <input placeholder-class="text-right" name="departureShift" placeholder="请输入离开班次" value="{{guestInfo.departureShift}}" />
         </view>
 
-        <view class="form-item">
-          <text class="item-label flex-1">同行人：</text>
-          <input placeholder-class="text-right" name="peer" placeholder="请输入同行人" value="{{guestInfo.peer}}" />
-        </view>
 
         <view class="form-item-radio">
           <text class="item-label flex-1">备注：</text>
@@ -505,33 +500,6 @@
       </view>
       <!-- 特邀嘉宾显示  -->
       <view wx:if="{{guestBool}}">
-
-        <view class="form-item-radio">
-          <view class="radio-label">
-            <text class="item-label flex-1 validate">是否用餐：</text>
-          </view>
-          <view>
-            <radio-group name='haveMeals' bindchange="needHaveMeal">
-              <label class="radio radio-item" wx:for="{{needHaveMealsArr}}" wx:key="item">
-                <radio class="radio-scale" value="{{item.value}}" color="#069F99" checked="{{item.checked}}" />{{item.name}}
-              </label>
-            </radio-group>
-          </view>
-        </view>
-
-        <view class="form-item-radio" wx:if="{{haveMeal === '1'}}">
-          <view class="radio-label">
-            <text class="item-label flex-1 validate">是否回民：</text>
-          </view>
-          <view>
-            <radio-group name='huiPeople'>
-              <label class="radio radio-item" wx:for="{{needHuiPeopleArr}}" wx:key="item">
-                <radio class="radio-scale" value="{{item.value}}" color="#069F99" checked="{{item.checked}}" />{{item.name}}
-              </label>
-            </radio-group>
-          </view>
-        </view>
-
         <view class="form-item-radio">
           <view class="radio-label">
             <text class="item-label flex-1 validate">是否需要接站：</text>
@@ -563,6 +531,10 @@
           <text class="item-label flex-1 validate">到达班次：</text>
           <input placeholder-class="text-right" name="arrivalShift" bindinput="bindInputPhone" placeholder="请输入到达班次" value="{{guestInfo.arrivalShift}}" />
         </view>
+        <view class="form-item" wx:if="{{needPick === '1' }}">
+          <text class="item-label flex-1">目的地</text>
+          <input placeholder-class="text-right" name="destinationHotel" placeholder="请输入目的地" value="{{guestInfo.destinationHotel}}" />
+        </view>
 
 
         <view class="form-item-radio">
@@ -597,10 +569,6 @@
           <input placeholder-class="text-right" name="departureShift" bindinput="bindInputPhone" placeholder="请输入离开班次" value="{{guestInfo.departureShift}}" />
         </view>
 
-        <view class="form-item">
-          <text class="item-label flex-1">同行人：</text>
-          <input placeholder-class="text-right" name="peer" placeholder="请输入同行人" value="{{guestInfo.peer}}" />
-        </view>
         <view class="form-item-radio">
           <text class="item-label flex-1">备注：</text>
           <textarea name="remark" placeholder="请输入备注" name="remark" value="{{guestInfo.remark}}" />
@@ -611,7 +579,7 @@
         </view>
 
       </view>
-      <!-- 合作伙伴显示 -->
+      <!-- 合作伙伴 || 参展商类别显示 -->
       <view wx:if="{{cooperatieBool}}">
 
         <view class="form-item">