From 137945dbe6d8289544fc1f5675381b20dde46601 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 16:44:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=9C=8B=E4=BA=86?=
 =?UTF-8?q?=E5=8F=88=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/detail/_id.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pages/goods/detail/_id.vue b/pages/goods/detail/_id.vue
index 48f70ea..60a138b 100644
--- a/pages/goods/detail/_id.vue
+++ b/pages/goods/detail/_id.vue
@@ -243,7 +243,7 @@ import { ApiPutAddCart } from "@/plugins/api/cart";
 import {
   ApiGetGoodsDetail,
   ApiGetGoodsSkus,
-  ApiGetRecommendedGoodsList,
+  ApiGetGoodsList,
 } from "@/plugins/api/goods";
 export default {
   componetns: { UiMoney, UiButton, UiGoodsItem, BsChosen },
@@ -271,10 +271,16 @@ export default {
     let id = this.$route.params.id;
     let res1 = await ApiGetGoodsDetail({ id });
     let res2 = await ApiGetGoodsSkus({ productId: id });
-    let res3 = await ApiGetRecommendedGoodsList();
+    let res3 = await ApiGetGoodsList({
+        length: 3,
+        pageIndex: 1,
+        name: "",
+        categoryId: "",
+        order: "",
+      });
     vm.detailData = res1.result;
     vm.skuData = res2.result;
-    vm.recommendedData = res3.result;
+    vm.recommendedData = res3.result.records;
     vm.pageLoading = false;
     if (
       vm.detailData.productActivityVO.isActivity &&

From b88f6ba9ceef6c181ea4dc5d3006b934c1474c4c Mon Sep 17 00:00:00 2001
From: xiaoguang <aadsdas1@dingtalk.com>
Date: Tue, 17 May 2022 16:45:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20dockerfile=E6=B7=BB=E5=8A=A0static?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                              |  1 +
 layouts/module/header/HeaderInfoBar.vue |  8 +++++---
 layouts/module/header/index.vue         | 14 +++++++-------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1a27724..c59aafb 100644
--- a/Dockerfile
+++ b/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
diff --git a/layouts/module/header/HeaderInfoBar.vue b/layouts/module/header/HeaderInfoBar.vue
index 848a5a6..e9265f5 100644
--- a/layouts/module/header/HeaderInfoBar.vue
+++ b/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;
diff --git a/layouts/module/header/index.vue b/layouts/module/header/index.vue
index eac91ff..760dc05 100644
--- a/layouts/module/header/index.vue
+++ b/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;