From 9b0a089e29f471ff858f5a212d5e69216cc6b589 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Thu, 12 Aug 2021 16:41:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=93=81=E7=89=8C=EF=BC=8C?=
 =?UTF-8?q?=E5=93=81=E7=89=8C=E7=BB=91=E5=AE=9A=E6=97=B6=E5=80=99=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/config/index.js                     |  8 +--
 buyer/src/pages/Merchant.vue                  |  9 +---
 .../pages/home/memberCenter/Distribution.vue  |  1 +
 .../src/views/goods/goods-manage/category.vue |  2 +-
 seller/src/libs/util.js                       | 52 ++++++++-----------
 5 files changed, 29 insertions(+), 43 deletions(-)

diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js
index b2b6bfdc..23784c11 100644
--- a/buyer/src/config/index.js
+++ b/buyer/src/config/index.js
@@ -17,10 +17,10 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    // common: 'http://192.168.0.100:8890',
-    // buyer: 'http://192.168.0.100:8888',
-    // seller: 'http://192.168.0.100:8889',
-    // manager: 'http://192.168.0.100:8887'
+    // 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',
diff --git a/buyer/src/pages/Merchant.vue b/buyer/src/pages/Merchant.vue
index cdf934a9..6083adc7 100644
--- a/buyer/src/pages/Merchant.vue
+++ b/buyer/src/pages/Merchant.vue
@@ -6,7 +6,7 @@
     <!-- 店铺logo -->
     <div class="shop-logo">
       <div>
-        <img :src="storeMsg.storeLogo" height="50" alt="">
+        <img :src="storeMsg.storeLogo" height="80" alt="">
         <div>
           <p>{{storeMsg.storeName || 'xx店铺'}}</p>
           <p class="ellipsis" :alt="storeMsg.storeDesc" v-html="storeMsg.storeDesc"></p>
@@ -199,10 +199,6 @@ export default {
     margin: 0 auto;
     align-items: center;
 
-    img {
-      width: 80px;
-    }
-
     >div:nth-child(2){
       margin-left: 10px;
       flex: 1;
@@ -212,9 +208,6 @@ export default {
       width: 200px;
     }
   }
-  img {
-    height: 80px;
-  }
   p:nth-child(1) {
     font-size: 20px;
   }
diff --git a/buyer/src/pages/home/memberCenter/Distribution.vue b/buyer/src/pages/home/memberCenter/Distribution.vue
index 481e82d3..8b911072 100644
--- a/buyer/src/pages/home/memberCenter/Distribution.vue
+++ b/buyer/src/pages/home/memberCenter/Distribution.vue
@@ -240,6 +240,7 @@ export default {
         if (res.success) {
           this.$Message.success('申请已提交，请等待审核')
           this.distribution()
+          this.getLog()
         } else {
           this.$Message.error(res.message)
         }
diff --git a/manager/src/views/goods/goods-manage/category.vue b/manager/src/views/goods/goods-manage/category.vue
index 8ea06ca7..9f55d894 100644
--- a/manager/src/views/goods/goods-manage/category.vue
+++ b/manager/src/views/goods/goods-manage/category.vue
@@ -83,7 +83,7 @@
 
       <Modal :title="modalBrandTitle" v-model="modalBrandVisible" :mask-closable="false" :width="500">
         <Form ref="brandForm" :model="brandForm" :label-width="100">
-          <Select v-model="brandForm.categoryBrands" multiple>
+          <Select v-model="brandForm.categoryBrands" filterable multiple>
             <Option v-for="item in brandWay" :value="item.id" :key="item.id">{{ item.name }}</Option>
 
           </Select>
diff --git a/seller/src/libs/util.js b/seller/src/libs/util.js
index a3fe02a5..fbd61e67 100644
--- a/seller/src/libs/util.js
+++ b/seller/src/libs/util.js
@@ -325,39 +325,31 @@ util.initRouter = function (vm) { // 初始化路由
     }
 
     if (!vm.$store.state.app.added) {
-        // 第一次加载 读取数据
-        let accessToken = window.localStorage.getItem('accessToken');
         // 加载菜单
-        // axios.get(getMenuList, { headers: { 'accessToken': accessToken } }).then(res => {
-            // let menuData = res.result;
-            let menuData = result;
-            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
-                    }
+        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
                 }
             }
-            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);
-        // });
+        }
+        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');