From c63a26c9fd0c218f78cc01ff521bd18be4aac308 Mon Sep 17 00:00:00 2001
From: fengchenchen <syxysoft.com>
Date: Mon, 27 Jun 2022 14:21:58 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E6=8A=A5=E5=90=8D=E9=A1=B5=E9=9D=A2=EF=BC=9A=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=20=E4=BF=AE=E6=94=B9=E6=88=90=20=E2=80=9C?=
 =?UTF-8?q?=E9=9D=9E=E6=A0=87=E5=8D=8F=E4=BC=9A=E5=91=98=E2=80=9D=EF=BC=9B?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BA=A4=E6=B5=81=E4=BC=9A=E5=8F=AA=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=80=E4=B8=AA=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/signUp/SignUpEntrance.vue | 5 +++--
 src/views/signUp/SignUpPage.vue     | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/signUp/SignUpEntrance.vue b/src/views/signUp/SignUpEntrance.vue
index e305883..8da84cf 100644
--- a/src/views/signUp/SignUpEntrance.vue
+++ b/src/views/signUp/SignUpEntrance.vue
@@ -181,8 +181,9 @@ export default {
             })
           }
           // 初始化会议费用
-          if (this.currentMeetingInfo.meetingCostsVip) {
-            this.meetingMoney = `普通会员(${this.currentMeetingInfo.meetingCosts}/人)  标协会员(${this.currentMeetingInfo.meetingCostsVip}/人)`
+          // 有vip会议费用 并且 不是 信息交流会（年会）
+          if (this.currentMeetingInfo.meetingCostsVip && (this.currentMeetingInfo.tbMeetingType + '' !== '3')) {
+            this.meetingMoney = `非标协会员(${this.currentMeetingInfo.meetingCosts}/人)  标协会员(${this.currentMeetingInfo.meetingCostsVip}/人)`
           } else {
             this.meetingMoney = ` ${this.currentMeetingInfo.meetingCosts}/人`
           }
diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index bc70dc4..6a1e4a9 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -374,8 +374,9 @@ export default {
           this.currentMeetingInfo = res.result
           this.meetingType = this.currentMeetingInfo.meetingType
           // 初始化会议费用
-          if (this.currentMeetingInfo.meetingCostsVip) {
-            this.meetingMoney = `普通会员(${this.currentMeetingInfo.meetingCosts}/人)  标协会员(${this.currentMeetingInfo.meetingCostsVip}/人)`
+          // 有vip会议费用 并且 不是 信息交流会（年会）
+          if (this.currentMeetingInfo.meetingCostsVip && (this.currentMeetingInfo.tbMeetingType + '' !== '3')) {
+            this.meetingMoney = `非标协会员(${this.currentMeetingInfo.meetingCosts}/人)  标协会员(${this.currentMeetingInfo.meetingCostsVip}/人)`
             // 费用合计
             this.meetingCostSum = this.currentMeetingInfo.meetingCosts
           } else {