From 7e4fbc84adadda4a75c7dbeb8101f645684ad933 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sat, 8 Feb 2025 16:34:03 +0800
Subject: [PATCH] =?UTF-8?q?refactor(components):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E5=92=8C?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修正了 live/index.js 中的样式对象- 优化了 x-message 组件的样式计算逻辑
- 改进了 tangPopup 组件的动画效果，使过渡更快且不完全消失
---
 app/components/x-message/message/index.vue    | 23 +++++++++++--------
 .../components/SideButton/tangPopup.vue       |  5 ++--
 app/stores/live/index.js                      |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/components/x-message/message/index.vue b/app/components/x-message/message/index.vue
index 3b75985..dc78294 100644
--- a/app/components/x-message/message/index.vue
+++ b/app/components/x-message/message/index.vue
@@ -1,5 +1,4 @@
 <script setup>
-
 import error from '../images/error.png'
 import success from '../images/success.png'
 import warning from '../images/warning.png'
@@ -34,7 +33,7 @@ const props = defineProps({
     type: Boolean,
     default: true
   },
-  customStyle: {
+  style: {
     type: Object,
     default: () => ({})
   }
@@ -62,18 +61,24 @@ const typeConfig = {
     bgColor: '#FFF7EC',
   }
 }
+
+// 修正计算属性，使用 props.style
+const finalStyle = computed(() => {
+  return {
+    borderColor: props.style?.borderColor || typeConfig[props.type].borderColor,
+    backgroundColor: props.style?.backgroundColor || typeConfig[props.type].bgColor,
+    width: props.style?.width || '343px',
+    height: props.style?.height || 'auto',
+    minHeight: '46px',
+    ...props.style
+  }
+})
 </script>
 
 <template>
   <div
     :class="`box-border flex items-center border rounded-[4px] px-[15px] shadow-sm py-8px ${!message?'justify-center':''}`"
-    :style="{
-      borderColor: typeConfig[type].borderColor,
-      backgroundColor: typeConfig[type].bgColor,
-      width: customStyle.width || '343px',
-      height: customStyle.height || 'auto',
-      minHeight: '46px'
-    }"
+    :style="finalStyle"
   >
     <div v-if="showIcon" class="mr-[12px]">
       <img
diff --git a/app/pages/liveRoom/components/SideButton/tangPopup.vue b/app/pages/liveRoom/components/SideButton/tangPopup.vue
index 03962b8..5243fa8 100644
--- a/app/pages/liveRoom/components/SideButton/tangPopup.vue
+++ b/app/pages/liveRoom/components/SideButton/tangPopup.vue
@@ -37,6 +37,7 @@ const close = () => emit('update:show', false);
 const openShow=(item)=>{
   showDetailInfo.value=item
   showDetail.value=true
+
 }
 const loadMore = async () => {
   pageRef.value.page++
@@ -113,11 +114,11 @@ const loadMore = async () => {
   text-overflow: ellipsis;
 }
 .blink {
-  animation: fade 1s linear infinite;
+  animation: fade 1s linear infinite;  /* 改为0.4秒，使用linear让过渡更快 */
 }
 
 @keyframes fade {
   0%, 100% { opacity: 1; }
-  50% { opacity: 0.4; }
+  50% { opacity: 0.4; }  /* 改为0.3，这样不会完全消失 */
 }
 </style>
\ No newline at end of file
diff --git a/app/stores/live/index.js b/app/stores/live/index.js
index 64c4e45..422263e 100644
--- a/app/stores/live/index.js
+++ b/app/stores/live/index.js
@@ -42,7 +42,7 @@ export const liveStore = createGlobalState(() => {
                         },
                         style: {
                             width: '151px',
-                            bottom: '230px'
+                            bottom: '230px',
                         },
                     }, 500000)
                 }else if (data.data?.tip?.tipType === 'othersBid'){