diff --git a/src/permission.js b/src/permission.js index d29e53ab..ea78a655 100644 --- a/src/permission.js +++ b/src/permission.js @@ -4,7 +4,7 @@ import store from './store' // import { Message } from 'element-ui' import NProgress from 'nprogress' import 'nprogress/nprogress.css' -import { getToken } from '@/utils/auth' +import { getToken, removeToken } from '@/utils/auth' import Vue from 'vue' import { OSSclient } from './utils/oss' import WHITELIST from "./utils/whiteList" @@ -70,6 +70,16 @@ router.beforeEach(async (to, from, next) => { } next() NProgress.done() + } else if (from.path === '/researchForm') { + removeToken() + let lang = to.query.lang || zzSessionStorage.getItem('lang') + next(`/researchLogin?trialId=${to.query.trialId}&lang=${lang}`) + NProgress.done() + } else if (from.path === '/researchDetail_m') { + removeToken() + let lang = to.query.lang || zzSessionStorage.getItem('lang') + next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`) + NProgress.done() } else { await OSSclient() const hasGetUserInfo = store.getters.userId @@ -97,9 +107,10 @@ router.beforeEach(async (to, from, next) => { /* has no token*/ if (whiteList.indexOf(to.path) !== -1) { if (to.path === '/researchLogin') { + let lang = to.query.lang || zzSessionStorage.getItem('lang') const flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i) if (flag) { - next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${to.query.lang}`) + next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`) } else { next() } @@ -112,10 +123,12 @@ router.beforeEach(async (to, from, next) => { } } else { if (to.path === '/researchForm') { - next(`/researchLogin?`) + let lang = to.query.lang || zzSessionStorage.getItem('lang') + next(`/researchLogin?trialId=${to.query.trialId}&lang=${lang}`) NProgress.done() } else if (to.path === '/researchDetail_m') { - next(`/researchLogin_m?`) + let lang = to.query.lang || zzSessionStorage.getItem('lang') + next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`) NProgress.done() } else if (to.path === '/ReviewersResearchForm') { next(`/ReviewersResearch?`) diff --git a/src/views/trials/trials-panel/setting/email-manage/index.vue b/src/views/trials/trials-panel/setting/email-manage/index.vue index 6a452ed4..107de54b 100644 --- a/src/views/trials/trials-panel/setting/email-manage/index.vue +++ b/src/views/trials/trials-panel/setting/email-manage/index.vue @@ -236,11 +236,11 @@ export default { flex: 1; overflow-y: auto; } - >>>.el-collapse-item__header{ + /deep/.el-collapse-item__header{ background:#e5ecef; padding-left:10px; } - >>>.el-collapse-item__content{ + /deep/.el-collapse-item__content{ padding: 10px; } .bottom{ diff --git a/src/views/trials/trials-panel/setting/medical-audit/index.vue b/src/views/trials/trials-panel/setting/medical-audit/index.vue index bab12043..f453be8f 100644 --- a/src/views/trials/trials-panel/setting/medical-audit/index.vue +++ b/src/views/trials/trials-panel/setting/medical-audit/index.vue @@ -1,5 +1,5 @@