finished

src/components/Navbar/index.tsx

@@ -38,7 +38,7 @@ const HoverLink = (props: HoverLinkType) => {
       onPointerEnter={() => setOnHover(true)}
       onPointerLeave={() => setOnHover(false)}
     >
-      <div className="cursor-pointer opacity-70">合作生态</div>
+      <div className={`cursor-pointer ${ props.theme === "light" ? "text-[#061E3B]" : " opacity-70 text-white "}`}>合作生态</div>
       {onHover ? (
         <div
           className={`w-[185%]
@@ -95,9 +95,9 @@ export default function Navbar(props: IAppProps) {
     if (pathname.includes("/news/")) {
       return true;
     }
-    // else if(pathname.includes("/details/")){
-    //   return true;
-    // }
+    if(pathname.includes("/docs/")){
+      return true;
+    }
     return false;
   }, [pathname]);
 
@@ -112,7 +112,7 @@ export default function Navbar(props: IAppProps) {
     (theme: string, active: boolean) => {
       if (theme === "light") {
         if (active) {
-          return "text-theme-dark content-sub2-title-cn py-0 hover:text-theme-blue  cursor-pointer";
+          return "text-theme-blue content-sub2-title-cn py-0 hover:text-theme-blue  cursor-pointer";
         }
         return "text-[#061E3B] font-normal hover:text-theme-blue  cursor-pointer";
       } else {

src/config/ballSetting.ts

@@ -140,7 +140,7 @@ export const aboutBalls=[
             {
                 size: "25%",
                 align: "right",
-                position: ["-85px", "10%"],
+                position: ["-85px", "20%"],
                 zIndex: "-999",
                 color: "blue",
             }
@@ -159,7 +159,7 @@ export const aboutBalls=[
             {
                 size: "25%",
                 align: "right",
-                position: ["-85px", "10%"],
+                position: ["-85px", "20%"],
                 zIndex: "-999",
                 color: "blue",
             }
@@ -178,7 +178,7 @@ export const aboutBalls=[
             {
                 size: "25%",
                 align: "right",
-                position: ["-85px", "10%"],
+                position: ["-85px", "20%"],
                 zIndex: "-999",
                 color: "blue",
             }

src/fetch/dataFetch.tsx

 import { AxiosRequestConfig, AxiosResponse } from "axios";
 import { count, from, map, Observable,reduce,tap } from "rxjs";
 import { initialization } from "./axios";
+import dayjs from "dayjs";
 import {chunk as _chunk} from 'lodash';
 export const baseURL = import.meta.env.VITE_FETCH_URL
 export const axiosRequestConfiguration: AxiosRequestConfig = {
@@ -36,13 +37,21 @@ export const getJobs =  async(department?: string)=>{
     }
 }
 
+function compare(a:any,b:any) {
+    if ( dayjs(a.date ,'YYYY-MM-DD').unix() < dayjs(b.date ,'YYYY-MM-DD').unix()){
+        return 1;
+      }
+      if ( dayjs(a.date ,'YYYY-MM-DD').unix() > dayjs(b.date ,'YYYY-MM-DD').unix() ){
+        return -1;
+      }
+      return 0;
+}
 
 export const getEvents = (index:number)=>{
 //    const res = await req.get('/events')
    const observable = from(req.get('/events')).pipe(map(res =>res.data),map((v,i) =>{ 
-        const l = v.length
-        // const group = Math.ceil(l/index)
-        const output= _chunk(v,index)
+        const newarr = v.sort(compare)
+        const output= _chunk(newarr,index)
         return output
    }));
    return observable

src/service/api.ts

@@ -2,6 +2,7 @@ import {service , newsService} from ".";
 import { Job } from "./types";
 import {filter, from, map} from "rxjs"
 import { AxiosResponse } from "axios";
+import dayjs from "dayjs";
 export const getJobsByDept = async (department: string) => {
   return service.get<unknown, Job[]>(
     '/jobs',
@@ -18,10 +19,21 @@ export const getJobsById = async (id: string) => {
     `/jobs/${id}`,
   )
 }
-
+function compare(a:any,b:any) {
+  if ( a.time_stamp  < b.time_stamp ){
+      return 1;
+    }
+    if (a.time_stamp  >b.time_stamp  ){
+      return -1;
+    }
+    return 0;
+}
 export const getNews = () => {
   const res = newsService.get(`news/newsList`)
-  const observable = from(res).pipe(filter(r=>r.data))
+  const observable = from(res).pipe(map(r=>r.data.list),map(k=>{
+    const newarr = k.sort(compare)
+    return newarr
+  }))
   return observable
 }
 

src/views/About/Contact/index.tsx

@@ -31,7 +31,10 @@ export const Contact = () => {
         <div>
         <div className="pb-[60px]">
           <div className="hero-title">Contact us</div>
-          <div className="subTitle-1-cn">联系我们</div>
+          <div className="subTitle-1-cn py-3 flex items-center gap-x-5">
+          <div className=" w-[80px] h-[2px] bg-theme-dark rounded"></div>
+            <div>联系我们</div>
+          </div>
         </div>
 
         <div className="grid grid-cols-2 gap-x-[100px] gap-y-[30px] pb-12">

src/views/About/JoinUs/index.tsx

@@ -23,13 +23,13 @@ interface DtailContainerType extends IProps {
 const DataGrid = (props: DataGridType) => {
   const { data, doSetSelecteItem,className } = props;
   return (
-    <div className={`grid grid-cols-3  gap-y-[15px] ${className}`}>
+    <div className={`grid grid-cols-3   ${className}`}>
       {data?.map((i, index) => (
         <div onClick={()=>doSetSelecteItem(i.id)} key={index}>
-        <HoverBox  className='w-[270px] cursor-pointer flex items-center justify-between px-[20px] py-2'>
+        <HoverBox  className='w-[270px] cursor-pointer flex items-center py-[15px] justify-between px-[20px] '>
           <>
           <div>
-            <div className="content-title-cn h-[48px]  w-[100%] line-clamp-1 ">{i.title}</div>
+            <div className="content-title-cn h-[36px] pt-0 pb-[5px]  w-[100%] line-clamp-1 ">{i.title}</div>
             <div className='normal-content'>{i.diploma}</div>
             <div className='normal-content'>{i.location}</div>
           </div>
@@ -119,9 +119,8 @@ export const JoinUs = () => {
   return (
     <AppContianer>
     <div className="flex items-center h-full w-full relative py-[30px]  ">
-      <div className=" w-full">
-
-        <div className="h-full min-h-[520px] w-full labtop:w-10/12 mx-auto flex gap-x-[100px]">
+      <div className="w-full">
+        <div className="h-full min-h-[520px] w-full labtop:w-10/12 mx-auto flex gap-x-[160px]">
           <div className='left translate-y-[130px] min-w-[100px]'>
             <div className="flex-col justify-start items-center">
             {departments.map((i: string) => (
@@ -131,7 +130,7 @@ export const JoinUs = () => {
                   selecteItem ? cancelAndSelect(i): setActivedDepartment(i);
                 }}
                 className={`item cursor-pointer content-sub2-title-cn my-5 ${
-                  activedDepartment !== i ? "text-gray-500" : "text-black"
+                  activedDepartment !== i ? "text-gray-500 font-[400]" : "text-black"
                 }`}
               >
                 {i}
@@ -139,20 +138,23 @@ export const JoinUs = () => {
             ))}
                 </div>
           </div>
-          <div className="flex-col w-full">
-              <div className="w-full  pb-[40px]">
+          <div className="right flex-col w-full">
+              <div className="w-full pb-[40px]">
               <div className="hero-title">Join us</div>
-              <div className="subTitle-1-cn">加入我们</div>
+              <div className="subTitle-1-cn py-3 flex items-center gap-x-5">
+          <div className=" w-[80px] h-[2px] bg-theme-dark rounded"></div>
+            <div>加入我们</div>
+          </div>
             </div>
             {selecteItem ? (
               <DtailContainer
-                className="w-7/12"
+                className="w-9/12"
                 doCancelSelecteItem={setSelecteItem}
                 data={selectedItem}
               ></DtailContainer>
             ) : (
               <DataGrid
-                className='w-10/12 -translate-x-[18px]  '
+                className='w-10/12 -translate-x-[20px]  -translate-y-[20px] '
                 data={selecteData ? selecteData : []}
                 doSetSelecteItem={setSelecteItem}
               ></DataGrid>

src/views/About/Memorabilia/EventItem.tsx

 import { IProps } from "@/common/Iprops.interface";
-import { useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { chunk as _chunk } from "lodash";
 import { offset, flip, shift, arrow } from "@floating-ui/react-dom";
 import {
@@ -34,8 +34,11 @@ export const EventItem = (props: EventItemType) => {
       // props
     }),
   ]);
+  const shortTitlte =  useCallback((title: string)=>{
+    return title.slice(0,60)+'...'
+  },[data])
   const move = useMemo(() => {
-    return itmeIndex * 85 + "px";
+    return itmeIndex * 75 + "px";
   }, [itmeIndex]);
   const dates = useMemo(() => {
     let date;
@@ -49,7 +52,7 @@ export const EventItem = (props: EventItemType) => {
   return (
     <>
       <div
-        className={`max-w-[15.5rem] h-fit cursor-pointer`}
+        className={`w-[225px] h-fit cursor-pointer`}
         ref={reference}
         style={{
           transform: `translateY(${move})`,
@@ -59,20 +62,28 @@ export const EventItem = (props: EventItemType) => {
           <div className="int-font-sub text-theme-dark">
             {dates && dates[0]}/
           </div>
-          <div className=" flex flex-col int-font-hero backdrop-opacity-30  text-theme-dark">
+          <div className=" flex flex-col int-font-hero backdrop-opacity-30 translate-x-[8px]  text-theme-dark">
             <div>{dates && dates[1]}</div>
-            <div className=" w-[80px] h-[2px] bg-theme-dark rounded"></div>
+            <div className="w-[80px] h-[2px] bg-theme-dark rounded"></div>
           </div>
         </div>
-        <div className="py-2 normal-content line-clamp-3 h-[70px] text-justify overflow-y-hidden ">
-          {data ? data.title : ""}
-        </div>
+        {/* <div className="py-2 normal-content  text-right  overflow-y-hidden "> */}
+        <div className="h-[90px] overflow-y-hidden line-clamp-4">
+          
+   
+              <div
+                dangerouslySetInnerHTML={{ __html: data && data.title }}
+                className="pt-[10px] h-full text-right"
+              ></div>
+                   </div>
+          {/* {data && data.title.length>100?shortTitlte(data.title):data.title} */}
+        {/* </div> */}
       </div>
-      {open && data && data.title.length > 50 && (
+      {open && data && data.details && (
         <div
           ref={floating}
           className="bg-theme-dark
-           normal-content z-[9999] text-white py-5 px-3 w-[270px] text-right rounded-md "
+           normal-content z-[9999] text-white py-5 px-3 w-[270px]  rounded-md "
           style={{
             position: strategy,
             top: y ?? 0,
@@ -89,7 +100,7 @@ export const EventItem = (props: EventItemType) => {
 export const EventCols = (props: EventColsType) => {
   const { data } = props;
   return (
-    <div className="grid grid-cols-4 pb-[3rem]">
+    <div className="grid grid-cols-4 gap-x-[] pb-[3rem]">
       {data &&
         data.length > 0 &&
         data.map((i: any, index: number) => (

src/views/About/Memorabilia/index.tsx

@@ -54,7 +54,7 @@ export const Memorabilia = () => {
             <div>大事记</div>
           </div>
         </div>
-      <div className='w-10/12 relative '>
+      <div className='w-[86%] labtop:w-10/12 relative '>
         {
           data?
           <div className="relative flex">

src/views/About/Partners/index.tsx

@@ -41,7 +41,7 @@ export const Partners = () => {
           </div>
         </div>
 
-        <div className="flex w-2/12 pl-[50px] pt-[46px] z-[2000]">
+        <div className="flex gap-x-[20px] w-2/12 pl-[50px] pt-[46px] z-[2000]">
 
         <div className="verticalText-cn">合作伙伴</div>
             <div className="hero-title verticalText">Partners</div>

src/views/Baas33/Service/index.tsx

@@ -60,7 +60,6 @@ const ServiceList = () => {
           <ul className="py-5 content-sub-title-cn ">
             {i.features.map((k, x) => (
               <div className="mb-[10px] flex normal-content items-start" key={"child" + x}>
-    
                 <img src={selectImg} />
                 <div className="pl-3 -translate-y-[3px] font-bold">{k}</div>
               </div>
@@ -92,7 +91,7 @@ export const Service = (props: ServiceType) => {
         <div className=" w-10/12 flex items-center h-full">
           <ServiceList />
         </div>
-          <div className="flex w-2/12 pt-[46px] pl-[20px]">
+          <div className="flex gap-x-[20px] w-2/12 pt-[46px] pl-[20px]">
             <div className="verticalText-cn">服务版本</div>
             <div className="hero-title verticalText">Service</div>
           </div>

src/views/DocViewer/index.tsx

@@ -48,7 +48,6 @@ export const DocViewer = (props:DocViewerType)=>{
                 {
                   show?'':<div className='text-center'>Loading...</div>  
                 }
-          
             </div>
         </PageLayout>
     )

src/views/News/NewsDetails.tsx

@@ -23,7 +23,7 @@ export const NewsDetails = (props: NewsDetailsType) => {
   }, [params]);
   useEffect(() => {
     getNews()
-      .pipe(map((v) => v.data.list))
+      .pipe(map((v) => v))
       .subscribe((v) => {
         const d = v.sort((a: any, b: any) => {
           return b.time_stamp - a.time_stamp;

src/views/News/index.tsx

@@ -22,9 +22,9 @@ export default function News(props: IAppProps) {
   useEffect(() => {
     setLoading(true);
     (async () => {
-      (await getNews()).pipe<any[]>(map((v) => v.data.list)).subscribe(
+      (await getNews()).pipe<any[]>(map((v) => v)).subscribe(
         (v) => {
-          const result = v.filter((v, i) => i < 10);
+          // const result = v.filter((v, i) => i < 10);
           setNews(v);
           setLoading(false);
         },