From 595d786ea0b79f18780691a744f8e075b24b4628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sun, 17 Nov 2019 10:16:27 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/user/AccountProfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/user/AccountProfile.js b/public/react/src/modules/user/AccountProfile.js index 04c9e51f4..ea8d20b8a 100644 --- a/public/react/src/modules/user/AccountProfile.js +++ b/public/react/src/modules/user/AccountProfile.js @@ -67,7 +67,7 @@ render() {

{content || '您需要去完善您的个人资料，才能使用此功能'}

- this.gotoback()}>{this.props.AccountProfiletype&&this.props.AccountProfiletype===true?"稍后完善":"取消"} + this.gotoback()}>稍后完善 {okText || '立即完善'}
From 7f22d497896fa323395b069cd92d9de4b1b7d643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sun, 17 Nov 2019 10:20:00 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/user/account/AccountNav.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/user/account/AccountNav.js b/public/react/src/modules/user/account/AccountNav.js index e069cdeb2..c4d8b0630 100644 --- a/public/react/src/modules/user/account/AccountNav.js +++ b/public/react/src/modules/user/account/AccountNav.js @@ -82,7 +82,7 @@ class AccountNav extends Component {
- {/*{basicInfo.name || (current_user ? current_user.login : '')}*/} + {basicInfo.name || (current_user ? "" : '')} {basicInfo.technical_title}
From 372c4c49003cd24504327f3c08ae8328c642e5c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sun, 17 Nov 2019 14:10:00 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/NewHeader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 9c5652aaf..c5121ede6 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -1187,7 +1187,7 @@ submittojoinclass=(value)=>{ onBlur={(e)=>this.hideshowSearchOpen(e)} onMouseLeave={()=>this.setevaluatinghides()}> this.onKeywordSearchKeyDowns()} onSearch={(value) => this.onKeywordSearchKeyDown(value)} // onPressEnter={this.onKeywordSearchKeyDown} @@ -1236,7 +1236,7 @@ submittojoinclass=(value)=>{ {coursestypes===true?"":
  • 我的课堂
    • } {/* p 老师 l 学生 */} {shixuntype===true?"":
  • 我的实训项目
    • } - {pathstype===true?"":
  • 我的实践课程
    • } + {pathstype===true?"":
  • 我的课程
    • } {this.props.user&&this.props.user.main_site===true?
  • 我的开发项目
    • :""} {/*
  • 我的众包
    • */}
  • From ecd847efdd331bda2504cc6ed3da610ddf50a7bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sun, 17 Nov 2019 14:20:40 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/NewHeader.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index c5121ede6..7a3c545ce 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -1187,7 +1187,7 @@ submittojoinclass=(value)=>{ onBlur={(e)=>this.hideshowSearchOpen(e)} onMouseLeave={()=>this.setevaluatinghides()}> this.onKeywordSearchKeyDowns()} onSearch={(value) => this.onKeywordSearchKeyDown(value)} // onPressEnter={this.onKeywordSearchKeyDown} @@ -1233,10 +1233,10 @@ submittojoinclass=(value)=>{
      {/*{user.username}*/} - {coursestypes===true?"":
    • 我的课堂
      • } + {coursestypes===true?"":
    • {this.props.user&&this.props.user.main_site===false?"我的课堂":"我的翻转课堂"}
      • } {/* p 老师 l 学生 */} {shixuntype===true?"":
    • 我的实训项目
      • } - {pathstype===true?"":
    • 我的课程
      • } + {pathstype===true?"":
    • {this.props.user&&this.props.user.main_site===false?"我的课程":"我的实践课程"}
      • } {this.props.user&&this.props.user.main_site===true?
    • 我的开发项目
      • :""} {/*
    • 我的众包
      • */}
    • @@ -1284,17 +1284,17 @@ submittojoinclass=(value)=>{
      {coursestypes===true&&this.props.user&&this.props.user.main_site===false?"":
        {coursestypes===true?"":
      • - 加入课堂 + {this.props.user&&this.props.user.main_site===false?"加入课堂":"加入翻转课堂"}
        • } {Addcoursestypes===true? Date: Sun, 17 Nov 2019 16:27:35 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/help/ContactUs.js | 2 +- public/react/src/modules/tpm/TPMIndexHOC.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/help/ContactUs.js b/public/react/src/modules/help/ContactUs.js index 04e3404fe..7f579bcf1 100644 --- a/public/react/src/modules/help/ContactUs.js +++ b/public/react/src/modules/help/ContactUs.js @@ -72,7 +72,7 @@ class ContactUs extends React.Component {
        公司地址
        - { address } + 长沙高新开发区尖山路39号长沙中电软件园一期13栋201室
      diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index 69f54bd77..4408265ce 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -153,7 +153,7 @@ export function TPMIndexHOC(WrappedComponent) { window.addEventListener('keyup', this.keyupListener) if(this.props.match.path==="/"){ - document.title="创新源于实践"; + // document.title="创新源于实践"; }else if(this.props.match.path==="/403"){ document.title="你没有权限访问"; }else if(this.props.match.path==="/nopage"){ From dcba8c1e2e1487860516dcc1dc18f0e0dac10be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sun, 17 Nov 2019 20:25:10 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/component/TPMRightSection.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/tpm/component/TPMRightSection.js b/public/react/src/modules/tpm/component/TPMRightSection.js index 803e1caf2..4306fc6e3 100644 --- a/public/react/src/modules/tpm/component/TPMRightSection.js +++ b/public/react/src/modules/tpm/component/TPMRightSection.js @@ -118,7 +118,7 @@ class TPMRightSection extends Component { } - {this.props.user&&this.props.user.main_site===true?

      所属课程

      @@ -159,7 +159,7 @@ class TPMRightSection extends Component { }) }
      - :""} + {TPMRightSectionData === undefined?"":TPMRightSectionData.paths===undefined?"":TPMRightSectionData.paths.length === 0 ? "" : this.props.user&&this.props.user.main_site===true?