From 31c66eb5e1a7bcd53f11e5871a468235172166a5 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, 9 Jan 2020 20:10:38 +0800 Subject: [PATCH] =?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/AppConfig.js | 20 +++++++++---------- .../Mailboxvalidation.js | 6 ++++++ .../Phonenumberverification.js | 5 +++++ .../Mailboxvalidation.js | 5 +++++ .../Phonenumberverification.js | 5 +++++ .../src/modules/login/Trialapplication.js | 6 +++++- .../src/modules/login/Trialapplicationysl.js | 6 +++++- .../src/modules/user/account/AccountSecure.js | 5 +++++ 8 files changed, 46 insertions(+), 12 deletions(-) diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index c7ab36285..5f870b683 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -27,16 +27,16 @@ function locationurl(list){ // TODO 开发期多个身份切换 let debugType ="" -// if (isDev) { -// const _search = window.location.search; -// let parsed = {}; -// if (_search) { -// parsed = queryString.parse(_search); -// } -// debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : -// window.location.search.indexOf('debug=s') != -1 ? 'student' : -// window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' -// } +if (isDev) { + const _search = window.location.search; + let parsed = {}; + if (_search) { + parsed = queryString.parse(_search); + } + debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : + window.location.search.indexOf('debug=s') != -1 ? 'student' : + window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' +} // 超管 // debugType="admin"; // 老师 diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Mailboxvalidation.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Mailboxvalidation.js index 143c2f74c..5f8ff2df9 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Mailboxvalidation.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Mailboxvalidation.js @@ -108,6 +108,12 @@ class Mailboxvalidation extends Component { }).then((result) => { if (result) { // 倒计时 + if(result.data.status===1){ + this.props.showNotification("验证码已发送，请注意查收!",2); + }else if(result.data.status===-2){ + this.props.showNotification(result.data.message,2); + } + this.setState({ secondsFlag: true }) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Phonenumberverification.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Phonenumberverification.js index 7ab9f9625..a81687ca7 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Phonenumberverification.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Phonenumberverification.js @@ -107,6 +107,11 @@ class Phonenumberverification extends Component { }).then((result) => { if (result) { // 倒计时 + if(result.data.status===1){ + this.props.showNotification("验证码已发送，请注意查收!",2); + }else if(result.data.status===-2){ + this.props.showNotification(result.data.message,2); + } this.setState({ secondsFlag: true }) diff --git a/public/react/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Mailboxvalidation.js b/public/react/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Mailboxvalidation.js index 143c2f74c..7edb4c14a 100644 --- a/public/react/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Mailboxvalidation.js +++ b/public/react/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Mailboxvalidation.js @@ -108,6 +108,11 @@ class Mailboxvalidation extends Component { }).then((result) => { if (result) { // 倒计时 + if(result.data.status===1){ + this.props.showNotification("验证码已发送，请注意查收!",2); + }else if(result.data.status===-2){ + this.props.showNotification(result.data.message,2); + } this.setState({ secondsFlag: true }) diff --git a/public/react/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Phonenumberverification.js b/public/react/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Phonenumberverification.js index 7ab9f9625..a81687ca7 100644 --- a/public/react/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Phonenumberverification.js +++ b/public/react/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Phonenumberverification.js @@ -107,6 +107,11 @@ class Phonenumberverification extends Component { }).then((result) => { if (result) { // 倒计时 + if(result.data.status===1){ + this.props.showNotification("验证码已发送，请注意查收!",2); + }else if(result.data.status===-2){ + this.props.showNotification(result.data.message,2); + } this.setState({ secondsFlag: true }) diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js index 2dc13ed1e..261029622 100644 --- a/public/react/src/modules/login/Trialapplication.js +++ b/public/react/src/modules/login/Trialapplication.js @@ -205,7 +205,11 @@ class Trialapplication extends Component { }).then((result) => { //验证有问题{"status":1,"message":"success"} // console.log(result); - + if(result.data.status===1){ + this.props.showNotification("验证码已发送，请注意查收!",2); + }else if(result.data.status===-2){ + this.props.showNotification(result.data.message,2); + } }).catch((error) => { console.log(error); diff --git a/public/react/src/modules/login/Trialapplicationysl.js b/public/react/src/modules/login/Trialapplicationysl.js index 05998511f..dc221e945 100644 --- a/public/react/src/modules/login/Trialapplicationysl.js +++ b/public/react/src/modules/login/Trialapplicationysl.js @@ -220,7 +220,11 @@ class Trialapplicationysl extends Component { }).then((result) => { //验证有问题{"status":1,"message":"success"} // console.log(result); - + if(result.data.status===1){ + this.props.showNotification("验证码已发送，请注意查收!",2); + }else if(result.data.status===-2){ + this.props.showNotification(result.data.message,2); + } }).catch((error) => { console.log(error); diff --git a/public/react/src/modules/user/account/AccountSecure.js b/public/react/src/modules/user/account/AccountSecure.js index 2e90824c9..1e2d65f8a 100644 --- a/public/react/src/modules/user/account/AccountSecure.js +++ b/public/react/src/modules/user/account/AccountSecure.js @@ -86,6 +86,11 @@ class AccountSecure extends Component { }}).then((result)=>{ if(result){ // 倒计时 + if(result.data.status===1){ + this.props.showNotification("验证码已发送，请注意查收!",2); + }else if(result.data.status===-2){ + this.props.showNotification(result.data.message,2); + } this.setState({ secondsFlag:true })