From 87d6b85091cf82b131ec5fe9db615e023b7c517f Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 1 Nov 2021 10:12:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90bug=E3=80=91=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E7=A0=94=E8=AE=A8=E4=BC=9A=E9=82=80=E8=AF=B7=E7=A0=81=E4=B8=8D?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/incomePayments/meetManage/Attendance.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 4a4d8db..b202911 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -58,13 +58,13 @@
           <label>VIP邀请码：</label><span>{{ currentMeetingInfo.vipInvitationCode }}</span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
-          <label style="min-width: 116px">演讲嘉宾邀请码：</label><span><j-ellipsis :value="currentMeetingInfo.speakerInvitationCode" :length="40"></j-ellipsis></span>
+          <label style="min-width: 116px">演讲嘉宾邀请码：</label><span><j-ellipsis :value="currentMeetingInfo.speakerInvitationCode" :length="35" ></j-ellipsis></span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
-          <label style="min-width: 116px">特邀嘉宾邀请码：</label><span><j-ellipsis :value="currentMeetingInfo.guestInvitationCode" :length="40"></j-ellipsis></span>
+          <label style="min-width: 116px">特邀嘉宾邀请码：</label><span><j-ellipsis :value="currentMeetingInfo.guestInvitationCode" :length="35"></j-ellipsis></span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
-          <label style="min-width: 116px">合作伙伴邀请码：</label><span><j-ellipsis :value="currentMeetingInfo.cooperativeInvitationCode" :length="40"></j-ellipsis></span>
+          <label style="min-width: 116px">合作伙伴邀请码：</label><span><j-ellipsis :value="currentMeetingInfo.cooperativeInvitationCode" :length="35"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row class="flex-col">
@@ -843,7 +843,6 @@ export default {
 .meeting-info {
   .ant-col {
     span {
-      display: inline-block;
       word-break: keep-all;
       white-space: nowrap;
       max-width: calc(100% - 100px);

From ef2019c4b87d173af276ae72396b10d705f5096c Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 1 Nov 2021 10:39:51 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jero/JUpload.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/jero/JUpload.vue b/src/components/jero/JUpload.vue
index 99932d4..17781ff 100644
--- a/src/components/jero/JUpload.vue
+++ b/src/components/jero/JUpload.vue
@@ -285,6 +285,7 @@ export default {
       this.$emit('change', path)
     },
     beforeUpload(file) {
+      debugger
       this.uploadGoOn = true
       file.uploadGoOn = true
       const fileSize = file.size // 上传的文件大小
@@ -336,6 +337,10 @@ export default {
             }
             return file
           })
+        }else{
+          info.fileList.pop()
+          this.uploadGoOn = false
+          this.$message.warn(info.file.response.message)
         }
         //this.$message.success(`${info.file.name} 上传成功!`);
       } else if (info.file.status === 'error') {

From 968a7a2e21fa9608c10ffeded60394cf03a21321 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 1 Nov 2021 14:44:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4debugger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jero/JUpload.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/jero/JUpload.vue b/src/components/jero/JUpload.vue
index 17781ff..abcb676 100644
--- a/src/components/jero/JUpload.vue
+++ b/src/components/jero/JUpload.vue
@@ -285,7 +285,6 @@ export default {
       this.$emit('change', path)
     },
     beforeUpload(file) {
-      debugger
       this.uploadGoOn = true
       file.uploadGoOn = true
       const fileSize = file.size // 上传的文件大小