From ae329419a61e70cb79d9c71a8553a3abf9fe9358 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Fri, 23 Jul 2021 11:46:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E7=AD=BE=E5=88=87=E6=8D=A2=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=80=E7=BA=A7=E8=8F=9C=E5=8D=95=E4=B9=9F=E8=A6=81=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=A4=9A=E4=B8=AA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/api/index.js                         | 10 ----------
 manager/src/config/index.js                      | 16 ++++++++--------
 manager/src/libs/axios.js                        |  1 +
 manager/src/libs/util.js                         |  7 ++++---
 manager/src/views/lili-components/region.vue     |  6 +++---
 .../views/lili-floor-renovation/renovation.vue   |  2 +-
 .../shrinkable-menu/shrinkable-menu.vue          |  7 +++++++
 manager/src/views/member/list/index.vue          |  2 +-
 manager/src/views/member/list/memberRecycle.vue  |  4 ++--
 .../my-components/lili/upload-pic-input.vue      |  2 +-
 .../my-components/lili/upload-pic-thumb.vue      |  2 +-
 manager/src/views/order/order/orderDetail.vue    |  2 +-
 .../page/article-manage/ArticleCategory.vue      |  4 ++--
 manager/src/views/region/index.vue               |  1 -
 seller/src/libs/util.js                          | 13 +++++++++++++
 .../shrinkable-menu/shrinkable-menu.vue          | 14 ++++++++++++++
 16 files changed, 59 insertions(+), 34 deletions(-)

diff --git a/manager/src/api/index.js b/manager/src/api/index.js
index c07340ad..b89115a9 100644
--- a/manager/src/api/index.js
+++ b/manager/src/api/index.js
@@ -304,11 +304,6 @@ export const deleteMessageSend = (ids, params) => {
   return deleteRequest(`/manager/messageSend/delByIds/${ids}`, params);
 };
 
