vp9)9f!o%{{Rw+Yi=6'}
@@ -1897,6 +1906,11 @@ packages:
resolution: {integrity: sha512-NKgHbWkSZXJUcaBHSsyzC8eegD6bBd4O0oCI6XMIJ+y4Bq3v4w7sY3wfWoKPuVlq9pQHRB6od0lmKpIqi8TlKA==}
hasBin: true
+ cross-env@7.0.3:
+ resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
+ engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'}
+ hasBin: true
+
cross-spawn@7.0.6:
resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
engines: {node: '>= 8'}
@@ -1904,6 +1918,9 @@ packages:
crossws@0.3.1:
resolution: {integrity: sha512-HsZgeVYaG+b5zA+9PbIPGq4+J/CJynJuearykPsXx4V/eMhyQ5EDVg3Ak2FBZtVXCiOLu/U7IiwDHTr9MA+IKw==}
+ crypto-js@4.2.0:
+ resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==}
+
css-declaration-sorter@7.2.0:
resolution: {integrity: sha512-h70rUM+3PNFuaBDTLe8wF/cdWu+dOZmb7pJt8Z2sedYbAcQVQV/tEchueg3GWxwqS0cxtbxmaHEdkNACqcvsow==}
engines: {node: ^14 || ^16 || >=18}
@@ -5979,6 +5996,10 @@ snapshots:
json-schema-traverse: 1.0.0
require-from-string: 2.0.2
+ aliyun-aliplayer@2.28.5:
+ dependencies:
+ crypto-js: 4.2.0
+
ansi-colors@4.1.3: {}
ansi-escapes@4.3.2:
@@ -6279,6 +6300,10 @@ snapshots:
cronstrue@2.52.0: {}
+ cross-env@7.0.3:
+ dependencies:
+ cross-spawn: 7.0.6
+
cross-spawn@7.0.6:
dependencies:
path-key: 3.1.1
@@ -6289,6 +6314,8 @@ snapshots:
dependencies:
uncrypto: 0.1.3
+ crypto-js@4.2.0: {}
+
css-declaration-sorter@7.2.0(postcss@8.4.49):
dependencies:
postcss: 8.4.49
From 512a1a58cebfb89d493dbc877629a12e747ca339 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Mon, 13 Jan 2025 15:30:01 +0800
Subject: [PATCH 04/16] =?UTF-8?q?build:=20=E6=9B=B4=E6=96=B0=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E6=9E=84=E5=BB=BA=E8=84=9A=E6=9C=AC=E5=92=8C=E4=BE=9D?=
=?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 移除 cross-env 依赖
- 更新脚本命令,使用 nuxt 命令替代 cross-env
- 添加 generate、postinstall、typecheck 和 release脚本
---
package.json | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/package.json b/package.json
index c397cf7..8084c61 100644
--- a/package.json
+++ b/package.json
@@ -4,12 +4,13 @@
"version": "0.3.0",
"packageManager": "pnpm@9.15.1",
"scripts": {
- "dev": "cross-env NODE_ENV=test nuxt dev",
- "build": "cross-env NODE_ENV=prod nuxt build",
- "build:test": "cross-env NODE_ENV=test nuxt build",
- "build:prod": "cross-env NODE_ENV=prod nuxt build",
- "preview": "cross-env NODE_ENV=prod nuxt preview",
- "preview:test": "cross-env NODE_ENV=test nuxt preview"
+ "build": "nuxt build",
+ "dev": "nuxt dev",
+ "generate": "nuxt generate",
+ "preview": "nuxt preview",
+ "postinstall": "nuxt prepare",
+ "typecheck": "vue-tsc --noEmit",
+ "release": "bumpp --commit --push --tag"
},
"dependencies": {
"@nuxtjs/color-mode": "^3.5.2",
@@ -30,7 +31,6 @@
"@unocss/preset-rem-to-px": "0.65.2",
"@vant/nuxt": "^1.0.6",
"bumpp": "^9.9.2",
- "cross-env": "^7.0.3",
"pinia": "^2.3.0",
"postcss-mobile-forever": "^4.3.1",
"sass": "^1.83.1",
From f5746e695b70ec47b39975605a74be06ea7e52a8 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Mon, 13 Jan 2025 16:30:56 +0800
Subject: [PATCH 05/16] =?UTF-8?q?refactor(app):=20=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E5=92=8C=E5=BC=80=E5=8F=91?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 移除了 LiveRoom 组件中的冗余控制台日志输出
-调整了 LiveRoom 组件的样式,使其占据剩余空间
- 隐藏了 Prism Player 的控制条
- 简化了 nuxt.config.js 中的导入语句
- 在 package.json 中添加了新的开发和构建脚本
---
app/pages/LiveRoom/index.client.vue | 14 ++++++--------
nuxt.config.js | 2 --
package.json | 5 ++++-
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/app/pages/LiveRoom/index.client.vue b/app/pages/LiveRoom/index.client.vue
index 5cf8816..f2a7673 100644
--- a/app/pages/LiveRoom/index.client.vue
+++ b/app/pages/LiveRoom/index.client.vue
@@ -7,15 +7,10 @@ import lockdfd from '@/static/images/lockdfd@2x.png';
const player = ref(null);
const quoteStatus = ref(false);
const config = useRuntimeConfig()
-
-// 使用环境变量
-console.log('API Base:', config.public.apiBase)
-console.log('WebSocket URL:', config.public.wsUrl)
-console.log('Player Source:', config.public.PLAYER_SOURCE)
+console.log('config',config)
const changeStatus = () => {
- console.log('quoteStatus before:', quoteStatus.value);
+
quoteStatus.value = !quoteStatus.value;
- console.log('quoteStatus after:', quoteStatus.value);
};
onMounted(() => {
@@ -43,7 +38,7 @@ onBeforeUnmount(() => {
-
+
@@ -92,4 +87,7 @@ video {
width: 100%;
height: auto;
}
+:deep(.prism-controlbar){
+ display: none!important;
+}
\ No newline at end of file
diff --git a/nuxt.config.js b/nuxt.config.js
index 80d2828..66ce9be 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -1,8 +1,6 @@
import process from 'node:process'
-import { appDescription } from './app/constants/index'
import preload from './app/utils/preload'
import { currentLocales } from './i18n/i18n'
-
export default defineNuxtConfig({
hooks: {
diff --git a/package.json b/package.json
index 8084c61..0892813 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,10 @@
"packageManager": "pnpm@9.15.1",
"scripts": {
"build": "nuxt build",
- "dev": "nuxt dev",
+ "dev": "nuxt dev --mode test",
+ "dev:prod": "nuxt dev --mode prod",
+ "build:test": "nuxt build --mode test",
+ "build:prod": "nuxt build --mode prod",
"generate": "nuxt generate",
"preview": "nuxt preview",
"postinstall": "nuxt prepare",
From 16bc0d6acc9fdd7d6a4b74aa4465463abedfcd0c Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Mon, 13 Jan 2025 16:52:59 +0800
Subject: [PATCH 06/16] =?UTF-8?q?feat(LiveRoom):=20=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=AE=A4=E9=A1=B5=E9=9D=A2=E5=B9=B6=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E6=96=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 重构了 LiveRoom 页面的代码结构,提高了可维护性
- 添加了新的竞拍功能,包括开启出价和确认出价按钮
- 优化了播放器配置,增加了预加载、自动播放等设置
- 增加了播放器错误处理机制,提高了用户体验
- 调整了页面布局,使其更加适应不同屏幕尺寸
---
app/pages/LiveRoom/index.client.vue | 106 ++++++++++++++++------------
app/pages/home/index.vue | 1 -
2 files changed, 62 insertions(+), 45 deletions(-)
diff --git a/app/pages/LiveRoom/index.client.vue b/app/pages/LiveRoom/index.client.vue
index f2a7673..5c3e970 100644
--- a/app/pages/LiveRoom/index.client.vue
+++ b/app/pages/LiveRoom/index.client.vue
@@ -1,47 +1,66 @@
-
-
+
+
-
+
@@ -57,37 +76,36 @@ onBeforeUnmount(() => {
+
\ No newline at end of file
diff --git a/app/pages/home/index.vue b/app/pages/home/index.vue
index 584055e..904281d 100644
--- a/app/pages/home/index.vue
+++ b/app/pages/home/index.vue
@@ -6,7 +6,6 @@ import itemDetail from '@/components/itemDetail/index.vue'
definePageMeta({
layout: 'default',
- title: '主页',
i18n: 'menu.home',
})
const liveRef = ref(null)
From d27e6bc0c54c2cd60f36cbd5705c6a478ca07705 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Mon, 13 Jan 2025 20:59:25 +0800
Subject: [PATCH 07/16] =?UTF-8?q?feat(home):=20=E5=AE=9E=E7=8E=B0=E9=A6=96?=
=?UTF-8?q?=E9=A1=B5=E7=9B=B4=E6=92=AD=E9=97=B4=E5=85=A8=E5=B1=8F=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 新增 fullLive 全局状态管理直播间的全屏状态
- 修改 AppHeader组件,根据 fullLive 状态控制返回按钮的显示
- 更新 default 布局,根据 fullLive 状态控制 AppFooter 的显示- 调整 LiveRoom组件,支持全屏模式下的布局变化
- 修改 home 页面,实现直播间全屏和列表之间的切换
---
app/components/AppHeader.vue | 10 +-
app/components/liveBroadcast/index.vue | 3 +-
app/layouts/default.vue | 8 +-
app/pages/LiveRoom/index.client.vue | 78 +++++----
app/pages/home/index.vue | 215 ++++++++++++++-----------
app/stores/home/index.js | 7 +
6 files changed, 184 insertions(+), 137 deletions(-)
create mode 100644 app/stores/home/index.js
diff --git a/app/components/AppHeader.vue b/app/components/AppHeader.vue
index 6d8365a..7dc7ee9 100644
--- a/app/components/AppHeader.vue
+++ b/app/components/AppHeader.vue
@@ -1,10 +1,15 @@
diff --git a/app/components/liveBroadcast/index.vue b/app/components/liveBroadcast/index.vue
index eb342a6..cc3090b 100644
--- a/app/components/liveBroadcast/index.vue
+++ b/app/components/liveBroadcast/index.vue
@@ -3,8 +3,7 @@
-
-
+
diff --git a/app/layouts/default.vue b/app/layouts/default.vue
index 2fcbd57..957db21 100644
--- a/app/layouts/default.vue
+++ b/app/layouts/default.vue
@@ -1,13 +1,13 @@
-
-
-
+
-
\ No newline at end of file
diff --git a/app/pages/LiveRoom/index.client.vue b/app/pages/LiveRoom/index.client.vue
index 5c3e970..06e7dbc 100644
--- a/app/pages/LiveRoom/index.client.vue
+++ b/app/pages/LiveRoom/index.client.vue
@@ -8,7 +8,12 @@ const player = ref(null)
const quoteStatus = ref(false)
const isPlayerReady = ref(false)
const config = useRuntimeConfig()
-console.log('config', config)
+const props = defineProps({
+ fullLive: {
+ type: Boolean,
+ default: false,
+ },
+})
const playerConfig = {
id: 'J_prismPlayer',
source: 'artc://live-pull-sh-01.szjixun.cn/live/live?auth_key=1736748343-0-0-feef65166e5cc62957c35b6e3eec82a1',
@@ -56,43 +61,45 @@ onBeforeUnmount(() => {
-
-
-
-
-
-
-
![]()
+
+
+
+
+
-
- {{ quoteStatus ? '关闭出价' : '开启出价' }}
+
+
+
![]()
+
+
+ {{ quoteStatus ? '关闭出价' : '开启出价' }}
+
-
+
+
-
@@ -108,4 +115,7 @@ onBeforeUnmount(() => {
--van-rolling-text-font-size: 16px;
--van-rolling-text-color: #FFF;
}
+:deep(.prism-license-watermark){
+ display: none!important;
+}
\ No newline at end of file
diff --git a/app/pages/home/index.vue b/app/pages/home/index.vue
index 904281d..2e65e1e 100644
--- a/app/pages/home/index.vue
+++ b/app/pages/home/index.vue
@@ -1,9 +1,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
- LOT{{ index * 2 + 1 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ LOT{{ index * 2 + 1 }}
+
+
+
+
+ {{ item.title }}
+
+
+ 起拍价:{{ item.startingPrice }}
+
+
+ 成交价:{{ item.transactionPrice }}
+
-
-
- {{ item.title }}
+
+
+
+
+
+
+ LOT{{ index * 2 + 2 }}
+
-
- 起拍价:{{ item.startingPrice }}
-
-
- 成交价:{{ item.transactionPrice }}
+
+
+ {{ item.title }}
+
+
+ 起拍价:{{ item.startingPrice }}
+
+
+ 成交价:{{ item.transactionPrice }}
+
-
-
-
-
-
- LOT{{ index * 2 + 2 }}
-
-
-
-
- {{ item.title }}
-
-
- 起拍价:{{ item.startingPrice }}
-
-
- 成交价:{{ item.transactionPrice }}
-
-
-
-
-
-
-
-
-
-
-
-
- 这里是后台富文本配置的说明,啊即可打开三等奖撒度老师的湿答答是快乐的阿四大皆空
+
+
-
+
+
+
+
+ 这里是后台富文本配置的说明,啊即可打开三等奖撒度老师的湿答答是快乐的阿四大皆空
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/stores/home/index.js b/app/stores/home/index.js
new file mode 100644
index 0000000..8e6d038
--- /dev/null
+++ b/app/stores/home/index.js
@@ -0,0 +1,7 @@
+import { createGlobalState } from '@vueuse/core'
+export const homeStore = createGlobalState(() => {
+ const fullLive=ref(false)
+ return{
+ fullLive
+ }
+})
\ No newline at end of file
From 7d483d45a7fd1423633c58444c6f1100020e2c01 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Tue, 14 Jan 2025 09:16:01 +0800
Subject: [PATCH 08/16] 1231
---
app/pages/home/index.vue | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/app/pages/home/index.vue b/app/pages/home/index.vue
index 2e65e1e..0b20486 100644
--- a/app/pages/home/index.vue
+++ b/app/pages/home/index.vue
@@ -44,6 +44,16 @@ const list = ref([{
title: '张天赐 | 日出而作,日落而息',
startingPrice: 'RMB 1,000',
transactionPrice: '',
+},{
+ image: 'https://e-cdn.fontree.cn/fonchain-main/prod/file/default/setting/637d95b4-2ae9-4a74-bd60-a3a9d2ca2ca0.png',
+ title: '张天赐 | 日出而作,日落而息',
+ startingPrice: 'RMB 1,000',
+ transactionPrice: 'RMB 10,000',
+},{
+ image: 'https://e-cdn.fontree.cn/fonchain-main/prod/file/default/setting/637d95b4-2ae9-4a74-bd60-a3a9d2ca2ca0.png',
+ title: '张天赐 | 日出而作,日落而息',
+ startingPrice: 'RMB 1,000',
+ transactionPrice: 'RMB 10,000',
}])
const page = ref(1)
From 3a174276ce84b0478e530d76fc432e6f8fa20668 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Tue, 14 Jan 2025 09:49:10 +0800
Subject: [PATCH 09/16] 1231
---
app/pages/home/index.vue | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/app/pages/home/index.vue b/app/pages/home/index.vue
index 0b20486..a2879bf 100644
--- a/app/pages/home/index.vue
+++ b/app/pages/home/index.vue
@@ -125,10 +125,7 @@ const changeLive=()=>{
-
+
From f54058b0ece0d96d33b26735dfd08c0ed2c2151f Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Wed, 15 Jan 2025 09:10:11 +0800
Subject: [PATCH 10/16] 1231
---
app/composables/counter.ts | 18 -------
app/pages/home/index.vue | 3 +-
app/pages/profile/index.vue | 2 +-
nuxt.config.js | 2 -
package.json | 3 --
pnpm-lock.yaml | 99 -------------------------------------
6 files changed, 2 insertions(+), 125 deletions(-)
delete mode 100644 app/composables/counter.ts
diff --git a/app/composables/counter.ts b/app/composables/counter.ts
deleted file mode 100644
index 717add7..0000000
--- a/app/composables/counter.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { defineStore } from 'pinia'
-
-const useCounter = defineStore('counter', () => {
- const count = ref(0)
-
- function increment() {
- count.value++
- }
-
- return {
- count,
- increment,
- }
-}, {
- persist: true,
-})
-
-export default useCounter
diff --git a/app/pages/home/index.vue b/app/pages/home/index.vue
index a2879bf..e544441 100644
--- a/app/pages/home/index.vue
+++ b/app/pages/home/index.vue
@@ -114,7 +114,6 @@ const changeLive=()=>{
-
+
diff --git a/app/pages/profile/index.vue b/app/pages/profile/index.vue
index b182617..4f15f6e 100644
--- a/app/pages/profile/index.vue
+++ b/app/pages/profile/index.vue
@@ -44,7 +44,7 @@ definePageMeta({
张天赐 | 日出而作,日落而息撒打算撒打算撒打决赛多久啊是世奥兰…
起拍价:RMB 1,000
-
成交价:RMB 10,000
+
成交价:RMB 10,000
diff --git a/nuxt.config.js b/nuxt.config.js
index 66ce9be..c7f55d4 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -21,8 +21,6 @@ export default defineNuxtConfig({
'@unocss/nuxt',
'@nuxtjs/color-mode',
'@nuxtjs/i18n',
- '@pinia/nuxt',
- 'pinia-plugin-persistedstate/nuxt',
],
runtimeConfig: {
public: {
diff --git a/package.json b/package.json
index 0892813..b6b4ba0 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,6 @@
"@vueuse/core": "^12.4.0",
"aliyun-aliplayer": "^2.28.5",
"nuxt": "^3.15.0",
- "pinia-plugin-persistedstate": "^4.2.0",
"pinyin": "4.0.0-alpha.2",
"segmentit": "^2.0.3",
"vue": "^3.5.13",
@@ -29,12 +28,10 @@
},
"devDependencies": {
"@iconify-json/carbon": "^1.2.5",
- "@pinia/nuxt": "^0.9.0",
"@unocss/nuxt": "0.65.2",
"@unocss/preset-rem-to-px": "0.65.2",
"@vant/nuxt": "^1.0.6",
"bumpp": "^9.9.2",
- "pinia": "^2.3.0",
"postcss-mobile-forever": "^4.3.1",
"sass": "^1.83.1",
"sass-loader": "^16.0.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9435d9a..9099d99 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -26,9 +26,6 @@ importers:
nuxt:
specifier: ^3.15.0
version: 3.15.0(@parcel/watcher@2.5.0)(@types/node@22.10.2)(db0@0.2.1)(eslint@9.17.0(jiti@2.4.2))(ioredis@5.4.2)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.29.1)(sass@1.83.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.2)(vite@6.0.5(@types/node@22.10.2)(jiti@2.4.2)(sass@1.83.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(yaml@2.6.1)
- pinia-plugin-persistedstate:
- specifier: ^4.2.0
- version: 4.2.0(@pinia/nuxt@0.9.0(magicast@0.3.5)(pinia@2.3.0(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)))(rollup@4.29.1))(magicast@0.3.5)(pinia@2.3.0(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)))(rollup@4.29.1)
pinyin:
specifier: 4.0.0-alpha.2
version: 4.0.0-alpha.2(segmentit@2.0.3)
@@ -45,9 +42,6 @@ importers:
'@iconify-json/carbon':
specifier: ^1.2.5
version: 1.2.5
- '@pinia/nuxt':
- specifier: ^0.9.0
- version: 0.9.0(magicast@0.3.5)(pinia@2.3.0(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)))(rollup@4.29.1)
'@unocss/nuxt':
specifier: 0.65.2
version: 0.65.2(magicast@0.3.5)(postcss@8.4.49)(rollup@4.29.1)(vite@6.0.5(@types/node@22.10.2)(jiti@2.4.2)(sass@1.83.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.2))(webpack@5.97.1(esbuild@0.24.2))
@@ -60,12 +54,6 @@ importers:
bumpp:
specifier: ^9.9.2
version: 9.9.2(magicast@0.3.5)
- cross-env:
- specifier: ^7.0.3
- version: 7.0.3
- pinia:
- specifier: ^2.3.0
- version: 2.3.0(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2))
postcss-mobile-forever:
specifier: ^4.3.1
version: 4.3.1(postcss@8.4.49)
@@ -1032,11 +1020,6 @@ packages:
resolution: {integrity: sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==}
engines: {node: '>= 10.0.0'}
- '@pinia/nuxt@0.9.0':
- resolution: {integrity: sha512-2yeRo7LeyCF68AbNeL3xu2h6uw0617RkcsYxmA8DJM0R0PMdz5wQHnc44KeENQxR/Mrq8T910XVT6buosqsjBQ==}
- peerDependencies:
- pinia: ^2.3.0
-
'@pkgjs/parseargs@0.11.0':
resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
engines: {node: '>=14'}
@@ -1906,11 +1889,6 @@ packages:
resolution: {integrity: sha512-NKgHbWkSZXJUcaBHSsyzC8eegD6bBd4O0oCI6XMIJ+y4Bq3v4w7sY3wfWoKPuVlq9pQHRB6od0lmKpIqi8TlKA==}
hasBin: true
- cross-env@7.0.3:
- resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
- engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'}
- hasBin: true
-
cross-spawn@7.0.6:
resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
engines: {node: '>= 8'}
@@ -2016,9 +1994,6 @@ packages:
deep-is@0.1.4:
resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
- deep-pick-omit@1.2.1:
- resolution: {integrity: sha512-2J6Kc/m3irCeqVG42T+SaUMesaK7oGWaedGnQQK/+O0gYc+2SP5bKh/KKTE7d7SJ+GCA9UUE1GRzh6oDe0EnGw==}
-
deepmerge@4.3.1:
resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
engines: {node: '>=0.10.0'}
@@ -3121,26 +3096,6 @@ packages:
resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
engines: {node: '>=12'}
- pinia-plugin-persistedstate@4.2.0:
- resolution: {integrity: sha512-3buhA7ac+ssbOIx3VRCC8oHkoFwhDM9oHRCjo7nj+O8WUqnW+jRqh7eYT5eS/DNa3H28zp3dYf/nd/Vc8zj8eQ==}
- peerDependencies:
- '@pinia/nuxt': '>=0.9.0'
- pinia: '>=2.3.0'
- peerDependenciesMeta:
- '@pinia/nuxt':
- optional: true
- pinia:
- optional: true
-
- pinia@2.3.0:
- resolution: {integrity: sha512-ohZj3jla0LL0OH5PlLTDMzqKiVw2XARmC1XYLdLWIPBMdhDW/123ZWr4zVAhtJm+aoSkFa13pYXskAvAscIkhQ==}
- peerDependencies:
- typescript: '>=4.4.4'
- vue: ^2.7.0 || ^3.5.11
- peerDependenciesMeta:
- typescript:
- optional: true
-
pinyin@4.0.0-alpha.2:
resolution: {integrity: sha512-SED2wWr1X0QwH6rXIDgg20zS1mAk0AVMO8eM3KomUlOYzC8mNMWZnspZWhhI0M8MBIbF2xwa+5r30jTSjAqNsg==}
engines: {install-node: ^18.0.0}
@@ -4091,17 +4046,6 @@ packages:
vue-bundle-renderer@2.1.1:
resolution: {integrity: sha512-+qALLI5cQncuetYOXp4yScwYvqh8c6SMXee3B+M7oTZxOgtESP0l4j/fXdEJoZ+EdMxkGWIj+aSEyjXkOdmd7g==}
- vue-demi@0.14.10:
- resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==}
- engines: {node: '>=12'}
- hasBin: true
- peerDependencies:
- '@vue/composition-api': ^1.0.0-rc.1
- vue: ^3.0.0-0 || ^2.6.0
- peerDependenciesMeta:
- '@vue/composition-api':
- optional: true
-
vue-devtools-stub@0.1.0:
resolution: {integrity: sha512-RutnB7X8c5hjq39NceArgXg28WZtZpGc3+J16ljMiYnFhKvd8hITxSWQSQ5bvldxMDU6gG5mkxl1MTQLXckVSQ==}
@@ -5227,15 +5171,6 @@ snapshots:
'@parcel/watcher-win32-ia32': 2.5.0
'@parcel/watcher-win32-x64': 2.5.0
- '@pinia/nuxt@0.9.0(magicast@0.3.5)(pinia@2.3.0(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)))(rollup@4.29.1)':
- dependencies:
- '@nuxt/kit': 3.15.0(magicast@0.3.5)(rollup@4.29.1)
- pinia: 2.3.0(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2))
- transitivePeerDependencies:
- - magicast
- - rollup
- - supports-color
-
'@pkgjs/parseargs@0.11.0':
optional: true
@@ -6300,10 +6235,6 @@ snapshots:
cronstrue@2.52.0: {}
- cross-env@7.0.3:
- dependencies:
- cross-spawn: 7.0.6
-
cross-spawn@7.0.6:
dependencies:
path-key: 3.1.1
@@ -6411,8 +6342,6 @@ snapshots:
deep-is@0.1.4: {}
- deep-pick-omit@1.2.1: {}
-
deepmerge@4.3.1: {}
default-browser-id@5.0.0: {}
@@ -7725,30 +7654,6 @@ snapshots:
picomatch@4.0.2: {}
- pinia-plugin-persistedstate@4.2.0(@pinia/nuxt@0.9.0(magicast@0.3.5)(pinia@2.3.0(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)))(rollup@4.29.1))(magicast@0.3.5)(pinia@2.3.0(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)))(rollup@4.29.1):
- dependencies:
- '@nuxt/kit': 3.15.0(magicast@0.3.5)(rollup@4.29.1)
- deep-pick-omit: 1.2.1
- defu: 6.1.4
- destr: 2.0.3
- optionalDependencies:
- '@pinia/nuxt': 0.9.0(magicast@0.3.5)(pinia@2.3.0(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)))(rollup@4.29.1)
- pinia: 2.3.0(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2))
- transitivePeerDependencies:
- - magicast
- - rollup
- - supports-color
-
- pinia@2.3.0(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)):
- dependencies:
- '@vue/devtools-api': 6.6.4
- vue: 3.5.13(typescript@5.7.2)
- vue-demi: 0.14.10(vue@3.5.13(typescript@5.7.2))
- optionalDependencies:
- typescript: 5.7.2
- transitivePeerDependencies:
- - '@vue/composition-api'
-
pinyin@4.0.0-alpha.2(segmentit@2.0.3):
dependencies:
commander: 1.1.1
@@ -8705,10 +8610,6 @@ snapshots:
dependencies:
ufo: 1.5.4
- vue-demi@0.14.10(vue@3.5.13(typescript@5.7.2)):
- dependencies:
- vue: 3.5.13(typescript@5.7.2)
-
vue-devtools-stub@0.1.0: {}
vue-flow-layout@0.1.1(vue@3.5.13(typescript@5.7.2)):
From 3c8cd2c782ce7d02968e324440a4516b280cae4b Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Wed, 15 Jan 2025 09:18:43 +0800
Subject: [PATCH 11/16] =?UTF-8?q?refactor(app):=20=E7=A7=BB=E9=99=A4=20Kee?=
=?UTF-8?q?pAlive=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 删除了 KeepAlive 相关的代码和组件
- 移除了 Pinia相关的代码和组件
- 更新了 README 文档,删除了 Pinia 相关的说明- 移除了国际化文件中与 KeepAlive 相关的翻译项
---
README.md | 5 -----
app/app.vue | 9 +--------
app/composables/keepalive.ts | 24 -----------------------
app/middleware/route.global.ts | 7 -------
app/pages/counter/index.vue | 35 ----------------------------------
i18n/locales/en-US.json | 1 -
6 files changed, 1 insertion(+), 80 deletions(-)
delete mode 100644 app/composables/keepalive.ts
delete mode 100644 app/middleware/route.global.ts
delete mode 100644 app/pages/counter/index.vue
diff --git a/README.md b/README.md
index 2d6baf6..1ab7e15 100644
--- a/README.md
+++ b/README.md
@@ -39,9 +39,6 @@
- 🔥 `
@@ -28,7 +21,7 @@ const keepAliveRouteNames = computed(() => {
-
+
diff --git a/app/composables/keepalive.ts b/app/composables/keepalive.ts
deleted file mode 100644
index fbe0233..0000000
--- a/app/composables/keepalive.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import type { RouteLocationNormalized, RouteRecordName } from 'vue-router'
-import { defineStore } from 'pinia'
-
-const useKeepalive = defineStore('keepalive', () => {
- const routeCaches = ref([])
-
- const addRoute = (route: RouteLocationNormalized) => {
- if (!route.name)
- return
-
- if (routeCaches.value.includes(route.name))
- return
-
- if (route?.meta?.keepalive)
- routeCaches.value.push(route.name)
- }
-
- return {
- routeCaches,
- addRoute,
- }
-})
-
-export default useKeepalive
diff --git a/app/middleware/route.global.ts b/app/middleware/route.global.ts
deleted file mode 100644
index 2262eff..0000000
--- a/app/middleware/route.global.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { RouteLocationNormalized } from 'vue-router'
-import useKeepalive from '~/composables/keepalive'
-
-export default defineNuxtRouteMiddleware((to: RouteLocationNormalized) => {
- if (to.meta && to.meta.keepalive)
- useKeepalive().addRoute(to)
-})
diff --git a/app/pages/counter/index.vue b/app/pages/counter/index.vue
deleted file mode 100644
index 0d63233..0000000
--- a/app/pages/counter/index.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
- Hello, Pinia!
-
-
-
- {{ $t('counter_page.label') }}
-
-
-
- {{ $t('counter_page.label_num') }}:
- {{ counter.count }}
-
-
-
-
-
diff --git a/i18n/locales/en-US.json b/i18n/locales/en-US.json
index fe49171..06adfb6 100644
--- a/i18n/locales/en-US.json
+++ b/i18n/locales/en-US.json
@@ -12,7 +12,6 @@
"404Demo": "🙅 Page 404 Demo",
"unocssExample": "🎨 Unocss example",
"keepAlive": "🧡 KeepAlive Demo",
- "persistPiniaState": "💾 Persist Pinia State",
"fetch": "🏄 Network Request"
},
"tabbar": {
From 68935e03a23a55d102b9bbd0171c56dc02c6f5d0 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Wed, 15 Jan 2025 09:30:29 +0800
Subject: [PATCH 12/16] =?UTF-8?q?refactor(components):=20=E4=BC=98?=
=?UTF-8?q?=E5=8C=96=20AppFooter=20=E7=BB=84=E4=BB=B6=E5=B9=B6=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=E9=A6=96=E9=A1=B5=E5=B8=83=E5=B1=80=E9=97=AE=E9=A2=98?=
=?UTF-8?q?-=20=E7=A7=BB=E9=99=A4=20AppFooter=20=E7=BB=84=E4=BB=B6?=
=?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=86=97=E4=BD=99=20v-if=20=E6=8C=87?=
=?UTF-8?q?=E4=BB=A4=20-=20=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5=E7=9B=B4?=
=?UTF-8?q?=E6=92=AD=E6=A8=A1=E5=9D=97=E5=B1=95=E5=BC=80=E6=97=B6=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E5=B8=83=E5=B1=80=E9=94=99=E4=B9=B1=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98-=20=E4=BC=98=E5=8C=96=E7=9B=B4=E6=92=AD=E6=A8=A1?=
=?UTF-8?q?=E5=9D=97=E5=B1=95=E5=BC=80=E5=92=8C=E6=94=B6=E8=B5=B7=E7=9A=84?=
=?UTF-8?q?=E5=8A=A8=E7=94=BB=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/components/AppFooter.vue | 2 +-
app/pages/home/index.vue | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/components/AppFooter.vue b/app/components/AppFooter.vue
index 2fc595a..9f1a809 100644
--- a/app/components/AppFooter.vue
+++ b/app/components/AppFooter.vue
@@ -18,7 +18,7 @@ initData()
-
+
{{ $t('tabbar.home') }}
diff --git a/app/pages/home/index.vue b/app/pages/home/index.vue
index e544441..a1b8e66 100644
--- a/app/pages/home/index.vue
+++ b/app/pages/home/index.vue
@@ -107,7 +107,7 @@ const openShow = () => {
})
}
const changeLive=()=>{
- fullLive.value= true
+ fullLive.value= !fullLive.value
}
@@ -116,8 +116,8 @@ const changeLive=()=>{
From 8c57db5764ce6c1cee7c5597b12483b89aacf269 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Wed, 15 Jan 2025 09:32:25 +0800
Subject: [PATCH 13/16] =?UTF-8?q?style(home):=20=E7=A7=BB=E9=99=A4?=
=?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=83=8C=E6=99=AF=E9=A2=9C=E8=89=B2=E5=B1=9E?=
=?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 删除了 index.vue 文件中 div 元素的 bg-#fff 类,以移除白色背景
- 此修改旨在调整首页的视觉效果,可能为后续样式添加做准备
---
app/pages/home/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/pages/home/index.vue b/app/pages/home/index.vue
index a1b8e66..79404c8 100644
--- a/app/pages/home/index.vue
+++ b/app/pages/home/index.vue
@@ -112,7 +112,7 @@ const changeLive=()=>{
-
+
-
+
+
@@ -227,6 +228,7 @@ const changeLive=()=>{
+
@@ -241,11 +243,27 @@ const changeLive=()=>{
width: 8px;
height: 8px;
}
-
+.fade-enter-active, .fade-leave-active {
+ transition: opacity 1s;
+}
+.fade-enter, .fade-leave-to /* .fade-leave-active in <2.1.8 */ {
+ opacity: 0;
+}
:deep(.van-swipe__indicator:not(.van-swipe__indicator--active) ) {
background: rgba(0, 0, 0, 0.8);
}
-
+.changeLive {
+ width: 100%;
+ overflow: hidden;
+ transition: height 0.5s ease, transform 0.5s ease;
+}
-
\ No newline at end of file
+.changeLive.collapsed {
+ height: 188px;
+}
+
+.changeLive.expanded {
+ height: calc(100vh - var(--van-nav-bar-height));
+ transform: translateY(0);
+}
+
From 824ffca63b995b60f17c7185092a061da887aad0 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Wed, 15 Jan 2025 11:45:46 +0800
Subject: [PATCH 15/16] =?UTF-8?q?feat(LiveRoom):=20=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?=
=?UTF-8?q?=E5=92=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
-调整了直播间的布局结构,增加了出价和支付相关功能- 添加了竞拍记录的显示,包括领先者、竞价时间等信息
- 优化了开启出价按钮的样式和提示文字- 调整了播放器的初始化配置,提高了稳定性
---
app/pages/LiveRoom/index.client.vue | 63 ++++++++++++++++++++++++-----
1 file changed, 53 insertions(+), 10 deletions(-)
diff --git a/app/pages/LiveRoom/index.client.vue b/app/pages/LiveRoom/index.client.vue
index 06e7dbc..c81293f 100644
--- a/app/pages/LiveRoom/index.client.vue
+++ b/app/pages/LiveRoom/index.client.vue
@@ -1,9 +1,10 @@
-
-
+
+
-
+
![]()
{
{{ quoteStatus ? '关闭出价' : '开启出价' }}
+