From 178cc9e01730b093417cd12a1ba2e993d04aaa52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 12 Nov 2019 13:54:48 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Bankcardnumberverification.js | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js index 0f75154cf..e43bea73a 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js @@ -40,7 +40,30 @@ class Bankcardnumberverification extends Component { } } + componentDidUpdate = (prevProps) => { + if (prevProps.bank_account != this.props.bank_account) { + console.log("componentDidUpdate"); + console.log(this.props); + console.log(prevProps); + ////console.log("Registration"); + ////console.log("componentDidUpdate"); + ////console.log(this.props.user.admin); + try { + if(this.props.bank_account){ + this.props.form.setFieldsValue({ + openingbank: this.props.bank_account.bank, + subbranch: this.props.bank_account.second_bank, + subbranchs: this.props.bank_account.card_no, + }) + } + }catch (e) { + + } + + } + + } yhBankstrue = () => { this.props.form.validateFieldsAndScroll((err, values) => { if (!err) { From d496f104223d3962a8fcf25704c32656b7fd12a1 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Tue, 12 Nov 2019 13:55:26 +0800 Subject: [PATCH 2/8] competition prize account api --- .../competitions/prize_leader_accounts_controller.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/competitions/prize_leader_accounts_controller.rb b/app/controllers/competitions/prize_leader_accounts_controller.rb index 0c01e2738..490c5fb6d 100644 --- a/app/controllers/competitions/prize_leader_accounts_controller.rb +++ b/app/controllers/competitions/prize_leader_accounts_controller.rb @@ -2,7 +2,7 @@ class Competitions::PrizeLeaderAccountsController < Competitions::BaseController before_action :require_prize_team_leader! def update - Competitions::SavePrizeTeamAccountService.call(current_competition, current_user, update_params) + Competitions::SavePrizeTeamAccountService.call(current_competition, current_prize_user, update_params) render_ok rescue ApplicationService::Error => ex render_error(ex.message) @@ -13,8 +13,8 @@ class Competitions::PrizeLeaderAccountsController < Competitions::BaseController def require_prize_team_leader! prize_user = current_competition.competition_prize_users.joins(:competition_prize) .where(competition_prizes: { category: :bonus }) - .find_by(leader: true, user_id: current_user.id) - return if prize_user.present? + .find_by(leader: true, user_id: current_prize_user.id) + return if prize_user.present? && (current_user.admin_or_business? || current_user.id == current_prize_user.id) render_forbidden end @@ -22,4 +22,8 @@ class Competitions::PrizeLeaderAccountsController < Competitions::BaseController def update_params params.permit(:bank, :second_bank, :card_no) end + + def current_prize_user + @_current_prize_user ||= User.find(params[:user_id]) + end end \ No newline at end of file From 87dd1d7766fb83334806863184378ae11e3263b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 12 Nov 2019 13:57:36 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompetitionContentspdfpeopledata.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js index e4c149fa3..4588accaf 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js @@ -321,11 +321,19 @@ class CompetitionContentspdfpeopledata extends Component { //撤销认证 Cancellationofapplication = (index) => { + let userid; + let query=this.props.location&&this.props.location.search; + const types = query.split('user_id=') + if(types[1]===undefined){ + userid=this.props.user&&this.props.user.user_id; + }else{ + userid=types[1]; + } let url = "" if (index === 1) { - url = `/users/accounts/${this.props.user.user_id}/authentication_apply.json`; + url = `/users/accounts/${userid}/authentication_apply.json`; } else if (index === 2) { - url = `/users/accounts/${this.props.user.user_id}/professional_auth_apply.json`; + url = `/users/accounts/${userid}/professional_auth_apply.json`; } axios.delete(url) .then((response) => { From 03221119613b468754faff62cb417bbf96a988b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 12 Nov 2019 13:58:11 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompetitionContentspdfpeopledata.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js index 4588accaf..19469bb87 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js @@ -344,7 +344,11 @@ class CompetitionContentspdfpeopledata extends Component { } else if (index === 2) { this.props.showNotification('撤销职业认证成功') } - this.getdata(this.state.userdata.id); + try { + this.getdata(this.state.userdata.id); + }catch (e) { + + } } } catch (e) { From 12140b7fc7f7486ce3463cc2c31cb26d349f39bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 12 Nov 2019 14:05:05 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompetitionContentspdfChild/Bankcardnumberverification.js | 1 + .../CompetitionContentspdfpeopledata.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js index e43bea73a..27db5d3db 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js @@ -69,6 +69,7 @@ class Bankcardnumberverification extends Component { if (!err) { let url = `/competitions/${this.props.match.params.identifier}/prize_leader_account.json`; axios.patch(url, { + user_id:this.props.userdata.id, bank: values.openingbank, second_bank: values.subbranchs, card_no: values.subbranch diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js index 19469bb87..3fc03dfe4 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js @@ -288,6 +288,7 @@ class CompetitionContentspdfpeopledata extends Component { if (!err) { let url = `/competitions/${this.props.match.params.identifier}/prize_leader_account.json`; axios.patch(url, { + user_id:this.state.userdata.id, bank: values.openingbank, second_bank: values.subbranchs, card_no: values.subbranch @@ -296,7 +297,7 @@ class CompetitionContentspdfpeopledata extends Component { try { if (result.data.status == 0) { // console.log(JSON.stringify(result)); - this.props.showNotification(`提交成功成功`); + this.props.showNotification(`提交成功`); this.getdata(this.state.userdata.id); this.GetawardinformationAPI(); } From 851164ff4672c1aa8571ef9324775ee22f569844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 12 Nov 2019 14:09:19 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Bankcardnumberverification.js | 18 +++++++++++++++--- .../CompetitionContentspdfpeopledata.js | 1 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js index 27db5d3db..4d9279546 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js @@ -60,6 +60,18 @@ class Bankcardnumberverification extends Component { } + try { + if(prevProps.bank_account){ + this.props.form.setFieldsValue({ + openingbank:prevProps.bank_account.bank, + subbranch: prevProps.bank_account.second_bank, + subbranchs: prevProps.bank_account.card_no, + }) + } + }catch (e) { + + } + } @@ -176,7 +188,7 @@ class Bankcardnumberverification extends Component { > {getFieldDecorator('openingbank', { rules: [{ - // initialValue: this.state.cityDefaultValue, + initialValue: this.state.openingbank, required: true, message: '请输入开户行', }], @@ -191,7 +203,7 @@ class Bankcardnumberverification extends Component { > {getFieldDecorator('subbranch', { rules: [{ - // initialValue: this.state.cityDefaultValue, + initialValue: this.state.subbranch, required: true, message: '请输入支行', }], @@ -206,7 +218,7 @@ class Bankcardnumberverification extends Component { > {getFieldDecorator('subbranchs', { rules: [{ - // initialValue: this.state.cityDefaultValue, + initialValue: this.state.subbranchs, required: true, message: '请输入账号', }], diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js index 3fc03dfe4..3f015a3bc 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js @@ -528,6 +528,7 @@ class CompetitionContentspdfpeopledata extends Component {
{ bank_account_editable === true ? + this.hideUpdating(i)} getdata={(id) => this.getdata(id)} From 376fd15c58b1662178e694b87bbda4cc396c82ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 12 Nov 2019 14:12:40 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompetitionContentspdfChild/Phonenumberverification.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4a9718032..fa0b20b7a 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Phonenumberverification.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Phonenumberverification.js @@ -47,7 +47,7 @@ class Phonenumberverification extends Component { }).then((result) => { if (result) { this.props.showNotification("手机号码绑定成功!"); - this.props.hideUpdating() + this.props.hideUpdating(1) this.props.getdata(id); } }).catch((error) => { From 25e07ae21d19eac2015d35849c4f2a135727bf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 12 Nov 2019 14:24:10 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Bankcardnumberverification.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js index 4d9279546..d376cefa2 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js @@ -188,7 +188,7 @@ class Bankcardnumberverification extends Component { > {getFieldDecorator('openingbank', { rules: [{ - initialValue: this.state.openingbank, + initialValue: this.state.openingbank&&this.state.openingbank, required: true, message: '请输入开户行', }], @@ -203,7 +203,7 @@ class Bankcardnumberverification extends Component { > {getFieldDecorator('subbranch', { rules: [{ - initialValue: this.state.subbranch, + initialValue: this.props.subbranch&&this.props.subbranch, required: true, message: '请输入支行', }], @@ -218,7 +218,7 @@ class Bankcardnumberverification extends Component { > {getFieldDecorator('subbranchs', { rules: [{ - initialValue: this.state.subbranchs, + initialValue: this.props.subbranchs&&this.props.subbranchs, required: true, message: '请输入账号', }],