diff --git a/.env.development b/.env.development index e860144..c881666 100644 --- a/.env.development +++ b/.env.development @@ -3,9 +3,9 @@ ENV = development # 本地环境接口地址 # VITE_API_URL = http://123.60.153.169:8040/apih5 -# VITE_API_URL = https://4155gf93ll13.vicp.fun/apih5 +VITE_API_URL = http://4155gf93ll13.vicp.fun/apih5 # VITE_API_URL = http://123.60.79.143:8041/apih5 # VITE_API_URL =http://localhost:8040/apih5 -VITE_API_URL = https://cankao.cs.com.cn/apih5 +# VITE_API_URL = https://cankao.cs.com.cn/apih5 VITE_API_DATAV_URL = https://cankao.cs.com.cn/zzck_datav \ No newline at end of file diff --git a/src/api/index.ts b/src/api/index.ts index 5db54d9..3df669f 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -57,7 +57,6 @@ export const getUnlockList = (data: any) => { // 全文搜索 -// export const searchNews = (data: any) => { return Request.post("/news/search", data); }; @@ -70,5 +69,5 @@ export const getReleaseList = (data: any) => { // 编辑精选接口 export const editTopNews = (data: any) => { - return Request.post("/news/top_news_release_h5_d", data); + return Request.post("/news/list/published", data); }; diff --git a/src/pages/realtimeInfo/pc/components/PageTop.vue b/src/pages/realtimeInfo/pc/components/PageTop.vue index 0e15dbc..4c51b4d 100644 --- a/src/pages/realtimeInfo/pc/components/PageTop.vue +++ b/src/pages/realtimeInfo/pc/components/PageTop.vue @@ -17,10 +17,10 @@ - + diff --git a/src/pages/realtimeInfo/pc/indexPC.vue b/src/pages/realtimeInfo/pc/indexPC.vue index f8ccca2..5e791f1 100644 --- a/src/pages/realtimeInfo/pc/indexPC.vue +++ b/src/pages/realtimeInfo/pc/indexPC.vue @@ -19,27 +19,29 @@ {{ infoData?.publishTime }} - + {{ infoData?.summary }} - + 行业分类: - {{ - item - }} + {{ + item + }} - + 概念标签: - {{ - item - }} + {{ + item + }} @@ -51,12 +53,8 @@ --> - + diff --git a/src/pages/realtimeInfo/pc/rank.vue b/src/pages/realtimeInfo/pc/rank.vue index 6746fc9..6215ecc 100644 --- a/src/pages/realtimeInfo/pc/rank.vue +++ b/src/pages/realtimeInfo/pc/rank.vue @@ -7,7 +7,7 @@ 资讯头条榜 编辑精选 - @@ -30,12 +30,17 @@ {{ item.title }} - {{ item.summary }} + {{ item.summary }} + {{ item.source }} - {{ dayjs(item.publish_time).format("YYYY-MM-DD HH:MM:ss") + {{ + dayjs(item.publish_time).format("YYYY-MM-DD HH:MM:ss") + }} + {{ + item.time }} @@ -70,7 +75,7 @@ import { useRoute, useRouter } from "vue-router"; const pageSizes = ref([10, 20, 30, 40]); const form = reactive({ - keyWord: "", + keyword: "", page: 1, size: 10, total: 10 @@ -94,6 +99,9 @@ async function getNewsList() { if (code == 200) { newsList.value = data.list; form.total = data.total; + data.list.forEach((item) => { + item.summary = item.summary.replace(form.keyword, "" + form.keyword + ''); + }); } } else { // 概念标签贴标 @@ -102,8 +110,14 @@ async function getNewsList() { } function goDetail(item) { + let id = null + if (pageType.value != 4) { + id = item.news_id + } else { + id = item.id + } uni.navigateTo({ - url: "/pages/realtimeInfo/pc/indexPC?id=" + item.news_id + "&type=1", + url: "/pages/realtimeInfo/pc/indexPC?id=" + id + "&type=" + pageType.value, }); }