新增公告弹窗和无人收件开关

2025-08-03 21:03:54 +08:00
parent 3a40cfc63b
commit 658c1776d5
43 changed files with 857 additions and 474 deletions
--- a/mail-vue/src/views/all-email/index.vue
+++ b/mail-vue/src/views/all-email/index.vue
@@ -45,8 +45,8 @@
          <el-option key="1" :label="$t('all')" value="all"/>
          <el-option key="3" :label="$t('received')" value="receive"/>
          <el-option key="2" :label="$t('sent')" value="send"/>
-          <el-option key="4" :label="$t('deleted')" value="delete"/>
-          <el-option key="4" :label="$t('noRecipient')" value="noone"/>
+          <el-option key="4" :label="$t('selectDeleted')" value="delete"/>
+          <el-option key="4" :label="$t('noRecipientTitle')" value="noone"/>
        </el-select>
        <Icon class="icon" icon="iconoir:search" @click="search" width="20" height="20"/>
        <Icon class="icon" @click="changeTimeSort" icon="material-symbols-light:timer-arrow-down-outline"
--- a/mail-vue/src/views/analysis/index.vue
+++ b/mail-vue/src/views/analysis/index.vue
@@ -130,7 +130,6 @@ import {debounce} from "lodash-es";
 import loading from "@/components/loading/index.vue";
 import {useRoute} from "vue-router";
 import { useI18n } from 'vue-i18n';
-import {toUtc, tzDayjs} from "@/utils/day.js";

 defineOptions({
  name: 'analysis'
@@ -693,7 +692,7 @@ function createSendGauge() {
      grid-template-columns: 1fr;
    }
    .number-item {
-      background: #fff;
+      background: var(--el-bg-color);
      border-radius: 8px;
      border: 1px solid var(--el-border-color);
      padding: 21px 20px;
--- a/mail-vue/src/views/login/index.vue
+++ b/mail-vue/src/views/login/index.vue
@@ -81,7 +81,7 @@
                data-after-interactive-callback="loadAfter"
                data-before-interactive-callback="loadBefore"
            >
-              <span style="font-size: 12px;color: #F56C6C" v-if="botJsError">人机验证模块加载失败,请刷新浏览器</span>
+              <span style="font-size: 12px;color: #F56C6C" v-if="botJsError">{{$t('verifyModuleFailed')}}</span>
            </div>
            <el-button class="btn" type="primary" @click="submitRegister" :loading="registerLoading"
            >{{$t('regBtn')}}
@@ -105,6 +105,7 @@ import {isEmail} from "@/utils/verify-utils.js";
 import {useSettingStore} from "@/store/setting.js";
 import {useAccountStore} from "@/store/account.js";
 import {useUserStore} from "@/store/user.js";
+import {useUiStore} from "@/store/ui.js";
 import {Icon} from "@iconify/vue";
 import {cvtR2Url} from "@/utils/convert.js";
 import {loginUserInfo} from "@/request/my.js";
@@ -114,6 +115,7 @@ import {useI18n} from "vue-i18n";
 const { t } = useI18n();
 const accountStore = useAccountStore();
 const userStore = useUserStore();
+const uiStore = useUiStore();
 const settingStore = useSettingStore();
 const loginLoading = ref(false)
 const show = ref('login')
@@ -220,6 +222,7 @@ const submit = () => {
      router.addRoute('layout', routerData);
    });
    await router.replace({name: 'layout'})
+    uiStore.showNotice()
  }).finally(() => {
    loginLoading.value = false
  })
--- a/mail-vue/src/views/role/index.vue
+++ b/mail-vue/src/views/role/index.vue
@@ -72,7 +72,7 @@
        <el-input-tag class="dialog-input-tag" tag-type="warning" :class="form.banEmail.length === 0 ? 'dialog-input' : '' " v-model="form.banEmail" @add-tag="banEmailAddTag"  type="text" :placeholder="$t('emailInterception')" autocomplete="off" />
        <el-radio-group class="dialog-radio" v-model="form.banEmailType" v-if="form.banEmail.length > 0">
          <el-radio :label="$t('removeAll')" :value="0" />