-// 通过id获取子地区
-export const getRegion = (id) => {
-  return getRequest(`/region/item/${id}`);
-};
-
 // 分页获取文件数据
 export const getFileListData = (params) => {
   return getRequest("/file", params);
@@ -389,11 +384,6 @@ export const delRegion = (ids) => {
   return deleteRequest(`/region/${ids}`);
 };
 
-// 通过id获取地区详情
-export const getRegionDetail = (id) => {
-  return getRequest(`/region/${id}`);
-};
-
 // 更新地区
 export const updateRegion = (id, params) => {
   return putRequest(`/region/${id}`, params);
diff --git a/manager/src/config/index.js b/manager/src/config/index.js
index 8c65db4f..ce41e786 100644
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -17,14 +17,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    // common: "https://common-api.pickmall.cn",
-    // buyer: "https://buyer-api.pickmall.cn",
-    // seller: "https://store-api.pickmall.cn",
-    // manager: "https://admin-api.pickmall.cn"
-    common: 'http://192.168.0.101:8890',
-    buyer: 'http://192.168.0.101:8888',
-    seller: 'http://192.168.0.101:8889',
-    manager: 'http://192.168.0.101:8887'
+    common: "https://common-api.pickmall.cn",
+    buyer: "https://buyer-api.pickmall.cn",
+    seller: "https://store-api.pickmall.cn",
+    manager: "https://admin-api.pickmall.cn"
+    // common: 'http://192.168.0.101:8890',
+    // buyer: 'http://192.168.0.101:8888',
+    // seller: 'http://192.168.0.101:8889',
+    // manager: 'http://192.168.0.101:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",
diff --git a/manager/src/libs/axios.js b/manager/src/libs/axios.js
index 5d8c68ec..0f485681 100644
--- a/manager/src/libs/axios.js
+++ b/manager/src/libs/axios.js
@@ -103,6 +103,7 @@ service.interceptors.response.use(
 
       } else {
         // 其他错误处理
+        console.log(error.response.data);
         Message.error(error.response.data.message)
       }
     }
diff --git a/manager/src/libs/util.js b/manager/src/libs/util.js
index bb47b972..eb16c8ab 100644
--- a/manager/src/libs/util.js
+++ b/manager/src/libs/util.js
@@ -331,7 +331,6 @@ util.initRouter = function (vm) { // 初始化路由
       getCurrentPermissionList().then(res => {
             if (!res.success) return false;
             let menuData = res.result;
-            // let menuData = result
 
             // 格式化数据，设置 空children 为 null
             for(let i =0;i<menuData.length;i++){
@@ -340,6 +339,8 @@ util.initRouter = function (vm) { // 初始化路由
                     let tt = t[k].children;
                     for(let z = 0;z<tt.length;z++){
                         tt[z].children = null
+                        // 给所有三级路由添加字段，显示一级菜单name，方便点击页签时的选中筛选
+                        tt[z].firstRouterName = menuData[i].name
                     }
                 }
             }
@@ -395,8 +396,7 @@ util.initMenuData = function (vm, data) {
     menuData.forEach(e => {
         let nav = {
             name: e.name,
-            title: e.title,
-            icon: e.icon
+            title: e.title
         }
         navList.push(nav);
     })
@@ -460,6 +460,7 @@ util.initRouterNode = function (routers, data) {  // data为所有子菜单数
         meta.permTypes = menu.permTypes ? menu.permTypes : null;
         meta.title = menu.title ? menu.title + " - lilishop 运营后台" : null;
         meta.url = menu.url ? menu.url : null;
+        meta.firstRouterName = item.firstRouterName
         menu.meta = meta;
 
         routers.push(menu);
diff --git a/manager/src/views/lili-components/region.vue b/manager/src/views/lili-components/region.vue
index 3ede1a0f..e2859e8e 100644
--- a/manager/src/views/lili-components/region.vue
+++ b/manager/src/views/lili-components/region.vue
@@ -11,7 +11,7 @@
 </template>
 <script>
 
-import * as API_Setup from "@/api/index.js";
+import * as API_Setup from "@/api/common.js";
 export default {
   data() {
     return {
@@ -46,7 +46,7 @@ export default {
     },
     loadData(item, callback) {
       item.loading = true;
-      API_Setup.getRegion(item.value).then((res) => {
+      API_Setup.getChildRegion(item.value).then((res) => {
         if (res.result.length <= 0) {
           item.loading = false;
           this.selected = item;
@@ -84,7 +84,7 @@ export default {
       });
     },
     init() {
-      API_Setup.getRegion(this.id).then((res) => {
+      API_Setup.getChildRegion(this.id).then((res) => {
         let way = [];
 
         res.result.forEach((item) => {
diff --git a/manager/src/views/lili-floor-renovation/renovation.vue b/manager/src/views/lili-floor-renovation/renovation.vue
index a0ec292d..0b3fbefc 100644
--- a/manager/src/views/lili-floor-renovation/renovation.vue
+++ b/manager/src/views/lili-floor-renovation/renovation.vue
@@ -58,7 +58,7 @@ export default {
         if (res.success) {
           this.$Message.success("保存模板成功");
         } else {
-          this.$Message.error(res.message);
+          // this.$Message.error(res.message);
         }
       });
     },
diff --git a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
index dbe7e4ec..1dc850a0 100644
--- a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
+++ b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@@ -27,6 +27,7 @@
 
 <script>
 import util from "@/libs/util.js";
+
 export default {
   name: "shrinkableMenu",
   computed: {
@@ -45,6 +46,9 @@ export default {
     $route: {
       handler: function (val, oldVal) {
         console.log(val);
+        if (val.meta.firstRouterName && val.meta.firstRouterName !== this.currNav) {
+          this.selectNav(val.meta.firstRouterName)
+        }
       }
     } 
   },
@@ -58,6 +62,9 @@ export default {
       this.$store.commit("setCurrNav", name);
       this.setStore("currNav", name);
       util.initRouter(this);
+      this.$nextTick(()=>{
+        this.$refs.childrenMenu.updateActiveName()
+      })
     },
   }
 };
diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
index 9f19bf41..35d40e70 100644
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -487,7 +487,7 @@ export default {
               this.$Message.success("禁用成功");
               this.getData();
             } else {
-              this.$Message.error(res.message);
+              // this.$Message.error(res.message);
             }
           });
         },
diff --git a/manager/src/views/member/list/memberRecycle.vue b/manager/src/views/member/list/memberRecycle.vue
index 5af21c76..f7bf58c4 100644
--- a/manager/src/views/member/list/memberRecycle.vue
+++ b/manager/src/views/member/list/memberRecycle.vue
@@ -422,7 +422,7 @@
                 this.$Message.success('禁用成功');
                 this.getData()
               } else {
-                this.$Message.error(res.message);
+                // this.$Message.error(res.message);
               }
             });
           }
@@ -447,7 +447,7 @@
                 this.$Message.success('禁用成功');
                 this.getData()
               } else {
-                this.$Message.error(res.message);
+                // this.$Message.error(res.message);
               }
             });
           }
diff --git a/manager/src/views/my-components/lili/upload-pic-input.vue b/manager/src/views/my-components/lili/upload-pic-input.vue
index 894bcf95..2db882e0 100644
--- a/manager/src/views/my-components/lili/upload-pic-input.vue
+++ b/manager/src/views/my-components/lili/upload-pic-input.vue
@@ -132,7 +132,7 @@ export default {
         this.$emit("input", this.currentValue);
         this.$emit("on-change", this.currentValue);
       } else {
-        this.$Message.error(res.message);
+        // this.$Message.error(res.message);
       }
     },
     // 上传失败
diff --git a/manager/src/views/my-components/lili/upload-pic-thumb.vue b/manager/src/views/my-components/lili/upload-pic-thumb.vue
index 03ec4086..e7422f5c 100644
--- a/manager/src/views/my-components/lili/upload-pic-thumb.vue
+++ b/manager/src/views/my-components/lili/upload-pic-thumb.vue
@@ -122,7 +122,7 @@ export default {
         // 返回组件值
         this.returnValue();
       } else {
-        this.$Message.error(res.message);
+        // this.$Message.error(res.message);
       }
     },
     handleError(error, file, fileList) {
diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue
index 4532e0e1..2ce8f830 100644
--- a/manager/src/views/order/order/orderDetail.vue
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -492,7 +492,7 @@ export default {
               this.$Message.success("收款成功");
               this.getDataList();
             } else {
-              this.$Message.error(res.message);
+              // this.$Message.error(res.message);
             }
           });
         },
diff --git a/manager/src/views/page/article-manage/ArticleCategory.vue b/manager/src/views/page/article-manage/ArticleCategory.vue
index f6ab4b0b..4013273d 100644
--- a/manager/src/views/page/article-manage/ArticleCategory.vue
+++ b/manager/src/views/page/article-manage/ArticleCategory.vue
@@ -181,7 +181,7 @@
 
                                     this.formAdd={}
                                 } else {
-                                    this.$Message.error(res.message);
+                                    // this.$Message.error(res.message);
                                 }
                                 this.getAllList();
                                 this.modalVisible = false;
@@ -193,7 +193,7 @@
                                 if (res.success) {
                                     this.$Message.success("修改成功");
                                 } else {
-                                    this.$Message.error(res.message);
+                                    // this.$Message.error(res.message);
                                 }
                                 this.getAllList();
                                 this.modalVisible = false;
diff --git a/manager/src/views/region/index.vue b/manager/src/views/region/index.vue
index 7c7b5487..c334b1c0 100644
--- a/manager/src/views/region/index.vue
+++ b/manager/src/views/region/index.vue
@@ -89,7 +89,6 @@
 import {
   getChildRegion,
   updateRegion,
-  getRegionDetail,
   delRegion,
   asyncRegion,
   addRegion,
diff --git a/seller/src/libs/util.js b/seller/src/libs/util.js
index 659a37a7..f850e358 100644
--- a/seller/src/libs/util.js
+++ b/seller/src/libs/util.js
@@ -338,6 +338,18 @@ util.initRouter = function (vm) { // 初始化路由
             if (!menuData) {
                 return;
             }
+            // 格式化数据，设置 空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
+                    }
+                }
+            }
             util.initAllMenuData(constRoutes, menuData);
             util.initRouterNode(otherRoutes, otherRouter);
             // 添加所有主界面路由
@@ -451,6 +463,7 @@ util.initRouterNode = function (routers, data) {  // data为所有子菜单数
         meta.permTypes = menu.permTypes ? menu.permTypes : null;
         meta.title = menu.title ? menu.title + " - lilishop商家后台" : null;
         meta.url = menu.url ? menu.url : null;
+        meta.firstRouterName = item.firstRouterName
         menu.meta = meta;
 
         routers.push(menu);
diff --git a/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
index 20128efc..c73d90c2 100644
--- a/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
+++ b/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@@ -46,6 +46,17 @@ export default {
       return this.$store.state.app.currNav;
     }
   },
+  watch: {
+    // 监听路由变化
+    $route: {
+      handler: function (val, oldVal) {
+        console.log(val);
+        if (val.meta.firstRouterName && val.meta.firstRouterName !== this.currNav) {
+          this.selectNav(val.meta.firstRouterName)
+        }
+      }
+    } 
+  },
   methods: {
     changeMenu(name) { //二级路由点击
       this.$router.push({
@@ -56,6 +67,9 @@ export default {
       this.$store.commit("setCurrNav", name);
       this.setStore("currNav", name);
       util.initRouter(this);
+      this.$nextTick(()=>{
+        this.$refs.childrenMenu.updateActiveName()
+      })
     },
   }
 };