From abee09555f50b17af8c47e1208afdba2a6181b45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Wed, 21 Aug 2024 13:13:17 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E5=A4=84=E7=90=86dayjs=E7=9A=84format?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=85=B7=E4=BD=93=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=E5=8F=82=E8=80=83=E5=95=86=E5=9F=8E=E5=AE=A2=E6=9C=8D=E7=9A=84?=
 =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/formatTime.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts
index 134a986e0..a13cfd6b0 100644
--- a/src/utils/formatTime.ts
+++ b/src/utils/formatTime.ts
@@ -69,7 +69,7 @@ export function formatDate(date: Date, format?: string): string {
     return ''
   }
   // 日期存在，则进行格式化
-  return date ? dayjs(date).format(format ?? 'YYYY-MM-DD HH:mm:ss') : ''
+  return date ? dayjs(date).format((format?.includes("YYYY-mm-dd") ? format.replace("YYYY-mm-dd", "YYYY-MM-DD") : format) ?? 'YYYY-MM-DD HH:mm:ss') : ''
 }
 
 /**
-- 
Gitee


From 93e928f94558326e445910fdd36f917a5046dbc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Wed, 21 Aug 2024 16:41:11 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BC=98=E5=8C=96=E5=95=86=E5=9F=8E=E5=AE=A2?=
 =?UTF-8?q?=E6=9C=8D=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=A4=96=E8=A7=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kefu/components/KeFuConversationList.vue  | 22 +++++++++----------
 .../kefu/components/KeFuMessageList.vue       |  5 +++--
 .../history/MemberBrowsingHistory.vue         |  2 +-
 .../kefu/components/message/OrderItem.vue     | 22 ++++++++++++++-----
 .../kefu/components/message/ProductItem.vue   | 11 +++++-----
 .../promotion/kefu/components/tools/emoji.ts  |  4 ++--
 6 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/src/views/mall/promotion/kefu/components/KeFuConversationList.vue b/src/views/mall/promotion/kefu/components/KeFuConversationList.vue
index 60188f322..0a8ba1eab 100644
--- a/src/views/mall/promotion/kefu/components/KeFuConversationList.vue
+++ b/src/views/mall/promotion/kefu/components/KeFuConversationList.vue
@@ -22,17 +22,16 @@
         <div class="ml-10px w-100%">
           <div class="flex justify-between items-center w-100%">
             <span class="username">{{ item.userNickname }}</span>
-            <span class="color-[#989EA6]">
+            <span class="color-[var(--left-menu-text-color)]" style="font-size: 13px;">
               {{ formatPast(item.lastMessageTime, 'YYYY-mm-dd') }}
             </span>
           </div>
           <!-- 最后聊天内容 -->
           <div
-            v-dompurify-html="
-              getConversationDisplayText(item.lastMessageContentType, item.lastMessageContent)
-            "
-            class="last-message flex items-center color-[#989EA6]"
-          ></div>
+            v-dompurify-html="getConversationDisplayText(item.lastMessageContentType, item.lastMessageContent)"
+            class="last-message flex items-center color-[var(--left-menu-text-color)]"
+          >
+          </div>
         </div>
       </div>
     </div>
@@ -182,7 +181,7 @@ watch(showRightMenu, (val) => {
   &-conversation {
     height: 60px;
     padding: 10px;
-    background-color: #fff;
+    //background-color: #fff;
     transition: border-left 0.05s ease-in-out; /* 设置过渡效果 */
 
     .username {
@@ -196,6 +195,7 @@ watch(showRightMenu, (val) => {
     }
 
     .last-message {
+      font-size: 13px;
       width: 200px;
       overflow: hidden; // 隐藏超出的文本
       white-space: nowrap; // 禁止换行
@@ -205,16 +205,16 @@ watch(showRightMenu, (val) => {
 
   .active {
     border-left: 5px #3271ff solid;
-    background-color: #eff0f1;
+    background-color: var(--left-menu-bg-active-color);
   }
 
   .pinned {
-    background-color: #eff0f1;
+    background-color: var(--left-menu-bg-active-color);
   }
 
   .right-menu-ul {
     position: absolute;
-    background-color: #fff;
+    background-color: var(--app-content-bg-color);
     padding: 10px;
     margin: 0;
     list-style-type: none; /* 移除默认的项目符号 */
@@ -228,7 +228,7 @@ watch(showRightMenu, (val) => {
       border-radius: 12px;
       transition: background-color 0.3s; /* 平滑过渡 */
       &:hover {
-        background-color: #e0e0e0; /* 悬停时的背景颜色 */
+        background-color: var(--left-menu-bg-active-color); /* 悬停时的背景颜色 */
       }
     }
   }
diff --git a/src/views/mall/promotion/kefu/components/KeFuMessageList.vue b/src/views/mall/promotion/kefu/components/KeFuMessageList.vue
index d3632e63a..410843031 100644
--- a/src/views/mall/promotion/kefu/components/KeFuMessageList.vue
+++ b/src/views/mall/promotion/kefu/components/KeFuMessageList.vue
@@ -369,9 +369,10 @@ const showTime = computed(() => (item: KeFuMessageRespVO, index: number) => {
       position: absolute;
       bottom: 35px;
       right: 35px;
-      background-color: #fff;
+      background-color: var(--app-content-bg-color);
       padding: 10px;
       border-radius: 30px;
+      font-size: 12px;
       box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); /* 阴影效果 */
     }
 
@@ -445,7 +446,7 @@ const showTime = computed(() => (item: KeFuMessageRespVO, index: number) => {
       border-radius: 12rpx;
       padding: 8rpx 16rpx;
       margin-bottom: 16rpx;
-      background-color: #e8e8e8;
+      //background-color: #e8e8e8;
       color: #999;
       font-size: 24rpx;
     }
diff --git a/src/views/mall/promotion/kefu/components/history/MemberBrowsingHistory.vue b/src/views/mall/promotion/kefu/components/history/MemberBrowsingHistory.vue
index 8b6891aec..52c1095b5 100644
--- a/src/views/mall/promotion/kefu/components/history/MemberBrowsingHistory.vue
+++ b/src/views/mall/promotion/kefu/components/history/MemberBrowsingHistory.vue
@@ -7,7 +7,7 @@
       <el-tab-pane label="订单列表" name="b" />
     </el-tabs>
     <div>
-      <el-scrollbar ref="scrollbarRef" always height="calc(100vh - 400px)" @scroll="handleScroll">
+      <el-scrollbar ref="scrollbarRef" always height="calc(115vh - 400px)" @scroll="handleScroll">
         <!-- 最近浏览 -->
         <ProductBrowsingHistory v-if="activeName === 'a'" ref="productBrowsingHistoryRef" />
         <!-- 订单列表 -->
diff --git a/src/views/mall/promotion/kefu/components/message/OrderItem.vue b/src/views/mall/promotion/kefu/components/message/OrderItem.vue
index 5ee21f281..2258c81eb 100644
--- a/src/views/mall/promotion/kefu/components/message/OrderItem.vue
+++ b/src/views/mall/promotion/kefu/components/message/OrderItem.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="isObject(getMessageContent)">
     <div :key="getMessageContent.id" class="order-list-card-box mt-14px">
-      <div class="order-card-header flex items-center justify-between p-x-20px">
+      <div class="order-card-header flex items-center justify-between p-x-5px">
         <div class="order-no">订单号：{{ getMessageContent.no }}</div>
         <div :class="formatOrderColor(getMessageContent)" class="order-state font-16">
           {{ formatOrderStatus(getMessageContent) }}
@@ -16,7 +16,7 @@
           :title="item.spuName"
         />
       </div>
-      <div class="pay-box flex justify-end pr-20px">
+      <div class="pay-box flex justify-end pr-5px">
         <div class="flex items-center">
           <div class="discounts-title pay-color"
             >共 {{ getMessageContent?.productCount }} 件商品,总金额:
@@ -97,18 +97,21 @@ function formatOrderStatus(order: any) {
 .order-list-card-box {
   border-radius: 10px;
   padding: 10px;
-  background-color: #e2e2e2;
+  border: 1px #6a6a6a solid;
+  background-color: var(--app-content-bg-color);
 
   .order-card-header {
     height: 28px;
 
     .order-no {
-      font-size: 16px;
+      font-size: 10px;
       font-weight: 500;
     }
   }
 
   .pay-box {
+    padding-top: 10px;
+
     .discounts-title {
       font-size: 16px;
       line-height: normal;
@@ -123,24 +126,33 @@ function formatOrderStatus(order: any) {
     }
 
     .pay-color {
-      color: #333;
+      font-size: 13px;
+      color: var(--left-menu-text-color);
     }
   }
 }
 
 .warning-color {
   color: #faad14;
+  font-size: 11px;
+  font-weight: bold;
 }
 
 .danger-color {
   color: #ff3000;
+  font-size: 11px;
+  font-weight: bold;
 }
 
 .success-color {
   color: #52c41a;
+  font-size: 11px;
+  font-weight: bold;
 }
 
 .info-color {
   color: #999999;
+  font-size: 11px;
+  font-weight: bold;
 }
 </style>
diff --git a/src/views/mall/promotion/kefu/components/message/ProductItem.vue b/src/views/mall/promotion/kefu/components/message/ProductItem.vue
index ba2a2a94a..8c58df2ea 100644
--- a/src/views/mall/promotion/kefu/components/message/ProductItem.vue
+++ b/src/views/mall/promotion/kefu/components/message/ProductItem.vue
@@ -113,7 +113,8 @@ const skuString = computed(() => {
 .ss-order-card-warp {
   padding: 20px;
   border-radius: 10px;
-  background-color: #e2e2e2;
+  border: 1px #6a6a6a solid;
+  background-color: var(--app-content-bg-color);
 
   .img-box {
     width: 80px;
@@ -139,13 +140,13 @@ const skuString = computed(() => {
   }
 
   .title-text {
-    font-size: 16px;
+    font-size: 13px;
     font-weight: 500;
     line-height: 20px;
   }
 
   .spec-text {
-    font-size: 16px;
+    font-size: 10px;
     font-weight: 400;
     color: #999999;
     min-width: 0;
@@ -157,13 +158,13 @@ const skuString = computed(() => {
   }
 
   .price-text {
-    font-size: 16px;
+    font-size: 11px;
     font-weight: 500;
     font-family: OPPOSANS;
   }
 
   .total-text {
-    font-size: 16px;
+    font-size: 10px;
     font-weight: 400;
     line-height: 16px;
     color: #999999;
diff --git a/src/views/mall/promotion/kefu/components/tools/emoji.ts b/src/views/mall/promotion/kefu/components/tools/emoji.ts
index 7e3f19be5..ff7a12e7c 100644
--- a/src/views/mall/promotion/kefu/components/tools/emoji.ts
+++ b/src/views/mall/promotion/kefu/components/tools/emoji.ts
@@ -80,8 +80,8 @@ export const useEmoji = () => {
   /**
    * 将文本中的表情替换成图片
    *
-   * @param data 文本
    * @return 替换后的文本
+   * @param content 消息内容
    */
   const replaceEmoji = (content: string) => {
     let newData = content
@@ -93,7 +93,7 @@ export const useEmoji = () => {
           const emojiFile = getEmojiFileByName(item)
           newData = newData.replace(
             item,
-            `<img class="chat-img" style="width: 24px;height: 24px;margin: 0 3px;" src="${emojiFile}"/>`
+            `<img class="chat-img" style="width: 24px;height: 24px;margin: 0 3px;" src="${emojiFile}" alt=""/>`
           )
         })
       }
-- 
Gitee


From e04ba1ddc2f1d0c394aa1885beed2bfdcda69a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Wed, 21 Aug 2024 17:41:31 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BC=98=E5=8C=96=E5=95=86=E5=9F=8E=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E7=9A=84=E8=BD=A8=E8=BF=B9=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mall/trade/order/detail/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/mall/trade/order/detail/index.vue b/src/views/mall/trade/order/detail/index.vue
index 67e547671..d521c2a39 100644
--- a/src/views/mall/trade/order/detail/index.vue
+++ b/src/views/mall/trade/order/detail/index.vue
@@ -397,13 +397,14 @@ onMounted(async () => {
     align-items: center;
     min-height: 30px;
     padding: 10px;
-    background-color: #f7f8fa;
+    border-radius: var(--el-card-border-radius);
+    background-color: var(--app-content-bg-color);
 
     &::before {
       position: absolute;
       top: 10px;
       left: 13px; /* 将伪元素水平居中 */
-      border-color: transparent #f7f8fa transparent transparent; /* 尖角颜色，左侧朝向 */
+      border-color: transparent var(--app-content-bg-color) transparent transparent; /* 尖角颜色，左侧朝向 */
       border-style: solid;
       border-width: 8px; /* 调整尖角大小 */
       content: ''; /* 必须设置 content 属性 */
-- 
Gitee


From 0f2061f80a083e50bdfcf2e94a000c4343af44b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Wed, 21 Aug 2024 22:05:07 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E9=BB=91=E6=9A=97=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mall/trade/order/components/OrderTableColumn.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/mall/trade/order/components/OrderTableColumn.vue b/src/views/mall/trade/order/components/OrderTableColumn.vue
index 5d1e25eec..adad30564 100644
--- a/src/views/mall/trade/order/components/OrderTableColumn.vue
+++ b/src/views/mall/trade/order/components/OrderTableColumn.vue
@@ -41,7 +41,7 @@
           <template #header>
             <div
               class="mr-[20px] h-[35px] flex items-center pl-[10px] pr-[10px]"
-              style="background-color: #f7f7f7"
+              style="background-color: var(--app-content-bg-color)"
             >
               <span class="mr-20px">订单号：{{ scope.row.no }} </span>
               <span class="mr-20px">下单时间：{{ formatDate(scope.row.createTime) }}</span>
-- 
Gitee


From 11584d3ee2616ad30084bab6ef1789623414650b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Wed, 21 Aug 2024 22:20:10 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8Ddayjs=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/formatTime.ts                                       | 4 ++--
 .../mall/promotion/kefu/components/KeFuConversationList.vue   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts
index a13cfd6b0..ded65fe6d 100644
--- a/src/utils/formatTime.ts
+++ b/src/utils/formatTime.ts
@@ -66,10 +66,10 @@ export const defaultShortcuts = [
 export function formatDate(date: Date, format?: string): string {
   // 日期不存在，则返回空
   if (!date) {
-    return ''
+    return '';
   }
   // 日期存在，则进行格式化
-  return date ? dayjs(date).format((format?.includes("YYYY-mm-dd") ? format.replace("YYYY-mm-dd", "YYYY-MM-DD") : format) ?? 'YYYY-MM-DD HH:mm:ss') : ''
+  return date ? dayjs(date).format(format ?? 'YYYY-MM-DD HH:mm:ss') : '';
 }
 
 /**
diff --git a/src/views/mall/promotion/kefu/components/KeFuConversationList.vue b/src/views/mall/promotion/kefu/components/KeFuConversationList.vue
index 0a8ba1eab..0ff3d422a 100644
--- a/src/views/mall/promotion/kefu/components/KeFuConversationList.vue
+++ b/src/views/mall/promotion/kefu/components/KeFuConversationList.vue
@@ -23,7 +23,7 @@
           <div class="flex justify-between items-center w-100%">
             <span class="username">{{ item.userNickname }}</span>
             <span class="color-[var(--left-menu-text-color)]" style="font-size: 13px;">
-              {{ formatPast(item.lastMessageTime, 'YYYY-mm-dd') }}
+              {{ formatPast(item.lastMessageTime, 'YYYY-MM-DD') }}
             </span>
           </div>
           <!-- 最后聊天内容 -->
-- 
Gitee