-          <el-radio :label="$t('removeBody')" :value="1" />
+          <el-radio :label="$t('removeContent')" :value="1" />
        </el-radio-group>
        <el-select
            class="dialog-input"
@@ -146,7 +146,7 @@ import loading from '@/components/loading/index.vue';
 import {useRoleStore} from "@/store/role.js";
 import {useUserStore} from "@/store/user.js";
 import {useSettingStore} from "@/store/setting.js";
-import {isEmail} from "@/utils/verify-utils.js";
+import {isEmail, isDomain} from "@/utils/verify-utils.js";
 import {useI18n} from "vue-i18n";

 defineOptions({
@@ -198,7 +198,10 @@ rolePermTree().then(tree => {
  treeList.push(...tree)
 })

-domainOptions = domainList.map(domain => ({label: domain,value: domain}))
+domainOptions = domainList.map(domain => {
+  const cleanDomain = domain.replace(/^@/, '');
+  return { label: cleanDomain, value: cleanDomain };
+});


 function availDomainChange() {
@@ -218,7 +221,7 @@ function banEmailAddTag(val) {
  form.banEmail.splice(form.banEmail.length - 1, 1)

  emails.forEach(email => {
-    if (isEmail(email) && !form.banEmail.includes(email)) {
+    if ((isEmail(email) || isDomain(email)) && !form.banEmail.includes(email)) {
      form.banEmail.push(email)
    }
  })
@@ -236,7 +239,7 @@ function roleFormClick() {
 function setDef(role) {
  roleSetDef(role.roleId).then(() => {
    ElMessage({
-      message: t('changSuccessMsg'),
+      message: t('saveSuccessMsg'),
      type: "success",
      plain: true
    })
@@ -297,7 +300,7 @@ function setRole() {
  permLoading.value = true
  roleSet(params).then(() => {
    ElMessage({
-      message: t('changSuccessMsg'),
+      message: t('saveSuccessMsg'),
      type: "success",
      plain: true
    })
@@ -340,6 +343,7 @@ function openRoleSet(role) {
  form.sendCount = role.sendCount
  form.accountCount = role.accountCount
  form.banEmail = role.banEmail
+  form.banEmailType = role.banEmailType
  form.availDomain = role.availDomain
  nextTick(() => {
    tree.value.setCheckedKeys(role.permIds)
--- a/mail-vue/src/views/setting/index.vue
+++ b/mail-vue/src/views/setting/index.vue
@@ -30,21 +30,6 @@
        </div>
      </div>
    </div>
-    <div class="container lang">
-      <div class="title">{{$t('language')}}</div>
-      <div>
-          <el-select v-model="lang" placeholder="Select" style="width: 100px">
-          <el-option
-              key="zh"
-              label="简体中文"
-              value="zh"/>
-          <el-option
-              key="en"
-              label="English"
-              value="en"/>
-        </el-select>
-      </div>
-    </div>
    <div class="del-email" v-perm="'my:delete'">
      <div class="title">{{$t('deleteUser')}}</div>
      <div style="color: #585d69;">
@@ -64,33 +49,25 @@
  </div>
 </template>
 <script setup>
-import {reactive, ref, defineOptions, watch} from 'vue'
+import {reactive, ref, defineOptions} from 'vue'
 import {resetPassword, userDelete} from "@/request/my.js";
 import {useUserStore} from "@/store/user.js";
 import router from "@/router/index.js";
-import { storeToRefs } from 'pinia'
 import {accountSetName} from "@/request/account.js";
 import {useAccountStore} from "@/store/account.js";
 import {useI18n} from "vue-i18n";
-import {useSettingStore} from "@/store/setting.js";

 const { t } = useI18n()
-const settingStore = useSettingStore()
 const accountStore = useAccountStore()
 const userStore = useUserStore();
 const setPwdLoading = ref(false)
 const setNameShow = ref(false)
 const accountName = ref(null)
-const { lang } = storeToRefs(settingStore)

 defineOptions({
  name: 'setting'
 })

-watch(() => lang.value,() => {
-  window.location.reload()
-})
-
 function showSetName() {
  accountName.value = userStore.user.name
  setNameShow.value = true
@@ -118,7 +95,7 @@ function setName() {

  accountSetName(userStore.user.accountId,name).then(() => {
    ElMessage({
-      message: t('changSuccessMsg'),
+      message: t('saveSuccessMsg'),
      type: 'success',
      plain: true,
    })
@@ -187,7 +164,7 @@ function submitPwd() {
  setPwdLoading.value = true
  resetPassword(form.password).then(() => {
    ElMessage({
-      message: t('changSuccessMsg'),
+      message: t('saveSuccessMsg'),
      type: 'success',
      plain: true,
    })
--- a/mail-vue/src/views/sys-setting/index.vue
+++ b/mail-vue/src/views/sys-setting/index.vue
@@ -124,7 +124,7 @@
            <div class="card-title">{{$t('emailSetting')}}</div>
            <div class="card-content">
              <div class="setting-item">
-                <div><span>{{$t('receiveEmails')}}</span></div>
+                <div><span>{{$t('receiveEmail')}}</span></div>
                <div>
                  <el-switch @change="change" :before-change="beforeChange" :active-value="0" :inactive-value="1"
                             v-model="setting.receive"/>
@@ -160,6 +160,18 @@
                             v-model="setting.send"/>
                </div>
              </div>
+              <div class="setting-item">
+                <div>
+                  <span>{{$t('noRecipientTitle')}}</span>
+                  <el-tooltip effect="dark" :content="$t('noRecipientDesc')">
+                    <Icon class="warning" icon="fe:warning" width="18" height="18"/>
+                  </el-tooltip>
+                </div>
+                <div>
+                  <el-switch @change="change" :before-change="beforeChange" :active-value="0" :inactive-value="1"
+                             v-model="setting.noRecipient"/>
+                </div>
+              </div>
              <div class="setting-item">
                <div><span>{{$t('resendToken')}}</span></div>
                <div>
@@ -286,12 +298,35 @@
            </div>
          </div>

+          <div class="settings-card">
+            <div class="card-title">{{$t('noticeTitle')}}</div>
+            <div class="card-content">
+              <div class="setting-item">
+                <div><span>{{$t('noticePopup')}}</span></div>
+                <div class="forward">
+                  <span>{{ setting.notice === 0 ? $t('enabled') : $t('disabled') }}</span>
+                  <el-button class="opt-button" size="small" type="primary" @click="openNoticePopupSetting">
+                    <Icon icon="fluent:settings-48-regular" width="18" height="18"/>
+                  </el-button>
+                </div>
+              </div>
+              <div class="setting-item">
+                <div><span>{{$t('popUp')}}</span></div>
+                <div class="forward">
+                  <el-button class="opt-button" size="small" type="primary" @click="openNoticePopup">
+                    <Icon icon="mynaui:click-solid" width="18" height="18"/>
+                  </el-button>
+                </div>
+              </div>
+            </div>
+          </div>
+
          <div class="settings-card about">
            <div class="card-title">{{$t('about')}}</div>
            <div class="card-content">
              <div class="concerning-item">
                <span>{{$t('version')}} :</span>
-                <span>v1.5.0</span>
+                <span>v1.6.0</span>
              </div>
              <div class="concerning-item">
                <span>{{$t('community')}} : </span>
@@ -323,7 +358,7 @@
      </div>

      <!-- Dialogs remain the same -->
-      <el-dialog v-model="editTitleShow" :title="$t('changeTitle')" width="340" >
+      <el-dialog v-model="editTitleShow" :title="$t('changeTitle')" width="340" @closed="editTitle = setting.title">
        <form>
          <el-input type="text" :placeholder="$t('websiteTitle')" v-model="editTitle"/>
          <el-button type="primary" :loading="settingLoading" @click="saveTitle">{{$t('save')}}</el-button>
@@ -474,19 +509,90 @@
          <el-table-column :width="tokenColumnWidth" property="value" label="Token" fixed="right" :show-overflow-tooltip="true" />
        </el-table>
      </el-dialog>
-      <el-dialog v-model="showRegVerifyCount" :title="$t('rulesVerifyTitle',{count: regVerifyCount})"  @closed="regVerifyCount = setting.regVerifyCount" >
+      <el-dialog v-model="regVerifyCountShow" :title="$t('rulesVerifyTitle',{count: regVerifyCount})"  @closed="regVerifyCount = setting.regVerifyCount" >
        <form>
          <el-input-number type="text" v-model="regVerifyCount" :min="1" >
          </el-input-number>
          <el-button type="primary" :loading="settingLoading" @click="saveRegVerifyCount">{{$t('save')}}</el-button>
        </form>
      </el-dialog>
-      <el-dialog v-model="showAddVerifyCount" :title="$t('rulesVerifyTitle',{count: addVerifyCount})" @closed="addVerifyCount = setting.addVerifyCount">
+      <el-dialog v-model="addVerifyCountShow" :title="$t('rulesVerifyTitle',{count: addVerifyCount})" @closed="addVerifyCount = setting.addVerifyCount">
        <form>
          <el-input-number type="text" v-model="addVerifyCount" :min="1"/>
          <el-button type="primary" :loading="settingLoading" @click="saveAddVerifyCount">{{$t('save')}}</el-button>
        </form>
      </el-dialog>
+      <el-dialog top="5vh" v-model="noticePopupShow" :title="$t('noticePopup')" class="notice-popup" @closed="resetNoticeForm">
+        <form>
+          <el-input v-model="noticeForm.noticeTitle" :placeholder="t('titleDesc')" />
+          <div class="notice-line-item" >
+            <el-select v-model="noticeForm.noticeType" >
+              <template #prefix>
+                <span style="margin-right: 10px">{{$t('icon')}}</span>
+              </template>
+              <el-option key="none" label="None" value="none" />
+              <el-option key="primary" label="Primary" value="primary" />
+              <el-option key="success" label="Success" value="success" />
+              <el-option key="warning" label="Warning" value="warning" />
+              <el-option key="info" label="Info" value="info" />
+            </el-select>
+            <el-select v-model="noticeForm.noticePosition" >
+              <template #prefix>
+                <span style="margin-right: 10px">{{$t('position')}}</span>
+              </template>
+              <el-option key="top-left" :label="t('topLeft')" value="top-left" />
+              <el-option key="top-right" :label="t('topRight')" value="top-right" />
+              <el-option key="bottom-left" :label="t('bottomLeft')" value="bottom-left" />
+              <el-option key="bottom-right" :label="t('bottomRight')" value="bottom-right" />
+            </el-select>
+            <el-input-number v-model="noticeForm.noticeWidth" >
+              <template #prefix >
+                {{$t('width')}}
+              </template>
+              <template #suffix >
+                px
+              </template>
+            </el-input-number>
+            <el-input-number v-model="noticeForm.noticeOffset" >
+              <template #prefix >
+                {{$t('offset')}}
+              </template>
+              <template #suffix >
+                px
+              </template>
+            </el-input-number>
+            <el-input-number v-model="noticeForm.noticeDuration" >
+              <template #prefix >
+                {{$t('duration')}}
+              </template>
+              <template #suffix >
+                ms
+              </template>
+            </el-input-number>
+          </div>
+          <div class="notice-popup-item">
+            <el-input
+                v-model="noticeForm.noticeContent"
+                :autosize="{ minRows: 15, maxRows: 25 }"
+                type="textarea"
+                :placeholder="t('noticeContentDesc')"
+            />
+          </div>
+        </form>
+        <template #footer>
+          <div class="dialog-footer">
+            <el-switch v-model="noticeForm.notice" :active-value="0" :inactive-value="1" :active-text="$t('enable')" :inactive-text="$t('disable')" />
+            <div>
+              <el-button @click="previewNoticePopup">
+                {{$t('preview')}}
+              </el-button>
+              <el-button :loading="settingLoading" type="primary" @click="saveNoticePopup">
+                {{$t('save')}}
+              </el-button>
+            </div>
+          </div>
+        </template>
+      </el-dialog>
    </el-scrollbar>
  </div>
 </template>
@@ -495,6 +601,7 @@
 import {computed, defineOptions, reactive, ref} from "vue";
 import {physicsDeleteAll, setBackground, settingQuery, settingSet} from "@/request/setting.js";
 import {useSettingStore} from "@/store/setting.js";
+import {useUiStore} from "@/store/ui.js";
 import {useUserStore} from "@/store/user.js";
 import {useAccountStore} from "@/store/account.js";
 import {Icon} from "@iconify/vue";
@@ -522,10 +629,12 @@ const resendTokenFormShow = ref(false)
 const r2DomainShow = ref(false)
 const turnstileShow = ref(false)
 const tgSettingShow = ref(false)
+const noticePopupShow = ref(false)
 const thirdEmailShow = ref(false)
 const forwardRulesShow = ref(false)
 const showResendList = ref(false)
 const settingStore = useSettingStore();
+const uiStore = useUiStore();
 const {settings: setting} = storeToRefs(settingStore);
 const editTitle = ref('')
 const settingLoading = ref(false)
@@ -537,8 +646,8 @@ const showSetBackground = ref(false)
 let regVerifyCount = ref(1)
 let addVerifyCount = ref(1)
 let backup = '{}'
-const showAddVerifyCount = ref(false)
-const showRegVerifyCount = ref(false)
+const addVerifyCountShow = ref(false)
+const regVerifyCountShow = ref(false)
 const resendTokenForm = reactive({
  domain: '',
  token: '',
@@ -548,13 +657,24 @@ const turnstileForm = reactive({
  secretKey: ''
 })

-const regKeyOptions = [
+const noticeForm = reactive({
+  noticeTitle: '',
+  noticeContent: '',
+  noticeType: '',
+  noticeDuration: '',
+  noticePosition: '',
+  noticeOffset: 0,
+  notice: 0,
+  noticeWidth: 0
+})
+
+const regKeyOptions = computed(() => [
  {label: t('enable'), value: 0},
  {label: t('disable'), value: 1},
  {label: t('optional'), value: 2},
-]
+])

-const options = [
+const options = computed(() => [
  {label: t('disable'), value: 0},
  {label: '3s', value: 3},
  {label: '5s', value: 5},
@@ -562,7 +682,7 @@ const options = [
  {label: '10s', value: 10},
  {label: '15s', value: 15},
  {label: '20s', value: 20}
-]
+])

 const tgChatId = ref([])
 const tgBotStatus = ref(0)
@@ -574,27 +694,44 @@ const tokenColumnWidth = ref(0)
 const ruleType = ref(0)
 const ruleEmail = ref([])

+getSettings()

-settingQuery().then(settingData => {
-  setting.value = settingData
-  resendTokenForm.domain = setting.value.domainList[0]
-  loginOpacity.value = setting.value.loginOpacity
-  firstLoading.value = false
-  backgroundUrl.value = setting.value.background?.startsWith('http') ? setting.value.background : ''
-  editTitle.value = setting.value.title
-  r2DomainInput.value = setting.value.r2Domain
-  addVerifyCount.value = setting.value.addVerifyCount
-  regVerifyCount.value = setting.value.regVerifyCount
-})
+function getSettings() {
+  settingQuery().then(settingData => {
+    setting.value = settingData
+    settingStore.domainList = settingData.domainList;
+    resendTokenForm.domain = setting.value.domainList[0]
+    loginOpacity.value = setting.value.loginOpacity
+    firstLoading.value = false
+    backgroundUrl.value = setting.value.background?.startsWith('http') ? setting.value.background : ''
+    editTitle.value = setting.value.title
+    r2DomainInput.value = setting.value.r2Domain
+    addVerifyCount.value = setting.value.addVerifyCount
+    regVerifyCount.value = setting.value.regVerifyCount
+    noticeForm.notice = setting.value.notice
+    noticeForm.noticeContent = setting.value.noticeContent
+    noticeForm.noticeDuration = setting.value.noticeDuration
+    noticeForm.noticeTitle = setting.value.noticeTitle
+    noticeForm.noticePosition = setting.value.noticePosition
+    noticeForm.noticeType = setting.value.noticeType
+    noticeForm.noticeOffset = setting.value.noticeOffset
+    noticeForm.noticeWidth = setting.value.noticeWidth
+  })
+}
+
+
+function openNoticePopup() {
+  uiStore.showNotice()
+}

 function openAddVerifyCount() {
  if (settingLoading.value) return
-  showAddVerifyCount.value = true
+  addVerifyCountShow.value = true
 }

 function openRegVerifyCount() {
  if (settingLoading.value) return
-  showRegVerifyCount.value = true
+  regVerifyCountShow.value = true
 }

 const resendList = computed(() => {
@@ -659,10 +796,36 @@ function openTgSetting() {
  tgSettingShow.value = true
 }

+function openNoticePopupSetting() {
+  noticePopupShow.value = true
+}
+
 function openResendList() {
  showResendList.value = true
 }

+function resetNoticeForm() {
+  noticeForm.notice = setting.value.notice
+  noticeForm.noticeContent = setting.value.noticeContent
+  noticeForm.noticeDuration = setting.value.noticeDuration
+  noticeForm.noticeTitle = setting.value.noticeTitle
+  noticeForm.noticePosition = setting.value.noticePosition
+  noticeForm.noticeType = setting.value.noticeType
+  noticeForm.noticeOffset = setting.value.noticeOffset
+  noticeForm.noticeWidth = setting.value.noticeWidth
+}
+
+function saveNoticePopup() {
+  noticeForm.noticeOffset =  noticeForm.noticeOffset || 0
+  noticeForm.noticeWidth =  noticeForm.noticeWidth || 0
+  noticeForm.noticeDuration =  noticeForm.noticeDuration || 0
+  editSetting({...noticeForm})
+}
+
+function previewNoticePopup() {
+  uiStore.previewNotice({...noticeForm})
+}
+
 function openThirdEmailSetting() {
  forwardEmail.value = []
  forwardStatus.value = setting.value.forwardStatus
@@ -825,7 +988,7 @@ async function saveBackground() {
    setting.value.background = key
    showSetBackground.value = false
    ElMessage({
-      message: t('changSuccessMsg'),
+      message: t('saveSuccessMsg'),
      type: "success",
      plain: true
    })
@@ -855,7 +1018,7 @@ function openCut() {

 function saveR2domain() {
  const settingForm = {r2Domain: r2DomainInput.value}
-  editSetting(settingForm, true)
+  editSetting(settingForm)
 }

 function openResendForm() {
@@ -897,13 +1060,6 @@ function change(e) {
  editSetting(settingForm, false)
 }

-function refresh() {
-  settingQuery().then(setting => {
-    settingStore.settings = setting;
-    settingStore.domainList = setting.domainList;
-  })
-}
-
 function saveTitle() {
  editSetting({title: editTitle.value})
 }
@@ -922,7 +1078,7 @@ function editSetting(settingForm, refreshStatus = true) {
  settingSet(settingForm).then(() => {
    settingLoading.value = false
    ElMessage({
-      message: t('changSuccessMsg'),
+      message: t('saveSuccessMsg'),
      type: "success",
      plain: true
    })
@@ -930,7 +1086,7 @@ function editSetting(settingForm, refreshStatus = true) {
      accountStore.currentAccountId = userStore.user.accountId;
    }
    if (refreshStatus) {
-      refresh()
+      getSettings()
    }
    editTitleShow.value = false
    r2DomainShow.value = false
@@ -939,8 +1095,9 @@ function editSetting(settingForm, refreshStatus = true) {
    tgSettingShow.value = false
    thirdEmailShow.value = false
    forwardRulesShow.value = false
-    showAddVerifyCount.value = false
-    showRegVerifyCount.value = false
+    addVerifyCountShow.value = false
+    regVerifyCountShow.value = false
+    noticePopupShow.value = false
  }).catch((e) => {
    loginOpacity.value = setting.value.loginOpacity
    setting.value = {...setting.value, ...JSON.parse(backup)}
@@ -1045,7 +1202,7 @@ function editSetting(settingForm, refreshStatus = true) {
  display: grid;
  grid-template-columns: auto 1fr;
  gap: 10px;
-  font-weight: bold;
+  font-weight: normal;
  > div:first-child {
    display: flex;
    align-items: center;
@@ -1069,12 +1226,14 @@ function editSetting(settingForm, refreshStatus = true) {
 }

 .warning {
-  margin-left: 5px;
+  margin-left: 4px;
  color: gray;
  cursor: pointer;
 }

 .cropper {
+  border-radius: 4px;
+  border: 1px solid #D4D7DE;
  height: 397px;
  width: 705px;
  @media (max-width: 767px) {
@@ -1088,6 +1247,26 @@ function editSetting(settingForm, refreshStatus = true) {
  justify-content: space-between;
 }

+.notice-popup-item {
+  margin-top: 15px;
+}
+
+.notice-line-item {
+  margin-top: 15px;
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+  gap: 15px;
+  > * {
+    width: 100%;
+  }
+  @media (max-width: 840px) {
+    grid-template-columns: 1fr 1fr;
+  }
+  @media (max-width: 580px) {
+    grid-template-columns: 1fr;
+  }
+}
+
 .background-url {
  width: min(calc(100vw - 70px), 500px);
 }
@@ -1112,6 +1291,16 @@ function editSetting(settingForm, refreshStatus = true) {
  }
 }

+:deep(.notice-popup.el-dialog) {
+  min-height: 300px;
+  width: 820px !important;
+  @media (max-width: 860px) {
+    width: calc(100% - 40px) !important;
+    margin-right: 20px !important;
+    margin-left: 20px !important;
+  }
+}
+
 :deep(.resend-table .el-dialog__header) {
  padding-bottom: 5px;
 }
@@ -1257,7 +1446,7 @@ function editSetting(settingForm, refreshStatus = true) {
  }

  > span:first-child {
-    font-weight: bold;
+    font-weight: normal;
    padding-right: 20px;
  }
 }
--- a/mail-vue/src/views/user/index.vue
+++ b/mail-vue/src/views/user/index.vue
@@ -502,6 +502,7 @@ function submit() {
 function formatSendType(user) {
  if (user.sendAction.sendType === 'day') return t('daily')
  if (user.sendAction.sendType === 'count') return t('total')
+  if (user.sendAction.sendType === 'ban') return t('sendBanned')
 }

 function formatSendCount(user) {
@@ -617,7 +618,7 @@ function httpSetStatus(user) {
  userSetStatus({status: status, userId: user.userId}).then(() => {
    user.status = status
    ElMessage({
-      message: t('changSuccessMsg'),
+      message: t('saveSuccessMsg'),
      type: "success",
      plain: true
    })
@@ -630,7 +631,7 @@ function setType() {
    chooseUser.type = userForm.type
    setTypeShow.value = false
    ElMessage({
-      message: t('changSuccessMsg'),
+      message: t('saveSuccessMsg'),
      type: "success",
      plain: true
    })
@@ -675,7 +676,7 @@ function updatePwd() {
  userSetPwd({password: userForm.password, userId: userForm.userId}).then(() => {
    setPwdShow.value = false
    ElMessage({
-      message: t('changSuccessMsg'),
+      message: t('saveSuccessMsg'),
      type: "success",
      plain: true
    })