Merge branch 'test' into feat_delivery_zyh

src/styles/reset.scss

@@ -136,6 +136,7 @@ div {
 }
 
 .markdown-body {
+  display: inline-block;
   line-height: 1.6;
   font-size: 16px;
   color: #333;
@@ -199,12 +200,19 @@ div {
   overflow-x: auto;
 }
 
-.markdown-test b, .markdown-test strong,.markdown-test p,.markdown-test code,.markdown-test blockquote,.markdown-test ul,
-.markdown-test ol,.markdown-test li,.markdown-test h1,
+.markdown-test b,
+.markdown-test strong,
+.markdown-test p,
+.markdown-test code,
+.markdown-test blockquote,
+.markdown-test ul,
+.markdown-test ol,
+.markdown-test li,
+.markdown-test h1,
 .markdown-test h2,
 .markdown-test h3,
 .markdown-test h4,
 .markdown-test h5,
 .markdown-test h6 {
-  color: #FFF;
-}
+  color: #fff;
+}

src/utils/tools.ts

@@ -6,11 +6,17 @@ const formatString = computed(() => {
   return userStore.dateFormat || 'MM/DD/YYYY'
 })
 
-export const formatTimezone = (time: string, timezone?: string) => {
+export const formatTimezone = (time: string, timezone?: string, is12HourClock?: boolean) => {
   if (!time) return '--'
   let formattedTime = ''
   if (time.length > 12) {
-    formattedTime = moment(time).format(`${formatString.value} hh:mm A`)
+    if (is12HourClock) {
+      // 如果是12小时制，使用12小时制格式化
+      formattedTime = moment(time).format(`${formatString.value} hh:mm A`)
+    } else {
+      // 如果是24小时制，使用24小时制格式化
+      formattedTime = moment(time).format(`${formatString.value} HH:mm`)
+    }
     if (!timezone) {
       return formattedTime
     }
@@ -41,7 +47,7 @@ export const getTimezone = (timezone: string, time?: string): string => {
 export const formatTimezoneByUTCorGMT = (time: string, timezone: string) => {
   if (!time) return '--'
   let formattedTime = ''
-  formattedTime = moment(time).format(`${formatString.value} hh:mm A`)
+  formattedTime = moment(time).format(`${formatString.value} hh:mm`)
   let gmtOffset = ''
   if (timezone != null) {
     const timeZoneOffset = moment.tz(time, timezone).format('Z')

src/views/AIRobotChat/src/AIRobotChat.vue

@@ -289,14 +289,10 @@ defineExpose({
           src="./image/icon_loading.png"
           alt=""
         />
-        <!-- <span v-if="!msg.isAnswer">{{ msg.content }}</span> -->
-        <div>
-          <div v-html="renderedMessage(msg.content)" class="markdown-body"></div>
-          <LoadingDots
-            v-if="index === messages.length - 1 && msg.isAnswer && loadingAnswer"
-          ></LoadingDots>
-          <div></div>
-        </div>
+        <div v-html="renderedMessage(msg.content)" class="markdown-body"></div>
+        <LoadingDots
+          v-if="index === messages.length - 1 && msg.isAnswer && loadingAnswer"
+        ></LoadingDots>
         <!-- 评价  -->
         <div class="review" v-if="msg.isShowFeedback && msg.isAnswer">
           <el-button
@@ -526,7 +522,8 @@ defineExpose({
       .pause-btn {
         position: absolute;
         right: -22px;
-        top: 13px;
+        top: 50%;
+        transform: translateY(-50%);
         display: flex;
         align-items: center;
         justify-content: center;