Merge branch 'dev_aliyun' into dev_auth

app/controllers/competitions/certificates_controller.rb

@@ -11,9 +11,9 @@ class Competitions::CertificatesController < Competitions::BaseController
   end
 
   def team
-    team = CompetitionTeam.find(id: params[:id])
+    team = CompetitionTeam.find(params[:id])
     return render_forbidden unless team.team_members.exists?(user_id: current_user.id)
-    return render_not_found unless team.certificate_exist?
+    return render_not_found unless team.certificate_exists?
 
     prize = team.competition_prize_users.first.competition_prize
     filename = "#{current_competition.name}-#{prize.name}-#{team.name}.pdf"

app/services/competitions/save_prize_team_account_service.rb

@@ -10,7 +10,7 @@ class Competitions::SavePrizeTeamAccountService < ApplicationService
   def call
     Competitions::SavePrizeTeamAccountForm.new(params).validate!
 
-    prize_leaders = competition.competition_prize_users.where(competition.competition_prize_users)
+    prize_leaders = competition.competition_prize_users.where(user_id: user.id, leader: true)
 
     raise Error, '审批通过后不能修改' if prize_leaders.exists?(status: :approved)
 

app/templates/competition_certificates/team.html.erb

@@ -9,7 +9,7 @@
   <img src="<%= ApplicationController.helpers.download_image(@prize.team_certificate_path) %>"/>
   <div class="competition-certificate-body" style="position: absolute;width: 82%;top: 35%;left: 9%;">
     <p style="text-indent:2em;line-height: 1.8;margin-bottom: 0px;">
-      <%= @member_names %>（指导老师：<%= @teacher_names %>） 在第二届“<b>全国高校绿色计算大赛</b>”（任务挑战组）中成绩突出，荣获“<b>团体 <%= @prize.name %></b>”。
+      <%= @member_names %>（指导老师：<%= @teacher_names %>） 在第二届“<b>全国高校绿色计算大赛</b>”（<%= @prize.competition.sub_title %>）中成绩突出，荣获“<b>团体 <%= @prize.name %></b>”。
     </p>
     <p style="text-indent:2em;line-height: 1.8;margin-top: 0px;">特发此证，以资鼓励。</p>
   </div>

app/views/admins/competition_prize_users/shared/_tr.html.erb

@@ -16,7 +16,7 @@
 <td class="action-container">
   <% if prize_user.leader? && prize_user.competition_prize.category == 'bonus' %>
     <% bank_content = [prize_user.extra&.[]('bank'), prize_user.extra&.[]('second_bank'), prize_user.extra&.[]('card_no')].compact.join('<br>').presence || '无' %>
-    <%= javascript_void_link('查看银行账户', data: { toggle: 'popover', title: '银行账号', content: bank_content.html_safe }) %>
+    <%= javascript_void_link('查看银行账户', data: { toggle: 'popover', title: '银行账号', content: bank_content.html_safe, html: true }) %>
  <% end %>
 
   <% if prize_user.pending? %>

app/views/competitions/prizes/show.json.jbuilder

@@ -7,13 +7,13 @@ end
 
 json.personal_certifications do
   json.array! @self_prizes do |prize_user|
-    json.url personal_competition_certificate_path(current_competition, prize_user)
+    json.url personal_competition_certificate_path(current_competition.identifier, prize_user)
   end
 end
 
 json.team_certifications do
   json.array! @team_prizes do |team|
-    json.url team_competition_certificate_path(current_competition, team)
+    json.url team_competition_certificate_path(current_competition.identifier, team)
   end
 end