From 3c69236caa8240a14cfe28466e8dc1c296e23048 Mon Sep 17 00:00:00 2001 From: xingyy <64720302+Concur-max@users.noreply.github.com> Date: Tue, 11 Feb 2025 14:55:25 +0800 Subject: [PATCH] =?UTF-8?q?feat(live):=20=E5=AE=9E=E7=8E=B0=E7=9B=B4?= =?UTF-8?q?=E6=92=AD=E9=97=B4=E6=9C=80=E5=B0=8F=E5=8C=96=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增最小化窗口组件 liveMinWindow - 在 liveRoom 页面中集成最小化窗口功能 - 优化 liveStore,增加相关状态和方法支持最小化窗口 - 调整 --- app/components/liveMinWindow/index.vue | 189 ++++++++++++++++++ .../liveRoom/components/Broadcast/index.vue | 10 +- .../components/PaymentInput/index.vue | 34 +++- app/pages/liveRoom/index.client.vue | 106 +++------- app/pages/signature/protocol/index.vue | 5 +- app/stores/live/index.js | 32 +++ 6 files changed, 295 insertions(+), 81 deletions(-) create mode 100644 app/components/liveMinWindow/index.vue diff --git a/app/components/liveMinWindow/index.vue b/app/components/liveMinWindow/index.vue new file mode 100644 index 0000000..351f057 --- /dev/null +++ b/app/components/liveMinWindow/index.vue @@ -0,0 +1,189 @@ + + + + + + + 点击回到直播 + + + + + + + + + + + \ No newline at end of file diff --git a/app/pages/liveRoom/components/Broadcast/index.vue b/app/pages/liveRoom/components/Broadcast/index.vue index b07b99d..cb181a2 100644 --- a/app/pages/liveRoom/components/Broadcast/index.vue +++ b/app/pages/liveRoom/components/Broadcast/index.vue @@ -36,11 +36,11 @@ const headItem=(statusCode)=>{ - {{ headItem(item.statusCode).label }} - {{ item.auctionType==='local'?'现场竞价':'网络竞价' }} - {{ item.createdAt }} - {{item.baseCurrency}}{{ item.baseMoney }} - {{ item.userId===userInfo.ID?'我':'' }} + {{ headItem(item.statusCode).label }} + {{ item.auctionType==='local'?'现场竞价':'网络竞价' }} + {{ item.createdAt }} + {{item.baseCurrency}}{{ item.baseMoney }} + {{ item.userId===userInfo.ID?'我':'' }} diff --git a/app/pages/liveRoom/components/PaymentInput/index.vue b/app/pages/liveRoom/components/PaymentInput/index.vue index cf9aa63..00ffe21 100644 --- a/app/pages/liveRoom/components/PaymentInput/index.vue +++ b/app/pages/liveRoom/components/PaymentInput/index.vue @@ -1,4 +1,7 @@ - + 支付全部 diff --git a/app/pages/liveRoom/index.client.vue b/app/pages/liveRoom/index.client.vue index a3ce81f..78af3d4 100644 --- a/app/pages/liveRoom/index.client.vue +++ b/app/pages/liveRoom/index.client.vue @@ -1,5 +1,5 @@ - + - + @@ -171,19 +127,18 @@ const tipOpen = () => { {{ `确认出价 ${auctionData?.nowAuctionPrice?.currency} ${auctionData?.nowAuctionPrice?.nextPrice ?? 0}` - }} - + }} - + 点击"开启出价",即刻参与竞拍 - + @@ -197,16 +152,19 @@ const tipOpen = () => { + +