LK/income_payments_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'branch20211008'

Browse Source
This commit is contained in:
fengachen
2021-11-01 14:47:32 +08:00
parent 7fe05b972d 968a7a2e21
commit e0e324299e
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/jero/JUpload.vue
+4
View File
@@ -336,6 +336,10 @@ export default {
} }
return file return file
}) })
}else{
info.fileList.pop()
this.uploadGoOn = false
this.$message.warn(info.file.response.message)
} }
//this.$message.success(`${info.file.name} 上传成功!`); //this.$message.success(`${info.file.name} 上传成功!`);
} else if (info.file.status === 'error') { } else if (info.file.status === 'error') {
src/views/incomePayments/meetManage/Attendance.vue
+3 -4
View File
@@ -58,13 +58,13 @@
<label>VIP邀请码：</label><span>{{ currentMeetingInfo.vipInvitationCode }}</span> <label>VIP邀请码：</label><span>{{ currentMeetingInfo.vipInvitationCode }}</span>
</a-col> </a-col>
<a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' "> <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>
<a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' "> <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>
<a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' "> <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-col>
</a-row> </a-row>
<a-row class="flex-col"> <a-row class="flex-col">
@@ -843,7 +843,6 @@ export default {
.meeting-info { .meeting-info {
.ant-col { .ant-col {
span { span {
display: inline-block;
word-break: keep-all; word-break: keep-all;
white-space: nowrap; white-space: nowrap;
max-width: calc(100% - 100px); max-width: calc(100% - 100px);