From 4f0f97e2194e5218514ef3089576fed02c8736f6 Mon Sep 17 00:00:00 2001
From: xiaoguang <aadsdas1@dingtalk.com>
Date: Tue, 17 May 2022 14:29:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=93=8D=E5=BA=94=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=A0=81=E4=B8=BA=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=94=E5=9B=9Ereject?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layouts/module/header/HeaderCart.vue | 11 ++++-------
 layouts/module/header/index.vue      | 17 ++++++++---------
 plugins/axiosTk.js                   |  1 -
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/layouts/module/header/HeaderCart.vue b/layouts/module/header/HeaderCart.vue
index f06ea24..710caba 100644
--- a/layouts/module/header/HeaderCart.vue
+++ b/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");
     },
   },
diff --git a/layouts/module/header/index.vue b/layouts/module/header/index.vue
index faded79..eac91ff 100644
--- a/layouts/module/header/index.vue
+++ b/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"
-          >
-            <img
-              class="header-box-wrap__logo"
-              src="~/assets/img/layout/logo.png"
-            />
+          <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>
diff --git a/plugins/axiosTk.js b/plugins/axiosTk.js
index 722772a..acdf289 100644
--- a/plugins/axiosTk.js
+++ b/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);
 		}