Merge branch 'feature/task1.0.0' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into feature/task1.0.0

Dockerfile

@@ -4,6 +4,7 @@ WORKDIR /workload
 COPY nuxt.config.js /workload/nuxt.config.js
 COPY package.json /workload/package.json
 COPY .nuxt /workload/.nuxt
+COPY static /workload/static
 
 RUN npm config set registry https://registry.npm.taobao.org \
     && npm install

layouts/module/header/HeaderInfoBar.vue

@@ -152,7 +152,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(["userInfo", "token","unreadCount"]),
+    ...mapState(["userInfo", "token", "unreadCount"]),
     menuIcon() {
       return this.menuVisible
         ? require("~/assets/img/layout/icon-up-light.png")
@@ -160,7 +160,7 @@ export default {
     },
   },
   mounted() {
-    this.$startWebSockets()
+    this.$startWebSockets();
   },
   methods: {
     onLoginClick() {
@@ -248,7 +248,7 @@ export default {
   height: 30px;
   color: #999999;
   background: #f1f1f1;
-  border-radius: 0px 0px 0px 0px;
+  font-size: 12px;
   .info-bar-header-wrap {
     height: 100%;
     @include layout-box;
@@ -270,6 +270,8 @@ export default {
           position: relative;
           padding: 0 18px;
           height: 30px;
+          font-size: 12px;
+          color: #999999;
           cursor: pointer;
           .content-login-info__logo {
             width: 8px;

layouts/module/header/index.vue

@@ -62,11 +62,8 @@
       <div class="default-bar-header">
         <div class="bar-header-box">
           <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 class="header-box-wrap__logo" @click="onOpenHomePage">
+              <img src="~/assets/img/layout/logo.png" />
             </div>
             <div class="header-box-wrap__right flex flex-middle">
               <div class="box-wrap-right__search flex">
@@ -203,7 +200,10 @@ export default {
       window.open(`${location.origin}/cart`);
     },
     onOpenHomePage() {
-      this.$router.push("/");
+      if (this.$route.path === "/") {
+        return;
+      }
+      window.open(`${location.origin}/`);
     },
   },
 };
@@ -308,7 +308,7 @@ export default {
     @include layout-box;
     background: #ffffff;
     .bar-header-box__wrap {
-      height: 42px;
+      height: 40px;
       font-size: 14px;
       margin-bottom: 38px;
       padding-right: 50px;