Browse Source

修改bug

cr 3 years ago
parent
commit
515c21347a
5 changed files with 6 additions and 5 deletions
  1. 1 1
      releaselog.md
  2. 1 1
      src/App.vue
  3. 2 1
      src/common/js/plugin.js
  4. 1 1
      src/common/store/common.js
  5. 1 1
      src/pages/manage/index.vue

+ 1 - 1
releaselog.md

@@ -1,7 +1,7 @@
1
 
1
 
2
 
2
 
3
 # 0.5.4 (21.03.31 18:00) 
3
 # 0.5.4 (21.03.31 18:00) 
4
-### 优选相关设置
4
+### 直邮相关设置
5
 
5
 
6
 # 0.5.3 (21.03.22 18:00) 
6
 # 0.5.3 (21.03.22 18:00) 
7
 ### 添加平台  群设置修改bug
7
 ### 添加平台  群设置修改bug

+ 1 - 1
src/App.vue

@@ -38,7 +38,7 @@ export default {
38
                 },
38
                 },
39
                 {
39
                 {
40
                     id: 4,
40
                     id: 4,
41
-                    name: "优选",
41
+                    name: "直邮",
42
                     imgOff: "../../static/tabBar/icon_green_3.png",
42
                     imgOff: "../../static/tabBar/icon_green_3.png",
43
                     imgOn: "../../static/tabBar/icon_green_3_select.png",
43
                     imgOn: "../../static/tabBar/icon_green_3_select.png",
44
                     url: "/pages/youxuan/brand",
44
                     url: "/pages/youxuan/brand",

+ 2 - 1
src/common/js/plugin.js

@@ -255,7 +255,6 @@ export default {
255
                         code: result.code,
255
                         code: result.code,
256
                         appId: config.appId,
256
                         appId: config.appId,
257
                     }, { pass: true }).then(res => {
257
                     }, { pass: true }).then(res => {
258
-                        resolve();
259
                         if (res.success) {
258
                         if (res.success) {
260
                             store.commit("user/login", res.data);
259
                             store.commit("user/login", res.data);
261
 
260
 
@@ -292,6 +291,7 @@ export default {
292
                                     this.setTabBar([1, 2]);
291
                                     this.setTabBar([1, 2]);
293
                                 }
292
                                 }
294
                                 this.roleHandle();
293
                                 this.roleHandle();
294
+                                resolve();
295
                                 return;
295
                                 return;
296
                             } else {
296
                             } else {
297
                                 // 正常用户
297
                                 // 正常用户
@@ -311,6 +311,7 @@ export default {
311
                                     isTabBar: true,
311
                                     isTabBar: true,
312
                                     path: "/pages/index/index",
312
                                     path: "/pages/index/index",
313
                                 });
313
                                 });
314
+                                resolve();
314
                             }
315
                             }
315
                         } else {
316
                         } else {
316
                             router.push({
317
                             router.push({

+ 1 - 1
src/common/store/common.js

@@ -41,7 +41,7 @@ const module = {
41
         },
41
         },
42
         {
42
         {
43
             id: 4,
43
             id: 4,
44
-            name: "优选",
44
+            name: "直邮",
45
             imgOff: "../../static/tabBar/icon_green_3.png",
45
             imgOff: "../../static/tabBar/icon_green_3.png",
46
             imgOn: "../../static/tabBar/icon_green_3_select.png",
46
             imgOn: "../../static/tabBar/icon_green_3_select.png",
47
             "url": "/pages/youxuan/brand",
47
             "url": "/pages/youxuan/brand",

+ 1 - 1
src/pages/manage/index.vue

@@ -92,7 +92,7 @@
92
 
92
 
93
         <!-- <button class="btn" @click="layout">退出登录</button> -->
93
         <!-- <button class="btn" @click="layout">退出登录</button> -->
94
 
94
 
95
-        <div class="ver">0.5.56</div>
95
+        <div class="ver">0.5.57</div>
96
         <wyg-bottom-tab
96
         <wyg-bottom-tab
97
             ref="tabbar"
97
             ref="tabbar"
98
             :tabIndex="2"
98
             :tabIndex="2"