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

feat: 修复个人中午物流未显示bug

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

layouts/module/header/HeaderCart.vue

@@ -17,7 +17,7 @@
       <div
         v-if="cartCount > 0"
         class="wrap-right-cart__tip flex flex-middle flex-center"
-        :class="{ 'wrap-right-cart__tip--more': cartCount > 10 }"
+        :class="{ 'wrap-right-cart__tip--more': cartCount > 9 }"
       >
         {{ cartCount }}
       </div>

layouts/module/header/HeaderInfoBar.vue

@@ -52,7 +52,11 @@
           >
             <img src="~/assets/img/layout/icon-message.png" />
             <span class="hover-text">消息</span>
-            <div v-if="messageCount > 0" class="wrap-content-message__tip">
+            <div
+              v-if="messageCount > 0"
+              class="wrap-content-message__tip flex flex-center flex-middle"
+              :class="{ 'wrap-content-message__tip--more': messageCount > 9 }"
+            >
               {{ messageCount }}
             </div>
           </div>
@@ -244,16 +248,18 @@ export default {
         }
       }
       .wrap-content-message__tip {
-        min-width: 14px;
+        width: 14px;
         height: 14px;
-        padding: 0 3px;
-        line-height: 14px;
         font-size: 10px;
         color: #ffffff;
-        text-align: center;
         background: #ff512b;
         border-radius: 50%;
         margin-left: 4px;
+        &--more {
+          width: unset;
+          padding: 0 3px;
+          border-radius: 7px;
+        }
       }
       .header-wrap-content--line {
         width: 1px;

layouts/module/header/index.vue

@@ -32,7 +32,13 @@
             />
             <div class="header-wrap-icons__shop" @click="$router.push('/cart')">
               <img src="~/assets/img/layout/icon-shop-sticky.png" />
-              <span v-if="cartCount > 0" class="">{{ cartCount }}</span>
+              <div
+                v-if="cartCount > 0"
+                :class="{ 'wrap-icons-shop__tip--more': cartCount > 10 }"
+                class="wrap-icons-shop__tip flex flex-middle flex-center"
+              >
+                {{ cartCount }}
+              </div>
             </div>
             <div
               v-if="token"
@@ -123,12 +129,14 @@ export default {
     return {
       searchContent: "",
       tabPath: "/",
-      cartCount: 0, // 购物车商品数
       cartProductList: [], // 购物车列表
     };
   },
   computed: {
-    ...mapState(["userInfo", "token", "seckillTabVisible"]),
+    ...mapState(["userInfo", "token", "seckillTabVisible", "cartProducts"]),
+    cartCount() {
+      return this.cartProducts.length;
+    },
     tabList() {
       const defaultList = [
         { label: "首页", value: "/" },
@@ -215,19 +223,21 @@ export default {
       .header-wrap-icons__shop {
         position: relative;
         margin-left: 14px;
-        span {
+        .wrap-icons-shop__tip {
           position: absolute;
-          right: -6px;
+          left: 18px;
           top: -4px;
-          display: block;
           height: 14px;
-          padding: 0 2px;
+          width: 14px;
-          line-height: 14px;
-          text-align: center;
           background: #ff512b;
           font-size: 10px;
           color: #ffffff;
           border-radius: 50%;
+          &--more {
+            width: unset;
+            padding: 0 3px;
+            border-radius: 7px;
+          }
         }
       }
       .header-wrap-icons__login {

pages/account/index/home/module/LogisitcsInfo.vue

@@ -99,13 +99,13 @@ export default {
         if (records && records.length > 0) {
           const formatRecords = records.map((item) => {
             const goods = item.products || [{ productImageUrl: "" }];
-            const logisticsList = item.logistics.logisticsDataList || [
+            const logisticsList = item.logistics.logisticsDataList || [];
-              { context: "暂无物流信息" },
-            ];
             return {
               ...item,
               cover: goods[0].productImageUrl, // 订单封面
-              logisticsContext: logisticsList[0].context, // 物流详细信息
+              logisticsContext:
+                (logisticsList.length > 0 && logisticsList[0].context) ||
+                "暂无物流信息", // 物流详细信息
             };
           });
           this.list = this.list.concat(formatRecords);