From b7f984161b089e026b84c1dfeb61dd636bc14a96 Mon Sep 17 00:00:00 2001
From: xjs <xjs@ycymedu.com>
Date: Fri, 28 Feb 2025 16:55:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E9=97=BB=E6=80=BB=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8F=8A=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc-auto-import.json              |   4 +-
 src/components/fab/Fab.vue              |   2 +-
 src/components/home/Consultation.vue    |  18 +++-
 src/hooks/useCityInfoHook.ts            |  12 +--
 src/pages-sub/home/aiAutoFill/index.vue |  11 +++
 src/pages-sub/home/news/newsList.vue    | 107 ++++++++++++++++++++++++
 src/pages-sub/home/schoolRank/index.vue |  28 +------
 src/pages.json                          |  16 ++++
 src/service/index/api.ts                |   9 ++
 src/types/auto-import.d.ts              |   3 +
 src/types/uni-pages.d.ts                |   2 +
 11 files changed, 177 insertions(+), 35 deletions(-)
 create mode 100644 src/pages-sub/home/aiAutoFill/index.vue
 create mode 100644 src/pages-sub/home/news/newsList.vue

diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 9664d93..3ea8661 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -119,6 +119,8 @@
     "useCityNewTop": true,
     "useCityNewDetail": true,
     "newDetail": true,
-    "newsDetail": true
+    "newsDetail": true,
+    "useNewsList": true,
+    "newsList": true
   }
 }
diff --git a/src/components/fab/Fab.vue b/src/components/fab/Fab.vue
index e85d7ce..f02e78b 100644
--- a/src/components/fab/Fab.vue
+++ b/src/components/fab/Fab.vue
@@ -1,5 +1,5 @@
 <template>
-  <wd-fab :draggable="true" :expandable="false" :gap="{ bottom: 170 }">
+  <wd-fab :draggable="true" :expandable="false" :gap="{ bottom: 100 }">
     <template #trigger>
       <view class="btn-wrapper" @click="handleClick">
         <image
diff --git a/src/components/home/Consultation.vue b/src/components/home/Consultation.vue
index 5eb8b33..7b69e61 100644
--- a/src/components/home/Consultation.vue
+++ b/src/components/home/Consultation.vue
@@ -6,7 +6,11 @@
       :hover-stop-propagation="false"
     >
       <text class="text-[32rpx] text-[#333333] font-semibold">高考资讯</text>
-      <image class="w-[40rpx] h-[40rpx]" src="/static/images/home/right.svg"></image>
+      <image
+        class="w-[40rpx] h-[40rpx]"
+        src="/static/images/home/right.svg"
+        @click="toNewsPage"
+      ></image>
     </view>
 
     <view class="my-[30rpx]" hover-class="none" :hover-stop-propagation="false">
@@ -27,14 +31,22 @@
 </template>
 
 <script lang="ts" setup>
-import { useCityNewTop } from '@/hooks/useCityInfoHook'
+import { useCityNewTop, newsList } from '@/hooks/useCityInfoHook'
 import { News } from '@/types/app-type'
 
-const { newsList } = useCityNewTop()
+onShow(() => {
+  useCityNewTop()
+})
 
 const handleClick = (item: News) => {
   uni.navigateTo({
     url: `/pages-sub/home/news/index?newsId=${item.id}`,
   })
 }
+
+const toNewsPage = () => {
+  uni.navigateTo({
+    url: '/pages-sub/home/news/newsList',
+  })
+}
 </script>
diff --git a/src/hooks/useCityInfoHook.ts b/src/hooks/useCityInfoHook.ts
index 1499ea9..0c2a1e3 100644
--- a/src/hooks/useCityInfoHook.ts
+++ b/src/hooks/useCityInfoHook.ts
@@ -1,4 +1,9 @@
-import { getNewsTop, getVolunteerInitialization, getNewsDetailInfo } from '@/service/index/api'
+import {
+  getNewsTop,
+  getVolunteerInitialization,
+  getNewsDetailInfo,
+  getNewsList,
+} from '@/service/index/api'
 import { useCityStore } from '@/store/city'
 import { useUserStore } from '@/store/user'
 import { City, News, NewsDetail } from '@/types/app-type'
@@ -48,9 +53,8 @@ const groupByFirstLetter = (lis: Province[]): { letter: string; provinces: Provi
     .map((key) => ({ letter: key, provinces: grouped[key] }))
 }
 
