Merge branch 'msb_test' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into msb_test

layouts/module/header/HeaderCart.vue

@@ -10,7 +10,7 @@
     <div
       slot="reference"
       class="header-cart-popover__refrence flex flex-middle"
-      @click="onJumpCart"
+      @click="onJumCartPage"
     >
       <img src="~/assets/img/layout/icon-shop.png" />
       <span>购物车</span>
@@ -144,16 +144,13 @@ export default {
     },
   },
   methods: {
-    onJumpCart() {
-      if (!this.$isLoginValidate()) {
-        return;
-      }
-      this.$router.push("/cart");
-    },
     onJumpGoodsDetail(id) {
       this.$router.push(`/goods/detail/${id}`);
     },
     onJumCartPage() {
+      if (!this.$isLoginValidate()) {
+        return;
+      }
       this.$router.push("/cart");
     },
   },

layouts/module/header/index.vue

@@ -61,14 +61,13 @@
       <HeaderInfoBar />
       <div class="default-bar-header">
         <div class="bar-header-box">
-          <div
-            class="bar-header-box__wrap flex flex-between flex-middle"
-            @click="onOpenHomePage"
-          >
+          <div class="bar-header-box__wrap flex flex-between flex-middle">
+            <div @click="onOpenHomePage">
               <img
                 class="header-box-wrap__logo"
                 src="~/assets/img/layout/logo.png"
               />
+            </div>
             <div class="header-box-wrap__right flex flex-middle">
               <div class="box-wrap-right__search flex">
                 <div class="search-input">
@@ -76,7 +75,7 @@
                     v-model="searchContent"
                     clearable
                     placeholder="请输入商品名称"
-                    @keyup.enter="onSearch"
+                    @keyup.enter.native="onSearch"
                   >
                   </el-input>
                 </div>

plugins/axiosTk.js

@@ -25,7 +25,6 @@ export default function ({$axios, store, route}, inject) {
 			if(result.code === 'TOKEN_FAIL'){
 				store.commit('setLoginOut');
 				store.commit('setLoginVisible');
-				return result;
 			}
 			return Promise.reject(result);
 		}