From e6c26ca3203385214c7de8f57370bcac2fdaa65a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= <xyhuang29@outlook.com>
Date: Fri, 9 Jun 2023 17:41:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Information/Pages/headerPage.jsx    |  8 +++----
 .../Information/Pages/headerPageZone1.jsx     |  8 +++----
 src/forge/Information/api.js                  |  3 ++-
 src/forge/Information/index.jsx               | 22 ++++++-------------
 src/forge/Information/indexZone1.scss         |  2 +-
 5 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/forge/Information/Pages/headerPage.jsx b/src/forge/Information/Pages/headerPage.jsx
index e7cb4bb85..8ba5ccf5d 100644
--- a/src/forge/Information/Pages/headerPage.jsx
+++ b/src/forge/Information/Pages/headerPage.jsx
@@ -72,7 +72,7 @@ function HeaderPage(props){
       }
       {
         // 新闻动态
-        data && data.cmsShow && newsList && newsList.length>0 &&
+        data && data.cmsShow === 1 && newsList && newsList.length>0 &&
         <div className="zone_news">
           <p className="in_title mb40">{ data.homepageCmsTitle }</p>
           <div className="boxmain" style={{display:"flex"}}>
@@ -112,7 +112,7 @@ function HeaderPage(props){
       }
       {
         // 精选项目
-        data && data.projectShow &&
+        data && data.projectShow === 1 &&
         <div className="zone_projects">
           <p className="in_title mb40">{ data.homepageProjectTitle }</p>
           {
@@ -137,7 +137,7 @@ function HeaderPage(props){
       }
       {
         // 核心贡献者
-        data && data.memberShow &&
+        data && data.memberShow === 1 &&
         <div className="zone_contributor">
           <p className="in_title">{ data.homepageMemberTitle }</p>
           {
@@ -162,7 +162,7 @@ function HeaderPage(props){
 
       {
         // 合作伙伴
-        data && data.partnersShow && 
+        data && data.partnersShow === 1 && 
         <div className="zone_parter">
           <p className="in_title">{ data.homepagePartnersTitle }</p>
           <Partner id={ id }></Partner>
diff --git a/src/forge/Information/Pages/headerPageZone1.jsx b/src/forge/Information/Pages/headerPageZone1.jsx
index 04755b712..51e9eb3fd 100644
--- a/src/forge/Information/Pages/headerPageZone1.jsx
+++ b/src/forge/Information/Pages/headerPageZone1.jsx
@@ -131,7 +131,7 @@ function HeaderPage(props){
       </div>
       {
         // 新闻动态
-        data && data.cmsShow && newsList && newsList.length>0 &&
+        data && data.cmsShow === 1 && newsList && newsList.length>0 &&
         <div className="zone_news">
           <div className="boxmain" style={{display:"flex"}}>
             <p className="news_title">{ data.homepageCmsTitle }</p>
@@ -179,7 +179,7 @@ function HeaderPage(props){
       }
       {
         // 精选项目
-        data && data.projectShow &&
+        data && data.projectShow === 1 && projectList && projectList.length > 0 &&
         <div className="zone_projects pt50 pb30">
           <p className="in_title mb40">{ data.homepageProjectTitle }</p>
           <Projects projectList={projectList}></Projects>
@@ -187,7 +187,7 @@ function HeaderPage(props){
       }
       {
         // 核心贡献者
-        data && data.memberShow &&
+        data && data.memberShow === 1 && personList && personList.length > 0 &&
         <div className="zone_contributor">
           <p className="in_title">{ data.homepageMemberTitle }</p>
           <Contributor personList={personList}></Contributor>
@@ -262,7 +262,7 @@ function HeaderPage(props){
       </div>
       {
         // 合作伙伴
-        data && data.partnersShow && 
+        data && data.partnersShow === 1 && 
         <div className="zone_parter">
           <p className="in_title">{ data.homepagePartnersTitle }</p>
           <Partner id={ id }></Partner>
diff --git a/src/forge/Information/api.js b/src/forge/Information/api.js
index 21f778128..6d0576ca0 100644
--- a/src/forge/Information/api.js
+++ b/src/forge/Information/api.js
@@ -2,10 +2,11 @@
 import fetch from './fetch';
 
 /**入口页接口***/
-export function getMainInfos(deptId) {
+export function getMainInfos(deptId, params) {
   return fetch({
     url: `/zone/open/zoneName/${deptId}`,
     method: 'get',
+    params
   });
 }
 
diff --git a/src/forge/Information/index.jsx b/src/forge/Information/index.jsx
index 8597af55a..29e466c80 100644
--- a/src/forge/Information/index.jsx
+++ b/src/forge/Information/index.jsx
@@ -1,15 +1,14 @@
 import React ,{ useEffect , useState } from "react";
 
-import { Route, Switch, useLocation } from "react-router-dom";
+import { Route, Switch } from "react-router-dom";
 import { withRouter } from "react-router";
-import { httpUrl } from './fetch';
 
 import { SnackbarHOC } from "educoder";
 import { CNotificationHOC } from "../../modules/courses/common/CNotificationHOC";
 import { TPMIndexHOC } from "../../modules/tpm/TPMIndexHOC";
 import Loadable from "react-loadable";
 import Loading from "../../Loading";
-import axios from 'axios';
+import { getMainInfos , getCheckZoneRole } from './api';
 import PublicBanner from "./Component/publicBanner";
 import './index.scss';
 import "slick-carousel/slick/slick.css";
@@ -66,16 +65,13 @@ function Index(props){
   setTheme()
 
   function getDetail(){
-    const url = `${httpUrl}/zone/open/zoneName/${deptId}`;
-    axios.get(url, {params:{
-      template: temp
-    }}).then(result=>{
+    getMainInfos(deptId, { template: temp }).then(result=>{
       if(result){
-        if (result.data.code === 404) {
+        if (result.code === 404) {
           props.history.push('/nopage');
           return
         } 
-        let data = result.data.data;
+        let data = result.data;
         setData(data);
         document.title= data&& data.name;
         setId(data.id);
@@ -87,12 +83,8 @@ function Index(props){
   }
 
   function getAdminUrl(id){
-    const url = `${httpUrl}/zone/zoneDetail/${deptId}/checkZoneRole`;
-    if (window.location.href.indexOf('localhost') < 0) {
-      axios.defaults.withCredentials = true;
-    }
-    axios.get(url).then(response=>{
-      if(response && response.data.code === 200){
+    getCheckZoneRole(id).then(response=>{
+      if(response && response.data && response.data.data){
         setAdminUrl(response.data.data);
       }else{
         setAdminUrl(undefined);
diff --git a/src/forge/Information/indexZone1.scss b/src/forge/Information/indexZone1.scss
index c37b4370c..9c9535288 100644
--- a/src/forge/Information/indexZone1.scss
+++ b/src/forge/Information/indexZone1.scss
@@ -536,7 +536,7 @@
             position: absolute;
             z-index: 10;
             background-image: -webkit-linear-gradient(0deg,#fffcf9 0%,#ffffff 51.47%,#fed5a6 100%);
-            background-clip: text;
+            -webkit-background-clip: text;
             -webkit-text-fill-color: transparent;
             text-shadow: none;
           }