From 89272eb612d6a741a66ec2b7a4abb8e0da2219c9 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Mon, 8 Jul 2019 08:51:51 +0800 Subject: [PATCH 1/4] array --- public/react/src/modules/login/LoginDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js index 36a9530b9..1275cf4a0 100644 --- a/public/react/src/modules/login/LoginDialog.js +++ b/public/react/src/modules/login/LoginDialog.js @@ -316,7 +316,7 @@ class LoginDialog extends Component { // // return Promise.reject(error); }); } - handleDialogClose() { + handleDialogClose = () => { if(this.props.match.path==="/"){ this.setState({ isRender: false From d19007149977e5d222755b139f86f3268cec88db Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 8 Jul 2019 09:02:15 +0800 Subject: [PATCH 2/4] =?UTF-8?q?issue+=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/courses/poll/PollListItem.js | 14 ++++++-------- public/react/src/modules/login/Trialapplication.js | 3 --- public/react/src/modules/user/usersInfo/Infos.js | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollListItem.js b/public/react/src/modules/courses/poll/PollListItem.js index 8e6198eae..898b296f0 100644 --- a/public/react/src/modules/courses/poll/PollListItem.js +++ b/public/react/src/modules/courses/poll/PollListItem.js @@ -35,15 +35,13 @@ class PollListItem extends Component{ }

+ {item.polls_name} { - //非课堂成员（未登录的用户）且课堂未公开 - courseType && courseType.user_permission == 0 && item.lock_status == 0 ? - {item.polls_name} - : - {item.polls_name} - } - { - item.lock_status === 0 ? :"" + item.lock_status === 0 ? + + + + :"" } { diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js index 89164da2b..2fdc73c28 100644 --- a/public/react/src/modules/login/Trialapplication.js +++ b/public/react/src/modules/login/Trialapplication.js @@ -387,9 +387,6 @@ class Trialapplication extends Component { .dialogBox2{ height: 420px; } - #DialogIDysl{ - z-index: 20000; - } #DialogIDysl .dialogBox { width: 560px; } diff --git a/public/react/src/modules/user/usersInfo/Infos.js b/public/react/src/modules/user/usersInfo/Infos.js index 9c8abcde1..49e84efa7 100644 --- a/public/react/src/modules/user/usersInfo/Infos.js +++ b/public/react/src/modules/user/usersInfo/Infos.js @@ -211,7 +211,7 @@ class Infos extends Component{ return(

{ - isRenders && this.cancelModulationModels()}/> + isRenders && this.cancelModulationModels()}/> }
From b3a924ae6c199260d5bdfffd56a68ddc9b9909d6 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Mon, 8 Jul 2019 09:22:37 +0800 Subject: [PATCH 3/4] can not link --- public/react/src/modules/courses/busyWork/CommonWorkItem.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkItem.js b/public/react/src/modules/courses/busyWork/CommonWorkItem.js index 6c3e7997a..6521d2add 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkItem.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkItem.js @@ -139,9 +139,10 @@ class CommonWorkItem extends Component{ }
this.props.onItemClick(Object.assign({}, item, {id: item.homework_id})) }>

+ {/* 放开点击进入，进入后弹框，canNotLink ? () => {} : */} {} : () => this.onItemClick(item)} + onClick={() => this.onItemClick(item)} >{item.name} {/* 只有非课堂成员且作业是私有的情况下才会为true */} From 3f762340108e7ee282d95604431b264c525e820b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Mon, 8 Jul 2019 09:25:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/tpm/shixuns/ShixunSearchBar.js | 58 ++++++++++++++----- 1 file changed, 43 insertions(+), 15 deletions(-) diff --git a/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js b/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js index b05732e31..f9f56a90d 100644 --- a/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js +++ b/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js @@ -25,7 +25,7 @@ class ShixunSearchBar extends Component { super(props) this.state = { status: undefined, - diff: undefined, + diff: 0, InputValue: undefined, shixunhoverData: [], shixunchildValues:'', @@ -238,6 +238,7 @@ render() {

  • 全部
    • { shixunhoverData.map((item,key)=>{ + return(
  • {item.name} @@ -269,21 +270,48 @@ render() {
    • 筛选： -
    - {/**!/*/} + {/*/!**!/*/} + {/*/!**!/*/} + {/*/!**!/*/} + {/*/!**!/*/} + {/*/!**!/*/} + {/**/} - -
    + {/*
    */} {/*
    */} {/*