From 769347c77a87b1c25472753c0d55d59cebb297b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 4 Jul 2019 11:34:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B7=B3=E5=85=B3=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tpm/shixunchild/Challenges/Challenges.js | 55 +++++++++++-------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js index 5554e0370..04cbaf6a3 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js @@ -479,46 +479,41 @@ class Challenges extends Component { {/*判断比较复杂 有排第一不能是灰色按钮*/} {item.status === 2 ? - this.startshixunCombat(false,undefined, item.challenge_id)} + this.startshixunCombat(false,undefined, item.challenge_id)} // onClick={() => this.startshixunCombat(false)} + title={"查看挑战关卡"} >已完成 : "" } { ChallengesDataList.allow_skip === true && item.status === 1? - this.startshixunCombat(false,undefined, item.challenge_id)} + onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)} // onClick={() => this.startshixunCombat(false)} >直接挑战 : "" } + { + ChallengesDataList.allow_skip === false ? item.status === 1? + + this.startshixunCombat(false,undefined, item.challenge_id)} + style={{marginTop: '-2px'}}>直接挑战 + :"":"" - { - ChallengesDataList.allow_skip === false ? item.status === 1 && newstatus === 2 ? - - this.startshixunCombat(false,undefined, item.challenge_id):""} - style={{marginTop: '-2px'}}>直接挑战 - - - : item.status === 1 && newstatus === 1 ? - - this.startshixunCombat(false,undefined, item.challenge_id):""} - style={{marginTop: '-2px'}}>直接挑战 - : "" : "" + } - } { item.status === 0 ? - - this.startshixunCombat(false,undefined, item.challenge_id):""} + + this.startshixunCombat(false,undefined, item.challenge_id):""} style={{marginTop: '-2px'}}>直接挑战 : "" } @@ -598,3 +593,19 @@ class Challenges extends Component { } export default Challenges; + // { + // ChallengesDataList.allow_skip === false ? item.status === 1 && newstatus === 2 ? + // + // this.startshixunCombat(false,undefined, item.challenge_id)} + // style={{marginTop: '-2px'}}>直接挑战 + // + // + // : item.status === 1 && newstatus === 1 ? + // + // this.startshixunCombat(false,undefined, item.challenge_id)} + // style={{marginTop: '-2px'}}>直接挑战 + // : "" : "" + // + // } \ No newline at end of file From e3ff332d27a52f145999a34e4a07a280099d63b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 4 Jul 2019 13:57:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B7=B3=E5=85=B3=E5=8A=9F=E8=83=BD?= =?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/courses/Resource/index.js | 13 ++++++------- .../tpm/shixunchild/Challenges/Challenges.js | 11 ++++++++--- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js index 8ce285ae1..f26d97ad3 100644 --- a/public/react/src/modules/courses/Resource/index.js +++ b/public/react/src/modules/courses/Resource/index.js @@ -176,8 +176,8 @@ class Fileslists extends Component{ let list=result.data.data; this.setState({ total_count:list.total_count, - public_count:list.public_count, - private_count:list.private_count, + publish_count:list.publish_count, + unpublish_count:list.unpublish_count, files:list.files, filesId:list.id, name:list.name, @@ -625,13 +625,12 @@ class Fileslists extends Component{ }) } render(){ - let { searchValue, checkBoxValues, checkAllValue, total_count, - public_count, - private_count, + publish_count, + unpublish_count, files, sorttype, Modalstype, @@ -766,8 +765,8 @@ class Fileslists extends Component{ secondRowLeft={
共 {total_count} 个资源 - 已发布：{public_count}个 - 未发布：{private_count}个 + 已发布：{publish_count}个 + 未发布：{unpublish_count}个
} onPressEnter={this.onPressEnter} diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js index 04cbaf6a3..d0a6acbef 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js @@ -479,7 +479,7 @@ class Challenges extends Component { {/*判断比较复杂 有排第一不能是灰色按钮*/} {item.status === 2 ? - this.startshixunCombat(false,undefined, item.challenge_id)} // onClick={() => this.startshixunCombat(false)} title={"查看挑战关卡"} @@ -510,12 +510,17 @@ class Challenges extends Component { { - item.status === 0 ? + item.status === 0 ?this.props.identity>2? this.startshixunCombat(false,undefined, item.challenge_id):""} style={{marginTop: '-2px'}}>直接挑战 - : "" + : this.startshixunCombat(false,undefined, item.challenge_id)} + // onClick={() => this.startshixunCombat(false)} + >直接挑战:"" } From 2b97bed30c13c5774258f34b2b6204720b28a600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 4 Jul 2019 13:59:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/tpm/shixunchild/Challenges/Challenges.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js index d0a6acbef..4ef6abfa3 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js @@ -510,17 +510,12 @@ class Challenges extends Component { { - item.status === 0 ?this.props.identity>2? + item.status === 0 ? this.startshixunCombat(false,undefined, item.challenge_id):""} style={{marginTop: '-2px'}}>直接挑战 - : this.startshixunCombat(false,undefined, item.challenge_id)} - // onClick={() => this.startshixunCombat(false)} - >直接挑战:"" + :"" }