diff --git a/admin/src/assets/home/bg.png b/admin/src/assets/home/bg.png new file mode 100644 index 00000000..4d1eb91f Binary files /dev/null and b/admin/src/assets/home/bg.png differ diff --git a/admin/src/assets/home/fff.png b/admin/src/assets/home/fff.png new file mode 100644 index 00000000..82ca26e1 Binary files /dev/null and b/admin/src/assets/home/fff.png differ diff --git a/admin/src/assets/home/route.png b/admin/src/assets/home/route.png new file mode 100644 index 00000000..6f54d7aa Binary files /dev/null and b/admin/src/assets/home/route.png differ diff --git a/admin/src/assets/home/verification.png b/admin/src/assets/home/verification.png new file mode 100644 index 00000000..7e536769 Binary files /dev/null and b/admin/src/assets/home/verification.png differ diff --git a/admin/src/assets/home/visa.png b/admin/src/assets/home/visa.png new file mode 100644 index 00000000..8d1bcb2a Binary files /dev/null and b/admin/src/assets/home/visa.png differ diff --git a/admin/src/permission.js b/admin/src/permission.js index ff5eaad2..08c85834 100644 --- a/admin/src/permission.js +++ b/admin/src/permission.js @@ -8,9 +8,9 @@ import getPageTitle from '@/utils/get-page-title' NProgress.configure({ showSpinner: false }) // NProgress Configuration -const whiteList = ['/login', '/auth-redirect'] // no redirect whitelist +const whiteList = ['/login', '/auth-redirect', '/home', '/line_on_sale'] // no redirect whitelist -router.beforeEach(async(to, from, next) => { +router.beforeEach(async (to, from, next) => { // start progress bar NProgress.start() @@ -49,7 +49,8 @@ router.beforeEach(async(to, from, next) => { // remove token and go to login page to re-login await store.dispatch('user/resetToken') Message.error(error || 'Has Error') - next(`/login?redirect=${to.path}`) + // next(`/login?redirect=${to.path}`) + next(`/home?redirect=${to.path}`) NProgress.done() } } @@ -62,7 +63,8 @@ router.beforeEach(async(to, from, next) => { next() } else { // other pages that do not have permission to access are redirected to the login page. - next(`/login?redirect=${to.path}`) + // next(`/login?redirect=${to.path}`) + next(`/home?redirect=${to.path}`) NProgress.done() } } diff --git a/admin/src/router/index.js b/admin/src/router/index.js index 5d0ca2b4..39e5c2b9 100644 --- a/admin/src/router/index.js +++ b/admin/src/router/index.js @@ -28,6 +28,16 @@ export const constantRoutes = [ component: () => import('@/views/login/index'), hidden: true }, + { + path: '/home', + component: () => import('@/views/home/index'), + hidden: true + }, + { + path: '/line_on_sale', + component: () => import('@/views/home/line_on_sale'), + hidden: true + }, { path: '/auth-redirect', component: () => import('@/views/login/auth-redirect'), @@ -280,7 +290,7 @@ export const asyncRoutes = [ } } ] - },{ + }, { path: '/log', component: Layout, redirect: '/log/index', diff --git a/admin/src/views/home/components/overflow_concealment.vue b/admin/src/views/home/components/overflow_concealment.vue new file mode 100644 index 00000000..7c2366a9 --- /dev/null +++ b/admin/src/views/home/components/overflow_concealment.vue @@ -0,0 +1,51 @@ + + + + + \ No newline at end of file diff --git a/admin/src/views/home/index.vue b/admin/src/views/home/index.vue new file mode 100644 index 00000000..b87c789b --- /dev/null +++ b/admin/src/views/home/index.vue @@ -0,0 +1,89 @@ + + + + \ No newline at end of file diff --git a/admin/src/views/home/line_on_sale.vue b/admin/src/views/home/line_on_sale.vue new file mode 100644 index 00000000..9da700f0 --- /dev/null +++ b/admin/src/views/home/line_on_sale.vue @@ -0,0 +1,169 @@ + + + + \ No newline at end of file diff --git a/admin/vue.config.js b/admin/vue.config.js index dd07f887..7cce8b25 100644 --- a/admin/vue.config.js +++ b/admin/vue.config.js @@ -38,7 +38,7 @@ module.exports = { }, proxy: { '/dev-api': { // 接口地址 以 api开头的都走下面的配置 - target: 'http://127.0.0.1:8787', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2 + target: 'http://192.168.1.8:8787', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2 ws: true, // 是否支持 websocket 请求 支持 changeOrigin: true, // 是否启用跨域 pathRewrite: {