Compare commits

..

No commits in common. '0f9938803f8c8670c23c4d7e4ede0df395378a92' and '215af0c97e4f1d441f13bc1fe4c4d9405fc2740b' have entirely different histories.

@ -11,23 +11,12 @@ import {
let loadAsyncRouter = false let loadAsyncRouter = false
const whiteList = ['/login', '/welcome'] // 不重定向白名单 const whiteList = ['/login', '/welcome'] // 不重定向白名单
// 获取参数
function getUrlKey(name, url) {
// eslint-disable-next-line no-sparse-arrays
return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(url) || [, ''])[1].replace(/\+/g, '%20')) || null
}
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
if (to.meta.disabled) { if (to.meta.disabled) {
next(false) next(false)
return return
} }
NProgress.start() NProgress.start()
if (!getAuth() && window.location.href.indexOf('authkey') >= 0) {
store.commit('SET_AUTH', {
authKey: getUrlKey('authkey', window.location.href),
sessionId: getUrlKey('sessionid', window.location.href)
})
}
/** 请求头包含授权信息 并且 页面必须授权 直接进入 */ /** 请求头包含授权信息 并且 页面必须授权 直接进入 */
if (getAuth()) { if (getAuth()) {
if (whiteList.includes(to.path)) { if (whiteList.includes(to.path)) {

@ -67,10 +67,6 @@
:prop="item.prop" :prop="item.prop"
:label="item.label" :label="item.label"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column
label="微信账号"
prop="wxwork_name"
width="100" />
<el-table-column <el-table-column
label="操作" label="操作"
width="100"> width="100">

Loading…
Cancel
Save