Merge remote-tracking branch 'gogs/master'

src/app/about/page.tsx

@@ -160,17 +160,17 @@ export default async function Home() {
         </AnimatedSection>
 
         {/* 公司招聘 */}
-        {/* <AnimatedSection effect="slide" direction="right">
-          <section
-            id="section-3"
-            className="scroll-mt-10 w-full py-12 px-4 bg-[url('/assets/about/20.png')]"
-          >
-            <div className="w-4/5 mx-auto my-10 sm:my-6">
-              <SubTitle title="公司招聘"/>
-            </div>
-            <Recruitment list={res.data.records}/>
-          </section>
-        </AnimatedSection> */}
+        {/*<AnimatedSection effect="slide" direction="right">*/}
+        {/*  <section*/}
+        {/*    id="section-3"*/}
+        {/*    className="scroll-mt-10 w-full py-12 px-4 bg-[url('/assets/about/20.png')]"*/}
+        {/*  >*/}
+        {/*    <div className="w-4/5 mx-auto my-10 sm:my-6">*/}
+        {/*      <SubTitle title="公司招聘"/>*/}
+        {/*    </div>*/}
+        {/*    <Recruitment list={res.data.records}/>*/}
+        {/*  </section>*/}
+        {/*</AnimatedSection>*/}
         {/* 联系我们 */}
         <AnimatedSection effect="slide" direction="left">
           <ContactUs basicInfo={basicInfo} locationInfoList={locationInfoList}/>

src/components/about/ContactUs.tsx

@@ -1,44 +1,44 @@
 'use client'
 import React, {useEffect} from 'react';
 import SubTitle from "@/components/subTitle";
-import {BDMapGL} from "@/utils/BDMap";
+// import {BDMapGL} from "@/utils/BDMap";
 import Image from "next/image";
 
 function ContactUs({basicInfo, locationInfoList}: { basicInfo: BasicInfo, locationInfoList: LocationInfo[] }) {
   const BASE_URL: string = process.env.NEXT_PUBLIC_BASE_URL as string;
 
-  const BDMapInit = () => {
-    BDMapGL('94KOPB1NRjoXmLvlJN6HMi7eVC50z09K').then((BMapGL: any) => {
-      const map = new BMapGL.Map('container')
-      locationInfoList.forEach(point => {
-        const bmapPoint = new BMapGL.Point(point.longitude, point.latitude);
-        const marker = new BMapGL.Marker(bmapPoint);
-
-        // 创建信息窗口（内容可自定义 HTML）
-        const infoWindow = new BMapGL.InfoWindow(`
-            <div>
-              <h4>姓名：${point.name}</h4>
-              <p style="margin: 5px 0 0; color: #666;">区域：${point.marker}</p>
-              <p style="margin: 5px 0 10px; color: #666;">联系方式：${point.phone}</p>
-            </div>
-          `);
-
-        // 绑定点击事件：点击标记点显示信息窗口
-        marker.addEventListener("click", () => {
-          map.openInfoWindow(infoWindow, bmapPoint); // 在点位坐标处打开窗口
-        });
-
-        map.centerAndZoom(bmapPoint, 7)
-        map.enableScrollWheelZoom(true) //设置鼠标放大缩小
-        map.addControl(new BMapGL.ScaleControl()) //卡尺
-        map.addOverlay(marker)
-      });
-
-    })
-  }
+  // const BDMapInit = () => {
+  //   BDMapGL('94KOPB1NRjoXmLvlJN6HMi7eVC50z09K').then((BMapGL: any) => {
+  //     const map = new BMapGL.Map('container')
+  //     locationInfoList.forEach(point => {
+  //       const bmapPoint = new BMapGL.Point(point.longitude, point.latitude);
+  //       const marker = new BMapGL.Marker(bmapPoint);
+  //
+  //       // 创建信息窗口（内容可自定义 HTML）
+  //       const infoWindow = new BMapGL.InfoWindow(`
+  //           <div>
+  //             <h4>姓名：${point.name}</h4>
+  //             <p style="margin: 5px 0 0; color: #666;">区域：${point.marker}</p>
+  //             <p style="margin: 5px 0 10px; color: #666;">联系方式：${point.phone}</p>
+  //           </div>
+  //         `);
+  //
+  //       // 绑定点击事件：点击标记点显示信息窗口
+  //       marker.addEventListener("click", () => {
+  //         map.openInfoWindow(infoWindow, bmapPoint); // 在点位坐标处打开窗口
+  //       });
+  //
+  //       map.centerAndZoom(bmapPoint, 7)
+  //       map.enableScrollWheelZoom(true) //设置鼠标放大缩小
+  //       map.addControl(new BMapGL.ScaleControl()) //卡尺
+  //       map.addOverlay(marker)
+  //     });
+  //
+  //   })
+  // }
   const qrCodeUrl = BASE_URL + basicInfo.qrCodeUrl
   useEffect(() => {
-    BDMapInit()
+    // BDMapInit()
   }, []);
   return (
     <>

src/components/footerBlock.tsx

@@ -82,6 +82,12 @@ export default async function FooterBlock() {
                   {basicInfo.address}
                 </p>
               </div>
+              <div>
+                <h4 className="font-medium mb-2">公司邮箱</h4>
+                <p className="text-blue-200 text-sm leading-relaxed">
+                  {basicInfo.email}
+                </p>
+              </div>
             </div>
           </div>
 
@@ -102,9 +108,9 @@ export default async function FooterBlock() {
         </div>
 
         {/* Copyright */}
-        <div className="border-t border-blue-800 pt-6 text-center">
-          <p className="text-blue-200 text-sm">@COPYRUGHT@2014-2024 中科盛阳信息技术有限公司</p>
-        </div>
+        {/*<div className="border-t border-blue-800 pt-6 text-center">*/}
+        {/*  <p className="text-blue-200 text-sm">@COPYRUGHT@2014-2024 中科盛阳信息技术有限公司</p>*/}
+        {/*</div>*/}
       </div>
     </footer>
   )