From 70ccb3bc349c32afff550e2fac64426348e20eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 29 Jul 2019 17:34:50 +0800 Subject: [PATCH 1/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 --- .../courses/busyWork/CommonWorkDetailIndex.js | 2 +- .../courses/busyWork/CommonWorkList.js | 9 ++- .../modules/user/LoginRegisterComponent.js | 57 ------------------- 3 files changed, 8 insertions(+), 60 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js index a300e73dc..f1b9faab7 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js @@ -384,7 +384,7 @@ class CommonWorkDetailIndex extends Component{ {/* 作品列表 */} () + (props) => () } > diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js index f9deeebb4..8bc029cec 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkList.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js @@ -400,8 +400,13 @@ class CommonWorkList extends Component{ componentDidMount() { this.fetchList() on('commonwork_fetch_all', this.fetchAllListener) - $("html").animate({ scrollTop: $('html').scrollTop() - 100 }) - this.props.triggerRef(this); + $("html").animate({ scrollTop: $('html').scrollTop() - 100 }); + try { + this.props.triggerRef(this); + }catch (e) { + + } + } componentWillUnmount() { off('commonwork_fetch_all', this.fetchAllListener) diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js index 72614e566..99884e28e 100644 --- a/public/react/src/modules/user/LoginRegisterComponent.js +++ b/public/react/src/modules/user/LoginRegisterComponent.js @@ -678,63 +678,6 @@ class LoginRegisterComponent extends Component { } //失去焦点判断 inputOnBlur = (e, id) => { - // debugger - // // this.isCorrectname(e.target.value, id); - // // this.Emailphonenumberverification(e.target.value, id); - // if (e.target.value.length === 0) { - // this.setState({ - // Phonenumberisnotco: undefined, - // Phonenumberisnotcobool: false, - // }) - // return; - // } - // // var telephone = $("#telephoneAdd.tianjia_phone").val(); - // var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/; - // // var email = $("#add_email.tianjia_email").val(); - // var regemail = /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/; - // - // // [1]手机号开头必须是1 [3,4,5,6,7,8] 第二位是3-8中的一个 [0-9]{9} 后边9位可以是0-9的任意数字。 - // var stringdata = undefined; - // if (!regph.test(e.target.value)) { - // stringdata = "手机号格式不正确"; - // this.setState({ - // Phonenumberisnotco: stringdata, - // Phonenumberisnotcobool: true, - // dragOk:false, - // Whethertoverify:this.state.Whethertoverify===true?false:true, - // }) - // } else { - // console.log("706"); - // this.setState({ - // Phonenumberisnotco: undefined, - // Phonenumberisnotcobool: false, - // }) - // return - // } - // - // if (!regemail.test(e.target.value)) { - // if ((e.target.value.indexOf("@") != -1) === true) { - // stringdata = "邮箱格式不正确"; - // } else { - // stringdata = "手机号格式不正确"; - // - // } - // this.setState({ - // Phonenumberisnotco: stringdata, - // Phonenumberisnotcobool: true, - // dragOk:false, - // Whethertoverify:this.state.Whethertoverify===true?false:true, - // }) - // return - // } else { - // console.log("729"); - // this.setState({ - // Phonenumberisnotco: undefined, - // Phonenumberisnotcobool: false, - // }) - // this.Emailphonenumberverification(e.target.value, 1); - // return - // } this.Emailphonenumberverification(e.target.value, 1); } inputOnBlurzhuche = (e, id) => { From 38be938c5ecf12eefa31b6d79275a990ec58b62d Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Mon, 29 Jul 2019 17:38:24 +0800 Subject: [PATCH 2/3] 100 --- public/react/src/modules/courses/exercise/Exercisetablesmubu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/exercise/Exercisetablesmubu.js b/public/react/src/modules/courses/exercise/Exercisetablesmubu.js index 60c29ffbc..92cfa30b7 100644 --- a/public/react/src/modules/courses/exercise/Exercisetablesmubu.js +++ b/public/react/src/modules/courses/exercise/Exercisetablesmubu.js @@ -52,7 +52,7 @@ class Exercisetablesmubus extends Component { dataIndex: 'commit_percent', key: 'commit_percent', render: (text, record, index) => { - const _content = + const _content = {text.value!="有效填写量"&&text.value!="wrong" && } From 383f7963180235378b9562c167dc92928a3855f3 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 29 Jul 2019 18:07:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...0729095722_delete_error_myshixun_from_myshxiuns.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 db/migrate/20190729095722_delete_error_myshixun_from_myshxiuns.rb diff --git a/db/migrate/20190729095722_delete_error_myshixun_from_myshxiuns.rb b/db/migrate/20190729095722_delete_error_myshixun_from_myshxiuns.rb new file mode 100644 index 000000000..ef5b86975 --- /dev/null +++ b/db/migrate/20190729095722_delete_error_myshixun_from_myshxiuns.rb @@ -0,0 +1,11 @@ +class DeleteErrorMyshixunFromMyshxiuns < ActiveRecord::Migration[5.2] + def change + myshixuns = Myshixun.where("created_at > '2019-07-26 00:00:00' and repo_name is null") + myshixuns.find_each do |myshixun| + if myshixun.games.blank? + puts("###########user_login: #{User.find(myshixun.user_id).login}") + myshixun.destroy! + end + end + end +end