diff --git a/src/assets/fonts/YOUSHEBIAOTIHEI.TTF b/src/assets/fonts/YOUSHEBIAOTIHEI.TTF new file mode 100644 index 00000000..3729151a Binary files /dev/null and b/src/assets/fonts/YOUSHEBIAOTIHEI.TTF differ diff --git a/src/permission.js b/src/permission.js index baab6d2e..6a80359a 100644 --- a/src/permission.js +++ b/src/permission.js @@ -101,8 +101,11 @@ const whiteList = [ '/sunVillage/user/index', //个人中心 '/sunVillage/user/mobile', //个人中心-修改手机号 '/sunVillage/user/information', //个人中心-修改用户信息 - '/sunVillage/user/cooperative' //个人中心-修改所属合作社 + '/sunVillage/user/cooperative', //个人中心-修改所属合作社 //阳光村务公众号 -- 待删 + + //宅基地 + '/zjdLogin', ] router.beforeEach((to, from, next) => { @@ -141,7 +144,8 @@ router.beforeEach((to, from, next) => { } else if ('/homestead/index'.indexOf(to.path) !== -1) { next({ path: '/homestead/login' }) } else if (to.path.indexOf('/onlineHome') !== -1) { - next(`/onlineHomeLogin`) + //next(`/onlineHomeLogin`) + next(`/zjdLogin`) } else if (to.path.indexOf('/yinnong') !== -1) { next(`/yinnongLogin`) } else if (to.path.indexOf('/homesteadSurvey') !== -1) { @@ -153,7 +157,8 @@ router.beforeEach((to, from, next) => { }else if (to.path.indexOf('/homestead/') !== -1) { next(`/homestead/login`) } else { - next({ path: '/' }) + next(`/zjdLogin`) + //next({ path: '/' }) } }) }) diff --git a/src/router/index.js b/src/router/index.js index 7ed69343..e70d4965 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2752,6 +2752,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage/user/cooperative'], resolve) }, + { + path: '/zjdLogin', + name: 'zjdLogin', + meta: { + title: '登录页', + hidden: true, + }, + component: (resolve) => require(['@/views/zjdLogin'], resolve) + }, { path: '/onlineHome/arbitrationList', name: 'arbitrationList', diff --git a/src/utils/request.js b/src/utils/request.js index 818d0379..c967209e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -85,7 +85,8 @@ service.interceptors.response.use(res => { } else if (window.location.href.indexOf('homesteadSurvey') != -1) { window.location.href = '/homesteadLogin'; } else if (window.location.href.indexOf('onlineHome') != -1) { - window.location.href = '/onlineHomeLogin'; + //window.location.href = '/onlineHomeLogin'; + window.location.href = '/zjdLogin'; } else if (window.location.href.indexOf('yinnong') != -1) { window.location.href = '/yinnongLogin'; } else if (window.location.href.indexOf('/sunVillage') != -1) { @@ -94,7 +95,7 @@ service.interceptors.response.use(res => { window.location.href = '/homestead/login'; } else { // 农村宅基地调查 - window.location.href = '/homestead/login'; + window.location.href = '/zjdLogin'; /*window.location.href = '/index';*/ } diff --git a/src/views/onlineHome/workbench.vue b/src/views/onlineHome/workbench.vue index f019f8dc..1e3fcc54 100644 --- a/src/views/onlineHome/workbench.vue +++ b/src/views/onlineHome/workbench.vue @@ -575,7 +575,7 @@ data() { return { list1: [], - images:['../../../static/images/onlineHome/tab.jpg'], + images:['../../../static/images/onlineHome/home_img.png'], deptName:"", queryParams: { pageNum: 1, diff --git a/src/views/zjdLogin.vue b/src/views/zjdLogin.vue new file mode 100644 index 00000000..cc7fc5c2 --- /dev/null +++ b/src/views/zjdLogin.vue @@ -0,0 +1,374 @@ + + + diff --git a/static/images/onlineHome/home_img.png b/static/images/onlineHome/home_img.png new file mode 100644 index 00000000..916fe3ce Binary files /dev/null and b/static/images/onlineHome/home_img.png differ diff --git a/static/images/onlineHome/zjdLogo.png b/static/images/onlineHome/zjdLogo.png new file mode 100644 index 00000000..f0fef0a5 Binary files /dev/null and b/static/images/onlineHome/zjdLogo.png differ