diff --git a/src/api/index.ts b/src/api/index.ts index e2d75e1..5db9a52 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -72,7 +72,12 @@ export const doShare = (data: any) => { return Request.post("/user/share", data); }; -// 微信分享 +// 国内资讯列表 export const getDomestic = (data: any) => { return Request.get("/news/domestic", data); -}; \ No newline at end of file +}; + +// 国内资讯详情 +export const getDomesticDetail = (data: any) => { + return Request.get(`/news/domestic/${data.id}`); +}; diff --git a/src/components/domesticMini.vue b/src/components/domesticMini.vue index bd489eb..8906d12 100644 --- a/src/components/domesticMini.vue +++ b/src/components/domesticMini.vue @@ -19,6 +19,13 @@ const form = reactive({ pageNum: 1, pageSize: 10, }); + +function doDetail(item) { + uni.navigateTo({ + url: "/pages/detail/indexNewsInfo?id=" + item.id + "&type=guonei", + }); +} + async function getDomesticFn() { uni.showLoading(); let { code, data } = await getDomestic({ diff --git a/src/pages/detail/indexNewsInfo.vue b/src/pages/detail/indexNewsInfo.vue index 0d1b636..718190c 100644 --- a/src/pages/detail/indexNewsInfo.vue +++ b/src/pages/detail/indexNewsInfo.vue @@ -50,7 +50,7 @@ { console.log("🚀 ~ onReachBottom ~ onReachBottom:"); }); +const isDomestic = ref(false); onLoad(async (option: any) => { uni.pageScrollTo({ scrollTop: 0, }); - newType.value = option.type || 14; - const res = await fetchArticleDetail({ - id: option.id, - // id: 763, - }); + if (option?.type == "guonei") { + isDomestic.value = true; + let res = await getDomesticDetail({ id: option.id }); + if (res.code === 200) { + data.value = res.data; - if (res.code === 200) { - data.value = res.data; + data.value.content = res.data.content.replace(/\n{3,}/g, "\n"); - res.data.content = res.data.content.replace(/\n{3,}/g, "\n"); + columnName.value = data.columnName1; + } + } else { + newType.value = option.type || 14; + const res = await fetchArticleDetail({ + id: option.id, + // id: 763, + }); - columnName.value = res.data.columnName1; - newList(res.data.columnId1); - wxShare(); + if (res.code === 200) { + data.value = res.data; + + res.data.content = res.data.content.replace(/\n{3,}/g, "\n"); + + columnName.value = res.data.columnName1; + newList(res.data.columnId1); + wxShare(); + } } }); diff --git a/src/pages/minihome/index.vue b/src/pages/minihome/index.vue index 1917af4..f9a8581 100644 --- a/src/pages/minihome/index.vue +++ b/src/pages/minihome/index.vue @@ -124,6 +124,9 @@ function tabChange(index) { break; case 1: break; + case 2: + uni.setStorageSync("homeTabIndex", 2); + break; } } @@ -157,8 +160,11 @@ onPageScroll((val) => { }); onShow(() => { - if (uni.getStorageSync("homeTabIndex") == 1) { - tabChange(1); + if ( + uni.getStorageSync("homeTabIndex") == 1 || + uni.getStorageSync("homeTabIndex") == 2 + ) { + tabChange(uni.getStorageSync("homeTabIndex")); } else { tabChange(0); }