Просмотр исходного кода

Merge branch 'master' of http://111.23.174.45:3000/nahida/zksy-website-front

nahida 4 месяцев назад
Родитель
Сommit
946cde531c
4 измененных файлов с 4 добавлено и 7 удалено
  1. 1 1
      next-env.d.ts
  2. 2 2
      src/app/news/page.tsx
  3. 0 3
      src/components/about/Honor.tsx
  4. 1 1
      tsconfig.json

+ 1 - 1
next-env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-/// <reference path="./.next/types/routes.d.ts" />
+import "./.next/dev/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

+ 2 - 2
src/app/news/page.tsx

@@ -51,13 +51,13 @@ export default async function NewsPage({
   // 等待 searchParams 解析
   const params = await searchParams
   const pageNum = Number.parseInt(params.page || "1", 10)
-  const pageSize = 6
+  const pageSize = 10
   const newsListRes = await getNewsList(pageNum, pageSize)
   const specialNewsRes = await getSpecialNews()
   const specialNews = specialNewsRes.data.records[0]
   const newsList = newsListRes.data.records
   const totalNews = newsListRes.data.total
-
+  console.log(1112233,newsListRes,newsList)
   return (
     <>
       <AnimatedSection effect="slide" direction="left">

+ 0 - 3
src/components/about/Honor.tsx

@@ -83,9 +83,6 @@ function Honor({ honorList }: { honorList: HonorInfo[] }) {
                         height={300}
                         className="w-full h-auto max-h-100 min-h-100 object-contain group-hover:scale-105 transition-transform duration-300"
                       />
-                      <div className="p-4">
-                        <p className="text-sm text-gray-600 text-center">证书</p>
-                      </div>
                     </div>
                   </div>
                 ))}

+ 1 - 1
tsconfig.json

@@ -15,7 +15,7 @@
     "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "preserve",
+    "jsx": "react-jsx",
     "incremental": true,
     "plugins": [
       {