diff --git a/pages/avatar/detail.vue b/pages/avatar/detail.vue index e5985e5..d83d928 100644 --- a/pages/avatar/detail.vue +++ b/pages/avatar/detail.vue @@ -128,7 +128,7 @@ import { ref, onMounted } from "vue"; import { onLoad, onShareAppMessage, onShareTimeline } from "@dcloudio/uni-app"; import { getPageDetail } from "@/api/system.js"; import { getAvatarRecommendList } from "@/api/avatar.js"; -import { saveViewRequest } from "@/utils/common.js"; +import { getShareToken, saveViewRequest } from "@/utils/common.js"; import NavBar from "@/components/NavBar/NavBar.vue"; const defaultAvatar = @@ -145,20 +145,22 @@ onLoad((options) => { fetchFrames(); }); -onShareAppMessage(() => { +onShareAppMessage(async () => { + const token = await getShareToken("avatar_detail", detailData.value?.id); return { title: "快来看看我刚领到的新年专属头像 🎊", - path: `/pages/avatar/detail?shareToken=${shareToken.value}`, + path: `/pages/avatar/detail?shareToken=${token}`, imageUrl: detailData.value?.imageUrl || "https://file.lihailezzc.com/resource/8dd026d76ef7a63d123b7fd698fb989b.png", }; }); -onShareTimeline(() => { +onShareTimeline(async () => { + const token = await getShareToken("avatar_timeline", detailData.value?.id); return { title: "快来看看我刚领到的新年专属头像 🎊", - query: `shareToken=${shareToken.value}`, + query: `shareToken=${token}`, imageUrl: detailData.value?.imageUrl || "https://file.lihailezzc.com/resource/8dd026d76ef7a63d123b7fd698fb989b.png", @@ -169,7 +171,7 @@ const fetchDetail = async () => { try { // uni.showLoading({ title: "加载中..." }); const res = await getPageDetail(shareToken.value); - saveViewRequest(shareToken.value, "avatar_download", res.id); + saveViewRequest(shareToken.value, "avatar_detail", res.id); if (res) { detailData.value = res; } diff --git a/pages/avatar/index.vue b/pages/avatar/index.vue index bba385f..1c89eab 100644 --- a/pages/avatar/index.vue +++ b/pages/avatar/index.vue @@ -195,6 +195,7 @@ import { getShareToken, generateObjectId, uploadImage, + saveViewRequest, } from "@/utils/common.js"; import NavBar from "@/components/NavBar/NavBar.vue"; import LoginPopup from "@/components/LoginPopup/LoginPopup.vue"; @@ -348,6 +349,10 @@ onLoad((options) => { currentAvatar.value = recommendItem; } } + + if (options.shareToken) { + saveViewRequest("avatar_download", options.shareToken); + } }); onReachBottom(() => { @@ -718,9 +723,11 @@ onShareAppMessage(async () => { }; }); -onShareTimeline(() => { +onShareTimeline(async () => { + const shareToken = await getShareToken("avatar_timeline"); return { title: "快来定制你的新年专属头像 🎊", + query: `shareToken=${shareToken}`, imageUrl: "https://file.lihailezzc.com/resource/8dd026d76ef7a63d123b7fd698fb989b.png", }; diff --git a/pages/detail/index.vue b/pages/detail/index.vue index df2b4e4..a9512e5 100644 --- a/pages/detail/index.vue +++ b/pages/detail/index.vue @@ -117,7 +117,7 @@ import { ref } from "vue"; import { onLoad, onShareAppMessage, onShareTimeline } from "@dcloudio/uni-app"; import { getPageDetail } from "@/api/system.js"; -import { saveViewRequest } from "@/utils/common.js"; +import { getShareToken, saveViewRequest } from "@/utils/common.js"; import NavBar from "@/components/NavBar/NavBar.vue"; const cardId = ref(""); @@ -132,20 +132,22 @@ onLoad(async (options) => { } }); -onShareAppMessage(() => { +onShareAppMessage(async () => { + const token = await getShareToken("card_detail", cardDetail.value?.id); return { title: "送你一张精美的新春祝福卡片 🎊", - path: `/pages/detail/index?shareToken=${cardDetail.value?.shareToken || ""}`, + path: `/pages/detail/index?shareToken=${token || ""}`, imageUrl: cardDetail.value?.imageUrl || "https://file.lihailezzc.com/resource/8dd026d76ef7a63d123b7fd698fb989b.png", }; }); -onShareTimeline(() => { +onShareTimeline(async () => { + const token = await getShareToken("card_timeline", cardDetail.value?.id); return { title: "送你一张精美的新春祝福卡片 🎊", - query: `shareToken=${cardDetail.value?.shareToken || ""}`, + query: `shareToken=${token}`, imageUrl: cardDetail.value?.imageUrl || "https://file.lihailezzc.com/resource/8dd026d76ef7a63d123b7fd698fb989b.png", diff --git a/pages/fortune/index.vue b/pages/fortune/index.vue index 2eb81ba..89b0659 100644 --- a/pages/fortune/index.vue +++ b/pages/fortune/index.vue @@ -130,6 +130,7 @@ import { getShareToken, saveRemoteImageToLocal, saveRecordRequest, + saveViewRequest, } from "@/utils/common.js"; import NavBar from "@/components/NavBar/NavBar.vue"; @@ -155,7 +156,11 @@ audioContext.onEnded(() => { } }); -onLoad(() => {}); +onLoad((options) => { + if (options.shareToken) { + saveViewRequest(options.shareToken, "fortune_draw"); + } +}); onShow(() => { checkDrawStatus(); @@ -176,9 +181,11 @@ onShareAppMessage(async () => { }; }); -onShareTimeline(() => { +onShareTimeline(async () => { + const shareToken = await getShareToken("fortune_timeline"); return { title: "新春到，抽灵签！快来测测你的新年运势 🏮", + query: `shareToken=${shareToken}`, imageUrl: "https://file.lihailezzc.com/resource/8dd026d76ef7a63d123b7fd698fb989b.png", }; diff --git a/pages/index/index.vue b/pages/index/index.vue index d0538fa..ea961e9 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -31,7 +31,9 @@ class="notice-swiper-item" @tap="onNoticeTap(tip)" > - {{ getTagText(tip.tag) }} + {{ + getTagText(tip.tag) + }} {{ tip.text }} @@ -209,15 +211,16 @@ onShareAppMessage(async () => { }; }); -onShareTimeline(() => { +onShareTimeline(async () => { + const shareToken = await getShareToken("index_timeline"); return { title: "新年好运已送达 🎊｜祝福卡·头像·壁纸", + query: `shareToken=${shareToken}`, imageUrl: "https://file.lihailezzc.com/resource/8dd026d76ef7a63d123b7fd698fb989b.png", }; }); - const getIndexTips = async () => { const res = await getTipsList(); noticeList.value = res || []; diff --git a/pages/make/index.vue b/pages/make/index.vue index 74fb2ed..149b5d8 100644 --- a/pages/make/index.vue +++ b/pages/make/index.vue @@ -1015,9 +1015,11 @@ onShareAppMessage(async (options) => { } }); -onShareTimeline(() => { +onShareTimeline(async () => { + const shareToken = await getShareToken("card_timeline"); return { title: "送你一张精美的新春祝福卡片 🎊", + query: `shareToken=${shareToken}`, imageUrl: "https://file.lihailezzc.com/resource/8dd026d76ef7a63d123b7fd698fb989b.png", }; diff --git a/pages/mine/greeting.vue b/pages/mine/greeting.vue index c21f594..7507bc3 100644 --- a/pages/mine/greeting.vue +++ b/pages/mine/greeting.vue @@ -99,7 +99,6 @@ import { onPullDownRefresh, onReachBottom, onShareAppMessage, - onShareTimeline, } from "@dcloudio/uni-app"; import { getMyCard } from "@/api/mine.js"; import NavBar from "@/components/NavBar/NavBar.vue"; @@ -148,14 +147,6 @@ onShareAppMessage(async (options) => { } }); -onShareTimeline(() => { - return { - title: "送你一张精美的新春祝福卡片 🎊", - imageUrl: - "https://file.lihailezzc.com/resource/8dd026d76ef7a63d123b7fd698fb989b.png", - }; -}); - const fetchList = async (reset = false) => { if (loading.value) return; if (reset) { diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index b40c8a8..807b0d5 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -136,7 +136,8 @@ \ No newline at end of file + diff --git a/pages/wallpaper/detail.vue b/pages/wallpaper/detail.vue index ac2712b..5849158 100644 --- a/pages/wallpaper/detail.vue +++ b/pages/wallpaper/detail.vue @@ -129,7 +129,7 @@ import { onLoad, onShareAppMessage, onShareTimeline } from "@dcloudio/uni-app"; import { getBavBarHeight } from "@/utils/system"; import { getPageDetail } from "@/api/system"; import { getWallpaperRecommendList } from "@/api/wallpaper"; -import { saveViewRequest } from "@/utils/common.js"; +import { getShareToken, saveViewRequest } from "@/utils/common.js"; const navHeight = getBavBarHeight(); const statusBarHeight = uni.getSystemInfoSync().statusBarHeight; @@ -148,20 +148,22 @@ onLoad(async (options) => { fetchRecommend(); }); -onShareAppMessage(() => { +onShareAppMessage(async () => { + const token = await getShareToken("wallpaper_detail", detailData.value?.id); return { title: "快来看看我刚领到的新年精美壁纸 🖼", - path: `/pages/wallpaper/detail?shareToken=${shareToken.value}`, + path: `/pages/wallpaper/detail?shareToken=${token || ""}`, imageUrl: detailData.value?.imageUrl || "https://file.lihailezzc.com/resource/8dd026d76ef7a63d123b7fd698fb989b.png", }; }); -onShareTimeline(() => { +onShareTimeline(async () => { + const token = await getShareToken("wallpaper_timeline", detailData.value?.id); return { title: "快来看看我刚领到的新年精美壁纸 🖼", - query: `shareToken=${shareToken.value}`, + query: `shareToken=${token}`, imageUrl: detailData.value?.imageUrl || "https://file.lihailezzc.com/resource/8dd026d76ef7a63d123b7fd698fb989b.png", @@ -171,7 +173,7 @@ onShareTimeline(() => { const fetchDetail = async () => { try { const res = await getPageDetail(shareToken.value); - saveViewRequest(shareToken.value, "wallpaper_download", res.id); + saveViewRequest(shareToken.value, "wallpaper_detail", res.id); if (res) { detailData.value = res; } diff --git a/pages/wallpaper/index.vue b/pages/wallpaper/index.vue index 34c46e4..741fc2e 100644 --- a/pages/wallpaper/index.vue +++ b/pages/wallpaper/index.vue @@ -104,7 +104,7 @@ const hasMore = ref(true); const isRefreshing = ref(false); onShareAppMessage(async (options) => { - if(!isLoggedIn.value) { + if (!isLoggedIn.value) { const shareToken = await getShareToken("wallpaper_download_index", ""); return { title: "新春祝福", @@ -134,9 +134,11 @@ onShareAppMessage(async (options) => { } }); -onShareTimeline(() => { +onShareTimeline(async () => { + const shareToken = await getShareToken("wallpaper_timeline"); return { title: "精选新年壁纸，让手机也过年 🖼", + query: `shareToken=${shareToken}`, imageUrl: "https://file.lihailezzc.com/resource/8dd026d76ef7a63d123b7fd698fb989b.png", };