Merge branch 'master' of https://git.nuttyreading.com/wangjinlei/tougao_web into Editorial-Board
This commit is contained in:
@@ -16,10 +16,10 @@
|
||||
<i class="el-icon-message"></i> {{ $t('mailboxCollect.inboxTab') }}
|
||||
<span class="badge" v-if="queryIn.num > 0">{{ queryIn.num }}</span>
|
||||
</li>
|
||||
<!-- <li :class="{ active: currentFolder === 'sent' }" @click="switchFolder('sent')">
|
||||
<li :class="{ active: currentFolder === 'sent' }" @click="switchFolder('sent')">
|
||||
<i class="el-icon-position"></i><span style="font-size: 14px;">{{ $t('mailboxCollect.outboxTab')}}</span>
|
||||
</li>
|
||||
<li @click="notImplemented"><i class="el-icon-document"></i> <span style="font-size: 14px;">{{ $t('mailboxCollect.draftsTab')}}</span> </li>
|
||||
<!-- <li @click="notImplemented"><i class="el-icon-document"></i> <span style="font-size: 14px;">{{ $t('mailboxCollect.draftsTab')}}</span> </li>
|
||||
<li @click="notImplemented"><i class="el-icon-delete"></i> <span style="font-size: 14px;">{{ $t('mailboxCollect.deletedTab')}}</span> </li>
|
||||
-->
|
||||
|
||||
@@ -116,10 +116,10 @@
|
||||
<el-dialog
|
||||
:title="$t('mailboxCollect.selectAccountTitle')"
|
||||
:visible.sync="accountDialogVisible"
|
||||
width="600px"
|
||||
width="800px"
|
||||
append-to-body
|
||||
:close-on-click-modal="false"
|
||||
:show-close="false"
|
||||
:show-close="true"
|
||||
:before-close="handleAccountDialogBeforeClose"
|
||||
>
|
||||
<el-form inline style="margin-bottom: 10px;">
|
||||
@@ -323,6 +323,8 @@ export default {
|
||||
const hasAccount = this.selectedAccount || this.$route.query.j_email_id;
|
||||
if (hasAccount) {
|
||||
done();
|
||||
}else{
|
||||
this.$message.error(this.$t('mailboxCollect.selectAccountTip'));
|
||||
}
|
||||
// 没选账号时不允许关闭
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user