From abd5087c07c3eb8fe6abb11eada1f5c159e3390e Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 1 Jul 2022 15:38:34 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E7=A0=94=E8=AE=A8=E4=BC=9A=E5=A2=9E=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E5=B1=95=E5=95=86=E7=B1=BB=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/MessagePage/MeetingDetailModal.vue        |  4 ++--
 .../meetingActivity/modules/CooperativeForm.vue     |  1 +
 .../meetingActivity/modules/EditSignUpInfo.vue      |  8 +++++++-
 .../meetingActivity/modules/SpeakGuestForm.vue      |  1 +
 .../meetingActivity/modules/TeyaoGuestForm.vue      |  1 +
 src/views/meetingActivity/modules/VipForm.vue       |  1 +
 src/views/signUp/SignUpPage.vue                     | 13 +++++++++++--
 7 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue
index a15865b..17a4b78 100644
--- a/src/views/MessagePage/MeetingDetailModal.vue
+++ b/src/views/MessagePage/MeetingDetailModal.vue
@@ -525,8 +525,8 @@
                 </a-col>
               </a-row>
             </section>
-            <!--合作伙伴身份显示 -->
-            <a-row :gutter="24" class="flex-col" v-show="situationInfo.guestType == 4 ">
+            <!--合作伙伴或者参展商身份显示 -->
+            <a-row :gutter="24" class="flex-col" v-show="situationInfo.guestType == 4 || situationInfo.guestType == 5 ">
               <a-col :span="12" v-show="situationInfo.arrivalTime">
                 <label>抵达时间：</label>
                 <span>{{ situationInfo.arrivalTime }}</span>
diff --git a/src/views/meetingActivity/modules/CooperativeForm.vue b/src/views/meetingActivity/modules/CooperativeForm.vue
index cc4decc..eda112d 100644
--- a/src/views/meetingActivity/modules/CooperativeForm.vue
+++ b/src/views/meetingActivity/modules/CooperativeForm.vue
@@ -60,6 +60,7 @@
               <a-radio :value="2">演讲嘉宾</a-radio>
               <a-radio :value="3">特邀嘉宾</a-radio>
               <a-radio :value="4">合作伙伴</a-radio>
+              <a-radio :value="5">参展商</a-radio>
             </a-radio-group>
           </a-form-item>
         </a-col>
diff --git a/src/views/meetingActivity/modules/EditSignUpInfo.vue b/src/views/meetingActivity/modules/EditSignUpInfo.vue
index b93321a..2ccd9e5 100644
--- a/src/views/meetingActivity/modules/EditSignUpInfo.vue
+++ b/src/views/meetingActivity/modules/EditSignUpInfo.vue
@@ -11,7 +11,7 @@
     <vip-form ref="vipForm" v-if="model.guestType === 1" @ok="handleCancel"></vip-form>
     <speak-guest-form ref="speakGuestForm" @ok="handleCancel" v-if="model.guestType === 2"></speak-guest-form>
     <teyao-guest-form ref="teyaoGuestForm" @ok="handleCancel" v-if="model.guestType === 3"></teyao-guest-form>
-    <cooperative-form ref="cooperativeForm"  @ok="handleCancel"  v-if="model.guestType === 4"></cooperative-form>
+    <cooperative-form ref="cooperativeForm"  @ok="handleCancel"  v-if="(model.guestType === 4 ||model.guestType === 5)"></cooperative-form>
   </j-modal>
 </template>
 
@@ -89,6 +89,9 @@ export default {
         case 4 :
           this.$refs.cooperativeForm && this.$refs.cooperativeForm.initForm(this.model)
           break
+        case 5 :
+          this.$refs.cooperativeForm && this.$refs.cooperativeForm.initForm(this.model)
+          break
       }
     },
     close() {
@@ -108,6 +111,9 @@ export default {
         case 4 :
           this.$refs.cooperativeForm && this.$refs.cooperativeForm.handleOk()
           break
+        case 5 :
+          this.$refs.cooperativeForm && this.$refs.cooperativeForm.handleOk()
+          break
       }
       this.visible = true
     },
diff --git a/src/views/meetingActivity/modules/SpeakGuestForm.vue b/src/views/meetingActivity/modules/SpeakGuestForm.vue
index 38eeeae..24fce6e 100644
--- a/src/views/meetingActivity/modules/SpeakGuestForm.vue
+++ b/src/views/meetingActivity/modules/SpeakGuestForm.vue
@@ -60,6 +60,7 @@
               <a-radio :value="2">演讲嘉宾</a-radio>
               <a-radio :value="3">特邀嘉宾</a-radio>
               <a-radio :value="4">合作伙伴</a-radio>
+              <a-radio :value="5">参展商</a-radio>
             </a-radio-group>
           </a-form-item>
         </a-col>
diff --git a/src/views/meetingActivity/modules/TeyaoGuestForm.vue b/src/views/meetingActivity/modules/TeyaoGuestForm.vue
index 9565a0b..1a764b8 100644
--- a/src/views/meetingActivity/modules/TeyaoGuestForm.vue
+++ b/src/views/meetingActivity/modules/TeyaoGuestForm.vue
@@ -60,6 +60,7 @@
               <a-radio :value="2">演讲嘉宾</a-radio>
               <a-radio :value="3">特邀嘉宾</a-radio>
               <a-radio :value="4">合作伙伴</a-radio>
+              <a-radio :value="5">参展商</a-radio>
             </a-radio-group>
           </a-form-item>
         </a-col>
diff --git a/src/views/meetingActivity/modules/VipForm.vue b/src/views/meetingActivity/modules/VipForm.vue
index ffd20da..82852ee 100644
--- a/src/views/meetingActivity/modules/VipForm.vue
+++ b/src/views/meetingActivity/modules/VipForm.vue
@@ -60,6 +60,7 @@
               <a-radio :value="2">演讲嘉宾</a-radio>
               <a-radio :value="3">特邀嘉宾</a-radio>
               <a-radio :value="4">合作伙伴</a-radio>
+              <a-radio :value="5">参展商</a-radio>
             </a-radio-group>
           </a-form-item>
         </a-col>
diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index ad8afee..5d8722b 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -210,8 +210,8 @@
                 <seminar-vip-form ref="seminarVipForm" @formData="getFormData"
                                   :guest-type="guestType"></seminar-vip-form>
               </template>
-              <!-- 国际研讨会身份选择嘉宾 并且是合作伙伴-->
-              <template v-if="identifyType === 1 && guestType === 4">
+              <!-- 国际研讨会身份选择嘉宾 并且是合作伙伴或者参展商-->
+              <template v-if="identifyType === 1 && (guestType === 4 || guestType === 5)">
                 <seminar-partner-form ref="seminarPartnerForm" @formData="getFormData"></seminar-partner-form>
               </template>
               <section class="meetingCost">
@@ -699,6 +699,11 @@ export default {
               this.identifyType = 1
               this.guestType = 1
               break
+            // 参展商
+            case this.currentMeetingInfo.exhibitorInvitationCode:
+              this.identifyType = 1
+              this.guestType = 5
+              break
             default :
               this.guestType = null
           }
@@ -735,6 +740,10 @@ export default {
         case this.currentMeetingInfo.vipInvitationCode:
           flag = true
           break
+        // 参展商
+        case this.currentMeetingInfo.exhibitorInvitationCode:
+          flag = true
+          break
         default :
           flag = false
       }