diff --git a/src/permission.js b/src/permission.js index 8d6bd2cf..d2376251 100644 --- a/src/permission.js +++ b/src/permission.js @@ -71,6 +71,7 @@ const whiteList = [ '/lawEnforcement/complaintAdd', '/homesteadLogin', '/yinnongLogin', + '/yinnongLiteLogin', '/lawEnforcement/userRegister', '/lawEnforcement/companyRegister', @@ -280,9 +281,18 @@ router.beforeEach((to, from, next) => { } else { try { let loginUrl = Cookies.get("_Login_url"); - if (loginUrl && loginUrl.indexOf("onlineHomeLogin") !== -1) { - next({ path: `/onlineHomeLogin?redirect=${to.fullPath}` }) - return; + console.log('登录页面: ' + loginUrl) + if (loginUrl) { + if(loginUrl.indexOf("onlineHomeLogin") !== -1) + { + next({ path: `/onlineHomeLogin?redirect=${to.fullPath}` }) + return; + } + else if(loginUrl.indexOf("yinnongLiteLogin") !== -1) + { + next({ path: '/yinnongLiteLogin' }) + return; + } } } catch (e) { console.log(e); } if ('/authenticRight/index'.indexOf(to.path) !== -1) { diff --git a/src/router/index.js b/src/router/index.js index 55a098bc..e878d884 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -472,6 +472,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/yinnongLogin'], resolve) }, + { + path: '/yinnongLiteLogin', + name: 'yinnongLiteLogin', + meta: { + title: '登录页', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnongNoSMSLogin'], resolve) + }, { path: '/yinnongIndex', name: 'yinnongIndex', diff --git a/src/utils/request.js b/src/utils/request.js index 278e298e..26983f32 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -83,9 +83,15 @@ if(responseInterceptor === undefined){ console.log('退出') try { let loginUrl = Cookies.get("_Login_url"); - if(loginUrl && loginUrl.indexOf("onlineHomeLogin") !== -1) { - window.location.href = loginUrl; - return; + console.log('登录页面: ' + loginUrl) + if(loginUrl) { + if(loginUrl.indexOf("onlineHomeLogin") !== -1 + || loginUrl.indexOf('yinnongLiteLogin') !== -1 + ) + { + window.location.href = loginUrl; + return; + } } } catch (e) { console.log(e); } diff --git a/src/views/yinnong/my.vue b/src/views/yinnong/my.vue index 7284863d..e74f2454 100644 --- a/src/views/yinnong/my.vue +++ b/src/views/yinnong/my.vue @@ -141,6 +141,7 @@ import {getInfo, logout} from "../../api/login"; import request from '@/utils/request' import {A_myDoneList, A_myTodoList} from "@/api/audit/aauditpipeline"; + import Cookies from "js-cookie"; export default { components: { yinnongIndex @@ -184,6 +185,14 @@ }, logout(){ this.$store.dispatch('LogOut').then(() => { + let loginUrl = Cookies.get("_Login_url"); + if(loginUrl) { + if(loginUrl.indexOf('yinnongLiteLogin') !== -1) + { + this.$router.push({path:"/yinnongLiteLogin"}) + return; + } + } this.$router.push({path:"../yinnongLogin"}) }); }, diff --git a/src/views/yinnongNoSMSLogin.vue b/src/views/yinnongNoSMSLogin.vue new file mode 100644 index 00000000..1a2eafa5 --- /dev/null +++ b/src/views/yinnongNoSMSLogin.vue @@ -0,0 +1,170 @@ + + +