From e8a89b184eec1bf5139f537c3ad3e218b5064ac5 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sat, 8 Feb 2025 17:40:54 +0800
Subject: [PATCH] =?UTF-8?q?refactor(live):=20=E4=BC=98=E5=8C=96=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD=E9=A1=B5=E9=9D=A2=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E5=92=8C=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除不必要的空行和逗号
- 统一消息提示的展示时间
- 为艺术品结束提示添加背景色和边框色
- 在竞价信息中添加货币符号
- 调整侧边按钮弹窗的动画效果
---
 app/pages/liveRoom/components/Broadcast/index.vue      | 2 +-
 app/pages/liveRoom/components/SideButton/tangPopup.vue | 4 ++--
 app/stores/live/index.js                               | 9 +++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/pages/liveRoom/components/Broadcast/index.vue b/app/pages/liveRoom/components/Broadcast/index.vue
index 7c04913..bad030a 100644
--- a/app/pages/liveRoom/components/Broadcast/index.vue
+++ b/app/pages/liveRoom/components/Broadcast/index.vue
@@ -67,7 +67,7 @@ onUnmounted(() => {
           <div class="flex-grow-1 text-start" :style="`color: ${item.statusCode==='head'?'#D03050':'#939393'}`" >{{ item.statusCode==='head'?'领先':'出局' }}</div>
           <div class="flex-grow-1 text-center">{{ item.auctionType==='local'?'现场竞价':'网络竞价' }}</div>
           <div class="flex-grow-1 text-center">{{ item.createdAt }}</div>
-          <div class="flex-grow-1 text-center">{{ item.baseMoney }}</div>
+          <div class="flex-grow-1 text-center">{{item.baseCurrency}}{{ item.baseMoney }}</div>
           <div class="flex-grow-1 text-center text-#2B53AC">{{ item.userId===userInfo.ID?'我':'' }}</div>
         </div>
       </template>
diff --git a/app/pages/liveRoom/components/SideButton/tangPopup.vue b/app/pages/liveRoom/components/SideButton/tangPopup.vue
index b7900d4..6a448f6 100644
--- a/app/pages/liveRoom/components/SideButton/tangPopup.vue
+++ b/app/pages/liveRoom/components/SideButton/tangPopup.vue
@@ -141,11 +141,11 @@ watch(()=>props.show,(newValue)=>{
   text-overflow: ellipsis;
 }
 .blink {
-  animation: fade 1s linear infinite;  /* 改为0.4秒，使用linear让过渡更快 */
+  animation: fade 1s linear infinite;
 }
 
 @keyframes fade {
   0%, 100% { opacity: 1; }
-  50% { opacity: 0.4; }  /* 改为0.3，这样不会完全消失 */
+  50% { opacity: 0.5; }
 }
 </style>
\ No newline at end of file
diff --git a/app/stores/live/index.js b/app/stores/live/index.js
index 422263e..5c2a91a 100644
--- a/app/stores/live/index.js
+++ b/app/stores/live/index.js
@@ -31,7 +31,6 @@ export const liveStore = createGlobalState(() => {
 
         ws.onMessage((data) => {
             auctionData.value = data.data
-
             if (data.data?.wsType === 'tip' ) {
                 if (data.data?.tip?.tipType === 'falling'){
                     message.warning({
@@ -44,7 +43,7 @@ export const liveStore = createGlobalState(() => {
                             width: '151px',
                             bottom: '230px',
                         },
-                    }, 500000)
+                    })
                 }else if (data.data?.tip?.tipType === 'othersBid'){
                     message.error({
                         title: {
@@ -62,7 +61,7 @@ export const liveStore = createGlobalState(() => {
                             width: '151px',
                             bottom: '230px'
                         },
-                    }, 500000)
+                    })
                 }else if (data.data?.tip?.tipType === 'successBid'){
                     message.success({
                         title: {
@@ -80,13 +79,15 @@ export const liveStore = createGlobalState(() => {
                             width: '151px',
                             bottom: '230px'
                         },
-                    }, 500000)
+                    })
                 }else if (data.data?.tip?.tipType === 'artworkOver'){
                     message.success({
                         title: {
                             text: '本拍品已结束',
                             color: '#575757',
                             align: 'center',
+                            backgroundColor: '#fff',
+                            borderColor:'#fff'
                         },
                         icon:false,
                         subTitle:{