modify menu

src/components/login-by-account.vue

@@ -60,7 +60,6 @@ import axios from "@/request/http.js";
 import { Encrypt } from "@/services/secret.js";
 import { useStore } from "vuex";
 import { useRouter } from "vue-router";
-import { menuData } from "./menu";
 
 const router = useRouter();
 
@@ -126,13 +125,10 @@ const getUserInfo = () => {
   return axios.get(`/v1/api/user/getUserInfo`);
 };
 const getMenu = (search) => {
-  // return axios.get(`/apaas/system/v5/menu/user/tree?search=${search}`);
-  return new Promise((resolve, reject) => {
-    resolve(menuData);
-  });
+  return axios.get(`/v1/api/menu/user/tree?search=${search}`);
 };
 const getUser = () => {
-  Promise.all([getUserInfo(), getMenu("79a8f214-db78-4db7-9c28-db66276b4be2")]).then((res) => {
+  Promise.all([getUserInfo(), getMenu("1e99371c-187f-4966-94cf-32f116f42ce6")]).then((res) => {
     console.log("res", res);
     if (res[0].data.code == 200 && res[1].data.code == 200) {
       let data = (res[1].data.data && res[1].data.data[0].children) || [];

src/components/login-by-code.vue

@@ -145,10 +145,10 @@ const getUserInfo = () => {
   return axios.get(`/v1/api/user/getUserInfo`);
 };
 const getMenu = (search) => {
-  return axios.get(`/apaas/system/v5/menu/user/tree?search=${search}`);
+  return axios.get(`/v1/api/menu/user/tree?search=${search}`);
 };
 const getUser = () => {
-  Promise.all([getUserInfo(), getMenu("79a8f214-db78-4db7-9c28-db66276b4be2")]).then((res) => {
+  Promise.all([getUserInfo(), getMenu("1e99371c-187f-4966-94cf-32f116f42ce6")]).then((res) => {
     if (res[0].data.code == 200 && res[1].data.code == 200) {
       let data = (res[1].data.data && res[1].data.data[0].children) || [];
       store.commit("setUserInfo", res[0].data.data);

src/main.js

@@ -33,8 +33,6 @@ import axios from "./request/http.js";
 import api from "./request/api.js";
 import config from "../package.json";
 
-import { menuData } from "@/components/menu.js";
-
 const createVue = createApp(App);
 // createVue.use(ElementPlus, { locale });
 
@@ -72,10 +70,7 @@ function getUser() {
 
 //获取用户菜单信息
 function getMenu(search) {
-  // return axios.get(`/apaas/system/v5/menu/user/tree?search=${search}`);
-  return new Promise((resolve, reject) => {
-    resolve(menuData);
-  });
+  return axios.get(`/v1/api/menu/user/tree?search=${search}`);
 }
 
 //处理菜单成为对象
@@ -89,7 +84,7 @@ function getMenuObj(menu, parentRowPath, menuObj) {
   });
 }
 store.commit("setWhiteList", ["/login", "/register", "/password"]);
-Promise.all([getUser(), getMenu("79a8f214-db78-4db7-9c28-db66276b4be2")])
+Promise.all([getUser(), getMenu("1e99371c-187f-4966-94cf-32f116f42ce6")])
   .then((res) => {
     if (res[0].data.code == 200 && res[1].data.code == 200) {
       //已登录则记录菜单和用户信息