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

Feature/task1.0.0 xg

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

layouts/module/header/HeaderCart.vue

@@ -145,13 +145,13 @@ export default {
   },
   methods: {
     onJumpGoodsDetail(id) {
-      this.$router.push(`/goods/detail/${id}`);
+      window.open(`${location.origin}/goods/detail/${id}`);
     },
     onJumCartPage() {
       if (!this.$isLoginValidate()) {
         return;
       }
-      this.$router.push("/cart");
+      window.open(`${location.origin}/cart`);
     },
   },
 };
@@ -178,10 +178,9 @@ export default {
     border-radius: 50%;
     color: #ffffff;
     margin-left: 4px;
-    padding-top: 2px;
     &--more {
       width: unset;
-      padding: 2px 5px 0 4px;
+      padding: 1px 5px 0 4px;
       border-radius: 7px;
     }
   }

layouts/module/header/HeaderCategory.vue

@@ -7,7 +7,7 @@
       @mouseenter="handleCategoryChange(true)"
       @mouseleave="handleCategoryChange(false)"
     >
-      <div class="tab-category__label flex flex-center flex-middle">
+      <div class="tab-category__label flex flex-middle">
         <img src="~/assets/img/layout/icon-category.png" />
         <span>热门分类</span>
       </div>
@@ -152,6 +152,7 @@ export default {
     .tab-category__label {
       width: 190px;
       height: 100%;
+      padding-left: 41px;
       background: linear-gradient(270deg, #ffa25a 0%, #ff7f39 100%);
       border-radius: 4px 4px 0px 0px;
       font-weight: bold;

layouts/module/header/HeaderInfoBar.vue

@@ -196,6 +196,10 @@ export default {
     display: none !important;
   }
 }
+.header-info-bar__popover {
+  padding: 22px !important;
+  margin-top: 8px !important;
+}
 </style>
 <style lang="scss" scoped>
 .header-info-bar__dropdown {
@@ -237,8 +241,10 @@ export default {
     font-size: 14px;
     color: #666666;
     text-align: center;
+    width: 186px;
+    margin: 0 auto;
     img {
-      width: 186px;
+      width: 100%;
       height: 186px;
       margin-bottom: 15px;
     }
@@ -262,10 +268,6 @@ export default {
             cursor: pointer;
           }
         }
-        .wrap-content-login__info--hover {
-          background: #ffffff !important;
-          color: #ff875b;
-        }
         .wrap-content-login__info {
           position: relative;
           padding: 0 18px;
@@ -279,6 +281,10 @@ export default {
             margin-left: 4px;
           }
         }
+        .wrap-content-login__info--hover {
+          background: #ffffff;
+          color: #ff875b;
+        }
       }
       .wrap-content-message__tip {
         width: 14px;

pages/account/index/home/index.vue

@@ -36,7 +36,6 @@
     </div>
     <div class="account-home-content flex">
       <LogisitcsInfo />
-      <Message />
     </div>
   </div>
 </template>
@@ -48,11 +47,10 @@ import {
   ApiGetRefundStatistisc,
 } from "@/plugins/api/order";
 import LogisitcsInfo from "./module/LogisitcsInfo.vue";
-import Message from "./module/Message.vue";
 
 export default {
   name: "AccountHome",
-  components: { LogisitcsInfo, Message },
+  components: { LogisitcsInfo },
   data() {
     function getOrderTypeIcon(path) {
       return require(`~/assets/img/account/home/${path}.png`);

pages/index/module/TabbarFixed.vue

@@ -22,13 +22,13 @@
       </div>
       <div class="tabbar-fixed-box__line"></div>
       <div
-        @mouseenter="customerHover = true"
-        @mouseleave="customerHover = false"
-        @click="onConcatCustomer"
+        @mouseenter="messageHover = true"
+        @mouseleave="messageHover = false"
+        @click="onOpenMessagePage"
         class="tabbar-fixed-box__common flex flex-middle"
       >
-        <span v-show="customerHover">消息通知</span>
-        <img v-show="!customerHover" src="~/assets/img/home/icon-message.png" />
+        <span v-show="messageHover">消息通知</span>
+        <img v-show="!messageHover" src="~/assets/img/home/icon-message.png" />
       </div>
       <div v-show="showToTop">
         <div class="tabbar-fixed-box__line"></div>
@@ -60,7 +60,7 @@ export default {
   data() {
     return {
       appHover: false,
-      customerHover: false,
+      messageHover: false,
       totopHover: false,
       tabBarVisible: false,
     };
@@ -80,10 +80,11 @@ export default {
         this.tabBarVisible = true;
       }
     },
-    onConcatCustomer() {
+    onOpenMessagePage() {
       if (!this.$isLoginValidate()) {
         return;
       }
+      window.open(`${location.origin}/account/message`);
     },
     toPageTop() {
       document.querySelector("body").scrollIntoView({ behavior: "smooth" });
@@ -98,6 +99,7 @@ export default {
   left: 50%;
   top: 568px;
   margin-left: 630px;
+  border: 1px solid #f8f8f8;
   &--change {
     margin-left: 390px;
   }