From 7cd64553ab0e06d35244bd852d6bfd2e1f37dc4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E8=89=AFking?= <2244255345@qq.com>
Date: Sat, 26 Feb 2022 15:35:04 +0800
Subject: [PATCH] chongtu

---
 seller/public/config.js | 12 +++++---
 seller/src/api/index.js |  6 ----
 seller/src/libs/util.js | 66 ++++++++++++++++++++++-------------------
 3 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/seller/public/config.js b/seller/public/config.js
index 73d787b0..77fabef0 100644
--- a/seller/public/config.js
+++ b/seller/public/config.js
@@ -3,10 +3,14 @@ var BASE = {
    * @description api请求基础路径
    */
   API_DEV: {
-    common: "http://localhost:8890",
-    buyer: "http://localhost:8888",
-    seller: "http://localhost:8889",
-    manager: "http://localhost:8887"
+    // common: "http://localhost:8890",
+    // buyer: "http://localhost:8888",
+    // seller: "http://localhost:8889",
+    // manager: "http://localhost:8887"
+    common:"http://192.168.0.113:8890",
+    buyer:"http://192.168.0.113:8888",
+    manager:"http://192.168.0.113:8887",
+    seller:"http://192.168.0.113:8889"
   },
   API_PROD: {
     common: "https://common-api.pickmall.cn",
diff --git a/seller/src/api/index.js b/seller/src/api/index.js
index cc98d2a4..1be54f63 100644
--- a/seller/src/api/index.js
+++ b/seller/src/api/index.js
@@ -27,12 +27,6 @@ export const getHomeNotice = params => {
   return getRequest("/other/article/getByPage?type=STORE_ARTICLE&pageSize=15");
 };
 
-// 获取全部权限数据
-export const getCurrentPermissionList = (params) => {
-  return getRequest("/menu/memberMenu", params);
-};
-
-
 // 登陆
 export const getSellerHomeData = params => {
   return getRequest("/statistics/index", params);
diff --git a/seller/src/libs/util.js b/seller/src/libs/util.js
index bf1499c2..2d833e58 100644
--- a/seller/src/libs/util.js
+++ b/seller/src/libs/util.js
@@ -2,7 +2,6 @@ import { getCurrentPermissionList } from "@/api/index";
 import lazyLoading from './lazyLoading.js';
 import Cookies from "js-cookie";
 import { result } from './routerJson.js';
-import { getCurrentPermissionList } from "@/api/index";
 
 const config = require('@/config/index')
 
@@ -331,36 +330,41 @@ util.initRouter = function (vm) { // 初始化路由
     if (!vm.$store.state.app.added) {
         // 加载菜单
         getCurrentPermissionList().then(res => {
-            console.log(res)
-            if (!res.success) return false; 
-                let menuData = res.result;
-                // 格式化数据，设置 空children 为 null
-                for (let i = 0; i < menuData.length; i++) {
-                    let t = menuData[i].children
-                    for (let k = 0; k < t.length; k++) {
-                        let tt = t[k].children;
-                        for (let z = 0; z < tt.length; z++) {
-                            tt[z].children = null
-                            // 给所有三级路由添加字段，显示一级菜单name，方便点击页签时的选中筛选
-                            tt[z].firstRouterName = menuData[i].name
-                        }
-                    }
-                }
-                if (!menuData) {
-                    return;
-                  }
-                util.initAllMenuData(constRoutes, menuData);
-                util.initRouterNode(otherRoutes, otherRouter);
-                // 添加所有主界面路由
-                vm.$store.commit('updateAppRouter', constRoutes.filter(item => item.children.length > 0));
-                // 添加全局路由
-                vm.$store.commit('updateDefaultRouter', otherRoutes);
-                // 添加菜单路由
-                util.initMenuData(vm, menuData);
-                // 缓存数据 修改加载标识
-                window.localStorage.setItem('menuData', JSON.stringify(menuData));
-                vm.$store.commit('setAdded', true);
-        })
+          if (!res.success) return false;
+          let menuData = result;
+
+
+          // 格式化数据，设置 空children 为 null
+          for (let i = 0; i < menuData.length; i++) {
+            let t = menuData[i].children;
+            for (let k = 0; k < t.length; k++) {
+              let tt = t[k].children;
+              for (let z = 0; z < tt.length; z++) {
+                tt[z].children = null;
+                // 给所有三级路由添加字段，显示一级菜单name，方便点击页签时的选中筛选
+                tt[z].firstRouterName = menuData[i].name;
+              }
+            }
+          }
+          if (!menuData) {
+            return;
+          }
+          util.initAllMenuData(constRoutes, menuData);
+          util.initRouterNode(otherRoutes, otherRouter);
+          // 添加所有主界面路由
+          vm.$store.commit(
+            "updateAppRouter",
+            constRoutes.filter(item => item.children.length > 0)
+          );
+          // 添加全局路由
+          vm.$store.commit("updateDefaultRouter", otherRoutes);
+          // 添加菜单路由
+          util.initMenuData(vm, menuData);
+          // 缓存数据 修改加载标识
+          window.localStorage.setItem("menuData", JSON.stringify(menuData));
+          vm.$store.commit("setAdded", true);
+        });
+    
     } else {
         // 读取缓存数据
         let data = window.localStorage.getItem('menuData');