From c1ac61c3fd319f9fb6abfef1dbce91a164110d88 Mon Sep 17 00:00:00 2001 From: expdsn <18111002318@163.com> Date: Tue, 22 Oct 2024 16:27:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E7=83=AD=E7=82=B9?= =?UTF-8?q?=E8=B5=84=E8=AE=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/icons/hotspot/baidu_info.png | Bin 0 -> 2470 bytes public/icons/hotspot/bilibili_info.png | Bin 0 -> 1648 bytes public/icons/hotspot/hot_tab_bg.png | Bin 0 -> 896 bytes public/icons/hotspot/weibo_info.png | Bin 0 -> 2234 bytes public/icons/热搜榜@2x.png | Bin 0 -> 5210 bytes src/layout/grid/BlockWrapper.tsx | 52 +++++++------- src/main.css | 8 ++- src/widgets/constellation/Modal.tsx | 3 +- src/widgets/discount/Modal.tsx | 88 +++++++++++++++-------- src/widgets/discount/useDiscountStore.ts | 32 ++++++--- src/widgets/hotspot/Large.tsx | 67 ++++++++++++++++- src/widgets/hotspot/Middle.tsx | 78 +++++++++++++++++++- src/widgets/hotspot/Modal.tsx | 76 ++++++++++++++++++-- src/widgets/hotspot/Small.tsx | 21 ++++-- src/widgets/hotspot/useHotspotStore.ts | 49 +++++++++++++ src/widgets/video/useVideoStore.tsx | 19 +++++ 16 files changed, 410 insertions(+), 83 deletions(-) create mode 100644 public/icons/hotspot/baidu_info.png create mode 100644 public/icons/hotspot/bilibili_info.png create mode 100644 public/icons/hotspot/hot_tab_bg.png create mode 100644 public/icons/hotspot/weibo_info.png create mode 100644 public/icons/热搜榜@2x.png create mode 100644 src/widgets/hotspot/useHotspotStore.ts diff --git a/public/icons/hotspot/baidu_info.png b/public/icons/hotspot/baidu_info.png new file mode 100644 index 0000000000000000000000000000000000000000..02132cb616aa49e7e86fe437140d2beb23346704 GIT binary patch literal 2470 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 IM6N<$f>ACFR{#J2 literal 0 HcmV?d00001 diff --git a/public/icons/热搜榜@2x.png b/public/icons/热搜榜@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..aac358b58eda7f568eea304c34aeca64f4f8164b GIT binary patch literal 5210 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 U(DL4BRsaA107*qoM6N<$g6-V(zyJUM literal 0 HcmV?d00001 diff --git a/src/layout/grid/BlockWrapper.tsx b/src/layout/grid/BlockWrapper.tsx index 4c4be32..ba1fe5d 100644 --- a/src/layout/grid/BlockWrapper.tsx +++ b/src/layout/grid/BlockWrapper.tsx @@ -26,7 +26,7 @@ export default defineComponent({ const hover = ref(false) return () => (
-
- {props.block.link ? ( - props.block.link.startsWith('id:') ? ( - // 文件夹 - +
+
+ {props.block.link ? ( + props.block.link.startsWith('id:') ? ( + // 文件夹 + + ) : ( + // 链接 + + ) ) : ( - // 链接 - - ) - ) : ( - // 小组件 - + // 小组件 + + )} +
+ {settings.state.showBlockLabel && ( +
+ {layout.getLabel(props.block)} +
)}
- {settings.state.showBlockLabel && ( -
- {layout.getLabel(props.block)} -
- )}
) } diff --git a/src/main.css b/src/main.css index d0ce42b..d5a92a6 100644 --- a/src/main.css +++ b/src/main.css @@ -165,7 +165,13 @@ body { scrollbar-width: none; -ms-overflow-style: none; } - +.hover-move { + transform: translateY(0); + animation: none; + transition-duration: 0.3s; + transition-property: transform; + transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); +} .hover-move:hover { transform: translateY(-4px); } diff --git a/src/widgets/constellation/Modal.tsx b/src/widgets/constellation/Modal.tsx index a2958cc..604590b 100644 --- a/src/widgets/constellation/Modal.tsx +++ b/src/widgets/constellation/Modal.tsx @@ -56,7 +56,8 @@ export default defineComponent(() => { } > { + onClick={(e) => { + e.stopPropagation() page.value = (page.value % 2) + 1 }} class={clsx( diff --git a/src/widgets/discount/Modal.tsx b/src/widgets/discount/Modal.tsx index 3b84059..a503969 100644 --- a/src/widgets/discount/Modal.tsx +++ b/src/widgets/discount/Modal.tsx @@ -2,17 +2,17 @@ import { defineComponent, ref, watch, type VNodeRef } from 'vue' import useGameNews from './useDiscountStore' import { RiTimeLine } from 'oh-vue-icons/icons' import { addIcons, OhVueIcon } from 'oh-vue-icons' +import { IoCloseCircleOutline, RiCloseCircleLine } from 'oh-vue-icons/icons' import dayjs from 'dayjs' -addIcons(RiTimeLine) +addIcons(RiTimeLine, IoCloseCircleOutline, RiCloseCircleLine) export default defineComponent(() => { const store = useGameNews() const containerRef = ref(null as VNodeRef | null) - + const searchText = ref('') const handleScroll = () => { const container = containerRef.value if (container.scrollTop + container.clientHeight >= container.scrollHeight - 50) { - store.getNews() } } @@ -24,46 +24,74 @@ export default defineComponent(() => { }} >
- +
+ { + searchText.value = e.target.value + }} + onKeydown={(e: any) => { + if (e.key === 'Enter') { + store.getNews() + } + }} + > + +
-
-
+
+
{store.list.map((item, index) => { return (
{ - }} + onClick={() => {}} key={index} > - +
- - {item.gameid} - - - {item.name} - -
- +
+ {item.name} +
+ + {item.typename} + +
+
+
+ -13% +
+ + ￥{item.commdity[0].price} + + + ￥{item.commdity[0].oldprice} + + + 剩余{item.commdity[0].oldprice}天 + +
diff --git a/src/widgets/discount/useDiscountStore.ts b/src/widgets/discount/useDiscountStore.ts index f681ec3..34128c4 100644 --- a/src/widgets/discount/useDiscountStore.ts +++ b/src/widgets/discount/useDiscountStore.ts @@ -1,9 +1,17 @@ import request from "@/utils/request"; import { defineStore } from "pinia"; -import { ref, type VNodeRef } from "vue"; - +import { reactive, ref, type VNodeRef } from "vue"; +type CommdityType = { + commodityClass: string; + img: string; + price: string; + oldprice: string; + royaltyrate: string + url: string; +} export interface GameDiscount { + commdity: CommdityType[]; gameid: string; status: number; typeid: string; @@ -12,30 +20,34 @@ export interface GameDiscount { } export default defineStore("gameDiscount", () => { const list = ref([]) - const page = ref(1) const loading = ref(false) const noMoreData = ref(false) - const containerRef = ref(null) - + const state = reactive({ + pageId: 1, + name: '', + }) const getList = async () => { const res = await request<{ data: GameDiscount[]; - }>('GET', `/api/gameDiscount?page=${page.value}&page_size=16`) + }>('POST', '/api/gameDiscount', { + data: { + pageId: state.pageId, + name: state.name + } + }) return res.data } const getNews = async () => { if (loading.value || noMoreData.value) return; loading.value = true; - try { const data = await getList() - if (data.length === 0) { noMoreData.value = true; } else { list.value.push(...data); - page.value++; + state.pageId += 1; } } catch (e) { console.log(e); @@ -51,6 +63,6 @@ export default defineStore("gameDiscount", () => { loading, noMoreData, getNews, - containerRef + state, } }) \ No newline at end of file diff --git a/src/widgets/hotspot/Large.tsx b/src/widgets/hotspot/Large.tsx index b83de91..8238048 100644 --- a/src/widgets/hotspot/Large.tsx +++ b/src/widgets/hotspot/Large.tsx @@ -1,9 +1,72 @@ import { defineComponent } from 'vue' +import useHotspotStore, { PlatformList } from './useHotspotStore' +import clsx from 'clsx' +import jump from '@/utils/jump' export default defineComponent(() => { + const store = useHotspotStore() return () => ( -
- large +
+
+ {[...PlatformList.entries()].map(([key, value]) => ( +
{ + store.type = key + e.stopPropagation() + }} + class={clsx( + ' py-2 cursor-pointer bg rounded-xl flex gap-x-1 relative', + store.type === key ? 'text-[#4162ce] font-bold' : '' + )} + > + {value} + {store.type === key && ( + bg + )} +
+ ))} +
+
+
+ {store.hotMap + .get(store.type) + ?.filter((_, idx) => idx < 5) + .map((item, index) => ( +
{ + jump(item.url) + }} + > +
+ + {index + 1}. + + + {item.title} + +
+ {item.hotScore} +
+ ))} +
+
) }) diff --git a/src/widgets/hotspot/Middle.tsx b/src/widgets/hotspot/Middle.tsx index 53edc23..faaa59d 100644 --- a/src/widgets/hotspot/Middle.tsx +++ b/src/widgets/hotspot/Middle.tsx @@ -1,10 +1,82 @@ import { defineComponent } from 'vue' +import useHotspotStore, { PlatformList } from './useHotspotStore' +import clsx from 'clsx' +import { BiCaretRightFill } from 'oh-vue-icons/icons' +import jump from '@/utils/jump' +import { addIcons, OhVueIcon } from 'oh-vue-icons' +addIcons(BiCaretRightFill) export default defineComponent(() => { - + const store = useHotspotStore() return () => ( -
- middle +
+
+
+ {[...PlatformList.entries()] + .filter((_, idx) => idx === 0) + .map(([key, value]) => ( +
{ + store.type = key + e.stopPropagation() + }} + class={clsx( + ' py-2 cursor-pointer bg rounded-xl flex gap-x-1 relative', + store.type === key ? 'text-[#4162ce] font-bold' : '' + )} + > + {value} + {store.type === key && ( + bg + )} +
+ ))} +
+
+ +
+
+
+
+ {store.hotMap + .get(store.type) + ?.filter((_, idx) => idx < 5) + .map((item, index) => ( +
{ + jump(item.url) + }} + > +
+ + {index + 1}. + + + {item.title} + +
+ {item.hotScore} +
+ ))} +
+
) }) diff --git a/src/widgets/hotspot/Modal.tsx b/src/widgets/hotspot/Modal.tsx index 9890740..fb102af 100644 --- a/src/widgets/hotspot/Modal.tsx +++ b/src/widgets/hotspot/Modal.tsx @@ -1,12 +1,76 @@ import { defineComponent } from 'vue' +import useHotspotStore, { PlatformList } from './useHotspotStore' +import clsx from 'clsx' +import jump from '@/utils/jump' export default defineComponent(() => { + const store = useHotspotStore() return () => ( -
+
+
+ +
+
+
+
+ {[...PlatformList.entries()].map(([key, value]) => ( +
{ + store.type = key + }} + class={clsx( + 'w-full py-3 cursor-pointer pl-3 bg rounded-xl flex gap-x-1', + + store.type === key + ? 'bg-[#ffffff] text-[#4162ce] font-bold' + : 'hover:bg-[#ffffff] text-[#666]' + )} + > + + {value}热点 +
+ ))} +
+
+
+ {store.hotMap.get(store.type)?.map((item, index) => ( +
{ + jump(item.url) + }} + > +
+ + {index + 1} + + + {item.title} + +
+ {item.hotScore} +
+ ))} +
+
+
+
+
) }) diff --git a/src/widgets/hotspot/Small.tsx b/src/widgets/hotspot/Small.tsx index bf0a763..2704692 100644 --- a/src/widgets/hotspot/Small.tsx +++ b/src/widgets/hotspot/Small.tsx @@ -1,14 +1,25 @@ + import { defineComponent } from 'vue' export default defineComponent(() => { return () => (
- + +
+
+ 热点折扣 +
+ 立即查看 +
+ +
+
+
+
) }) + diff --git a/src/widgets/hotspot/useHotspotStore.ts b/src/widgets/hotspot/useHotspotStore.ts new file mode 100644 index 0000000..34f4b76 --- /dev/null +++ b/src/widgets/hotspot/useHotspotStore.ts @@ -0,0 +1,49 @@ +import useLayoutStore from '@/layout/useLayoutStore' +import request from '@/utils/request' +import { defineStore } from 'pinia' +import { computed, ref, watch } from 'vue' + +type HotType = { + desc: string + hotScore: string + index: number + picurl: string + title: string + url: string +} +export const PlatformList = new Map([ + ['baidu', '百度'], + ['weibo', '微博'], + ['bilibili', 'B站'] +] as const) + +export default defineStore('hotspot', () => { + const hotMap = ref>(new Map()) + const type = ref('baidu') + const addHotType = (key: string, hotType: HotType[]) => { + if (hotMap.value.has(key)) { + // 如果 key 已存在，向对应的数组中添加新元素 + return + } else { + // 如果 key 不存在，初始化一个新的数组并设置该 key + hotMap.value.set(key, hotType); + } + }; + const getNews = async (type: string) => { + const res = await request<{ + data: HotType[] + }>('GET', `/api/hotList?type=${type}`) + addHotType(type, res.data) + } + + watch(type, val => { + if (hotMap.value.has(val)) return + getNews(val) + }) + getNews(type.value) + + return { + hotMap, + type + } +}) diff --git a/src/widgets/video/useVideoStore.tsx b/src/widgets/video/useVideoStore.tsx index 6e2bb3b..fc596da 100644 --- a/src/widgets/video/useVideoStore.tsx +++ b/src/widgets/video/useVideoStore.tsx @@ -1,10 +1,29 @@ import useLayoutStore from '@/layout/useLayoutStore' +import request from '@/utils/request' import { defineStore } from 'pinia' import { computed, ref, watch } from 'vue' +type HotType = { + desc: string + hotScore: string + index: number + picurl: string + title: string + url: string +} +export const PlatformList = new Map([ + ['baidu', '百度'], + ['weibo', '微博'], + ['bilibili', 'B站'] +] as const) + export default defineStore('video', () => { const videoList = ref([]) const layout = useLayoutStore() + const type = ref('baidu') + const getNews = async (type: string) => { + const res = request('GET', `/api/hotList?type=${type}`) + } watch( () => layout.state.current, (val) => {