Merge branches 'dev_aliyun' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1

app/controllers/competitions/competition_teams_controller.rb

@@ -121,6 +121,7 @@ class Competitions::CompetitionTeamsController < Competitions::BaseController
 
     @all_count = teams.count
     @all_teams = paginate(teams.includes(:user, users: { user_extension: :school }))
+    @all_member_count = current_competition.team_members.count
   end
 
   def user_competition_teams

app/controllers/weapps/register_codes_controller.rb

@@ -0,0 +1,24 @@
+class Weapps::RegisterCodesController < Weapps::BaseController
+  before_action :require_wechat_login!
+
+  def create
+    login = params[:login].to_s.strip
+    if login =~ /^[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/
+      user = User.find_by(mail: login)
+      return render_error('该邮箱已注册') if user.present?
+    elsif login =~ /^1\d{10}$/
+      user = User.find_by(phone: params[:login])
+      return render_error('该手机号已注册') if user.present?
+    else
+      return render_error('请输入正确的邮箱或手机号')
+    end
+
+    code = %W(0 1 2 3 4 5 6 7 8 9)
+    verification_code = code.sample(6).join
+    send_type = login =~ /^1\d{10}$/ ? 1 : 8
+    # 记录验证码
+    check_verification_code(verification_code, send_type, login)
+
+    render_ok
+  end
+end

app/views/competitions/competition_teams/index.json.jbuilder

@@ -1,4 +1,5 @@
 json.count @all_count
+json.members_count @all_member_count
 json.personal @personal
 json.competition_name @competition.name
 json.competition_teams do

config/routes.rb

@@ -852,6 +852,7 @@ Rails.application.routes.draw do
       resource :home, only: [:show]
       resource :session, only: [:create]
       resource :register, only: [:create]
+      resource :register_code, only: [:create]
       resource :code_session, only: [:create]
       resource :verify, only: [:create]
       resource :check_account, only: [:create]