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(() => {
{{ item.statusCode==='head'?'领先':'出局' }}
{{ item.auctionType==='local'?'现场竞价':'网络竞价' }}
{{ item.createdAt }}
-
{{ item.baseMoney }}
+
{{item.baseCurrency}}{{ item.baseMoney }}
{{ item.userId===userInfo.ID?'我':'' }}
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; } } \ 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:{