diff --git a/src/assets/zzlogo4.png b/src/assets/zzlogo4.png index 6a21b1c6..5f62d7fe 100644 Binary files a/src/assets/zzlogo4.png and b/src/assets/zzlogo4.png differ diff --git a/src/main.js b/src/main.js index 4cbcdfbc..2a547c89 100644 --- a/src/main.js +++ b/src/main.js @@ -15,7 +15,7 @@ import '@/styles/index.scss' // global css import App from './App' import store from './store' import router from './router' - +import WHITELIST from "./utils/whiteList" import '@/icons' // icon import '@/permission' // permission control import md5 from 'js-md5' @@ -324,7 +324,7 @@ async function VueInit() { if (eval(process.env.VUE_APP_LOGIN_FOR_PERMISSION)) { setInterval(() => { var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh' - if (_vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') { + if (WHITELIST.includes(_vm.$route.path)) { return } if (_vm.$store.state.user.userId !== zzSessionStorage.getItem('userId')) { @@ -388,7 +388,7 @@ async function VueInit() { // window.VUE_APP_COMPANY_NAME = process.env.VUE_APP_COMPANY_NAME; waitOperate(eval(process.env.VUE_APP_LOGOUT_FOR_PERMISSION) ? () => { var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh' - if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') { + if (_vm.$store.state.trials.unlock || WHITELIST.includes(_vm.$route.path)) { count = 0; localStorage.setItem('count', '0') return @@ -417,7 +417,7 @@ async function VueInit() { } : () => { }, process.env.VUE_APP_LOGOUT_FOR_TIME, eval(process.env.VUE_APP_LOCK_FOR_PERMISSION) ? () => { var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh' - if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') { + if (_vm.$store.state.trials.unlock || WHITELIST.includes(_vm.$route.path)) { count = 0; localStorage.setItem('count', '0') if (_vm.$route.path === '/login') { diff --git a/src/views/dictionary/template/email/components/EmailForm.vue b/src/views/dictionary/template/email/components/EmailForm.vue index b8bd2c27..05704515 100644 --- a/src/views/dictionary/template/email/components/EmailForm.vue +++ b/src/views/dictionary/template/email/components/EmailForm.vue @@ -284,6 +284,7 @@