diff --git a/src/pages/realtimeInfo/pc/components/PageTop.vue b/src/pages/realtimeInfo/pc/components/PageTop.vue index ce46b65..29494f1 100644 --- a/src/pages/realtimeInfo/pc/components/PageTop.vue +++ b/src/pages/realtimeInfo/pc/components/PageTop.vue @@ -3,22 +3,22 @@ - + 资讯头条榜 - + 热门行业 - + 风口概念 - + 编辑精选 @@ -31,7 +31,7 @@ diff --git a/src/pages/realtimeInfo/pc/index.vue b/src/pages/realtimeInfo/pc/index.vue index bf03fe6..44ff9a4 100644 --- a/src/pages/realtimeInfo/pc/index.vue +++ b/src/pages/realtimeInfo/pc/index.vue @@ -10,7 +10,6 @@ import { ref, onMounted, defineAsyncComponent, reactive } from "vue"; import PageTop from "@/pages/realtimeInfo/pc/components/PageTop.vue"; import { useRoute, useRouter } from "vue-router"; - const route = useRoute(); const router = useRouter(); const layoutName = ref(); @@ -21,7 +20,7 @@ onMounted(async () => { infoId.value = route.query.id; } // 如果过来的链接里有token说明是财保过来的 - console.log("🚀 ~ route.query:", route.query) + console.log("🚀 ~ route.query:", route.query); if (route.query.type) { switch (route.query.type) { @@ -41,11 +40,7 @@ onMounted(async () => { case "3": layoutName.value = "top10"; uni.navigateTo({ - url: - "/pages/realtimeInfo/pc/top10?type=" + - route.query.type + - "&name=" + - route.query.name, + url: "/pages/realtimeInfo/pc/top10?type=" + route.query.type + "&name=" + route.query.name, }); break; case "4": diff --git a/src/pages/realtimeInfo/pc/rank.vue b/src/pages/realtimeInfo/pc/rank.vue index d422a0a..6a8d139 100644 --- a/src/pages/realtimeInfo/pc/rank.vue +++ b/src/pages/realtimeInfo/pc/rank.vue @@ -7,10 +7,14 @@ 资讯头条榜 编辑精选 - - + style="margin-left: 40rpx; margin-top: 5rpx; border-radius: 20rpx" + > @@ -36,12 +40,8 @@ {{ item.source }} - {{ - dayjs(item.publish_time).format("YYYY-MM-DD HH:MM:ss") - }} - {{ - item.time - }} + {{ dayjs(item.publish_time).format("YYYY-MM-DD HH:MM:ss") }} + {{ item.time }} {{ item.news_score }} @@ -50,15 +50,24 @@ -
- +
+
- - + @@ -78,7 +87,7 @@ const form = reactive({ keyword: "", page: 1, size: 10, - total: 10 + total: 10, }); const currentPage = ref(form.page); @@ -88,19 +97,18 @@ const router = useRouter(); const pageType = ref(route.query.type); const newsList = ref([]); - async function getNewsList() { if (pageType.value == 4) { // 编辑精选 let { code, data } = await editTopNews({ - ...form + ...form, }); if (code == 200) { newsList.value = data.list; form.total = data.total; data.list.forEach((item) => { - item.summary = item.summary.replace(form.keyword, "" + form.keyword + ''); - item.title = item.title.replace(form.keyword, "" + form.keyword + ''); + item.summary = item.summary.replace(form.keyword, "" + form.keyword + ""); + item.title = item.title.replace(form.keyword, "" + form.keyword + ""); }); } } else { @@ -110,11 +118,11 @@ async function getNewsList() { } function goDetail(item) { - let id = null + let id = null; if (pageType.value != 4) { - id = item.news_id + id = item.news_id; } else { - id = item.id + id = item.id; } uni.navigateTo({ url: "/pages/realtimeInfo/pc/indexPC?id=" + id + "&type=" + pageType.value, @@ -127,24 +135,25 @@ function currentChange(page) { } onMounted(async (e) => { - - console.log("🚀 ~ route.query:", route.query) - if (route.query?.token && !Session.get("token")) { + console.log("🚀 ~ route.query:", route.query); + if (route.query?.token && (!Session.get("token") || Session.get("token") == "undefined")) { uni.showLoading({ - title: '加载中', - mask: true - }) + title: "加载中", + mask: true, + }); sendToken({ token: route.query.token, }).then((res) => { - uni.hideLoading() + uni.hideLoading(); if (res.code == 200) { Session.set("token", res.data.token); Session.set("userPhone", res.data.phone); - window.location.reload(); + setTimeout(() => { + window.location.reload(); + }, 500); } - }) + }); } else { if (!Session.get("token")) { LoginShow.value = true; @@ -152,8 +161,6 @@ onMounted(async (e) => { } getNewsList(); - - }); const LoginShow = ref(false); @@ -293,7 +300,6 @@ const handlePopupErrorCallback = () => { color: #333333; margin-top: 20rpx; - /* 必须:限制内容不溢出容器 */ overflow: hidden; /* 必须:超出部分显示省略号 */