Merge branch 'main' of https://gitea-inner.fontree.cn/scout666/liveh5-nuxt
This commit is contained in:
commit
49f908b174
@ -4,8 +4,9 @@ import LiveRoom from '@/pages/LiveRoom/index.client.vue';
|
|||||||
import itemDetail from '@/components/itemDetail/index.vue';
|
import itemDetail from '@/components/itemDetail/index.vue';
|
||||||
import {homeStore} from "@/stores/home/index.js";
|
import {homeStore} from "@/stores/home/index.js";
|
||||||
import Column from './components/Column/index.vue'
|
import Column from './components/Column/index.vue'
|
||||||
|
|
||||||
const {fullLive} = homeStore();
|
const {fullLive} = homeStore();
|
||||||
import { useFetch } from '#app'
|
|
||||||
|
|
||||||
definePageMeta({
|
definePageMeta({
|
||||||
layout: 'default',
|
layout: 'default',
|
||||||
@ -48,12 +49,12 @@ const list = ref([{
|
|||||||
title: '张天赐 | 日出而作,日落而息',
|
title: '张天赐 | 日出而作,日落而息',
|
||||||
startingPrice: 'RMB 1,000',
|
startingPrice: 'RMB 1,000',
|
||||||
transactionPrice: '',
|
transactionPrice: '',
|
||||||
},{
|
}, {
|
||||||
image: 'https://e-cdn.fontree.cn/fonchain-main/prod/file/default/setting/637d95b4-2ae9-4a74-bd60-a3a9d2ca2ca0.png',
|
image: 'https://e-cdn.fontree.cn/fonchain-main/prod/file/default/setting/637d95b4-2ae9-4a74-bd60-a3a9d2ca2ca0.png',
|
||||||
title: '张天赐 | 日出而作,日落而息',
|
title: '张天赐 | 日出而作,日落而息',
|
||||||
startingPrice: 'RMB 1,000',
|
startingPrice: 'RMB 1,000',
|
||||||
transactionPrice: 'RMB 10,000',
|
transactionPrice: 'RMB 10,000',
|
||||||
},{
|
}, {
|
||||||
image: 'https://e-cdn.fontree.cn/fonchain-main/prod/file/default/setting/637d95b4-2ae9-4a74-bd60-a3a9d2ca2ca0.png',
|
image: 'https://e-cdn.fontree.cn/fonchain-main/prod/file/default/setting/637d95b4-2ae9-4a74-bd60-a3a9d2ca2ca0.png',
|
||||||
title: '张天赐 | 日出而作,日落而息',
|
title: '张天赐 | 日出而作,日落而息',
|
||||||
startingPrice: 'RMB 1,000',
|
startingPrice: 'RMB 1,000',
|
||||||
@ -107,7 +108,7 @@ const changeLive = () => {
|
|||||||
<van-pull-refresh>
|
<van-pull-refresh>
|
||||||
<van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="loadData">
|
<van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="loadData">
|
||||||
<div class="w-full flex gap-[16px]">
|
<div class="w-full flex gap-[16px]">
|
||||||
<Column v-for="(column, colIndex) in columns" :key="colIndex" :items="column" @openShow="openShow" />
|
<Column v-for="(column, colIndex) in columns" :key="colIndex" :items="column" @openShow="openShow"/>
|
||||||
</div>
|
</div>
|
||||||
</van-list>
|
</van-list>
|
||||||
</van-pull-refresh>
|
</van-pull-refresh>
|
||||||
@ -168,6 +169,5 @@ const changeLive = () => {
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
height: calc(100vh - var(--van-nav-bar-height));
|
height: calc(100vh - var(--van-nav-bar-height));
|
||||||
transform: translateY(0);
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
@ -1,7 +1,49 @@
|
|||||||
import { createGlobalState } from '@vueuse/core'
|
import { createGlobalState } from '@vueuse/core'
|
||||||
export const homeStore = createGlobalState(() => {
|
export const homeStore = createGlobalState(() => {
|
||||||
const fullLive=ref(false)
|
const fullLive=ref(false)
|
||||||
|
const list = ref([{
|
||||||
|
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/f7b65e23-ce21-41b4-8e58-9e6dc6950727.png',
|
||||||
|
title: '张天赐 | 日出而作,日落而息',
|
||||||
|
startingPrice: 'RMB 1,000',
|
||||||
|
transactionPrice: '',
|
||||||
|
}, {
|
||||||
|
image: 'https://e-cdn.fontree.cn/fonchain-main/prod/file/default/setting/41eceb23-d168-4049-ae8e-48c5328b192f.png',
|
||||||
|
title: '张天赐 | 日出而作,日落而息',
|
||||||
|
startingPrice: 'RMB 1,000',
|
||||||
|
transactionPrice: '',
|
||||||
|
}, {
|
||||||
|
image: 'https://e-cdn.fontree.cn/fonchain-main/prod/file/default/setting/25c3f03c-9e0b-456b-963f-79b3d812c89a.png',
|
||||||
|
title: '张天赐 | 日出而作,日落而息',
|
||||||
|
startingPrice: 'RMB 1,000',
|
||||||
|
transactionPrice: '',
|
||||||
|
}, {
|
||||||
|
image: 'https://e-cdn.fontree.cn/fonchain-main/prod/file/default/setting/25c3f03c-9e0b-456b-963f-79b3d812c89a.png',
|
||||||
|
title: '张天赐 | 日出而作,日落而息',
|
||||||
|
startingPrice: 'RMB 1,000',
|
||||||
|
transactionPrice: '',
|
||||||
|
}, {
|
||||||
|
image: 'https://e-cdn.fontree.cn/fonchain-main/prod/file/default/setting/25c3f03c-9e0b-456b-963f-79b3d812c89a.png',
|
||||||
|
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',
|
||||||
|
}])
|
||||||
return{
|
return{
|
||||||
|
list,
|
||||||
fullLive
|
fullLive
|
||||||
}
|
}
|
||||||
})
|
})
|
2
env/.env.test
vendored
2
env/.env.test
vendored
@ -4,4 +4,4 @@ NUXT_PUBLIC_WS_URL=ws://test-ws.example.com
|
|||||||
NUXT_API_SECRET=test-secret
|
NUXT_API_SECRET=test-secret
|
||||||
|
|
||||||
# 阿里云播放器配置
|
# 阿里云播放器配置
|
||||||
NUXT_PUBLIC_PLAYER_SOURCE=artc://live-pull-sh-01.szjixun.cn/live/live?auth_key=1736748343-0-0-feef65166e5cc62957c35b6e3eec82a1
|
NUXT_PUBLIC_PLAYER_SOURCE=artc://live-pull-sh-01.szjixun.cn/live/live?auth_key=1737080180-0-0-42ad4cf26ba26eee78ca7de9c524d1e0
|
Loading…
Reference in New Issue
Block a user