From 76b2da3d2511d252298aaf1d37db200c48a8d092 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 六月 2022 14:51:54 +0800
Subject: [PATCH] 1.提交部分代码
---
src/utils/request.js | 4 ++--
.env.development | 2 +-
src/store/modules/user.js | 13 +++++++++----
src/api/user.js | 6 +++---
src/views/login/index.vue | 4 ++--
src/store/modules/permission.js | 3 ++-
src/utils/auth.js | 12 ++++++++++++
7 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/.env.development b/.env.development
index de583d0..5fd6935 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = 'http://121.196.36.24:8001/api/'
diff --git a/src/api/user.js b/src/api/user.js
index 8ff4389..43a99cf 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -2,9 +2,9 @@
export function login(data) {
return request({
- url: '/vue-admin-template/user/login',
- method: 'post',
- data
+ url: 'Login/LoginSave',
+ method: 'get',
+ params: data
})
}
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 63ba5fd..8e7e811 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -153,7 +153,7 @@
name: 'wldw',
component: '/jcsz/wldw',
meta: { title: '寰�鏉ュ崟浣�', icon: '' }
- },
+ }
]
},
{
@@ -188,6 +188,7 @@
asyncRoutes.push({ path: '*', redirect: '/404', hidden: true })
commit('SET_ROUTES', asyncRoutes)
resolve(asyncRoutes)
+ console.log(asyncRoutes, 1)
})
}
}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 2f6423f..a2ae53f 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,5 +1,5 @@
import { login, logout, getInfo } from '@/api/user'
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import { getToken, setToken, removeToken, setCookie } from '@/utils/auth'
import { resetRouter } from '@/router'
const getDefaultState = () => {
@@ -33,9 +33,14 @@
const { username, password } = userInfo
return new Promise((resolve, reject) => {
login({ username: username.trim(), password: password }).then(response => {
- const { data } = response
- commit('SET_TOKEN', data.token)
- setToken(data.token)
+ const { data: res } = response
+
+ setCookie('admin', res.username)
+ setCookie('navTabId', res.usercode)
+ // commit('SET_TOKEN', data.token)
+ // setToken(res)
+ // commit('SET_TOKEN', res)
+ // setToken(res)
resolve()
}).catch(error => {
reject(error)
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 059af18..a137df1 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -13,3 +13,15 @@
export function removeToken() {
return Cookies.remove(TokenKey)
}
+
+export function getCookie(key) {
+ return Cookies.get(key)
+}
+
+export function setCookie(key, value) {
+ return Cookies.set(key, value)
+}
+
+export function removeCookie(key) {
+ return Cookies.remove(key)
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 2fb95ac..eeb81b4 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -46,9 +46,9 @@
const res = response.data
// if the custom code is not 20000, it is judged as an error.
- if (res.code !== 20000) {
+ if (res.code !== '200') {
Message({
- message: res.message || 'Error',
+ message: res.Message || 'Error',
type: 'error',
duration: 5 * 1000
})
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 97268b0..ceeb1f2 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -130,8 +130,8 @@
}
return {
loginForm: {
- username: 'admin',
- password: '111111'
+ username: 'Admin',
+ password: '123456'
},
loginRules: {
username: [{ required: true, trigger: 'blur', validator: validateUsername }],
--
Gitblit v1.9.3