+export const newsList = ref([])
 export const useCityNewTop = () => {
-  const newsList = ref([])
-
   const fetchNewTopFun = (provinceCode) => {
     getNewsTop({ Top: 2, CategoryId: 1, provinceCode }).then((res) => {
       if (res.code === 200) {
@@ -68,8 +72,6 @@ export const useCityNewTop = () => {
   } else {
     fetchNewTopFun(userStore.userInfo.city.code)
   }
-
-  return { newsList }
 }
 
 export const newsDetail = ref<NewsDetail>({
diff --git a/src/pages-sub/home/aiAutoFill/index.vue b/src/pages-sub/home/aiAutoFill/index.vue
new file mode 100644
index 0000000..e4be082
--- /dev/null
+++ b/src/pages-sub/home/aiAutoFill/index.vue
@@ -0,0 +1,11 @@
+<route lang="json5" type="page">
+{
+  layout: 'page',
+  style: {
+    navigationStyle: 'custom',
+  },
+}
+</route>
+<template></template>
+
+<script setup lang="ts"></script>
diff --git a/src/pages-sub/home/news/newsList.vue b/src/pages-sub/home/news/newsList.vue
new file mode 100644
index 0000000..c0c3504
--- /dev/null
+++ b/src/pages-sub/home/news/newsList.vue
@@ -0,0 +1,107 @@
+<route lang="json5" type="page">
+{
+  layout: 'page',
+  style: {
+    navigationStyle: 'custom',
+  },
+}
+</route>
+
+<template>
+  <view class="flex flex-col h-screen">
+    <z-paging
+      ref="paging"
+      use-virtual-list
+      :force-close-inner-list="true"
+      cell-height-mode="dynamic"
+      @virtualListChange="virtualListChange"
+      @query="queryList"
+    >
+      <!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+      <template #top>
+        <view class="relative h-max" hover-class="none" :hover-stop-propagation="false">
+          <wd-navbar
+            title="高考头条"
+            left-arrow
+            @click-left="navigatorBack"
+            safeAreaInsetTop
+            :bordered="false"
+            custom-class="bg-transparent! z-[99]"
+          ></wd-navbar>
+        </view>
+      </template>
+      <view
+        class="item-wrapper"
+        :id="`zp-id-${item.zp_index}`"
+        :key="item.zp_index"
+        v-for="item in newsList"
+        @click="itemClick(item, item.zp_index)"
+      >
+        <view class="flex flex-col items-left p-[32rpx] w-full">
+          <text class="font-semibold text-[28rpx] text-[#1F2329] max-w-full text-left">
+            {{ item.title }}
+          </text>
+          <view
+            class="mt-[24rpx] flex justify-between items-center text-[#8F959E] font-normal font-normal w-full"
+          >
+            <text class="text-[24rpx]">来源:&nbsp;{{ item.source }}</text>
+            <text class="text-[22rpx]">{{ item.createTime }}</text>
+          </view>
+        </view>
+        <view class="w-full h-[2rpx] bg-[#eee]" hover-class="none"></view>
+      </view>
+    </z-paging>
+
+    <view class="flex-1 overflow-auto pb-safe"></view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import useNavbarWeixin from '@/hooks/useNavbarWeixin'
+import { getNewsList } from '@/service/index/api'
+import { useUserStore } from '@/store/user'
+
+const { safeAreaInsets } = useNavbarWeixin()
+
+const navigatorBack = () => {
+  uni.navigateBack()
+}
+
+const userStore = useUserStore()
+
+const newsList = ref([])
+const paging = ref(null)
+
+const virtualListChange = (_vList) => {
+  newsList.value = _vList
+}
+
+const itemClick = (item, index) => {
+  uni.navigateTo({
+    url: `/pages-sub/home/news/index?newsId=${item.id}`,
+  })
+}
+
+const queryList = (page: number, pageSize: number) => {
+  getNewsList({
+    CategoryId: 1,
+    provinceCode: userStore.userInfo.city.code,
+    PageIndex: page,
+    PageSize: pageSize,
+  }).then((res) => {
+    paging.value?.complete((res.result as { data: any[] }).data)
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+.item-wrapper {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 32rpx;
+}
+</style>
diff --git a/src/pages-sub/home/schoolRank/index.vue b/src/pages-sub/home/schoolRank/index.vue
index a078d1e..898fff8 100644
--- a/src/pages-sub/home/schoolRank/index.vue
+++ b/src/pages-sub/home/schoolRank/index.vue
@@ -52,7 +52,7 @@
             @change="tabsChange"
             ref="tabsRef"
           >
-            <block v-for="item in unSortTypeList" :key="item.type" :name="item.type">
+            <block v-for="item in unSortTypeList" :key="item.type">
               <wd-tab :title="`${item.name}`" :name="item.type">
                 <!-- <view class="content">内容{{ item}}</view> -->
               </wd-tab>
@@ -61,7 +61,7 @@
         </view>
       </template>
       <view
-        class="item"
+        class="item-wrapper"
         :id="`zp-id-${item.zp_index}`"
         :key="item.zp_index"
         v-for="(item, index) in schoolList"
@@ -160,7 +160,7 @@ const virtualListChange = (_vList) => {
   background: linear-gradient(270deg, #f2ce95 0%, #f8deba 100%);
 }
 
-.item {
+.item-wrapper {
   position: relative;
   display: flex;
   flex-direction: column;
@@ -170,28 +170,6 @@ const virtualListChange = (_vList) => {
   padding: 0 32rpx;
 }
 
-.item-content {
-  flex: 1;
-  margin-left: 20rpx;
-}
-
-.item-detail {
-  margin-top: 10rpx;
-  border-radius: 10rpx;
-  font-size: 28rpx;
-  color: #aaaaaa;
-  word-break: break-all;
-}
-
-.item-line {
-  position: absolute;
-  bottom: 0rpx;
-  left: 0rpx;
-  height: 1px;
-  width: 100%;
-  background-color: #eeeeee;
-}
-
 /* #ifdef H5 */
 :deep(.uni-scroll-view-content) {
   display: flex;
diff --git a/src/pages.json b/src/pages.json
index 36677ed..f991be8 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -123,6 +123,14 @@
             "navigationStyle": "custom"
           }
         },
+        {
+          "path": "home/aiAutoFill/index",
+          "type": "page",
+          "layout": "page",
+          "style": {
+            "navigationStyle": "custom"
+          }
+        },
         {
           "path": "home/autoFill/index",
           "type": "page",
@@ -183,6 +191,14 @@
             "navigationStyle": "custom"
           }
         },
+        {
+          "path": "home/news/newsList",
+          "type": "page",
+          "layout": "page",
+          "style": {
+            "navigationStyle": "custom"
+          }
+        },
         {
           "path": "home/rank/index",
           "type": "page"
diff --git a/src/service/index/api.ts b/src/service/index/api.ts
index f507e6e..0b8105e 100644
--- a/src/service/index/api.ts
+++ b/src/service/index/api.ts
@@ -55,3 +55,12 @@ export const getNewsTop = (params: { Top: number; CategoryId: number; provinceCo
 export const getNewsDetailInfo = (params: { id: number }) => {
   return http.get('/api/ZyNews/detail', params)
 }
+
+export const getNewsList = (params: {
+  CategoryId: number
+  provinceCode: string
+  PageIndex: number
+  PageSize: number
+}) => {
+  return http.get('/api/ZyNews/newsPage', params)
+}
diff --git a/src/types/auto-import.d.ts b/src/types/auto-import.d.ts
index c03e2b9..d01f6fa 100644
--- a/src/types/auto-import.d.ts
+++ b/src/types/auto-import.d.ts
@@ -26,6 +26,7 @@ declare global {
   const markRaw: typeof import('vue')['markRaw']
   const newDetail: typeof import('../hooks/useCityInfoHook')['newDetail']
   const newsDetail: typeof import('../hooks/useCityInfoHook')['newsDetail']
+  const newsList: typeof import('../hooks/useCityInfoHook')['newsList']
   const nextTick: typeof import('vue')['nextTick']
   const onActivated: typeof import('vue')['onActivated']
   const onAddToFavorites: typeof import('@dcloudio/uni-app')['onAddToFavorites']
@@ -96,6 +97,7 @@ declare global {
   const useModel: typeof import('vue')['useModel']
   const useNatureList: typeof import('../hooks/useFilterSchool')['useNatureList']
   const useNavbarWeixin: typeof import('../hooks/useNavbarWeixin')['default']
+  const useNewsList: typeof import('../hooks/useCityInfoHook')['useNewsList']
   const useRegionInfo: typeof import('../hooks/useFilterSchool')['useRegionInfo']
   const useRequest: typeof import('../hooks/useRequest')['default']
   const useRules: typeof import('../hooks/useRules')['useRules']
@@ -142,6 +144,7 @@ declare module 'vue' {
     readonly isRef: UnwrapRef<typeof import('vue')['isRef']>
     readonly markRaw: UnwrapRef<typeof import('vue')['markRaw']>
     readonly newsDetail: UnwrapRef<typeof import('../hooks/useCityInfoHook')['newsDetail']>
+    readonly newsList: UnwrapRef<typeof import('../hooks/useCityInfoHook')['newsList']>
     readonly nextTick: UnwrapRef<typeof import('vue')['nextTick']>
     readonly onActivated: UnwrapRef<typeof import('vue')['onActivated']>
     readonly onAddToFavorites: UnwrapRef<typeof import('@dcloudio/uni-app')['onAddToFavorites']>
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index ed4b681..06d8737 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -11,6 +11,7 @@ interface NavigateToOptions {
        "/pages/place/index/index" |
        "/pages/ucenter/index/index" |
        "/pages-sub/customerService/index/index" |
+       "/pages-sub/home/aiAutoFill/index" |
        "/pages-sub/home/autoFill/index" |
        "/pages-sub/home/career/index" |
        "/pages-sub/home/city/index" |
@@ -22,6 +23,7 @@ interface NavigateToOptions {
        "/pages-sub/home/line/index" |
        "/pages-sub/home/major/index" |
        "/pages-sub/home/news/index" |
+       "/pages-sub/home/news/newsList" |
        "/pages-sub/home/rank/index" |
        "/pages-sub/home/schoolRank/index" |
        "/components-sub/FilterMenu/FilterMenu" |