diff --git a/app/components/AppHeader.vue b/app/components/AppHeader.vue index 4c058c7..851f3b4 100644 --- a/app/components/AppHeader.vue +++ b/app/components/AppHeader.vue @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/app/pages/LiveRoom/components/broadcast/index.vue b/app/pages/LiveRoom/components/Broadcast/index.vue similarity index 96% rename from app/pages/LiveRoom/components/broadcast/index.vue rename to app/pages/LiveRoom/components/Broadcast/index.vue index 2409b37..40abec6 100644 --- a/app/pages/LiveRoom/components/broadcast/index.vue +++ b/app/pages/LiveRoom/components/Broadcast/index.vue @@ -11,7 +11,6 @@ const list = ref([ } ]); -// 记录定时器 ID let intervalId = null; const addItem = () => { @@ -32,7 +31,7 @@ const scrollToBottom = () => { if (container) { setTimeout(() => { container.scrollTop = container.scrollHeight; - }, 100); // 延迟以确保动画开始 + }, 100); } }; diff --git a/app/pages/LiveRoom/components/paymentInput/index.vue b/app/pages/LiveRoom/components/PaymentInput/index.vue similarity index 100% rename from app/pages/LiveRoom/components/paymentInput/index.vue rename to app/pages/LiveRoom/components/PaymentInput/index.vue diff --git a/app/pages/LiveRoom/components/paymentResults/index.vue b/app/pages/LiveRoom/components/PaymentResults/index.vue similarity index 100% rename from app/pages/LiveRoom/components/paymentResults/index.vue rename to app/pages/LiveRoom/components/PaymentResults/index.vue diff --git a/app/pages/LiveRoom/components/sideButton/PressableButton.vue b/app/pages/LiveRoom/components/SideButton/PressableButton.vue similarity index 100% rename from app/pages/LiveRoom/components/sideButton/PressableButton.vue rename to app/pages/LiveRoom/components/SideButton/PressableButton.vue diff --git a/app/pages/LiveRoom/components/sideButton/index.vue b/app/pages/LiveRoom/components/SideButton/index.vue similarity index 100% rename from app/pages/LiveRoom/components/sideButton/index.vue rename to app/pages/LiveRoom/components/SideButton/index.vue diff --git a/app/pages/LiveRoom/index.client.vue b/app/pages/LiveRoom/index.client.vue index 88abb02..242415a 100644 --- a/app/pages/LiveRoom/index.client.vue +++ b/app/pages/LiveRoom/index.client.vue @@ -2,12 +2,12 @@ import {ref, onMounted, onBeforeUnmount} from 'vue' import Aliplayer from 'aliyun-aliplayer' import 'aliyun-aliplayer/build/skins/default/aliplayer-min.css' -import sideButton from './components/sideButton/index.vue' -import broadcast from './components/broadcast/index.vue' +import sideButton from '~/pages/LiveRoom/components/SideButton/index.vue' +import broadcast from '~/pages/LiveRoom/components/Broadcast/index.vue' import {liveStore} from "~/stores/live/index.js"; -import paymentResults from './components/paymentResults/index.vue' -import paymentInput from './components/paymentInput/index.vue' -import PressableButton from './components/sideButton/PressableButton.vue' +import paymentResults from '~/pages/LiveRoom/components/PaymentResults/index.vue' +import paymentInput from '~/pages/LiveRoom/components/PaymentInput/index.vue' +import PressableButton from '~/pages/LiveRoom/components/SideButton/PressableButton.vue' const player = ref(null) const {quoteStatus, changeStatus, show, playerId, show1} = liveStore() diff --git a/app/pages/home/components/ItemList/index.vue b/app/pages/home/components/ItemList/index.vue index 96c0baf..8179bed 100644 --- a/app/pages/home/components/ItemList/index.vue +++ b/app/pages/home/components/ItemList/index.vue @@ -1,11 +1,69 @@ - - + + + + + + + + + + + + + + - \ No newline at end of file diff --git a/app/pages/home/index.vue b/app/pages/home/index.vue index 57e72ec..1bda2fc 100644 --- a/app/pages/home/index.vue +++ b/app/pages/home/index.vue @@ -2,135 +2,45 @@ import {useRect} from '@vant/use'; import LiveRoom from '@/pages/LiveRoom/index.client.vue'; import itemDetail from '@/components/itemDetail/index.vue'; -import {homeStore} from "@/stores/goods/index.js"; -import Column from './components/Column/index.vue' - -const {fullLive,getAuctionDetail,getArtworkList,itemList} = homeStore(); +import {goodStore} from "@/stores/goods/index.js"; +import ItemList from './components/ItemList/index.vue' +import Cescribe from './components/Cescribe/index.vue' +import {artworkList} from "~/api/goods/index.js"; +const {fullLive,getAuctionDetail,auctionDetail,itemList,pageRef,liveRef} = goodStore(); definePageMeta({ layout: 'default', i18n: 'menu.home', }) -const liveRef = ref(null); -const loading = ref(false); -const finished = ref(false); -const refreshing = ref(false); -const page = ref(1); -const show = ref(false); -const showHeight = ref(''); -const list = ref([{ - image: 'https://e-cdn.fontree.cn/fonchain-main/prod/file/default/setting/637d95b4-2ae9-4a74-bd60-a3a9d2ca2ca0.png', - title: '张天赐 | 日出而作,日落而息1', - 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: '张天赐 | 日出而作,日落而息2', - startingPrice: 'RMB 1,000', - transactionPrice: '', -}, { - image: 'https://e-cdn.fontree.cn/fonchain-main/prod/file/default/setting/41eceb23-d168-4049-ae8e-48c5328b192f.png', - title: '张天赐 | 日出而作,日落而息3', - 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', -}]) - -const loadData = async () => { - // 加载数据逻辑... -}; - -const onRefresh = () => { - finished.value = false; - page.value = 1; - refreshing.value = true; - loadData(); -}; - -const columns = computed(() => { - const result = [[], []]; - itemList.value.forEach((item, index) => { - result[index % 2].push({ ...item, index }); - }); - return result; -}); - -const openShow = () => { - const rect = useRect(liveRef.value.$el); - showHeight.value = rect.height; - nextTick(() => { - show.value = true; - }); -}; - const changeLive = () => { fullLive.value = true; }; const initData=async ()=>{ await getAuctionDetail() - await getArtworkList() + const res= await artworkList({auctionUuid: auctionDetail.value.uuid,...pageRef.value}) + if (res.status===0){ + itemList.value=res.data.data + pageRef.value.itemCount=res.data.count + } } initData() - - - - - + + + - - - - - - - - - + - - - 这里是后台富文本配置的说明,啊即可打开三等奖撒度老师的湿答答是快乐的阿四大皆空 - - + - - - - - diff --git a/app/stores/goods/index.js b/app/stores/goods/index.js index c045c89..0ee717a 100644 --- a/app/stores/goods/index.js +++ b/app/stores/goods/index.js @@ -1,63 +1,29 @@ -import { createGlobalState } from '@vueuse/core' +import {createGlobalState} from '@vueuse/core' import {artworkList, defaultDetail} from "~/api/goods/index.js"; -export const homeStore = createGlobalState(() => { - const actionDetails=ref({}) - const fullLive=ref(false) - const itemList = 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', - }]) - const auctionDetail=ref({}) - const getAuctionDetail=async ()=>{ - const res=await defaultDetail({}) - if (res.status===0){ - auctionDetail.value=res.data + +export const goodStore = createGlobalState(() => { + const actionDetails = ref({}) + const fullLive = ref(false) + const liveRef = ref(null); + const pageRef = ref({ + page: 1, + pageSize: 5, + itemCount: 0 + }) + const itemList = ref([]) + const auctionDetail = ref({}) + const getAuctionDetail = async () => { + const res = await defaultDetail({}) + if (res.status === 0) { + auctionDetail.value = res.data } } - const getArtworkList=async ()=>{ - const res=await artworkList({auctionUuid:auctionDetail.value.uuid}) - if (res.status===0){ - itemList.value=res.data.data - } + const getArtworkList = async (page = pageRef.value) => { + return artworkList({auctionUuid: auctionDetail.value.uuid, ...page}) } - return{ + return { + liveRef, + pageRef, getArtworkList, auctionDetail, getAuctionDetail, diff --git a/env/.env.test b/env/.env.test index 207c4c5..c868895 100644 --- a/env/.env.test +++ b/env/.env.test @@ -1,5 +1,5 @@ # 测试环境配置 -NUXT_PUBLIC_API_BASE=http://192.168.88.139:9021 +NUXT_PUBLIC_API_BASE=http://172.16.100.99:8005 NUXT_PUBLIC_WS_URL=ws://test-ws.example.com NUXT_API_SECRET=test-secret