diff --git a/app/controllers/competitions/prizes_controller.rb b/app/controllers/competitions/prizes_controller.rb
index c87026042..e63cac076 100644
--- a/app/controllers/competitions/prizes_controller.rb
+++ b/app/controllers/competitions/prizes_controller.rb
@@ -7,8 +7,8 @@ class Competitions::PrizesController < Competitions::BaseController
self_prizes = current_competition.competition_prize_users.where(user_id: current_prize_user.id).includes(:competition_team).order(:competition_prize_id)
@leader = self_prizes.any?{ |prize_user| prize_user.leader? && prize_user.competition_prize.category == 'bonus' } # 是否为队长并且有奖金奖励
- if @leader
- @bank_account = self_prizes.find(&:leader?).extra
+ if @leader || current_user.admin_or_business?
+ @bank_account = self_prizes.find(&:leader?)&.extra
@bank_account_editable = self_prizes.select(&:leader?).all?(&:pending?)
end
diff --git a/app/views/competitions/prizes/show.json.jbuilder b/app/views/competitions/prizes/show.json.jbuilder
index 18113a7ed..0fbec23f8 100644
--- a/app/views/competitions/prizes/show.json.jbuilder
+++ b/app/views/competitions/prizes/show.json.jbuilder
@@ -1,6 +1,6 @@
json.leader @leader
-if @leader
+if @leader || User.current.admin_or_business?
json.bank_account @bank_account
json.bank_account_editable @bank_account_editable
end
diff --git a/app/views/users/get_navigation_info.json.jbuilder b/app/views/users/get_navigation_info.json.jbuilder
index fe5bccb15..c507f7ef8 100644
--- a/app/views/users/get_navigation_info.json.jbuilder
+++ b/app/views/users/get_navigation_info.json.jbuilder
@@ -17,7 +17,7 @@ json.top do
json.crowdsourcing_url "/crowdsourcing"
# 客户管理
- json.customer_management_url current_user.partner_managers.exists? ? "#{@old_domain}/cooperates/#{current_user.partner_managers.first.partner_id}/partner_list" : nil
+ json.customer_management_url current_user.partner_managers.exists? ? "/partners/#{current_user.partner_managers.first.partner_id}/customers" : nil
json.career_url do
json.array! @career.to_a do |c|
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
index 4ccd8fb6f..b2ac34fe1 100755
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
@@ -468,7 +468,17 @@ class CompetitionCommon extends Component{
-
+
:""}
- {/**/}
-
- {/*———————— 快速登录 ————————*/}
- {/*
+ }
+
}
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index c48e29618..01188bdd1 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -1085,24 +1085,24 @@ class LoginRegisterComponent extends Component {
this.openweixinlogin()}>
- {/*this.openqqlogin()} className={"ml10"}>*/}
- {/*
*/}
+ this.openqqlogin()} className={"ml10"}>
+
+
+
+ :
+ ———————— 快速登录 ————————
+
- : ""}
+ }
}
- {/**/}
- {/*———————— 快速登录 ————————*/}
- {/*
*/}
- {/**/}
+
{
@@ -1260,27 +1260,27 @@ class LoginRegisterComponent extends Component {
this.openweixinlogin()}>
- {/*this.openqqlogin()} className={"ml10"}>*/}
- {/*
*/}
+ this.openqqlogin()} className={"ml10"}>
+
+
+
+ :
+ ———————— 快速登录 ————————
+
- : ""
+
}
}
- {/**/}
- {/*———————— 快速登录 ————————*/}
- {/*
*/}
- {/**/}
+
{weixinlogin===true?