!557 【功能优化】商城相关优化

Merge pull request !557 from 卢越/master

src/components/ContentWrap/src/ContentWrap.vue

@@ -11,7 +11,7 @@ const prefixCls = getPrefixCls('content-wrap')
 defineProps({
 defineProps({
   title: propTypes.string.def(''),
   title: propTypes.string.def(''),
   message: propTypes.string.def(''),
   message: propTypes.string.def(''),
-  bodyStyle: propTypes.object.def({ padding: '20px' })
+  bodyStyle: propTypes.object.def({ padding: '10px' })
 })
 })
 </script>
 </script>
 
 

src/components/DiyEditor/components/mobile/TabBar/property.vue

@@ -79,7 +79,7 @@
 </template>
 </template>
 
 
 <script setup lang="ts">
 <script setup lang="ts">
-import { TabBarProperty, THEME_LIST } from './config'
+import { TabBarProperty, component, THEME_LIST } from './config'
 import { usePropertyForm } from '@/components/DiyEditor/util'
 import { usePropertyForm } from '@/components/DiyEditor/util'
 // 底部导航栏
 // 底部导航栏
 defineOptions({ name: 'TabBarProperty' })
 defineOptions({ name: 'TabBarProperty' })
@@ -88,6 +88,9 @@ const props = defineProps<{ modelValue: TabBarProperty }>()
 const emit = defineEmits(['update:modelValue'])
 const emit = defineEmits(['update:modelValue'])
 const { formData } = usePropertyForm(props.modelValue, emit)
 const { formData } = usePropertyForm(props.modelValue, emit)
 
 
+// 将数据库的值更新到右侧属性栏
+component.property.items = formData.value.items
+
 // 要的主题
 // 要的主题
 const handleThemeChange = () => {
 const handleThemeChange = () => {
   const theme = THEME_LIST.find((theme) => theme.id === formData.value.theme)
   const theme = THEME_LIST.find((theme) => theme.id === formData.value.theme)

src/views/mall/promotion/kefu/components/KeFuConversationList.vue

@@ -22,13 +22,15 @@
         <div class="ml-10px w-100%">
         <div class="ml-10px w-100%">
           <div class="flex justify-between items-center w-100%">
           <div class="flex justify-between items-center w-100%">
             <span class="username">{{ item.userNickname }}</span>
             <span class="username">{{ item.userNickname }}</span>
-            <span class="color-[var(--left-menu-text-color)]" style="font-size: 13px;">
+            <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>
             </span>
           </div>
           </div>
           <!-- 最后聊天内容 -->
           <!-- 最后聊天内容 -->
           <div
           <div
-            v-dompurify-html="getConversationDisplayText(item.lastMessageContentType, item.lastMessageContent)"
+            v-dompurify-html="
+              getConversationDisplayText(item.lastMessageContentType, item.lastMessageContent)
+            "
             class="last-message flex items-center color-[var(--left-menu-text-color)]"
             class="last-message flex items-center color-[var(--left-menu-text-color)]"
           >
           >
           </div>
           </div>
@@ -205,7 +207,7 @@ watch(showRightMenu, (val) => {
 
 
   .active {
   .active {
     border-left: 5px #3271ff solid;
     border-left: 5px #3271ff solid;
-    background-color: var(--left-menu-bg-active-color);
+    background-color: var(--login-bg-color);
   }
   }
 
 
   .pinned {
   .pinned {
@@ -215,7 +217,7 @@ watch(showRightMenu, (val) => {
   .right-menu-ul {
   .right-menu-ul {
     position: absolute;
     position: absolute;
     background-color: var(--app-content-bg-color);
     background-color: var(--app-content-bg-color);
-    padding: 10px;
+    padding: 5px;
     margin: 0;
     margin: 0;
     list-style-type: none; /* 移除默认的项目符号 */
     list-style-type: none; /* 移除默认的项目符号 */
     border-radius: 12px;
     border-radius: 12px;

src/views/mall/promotion/kefu/components/message/OrderItem.vue

 <template>
 <template>
-  <div v-if="isObject(getMessageContent)" @click="openDetail(getMessageContent.id)" style="cursor: pointer;">
+  <div v-if="isObject(getMessageContent)">
     <div :key="getMessageContent.id" class="order-list-card-box mt-14px">
     <div :key="getMessageContent.id" class="order-list-card-box mt-14px">
       <div class="order-card-header flex items-center justify-between p-x-5px">
       <div class="order-card-header flex items-center justify-between p-x-5px">
-        <div class="order-no">订单号：{{ getMessageContent.no }}</div>
+        <div class="order-no">
+          订单号：
+          <span style="cursor: pointer" @click="openDetail(getMessageContent.id)">
+            {{ getMessageContent.no }}
+          </span>
+        </div>
         <div :class="formatOrderColor(getMessageContent)" class="order-state font-16">
         <div :class="formatOrderColor(getMessageContent)" class="order-state font-16">
           {{ formatOrderStatus(getMessageContent) }}
           {{ formatOrderStatus(getMessageContent) }}
         </div>
         </div>
@@ -113,8 +118,15 @@ function formatOrderStatus(order: any) {
     height: 28px;
     height: 28px;
 
 
     .order-no {
     .order-no {
-      font-size: 10px;
+      font-size: 12px;
       font-weight: 500;
       font-weight: 500;
+
+      span {
+        &:hover {
+          text-decoration: underline;
+          color: var(--left-menu-bg-active-color);
+        }
+      }
     }
     }
   }
   }