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/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/components/AppHeader.vue b/app/components/AppHeader.vue index 3d3835c..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/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/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/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/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/LiveRoom/index.client.vue b/app/pages/LiveRoom/index.client.vue new file mode 100644 index 0000000..ebe8bcb --- /dev/null +++ b/app/pages/LiveRoom/index.client.vue @@ -0,0 +1,163 @@ + + + + + + + + + 拍品 + (1/188) + + + + + + + {{ quoteStatus ? '关闭出价' : '开启出价' }} + + + + RMB + 5,000 + 去支付 + + + + + 当前价:RMB + + + + 下口价:RMB + + + + {{ quoteStatus ? '确认出价 RMB 3,000' : '点击"开启出价",即刻参与竞拍 ' }} + + + + 领先 + 现场竞价 + 10:12:12 + RMB5,500 + 我 + + + 领先 + 现场竞价 + 10:12:12 + RMB5,500 + 我 + + + 领先 + 现场竞价 + 10:12:12 + RMB5,500 + 我 + + + + + + + + + \ No newline at end of file diff --git a/app/pages/LiveRoom/index.vue b/app/pages/LiveRoom/index.vue deleted file mode 100644 index e990d69..0000000 --- a/app/pages/LiveRoom/index.vue +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - 拍品 - (1/188) - - - - - - 开启出价 - - - - - - - - - \ No newline at end of file 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 }} - - - - {{ $t('counter_page.btn_add') }} - - - diff --git a/app/pages/home/index.vue b/app/pages/home/index.vue index 584055e..6295057 100644 --- a/app/pages/home/index.vue +++ b/app/pages/home/index.vue @@ -1,12 +1,13 @@ - - - - - - - - - - - - - - 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 }} - - - - - - - - - - - - - 这里是后台富文本配置的说明,啊即可打开三等奖撒度老师的湿答答是快乐的阿四大皆空 + + - + + + + + 这里是后台富文本配置的说明,啊即可打开三等奖撒度老师的湿答答是快乐的阿四大皆空 + + + + + + + + + - - - - - - - - + + + + + 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/app/static/images/lockdfd@2x.png b/app/static/images/lockdfd@2x.png new file mode 100644 index 0000000..ec6785d Binary files /dev/null and b/app/static/images/lockdfd@2x.png differ 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 diff --git a/i18n/locales/en-US.json b/i18n/locales/en-US.json index 04a63bd..ecb4dac 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": { diff --git a/nuxt.config.js b/nuxt.config.js index dfe845e..b60e702 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: { @@ -23,8 +21,6 @@ export default defineNuxtConfig({ '@unocss/nuxt', '@nuxtjs/color-mode', '@nuxtjs/i18n', - '@pinia/nuxt', - 'pinia-plugin-persistedstate/nuxt', ], runtimeConfig: { public: { @@ -135,12 +131,6 @@ export default defineNuxtConfig({ inlineStyles: false, }, - eslint: { - config: { - standalone: false, - }, - }, - future: { compatibilityVersion: 4, }, diff --git a/package.json b/package.json index 959b93a..b6b4ba0 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", @@ -16,8 +19,8 @@ "@nuxtjs/color-mode": "^3.5.2", "@nuxtjs/i18n": "^9.1.1", "@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", @@ -25,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 83b2a02..9099d99 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,12 +20,12 @@ importers: '@vueuse/core': specifier: ^12.4.0 version: 12.4.0(typescript@5.7.2) + aliyun-aliplayer: + specifier: ^2.28.5 + version: 2.28.5 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) @@ -42,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)) @@ -57,9 +54,6 @@ importers: bumpp: specifier: ^9.9.2 version: 9.9.2(magicast@0.3.5) - 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) @@ -1026,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'} @@ -1609,6 +1598,9 @@ packages: ajv@8.17.1: resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==} + aliyun-aliplayer@2.28.5: + resolution: {integrity: sha512-UDy4Fj95fv/Syy0p8HRmYUGqadJHLuvucHEeJu6G71uHch87bllnaOI1r++ndfWu36oZph+dbArnP2eowR/Xsg==} + ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} engines: {node: '>=6'} @@ -1904,6 +1896,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} @@ -1999,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'} @@ -3104,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} @@ -4074,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==} @@ -5210,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 @@ -5979,6 +5931,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: @@ -6289,6 +6245,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 @@ -6384,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: {} @@ -7698,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 @@ -8678,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)):
- {{ $t('counter_page.label') }} -
- {{ $t('counter_page.label_num') }}: - {{ counter.count }} -