增加页面及路由;
修改proxy;
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
import { http } from "@/utils/http";
|
||||
import { baseUrlApi } from "./utils";
|
||||
|
||||
type Result = {
|
||||
success: boolean;
|
||||
@@ -6,5 +7,7 @@ type Result = {
|
||||
};
|
||||
|
||||
export const getAsyncRoutes = () => {
|
||||
return http.request<Result>("get", "/get-async-routes");
|
||||
// return http.request<Result>("get", "/get-async-routes");
|
||||
// 暂时返回空动态路由
|
||||
return http.request<Result>("get", baseUrlApi("auth/async-routes"));
|
||||
};
|
||||
|
||||
@@ -37,8 +37,10 @@ export type RefreshTokenResult = {
|
||||
|
||||
/** 登录 */
|
||||
export const getLogin = (data?: object) => {
|
||||
return http.request<UserResult>("post", "/login", { data });
|
||||
return http.request<any>("post", baseUrlApi("login"), { data });
|
||||
// return http.request<UserResult>("post", "/login", { data });
|
||||
// console.log(http.request<any>("get", baseUrlApi("/user/roles")));
|
||||
// console.log(data);
|
||||
return http.request<UserResult>("post", baseUrlApi("login"), { data });
|
||||
};
|
||||
|
||||
/** 刷新`token` */
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// 第一个代理后端地址
|
||||
export const baseUrlApi = (url: string) => `/api/${url}`;
|
||||
export const baseUrlApi = (url: string) => `/base/${url}`;
|
||||
// 第二个代理后端地址
|
||||
export const baseUrlOtherApi = (url: string) => `/otherApi/${url}`;
|
||||
export const baseUrlAuthrApi = (url: string) => `/auth/${url}`;
|
||||
|
||||
@@ -17,7 +17,7 @@ export default {
|
||||
component: () => import("@/views/airworthiness/index.vue"),
|
||||
meta: {
|
||||
title: "适航资源",
|
||||
roles: ["admin", "common"]
|
||||
roles: ["admin", "3"]
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
@@ -69,6 +69,8 @@ export const useUserStore = defineStore({
|
||||
return new Promise<UserResult>((resolve, reject) => {
|
||||
getLogin(data)
|
||||
.then(data => {
|
||||
console.log("loginByUsername");
|
||||
console.log(data.data);
|
||||
if (data?.success) setToken(data.data);
|
||||
resolve(data);
|
||||
})
|
||||
|
||||
@@ -43,7 +43,10 @@ const onLogin = async (formEl: FormInstance | undefined) => {
|
||||
if (valid) {
|
||||
loading.value = true;
|
||||
useUserStoreHook()
|
||||
.loginByUsername({ username: ruleForm.username, password: "admin123" })
|
||||
.loginByUsername({
|
||||
username: ruleForm.username,
|
||||
password: ruleForm.password
|
||||
})
|
||||
.then(res => {
|
||||
if (res.success) {
|
||||
// 获取后端路由
|
||||
|
||||
Reference in New Issue
Block a user