diff --git a/resources/frontend/src/api/users.js b/resources/frontend/src/api/users.js deleted file mode 100644 index 3b7507f..0000000 --- a/resources/frontend/src/api/users.js +++ /dev/null @@ -1,10 +0,0 @@ -import http from '@/util/http.js' - -// 用户管理页面 -export function users (data) { - return http({ - url: '/api/users', - method: 'get', - data - }) -} \ No newline at end of file diff --git a/resources/frontend/src/main.js b/resources/frontend/src/main.js index 047ff6a..f82289f 100644 --- a/resources/frontend/src/main.js +++ b/resources/frontend/src/main.js @@ -6,6 +6,7 @@ import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' import '@/css/style.css' import './router/index2' +import axios from 'axios' // import Router from 'vue-router' @@ -14,8 +15,8 @@ import './router/index2' // return routerPush.call(this, location).catch(error=> error) // } -Vue.use(ElementUI) +Vue.use(ElementUI) Vue.config.productionTip = false new Vue({ diff --git a/resources/frontend/src/router/index.js b/resources/frontend/src/router/index.js index b9b8f45..b9d8ab4 100644 --- a/resources/frontend/src/router/index.js +++ b/resources/frontend/src/router/index.js @@ -1,12 +1,23 @@ -import Vue from 'vue' -import VueRouter from 'vue-router' +import Vue from "vue"; +import VueRouter from "vue-router"; -Vue.use(VueRouter) +Vue.use(VueRouter); const createRouter = () => new VueRouter({ - scrollBehavior: () => ({ y: 0 }) - }) + scrollBehavior: () => ({ y: 0 }), + }); -const router = createRouter() -export default router +const router = createRouter(); + +router.beforeEach((to, from, next) => { + if (localStorage.getItem("token")) { + next(); + } else if (to.fullPath === "/logo") { + next(); + } else { + next("/logo"); + } +}); + +export default router; diff --git a/resources/frontend/src/router/index1.js b/resources/frontend/src/router/index1.js index 96e376b..d68f74e 100644 --- a/resources/frontend/src/router/index1.js +++ b/resources/frontend/src/router/index1.js @@ -1,12 +1,3 @@ -/* - * @Description: - * @Author: czw (725551805@qq.com) - * @Date: 2022-02-25 10:40:17 - * @LastEditors: czw (725551805@qq.com) - * @LastEditTime: 2022-03-01 20:29:32 - * @FilePath: /glxt/src/router/index1.js - */ - const list = [ { path: '/logo', diff --git a/resources/frontend/src/store/index.js b/resources/frontend/src/store/index.js index 332b916..971e161 100644 --- a/resources/frontend/src/store/index.js +++ b/resources/frontend/src/store/index.js @@ -1,15 +1,13 @@ -import Vue from 'vue' -import Vuex from 'vuex' +import Vue from "vue"; +import Vuex from "vuex"; -Vue.use(Vuex) +Vue.use(Vuex); -export default new Vuex.Store({ - state: { - }, - mutations: { - }, - actions: { - }, - modules: { - } -}) +const store = new Vuex.Store({ + state: {}, + mutations: {}, + actions: {}, + modules: {}, +}); + +export default store; diff --git a/resources/frontend/src/util/auth.js b/resources/frontend/src/util/auth.js index 9f228e9..d19bef4 100644 --- a/resources/frontend/src/util/auth.js +++ b/resources/frontend/src/util/auth.js @@ -1,7 +1,7 @@ const TokenKey = 'admin_token' // 获取token export function getToken () { - return localStorage.getItem(TokenKey) + return 'w1rr6IsxZIud46dIrGIivNAroFpqN52sSpXhk3azpPq2ZTbUXhgKTOLheoRm' } // 设置token export function setToken (token) { diff --git a/resources/frontend/src/views/logo.vue b/resources/frontend/src/views/logo.vue index 75fd681..3a81316 100644 --- a/resources/frontend/src/views/logo.vue +++ b/resources/frontend/src/views/logo.vue @@ -8,33 +8,113 @@ >

登录

- +
- +
记住密码
- 登录 + 登录 diff --git a/resources/frontend/src/views/users/users.vue b/resources/frontend/src/views/users/users.vue index d882ea9..e53d7f9 100644 --- a/resources/frontend/src/views/users/users.vue +++ b/resources/frontend/src/views/users/users.vue @@ -8,18 +8,23 @@
- - - - + + + + + + + - +
- 取消 - 确认 + 取消 + 确认
@@ -29,7 +34,7 @@