Merge branch 'feature/task1.0.0' into 'msb_prod'

Feature/task1.0.0

See merge request yanxuan-frontend/shop-pc!95

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", "");
     },

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;

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;
           }

layouts/module/header/HeaderInfoBar.vue

@@ -214,8 +214,8 @@ export default {
     height: 42px;
     font-size: 14px;
     img {
-      width: 8px;
+      width: 6px;
-      height: 14px;
+      height: 12px;
     }
   }
   .menu-item__wrap {

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() {

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>

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>