diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue
index 27ed5c7..ffc5c0a 100644
--- a/src/views/MessagePage/MeetingDetailModal.vue
+++ b/src/views/MessagePage/MeetingDetailModal.vue
@@ -78,7 +78,7 @@
       <a-row :gutter="24" class="flex-col">
         <a-col :span="24">
           <label>会议内容：</label>
-          <span><j-ellipsis :value="model.meetingContent" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="model.meetingContent" :length="100"></j-ellipsis></span>
         </a-col>
       </a-row>
     </section>
diff --git a/src/views/MessagePage/UploadMeetingCertificateModal.vue b/src/views/MessagePage/UploadMeetingCertificateModal.vue
index f6afd6c..9667a59 100644
--- a/src/views/MessagePage/UploadMeetingCertificateModal.vue
+++ b/src/views/MessagePage/UploadMeetingCertificateModal.vue
@@ -18,9 +18,9 @@
       <section class="base-info">
         <h3 class="title">报名信息</h3>
         <a-row :gutter="24" class="flex-col">
-          <a-col :span="12">
+          <a-col :span="24">
             <label>参会单位：</label>
-            <span><j-ellipsis :value="model.companyName" :length="20"></j-ellipsis></span>
+            <span><j-ellipsis :value="model.companyName" :length="40"></j-ellipsis></span>
           </a-col>
 
         </a-row>
@@ -35,27 +35,27 @@
           </a-col>
         </a-row>
         <a-row :gutter="24" class="flex-col">
-          <a-col :span="12">
-            <label>付款方式：</label>
-            <span><j-ellipsis :value="model.payMode_dictText " :length="20"></j-ellipsis></span>
-          </a-col>
           <a-col :span="12">
             <label>手机号：</label>
             <span><j-ellipsis :value="model.phone" :length="20"></j-ellipsis></span>
           </a-col>
+          <a-col :span="12">
+            <label>付款方式：</label>
+            <span><j-ellipsis :value="model.payMode_dictText " :length="20"></j-ellipsis></span>
+          </a-col>
         </a-row>
         <a-row :gutter="24" class="flex-col">
           <a-col :span="12">
             <label>需要发票：</label>
             <span><j-ellipsis :value="model.needInvoice_dictText" :length="20"></j-ellipsis></span>
           </a-col>
-        </a-row>
-        <!--        打包 或者不需要发票 不显示 邮寄信息 -->
-        <a-row :gutter="24" v-if="model.needInvoice !== 0" class="flex-col">
-          <a-col :span="12">
+          <a-col :span="12" v-if="model.needInvoice !== 0">
             <label>发票邮寄地址：</label>
             <span><j-ellipsis :value="model.postContactAddress" :length="20"></j-ellipsis></span>
           </a-col>
+        </a-row>
+        <!--        打包 或者不需要发票 不显示 邮寄信息 -->
+        <a-row :gutter="24" v-if="model.needInvoice !== 0" class="flex-col">
           <a-col :span="12">
             <label>邮编：</label>
             <span><j-ellipsis :value="model.postCode" :length="20"></j-ellipsis></span>
