From bc24c7511a769dcd758e55745211dd647b99c541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=BE=81?= <zhangz@163.com>
Date: Tue, 17 May 2022 19:57:13 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=9C=80=E5=A4=A7?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/detail/_id.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/goods/detail/_id.vue b/pages/goods/detail/_id.vue
index 0c6eb21..693c56b 100644
--- a/pages/goods/detail/_id.vue
+++ b/pages/goods/detail/_id.vue
@@ -159,7 +159,7 @@
           <div class="main__details-option--line flex flex-middle">
             <span class="line-txt">数量</span>
             <div class="line-btns">
-              <el-input-number v-model="curBuyNum" :min="1"></el-input-number>
+              <el-input-number v-model="curBuyNum" :min="1" :max='maxBuyNum'></el-input-number>
             </div>
           </div>
         </div>

From 4bdf753c6e1f707eb7fbaa2aaf59118ee0ea2d1c Mon Sep 17 00:00:00 2001
From: xiaoguang <aadsdas1@dingtalk.com>
Date: Tue, 17 May 2022 20:53:34 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E7=82=B9=E5=87=BB=E5=90=B8?=
 =?UTF-8?q?=E9=A1=B6=E6=A0=8F=E6=90=9C=E7=B4=A2=E6=BB=9A=E5=8A=A8=E5=88=B0?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8=E5=B9=B6=E4=B8=94=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E8=81=9A=E7=84=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layouts/module/header/HeaderCart.vue    |  3 +++
 layouts/module/header/HeaderInfoBar.vue |  4 ++--
 layouts/module/header/index.vue         | 12 +++++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/layouts/module/header/HeaderCart.vue b/layouts/module/header/HeaderCart.vue
index cc5da56..a4626e3 100644
--- a/layouts/module/header/HeaderCart.vue
+++ b/layouts/module/header/HeaderCart.vue
@@ -170,6 +170,9 @@ export default {
   border-radius: 4px;
   border: 1px solid #eeeeee;
   cursor: pointer;
+  &:hover {
+    background: #eeeeee;
+  }
   .wrap-right-cart__tip {
     width: 16px;
     height: 16px;
diff --git a/layouts/module/header/HeaderInfoBar.vue b/layouts/module/header/HeaderInfoBar.vue
index 8d49f49..85a4841 100644
--- a/layouts/module/header/HeaderInfoBar.vue
+++ b/layouts/module/header/HeaderInfoBar.vue
@@ -214,8 +214,8 @@ export default {
     height: 42px;
     font-size: 14px;
     img {
-      width: 8px;
-      height: 14px;
+      width: 6px;
+      height: 12px;
     }
   }
   .menu-item__wrap {
diff --git a/layouts/module/header/index.vue b/layouts/module/header/index.vue
index 760dc05..4bc0b6d 100644
--- a/layouts/module/header/index.vue
+++ b/layouts/module/header/index.vue
@@ -27,7 +27,7 @@
           <div class="bar-header-wrap__icons flex flex-middle">
             <img
               src="~/assets/img/layout/icon-search-sticky.png"
-              @click="$router.push('/goods/list')"
+              @click="onEnterSearch"
             />
             <div class="header-wrap-icons__shop" @click="onOpenCartPage">
               <img src="~/assets/img/layout/icon-shop-sticky.png" />
@@ -69,6 +69,7 @@
               <div class="box-wrap-right__search flex">
                 <div class="search-input">
                   <el-input
+                    ref="searchInput"
                     v-model="searchContent"
                     clearable
                     placeholder="请输入商品名称"
@@ -174,6 +175,12 @@ export default {
     this.getSeckillData();
   },
   methods: {
+    onEnterSearch() {
+      document.querySelector("body").scrollIntoView({ behavior: "smooth" });
+      setTimeout(() => {
+        this.$refs.searchInput.focus();
+      }, 500);
+    },
     async getSeckillData() {
       const { result } = await ApiGetHomeSeckill();
       if (result && result.activityTimeVO) {
@@ -197,6 +204,9 @@ export default {
       });
     },
     onOpenCartPage() {
+      if (!this.$isLoginValidate()) {
+        return;
+      }
       window.open(`${location.origin}/cart`);
     },
     onOpenHomePage() {

From ea82937dad58a98780e2d0a7209639bde57a4cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=BE=81?= <zhangz@163.com>
Date: Tue, 17 May 2022 20:56:18 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=94=AE=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/account/index/order/detail/module/GoodsInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/account/index/order/detail/module/GoodsInfo.vue b/pages/account/index/order/detail/module/GoodsInfo.vue
index e0eebb9..6718ec3 100644
--- a/pages/account/index/order/detail/module/GoodsInfo.vue
+++ b/pages/account/index/order/detail/module/GoodsInfo.vue
@@ -29,7 +29,7 @@
 					</td>
 					<td>
 						<template v-if="i.afterSaleApplyFlag || [2,3,4].includes(i.detailStatus)">
-							<a v-if="i.afterSaleApplyFlag">申请售后</a>
+              <nuxt-link v-if="i.afterSaleApplyFlag" to="/account/order/saleAfter/list">申请售后</nuxt-link>
 							<span v-else>
 								{{ i.detailStatus === 2 ? '退款中' :  i.detailStatus === 3 ? '已退款' : '退款关闭'}}
 							</span>

From ed326844ce7bc4f89dca5ebfa532d5e684b5060b Mon Sep 17 00:00:00 2001
From: xiaoguang <aadsdas1@dingtalk.com>
Date: Tue, 17 May 2022 21:48:19 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E5=88=86?=
 =?UTF-8?q?=E7=B1=BBUI=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layouts/module/header/HeaderCategory.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layouts/module/header/HeaderCategory.vue b/layouts/module/header/HeaderCategory.vue
index cb8273d..ee48a4d 100644
--- a/layouts/module/header/HeaderCategory.vue
+++ b/layouts/module/header/HeaderCategory.vue
@@ -173,13 +173,13 @@ export default {
       color: #333333;
       .tab-category-menu__left {
         width: 190px;
-        padding: 15px 0;
+        padding: 30px 0 35px 0;
         background: #ffffff;
         .menu-left__item {
           height: 36px;
           cursor: pointer;
           padding: 0 24px 0 41px;
-          margin-top: 23px;
+          margin-top: 15px;
           &:first-child {
             margin-top: 0;
           }

From c14ce44b1404e39fdfc01d5e62ebcad56eb14308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=BE=81?= <zhangz@163.com>
Date: Tue, 17 May 2022 21:57:12 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/BsAddress.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/BsAddress.vue b/components/BsAddress.vue
index a6cb15e..4f0fc66 100644
--- a/components/BsAddress.vue
+++ b/components/BsAddress.vue
@@ -330,7 +330,7 @@ export default {
       vm.$set(vm.selectData.city, "code", "");
       vm.$set(vm.selectData.province, "code", "");
       vm.$set(vm, "detailAddress", "");
-      vm.$set(vm, "defaultAddress", "");
+      vm.$set(vm, "defaultAddress", false);
       vm.$set(vm, "addressUser", "");
       vm.$set(vm, "addressPhone", "");
     },