diff --git a/build.tar.gz b/build.tar.gz index 1131b78ab..a0c2de539 100644 Binary files a/build.tar.gz and b/build.tar.gz differ diff --git a/package-lock.json b/package-lock.json index 471fc99c2..f8a9ce194 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2920,9 +2920,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001048", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz", - "integrity": "sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==" + "version": "1.0.30001274", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001274.tgz", + "integrity": "sha512-+Nkvv0fHyhISkiMIjnyjmf5YJcQ1IQHZN6U9TLUMroWR38FNwpsC51Gb68yueafX1V6ifOisInSgP9WJFS13ew==" }, "capture-stack-trace": { "version": "1.0.1", diff --git a/src/AppConfig.js b/src/AppConfig.js index 87a4c1a76..bee6ed78c 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -32,8 +32,9 @@ export function initAxiosInterceptors(props) { // 判断网络是否连接 initOnlineOfflineListener(); // var proxy = "http://172.27.144.138:3000/" + var proxy = "http://114.212.189.230:3000/" // var proxy = "https://testforgeplus.trustie.net"; - var proxy = "http://localhost:3000" + // var proxy = "http://localhost:3000" //响应前的设置 axios.interceptors.request.use( diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx index 1a6bd4f6d..a5257a04b 100644 --- a/src/forge/Main/sub/DetailBanner.jsx +++ b/src/forge/Main/sub/DetailBanner.jsx @@ -5,6 +5,7 @@ import { numFormat } from 'educoder'; function DetailBanner({ history,list , owner , projectsId , isManager , url , pathname , state , urlFlag , projectDetail , platform ,open_devops }){ const [ menuName , setMenuName ] = useState(undefined); + console.log(list); useEffect(()=>{ if(list){ // 没有资源库banner但是通过连接进资源库页面时 @@ -17,6 +18,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa setMenuName(list); } },[list]); + console.log(list); return(
{ @@ -115,7 +117,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa } { - item.menu_name === "setting" && + item.menu_name === "settings" &&
  • 0 ? "iconfont icon-cangkushezhiicon color-grey-3 mr5 font-14":"iconfont icon-cangkushezhiicon color-grey-6 font-14 mr5"}> diff --git a/src/forge/sponsor/Sponsor.js b/src/forge/sponsor/Sponsor.js index 0a44c88b8..6cd85561e 100644 --- a/src/forge/sponsor/Sponsor.js +++ b/src/forge/sponsor/Sponsor.js @@ -74,7 +74,7 @@ class extends Component{ return(
    - {getFieldDecorator(`description`,{ + {getFieldDecorator(`sponsor_description`,{ rules: [], initialValue: initValue ? initValue : undefined })( @@ -95,7 +95,7 @@ class Sponsor extends Component { this.state = { isSpin: false, user: undefined, - description: undefined, + sponsor_description: undefined, sponsors: undefined, edit: false, tiers: [], @@ -119,9 +119,10 @@ class Sponsor extends Component { .get(url) .then((result) => { // TODO: 在这里添加了对用户自我介绍的处理,前后端交互实现后需要删掉 - // result.data.description = tempDesc; + // result.data.sponsor_description = tempDesc; this.setState({ user: result.data, + sponsor_description: result.data.sponsor_description, isSpin: false, }, () => {this.fetchSponsors()}); // console.log(result.data); @@ -154,6 +155,7 @@ class Sponsor extends Component { isSpin: false, }); }); + // this.setState({ // sponsors: tempData, // displayList: tempData, @@ -194,13 +196,13 @@ class Sponsor extends Component { confirmEdit = () => { //TODO: 增加和后端交互 - let value = this.formRef.getItemsValue().description; + let value = this.formRef.getItemsValue().sponsor_description; // console.log(value); let user = this.state.user; - let url = `/users/${user.user_id}/update_description.json` - axios.put(url, {description: value}) + let url = `/users/${user.user_id}/update_sponsor_description.json` + axios.put(url, {sponsor_description: value}) .then((result) => { - user.description = value; + user.sponsor_description = value; this.setState({ user: user, edit: false @@ -214,7 +216,7 @@ class Sponsor extends Component { // if (user){ - // user.description = value; + // user.sponsor_description = value; // } // this.setState({ // user: user, @@ -226,8 +228,8 @@ class Sponsor extends Component { const user = this.state.user; return (
    - {user && user.description? - (

    {user.description}

    ):(

    暂无自我介绍

    )} + {user && user.sponsor_description? + (

    {user.sponsor_description}

    ):(

    暂无自我介绍

    )}
    ); } @@ -239,7 +241,7 @@ class Sponsor extends Component {
    this.editDescription()}>
    - {user && user.description? (
    {user.description}
    ):(
    暂无自我介绍
    )} + {user && user.sponsor_description? (
    {user.sponsor_description}
    ):(
    暂无自我介绍
    )}
  • ); } @@ -249,7 +251,7 @@ class Sponsor extends Component { return (
    this.formRef = form} /> diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js index e79e1021e..35796c0fa 100644 --- a/src/forge/users/InfosUser.js +++ b/src/forge/users/InfosUser.js @@ -114,9 +114,9 @@ class InfosUser extends Component { newItem =()=> ( - + {/* 新建镜像项目 - + */} 新建托管项目