@@ -187,7 +187,7 @@ function HeaderPage(props){
}
{
// 核心贡献者
- data && data.memberShow &&
+ data && data.memberShow === 1 && personList && personList.length > 0 &&
{ data.homepageMemberTitle }
@@ -262,7 +262,7 @@ function HeaderPage(props){
{
// 合作伙伴
- data && data.partnersShow &&
+ data && data.partnersShow === 1 &&
{ data.homepagePartnersTitle }
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;
}