From 4d1eac281deaf8f9934338afa20a8dc5a6563614 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Mon, 10 Jan 2022 22:43:22 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E3=80=81=E7=90=86=E4=BA=8B=E4=BC=9A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E3=80=81=E4=BC=9A=E8=AE=AE=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=20=E4=B8=8A=E4=BC=A0=E5=87=AD=E8=AF=81=E3=80=81=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E5=87=AD=E8=AF=81=20=E5=88=A4=E6=96=AD=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/detailPage/MeetingList.vue        | 16 ++++++++++++----
 src/views/meetingActivity/MeetingActivity.vue    |  7 ++++---
 .../standardsAssociation/meeting/MeetingList.vue |  4 ++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/components/detailPage/MeetingList.vue b/src/components/detailPage/MeetingList.vue
index 5c510af..b5a932e 100644
--- a/src/components/detailPage/MeetingList.vue
+++ b/src/components/detailPage/MeetingList.vue
@@ -39,10 +39,18 @@
         <!-- 可报名 或者不存在会议报名状态 且 会议未结束 有报名按钮 -->
 <!--        <a v-if="record.meetingStatus !== MeetingStatusEnums.ended.index && (record.signUpStatus === SignUpStatusEnum.canReport.index || !record.signUpStatus)" class="action-btn" @click="signUpRecord(record)">报名</a>-->
         <a v-if="Number(record.meetingSignUpType) === MeetingSignUpTypeEnums.canSignUp.index && !compareCurrentTime(record.registerDeadline)" class="action-btn" @click="signUpRecord(record)">报名</a>
-        <!-- 凭证待审核 状态有查看凭证按钮 -->
-        <a v-if="record.signUpStatus === SignUpStatusEnum.pendingReviewVoucher.index" class="action-btn" @click="uploadPaymentRecord(record)">查看凭证</a>
-        <!-- 待上传凭证 | 凭证被拒绝 状态有上传凭证按钮 -->
-        <a v-if="record.signUpStatus === SignUpStatusEnum.pendingUploadVoucher.index || record.signUpStatus === SignUpStatusEnum.rejectedVoucher.index" class="action-btn" @click="uploadPaymentRecord(record)">上传凭证</a>
+        <!-- A 缴费方式 为 汇款 或者现场缴费 B 会议状态为进行中 C 报名审核信息通过 D 会议的状态 不是待签到 -->
+        <template
+          v-if="(record.payMode === 2 || record.payMode === 1)
+                && record.meetingStatus === MeetingStatusEnums.onGoing.index
+                && record.registerCheckResult === 1
+                && record.signUpStatus !== SignUpStatusEnum.pendingSignIn.index"
+        >
+          <!-- 凭证待审核 状态有查看凭证按钮 -->
+          <a v-if="record.signUpStatus === SignUpStatusEnum.pendingReviewVoucher.index" class="action-btn" @click="uploadPaymentRecord(record)">查看凭证</a>
+          <!-- 待上传凭证 | 凭证被拒绝 状态有上传凭证按钮 -->
+          <a v-if="record.signUpStatus === SignUpStatusEnum.pendingUploadVoucher.index || record.signUpStatus === SignUpStatusEnum.rejectedVoucher.index" class="action-btn" @click="uploadPaymentRecord(record)">上传凭证</a>
+        </template>
         <!-- 待签到状态 显示-->
         <a v-if="record.signUpStatus === SignUpStatusEnum.pendingSignIn.index" class="action-btn action-text">请用小程序现场签到</a>
       </template>
diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue
index e593cb7..ccecc49 100644
--- a/src/views/meetingActivity/MeetingActivity.vue
+++ b/src/views/meetingActivity/MeetingActivity.vue
@@ -114,15 +114,16 @@
             <p class="item-meeting-img item-meeting-meetingTime item-sign-up-status">
               <img src="../../assets/meetingImgs/meeting-audit.png"
                    class="audit-img"/>报名状态：{{ item.signUpStatus_dictText || '无' }}
-              <!-- A 缴费方式 为 汇款 或者现场缴费 B 会议状态为 未开始 或 进行中 C 报名审核信息通过 D 会议的状态 不是待签到 -->
-            <!--  -->
+
               <!-- 可报名 状态有报名按钮 -->
               <a-button v-if="Number(item.meetingSignUpType) === MeetingSignUpTypeEnums.canSignUp.index && !compareCurrentTime(item.registerDeadline)" class="cell-btn"
                         type="primary"
                         @click.stop="signUpRecord(item)">报名
               </a-button>
+              <!-- A 缴费方式 为 汇款 或者现场缴费 B 会议状态为进行中 C 报名审核信息通过 D 会议的状态 不是待签到 -->
               <template
-                v-if="(item.payMode === 2 || item.payMode === 1) && (item.meetingStatus == MeetingStatusEnums.noStart.index || item.meetingStatus === MeetingStatusEnums.onGoing.index)
+                v-if="(item.payMode === 2 || item.payMode === 1)
+                && item.meetingStatus === MeetingStatusEnums.onGoing.index
                 && item.registerCheckResult === 1
                 && item.signUpStatus !== SignUpStatusEnum.pendingSignIn.index"
               >
diff --git a/src/views/standardsAssociation/meeting/MeetingList.vue b/src/views/standardsAssociation/meeting/MeetingList.vue
index cd6b004..7df882d 100644
--- a/src/views/standardsAssociation/meeting/MeetingList.vue
+++ b/src/views/standardsAssociation/meeting/MeetingList.vue
@@ -106,10 +106,10 @@
               <a-button v-if="Number(item.meetingSignUpType) === MeetingSignUpTypeEnums.canSignUp.index && !compareCurrentTime(item.registerDeadline)" class="cell-btn" type="primary"
                         @click.stop="signUpRecord(item)">报名
               </a-button>
-              <!-- A 缴费方式 为 汇款 或者现场缴费 B 会议状态为 未开始 或 进行中 C 报名审核信息通过 D 会议的状态 不是待签到 -->
+              <!-- A 缴费方式 为 汇款 或者现场缴费 B 会议状态为进行中 C 报名审核信息通过 D 会议的状态 不是待签到 -->
               <template
                 v-if="(item.payMode === 2 || item.payMode === 1)
-                && (item.meetingStatus == MeetingStatusEnums.noStart.index || item.meetingStatus === MeetingStatusEnums.onGoing.index)
+                && item.meetingStatus === MeetingStatusEnums.onGoing.index
                 && item.registerCheckResult === 1
                 && item.signUpStatus !== SignUpStatusEnum.pendingSignIn.index"
               >