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

Feature/task1.0.0

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

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