@@ -379,4 +379,4 @@ h3.title::before {
     border-bottom: 1px solid #ccc;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/standardsAssociation/meeting/MeetingList.vue b/src/views/standardsAssociation/meeting/MeetingList.vue
index e250684..86d766e 100644
--- a/src/views/standardsAssociation/meeting/MeetingList.vue
+++ b/src/views/standardsAssociation/meeting/MeetingList.vue
@@ -73,7 +73,8 @@
       <!--列表区域begin-->
       <a-spin :spinning="loading">
         <div class="list" v-if="tableData.length > 0">
-          <div class="item-meeting" v-for="(item,index) of tableData" :key="index" @click.stop="openMeetingDetail(item)">
+          <div class="item-meeting" v-for="(item,index) of tableData" :key="index"
+               @click.stop="openMeetingDetail(item)">
             <p class="item-meeting-meetingName">
               <j-ellipsis
                 class="primary-color"
@@ -98,23 +99,40 @@
               <j-ellipsis :value="item.venue + '/' + item.address " :length="20"></j-ellipsis>
             </p>
             <!-- 报名状态  缴费方式为打包 不显示  item.signUpStatus !== null-->
-            <p class="item-meeting-img item-meeting-meetingTime" v-show="item.payMode !== 3 ">
+            <p class="item-meeting-img item-meeting-meetingTime item-sign-up-status" v-show="item.payMode !== 3 ">
               <img src="@/assets/meetingImgs/meeting-audit.png"
                    class="audit-img" />报名状态：{{ item.signUpStatus_dictText }}
+
+              <!-- A 缴费方式 为 汇款 或者现场缴费 B 会议状态为 未开始 或 进行中 C 报名审核信息通过 D 会议的状态 不是待签到 -->
+              <template
+                v-if="(item.payMode === 2 || item.payMode === 1) && (item.meetingStatus == 2 || item.meetingStatus === 3)  && item.registerCheckResult === 1 && item.signUpStatus !== 6">
+                <!-- 可报名 状态有报名按钮 -->
+                <a-button v-if="Number(item.signUpStatus) === 8" class="cell-btn" type="primary"
+                          @click.stop="signUpRecord(item)">报名
+                </a-button>
+                <!-- 凭证待审核 状态有查看凭证按钮 -->
+                <a-button v-if="item.signUpStatus === 2" class="cell-btn" type="primary"
+                          @click.stop="uploadPaymentRecord(item)">查看凭证
+                </a-button>
+                <!-- 待上传凭证 | 凭证被拒绝 状态有上传凭证按钮 -->
+                <a-button v-if="item.signUpStatus === 4 || item.signUpStatus === 5" class="cell-btn" type="primary"
+                          @click.stop="uploadPaymentRecord(item)">上传凭证
+                </a-button>
+              </template>
             </p>
-            <!--            有缴费方式在显示 -->
-            <p class="item-meeting-img item-meeting-meetingPaymode" v-if="item.payMode_dictText !== null">
-              <img src="@/assets/meetingImgs/meeting_paymode.png" />
-              缴费方式：{{ item.payMode_dictText }}
-              <!--  缴费方式为线上缴费或者汇款的， 审核通过才显示 只有在会议召开时间期间才显示”上传凭证“按钮  "-->
-              <!--  报名状态为 凭证审核中   显示查看凭证 -->
-              <!-- 报名成功不显示-->
-              <a-button
-                v-show="(item.payMode === 2 || item.payMode === 1) && (item.meetingStatus == 2 || item.meetingStatus === 3) && item.registerCheckResult === 1 && item.meetingStatus === 3 && item.signUpStatus !== 6 "
-                type="primary" @click="uploadPaymentRecord(item)">
-                {{ item.signUpStatus === 2 ? '查看凭证' : '上传凭证' }}
-              </a-button>
-            </p>
+            <!--    20211210 需求去掉 有缴费方式在显示 -->
+            <!--<p class="item-meeting-img item-meeting-meetingPaymode" v-if="item.payMode_dictText !== null">
+                <img src="@/assets/meetingImgs/meeting_paymode.png" />
+                缴费方式：{{ item.payMode_dictText }}
+                &lt;!&ndash;  缴费方式为线上缴费或者汇款的， 审核通过才显示 只有在会议召开时间期间才显示”上传凭证“按钮  "&ndash;&gt;
+                &lt;!&ndash;  报名状态为 凭证审核中   显示查看凭证 &ndash;&gt;
+                &lt;!&ndash; 报名成功不显示&ndash;&gt;
+                <a-button
+                  v-show="(item.payMode === 2 || item.payMode === 1) && (item.meetingStatus == 2 || item.meetingStatus === 3) && item.registerCheckResult === 1 && item.meetingStatus === 3 && item.signUpStatus !== 6 "
+                  type="primary" @click="uploadPaymentRecord(item)">
+                  {{ item.signUpStatus === 2 ? '查看凭证' : '上传凭证' }}
+                </a-button>
+                </p>-->
 
             <img v-if="item.meetingStatus === 2 " class="meeting-img-status" src="@/assets/meetingImgs/no-start.png" />
             <img v-if="item.meetingStatus === 3 " class="meeting-img-status" src="@/assets/meetingImgs/ing.png" />
@@ -142,7 +160,10 @@
         />
       </div>
     </div>
-    <MeetingDetailModal ref="meetingDetail"></MeetingDetailModal>
+    <!--  会议详情 -->
+    <meeting-detail-modal ref="meetingDetail"></meeting-detail-modal>
+    <!--上传凭证-->
+    <upload-meeting-certificate-modal ref="upload" @ok="initData"></upload-meeting-certificate-modal>
   </div>
 </template>
 
@@ -330,6 +351,11 @@ export default {
         this.$refs.upload.open(item)
       }
     },
+    // 去报名
+    signUpRecord(item) {
+      let url = `${window._CONFIG['singUpQRCodeURL']}?id=${item.id}`
+      window.open(url, '_blank')
+    },
     /*
     *  打开会议详情
     * */
@@ -340,8 +366,8 @@ export default {
       //   let url = `${window._CONFIG['singUpQRCodeURL']}?id=${item.id}`
       //   window.open(url, '_blank')
       // } else {
-        // 打开会议详情
-        this.$refs.meetingDetail.open(item)
+      // 打开会议详情
+      this.$refs.meetingDetail.open(item)
       // }
 
     }
@@ -484,4 +510,16 @@ export default {
   margin: 20px auto !important;
 }
 
+// 面板中上传凭证按钮等相关功能
+// 报名状态 的row
+.item-sign-up-status {
+  position: relative;
+
+  .cell-btn {
+    position: absolute;
+    right: 0;
+    top: -4px;
+  }
+}
+
 </style>