diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index b7a764999..7c0ad24bb 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -586,9 +586,19 @@ class AccountController < ApplicationController def apply_trail apply_action = ApplyAction.where(:user_id => User.current.id, :container_type => "TrialAuthorization", :status => 0).first - if apply_action.blank? + if User.current.user_extensions.identity == 1 && !User.current.user_extensions.student_id.nil? && User.current.user_extensions.student_id != "" && !User.current.user_extensions.school.nil? + User.current.update_attributes(:certification => 1) + @tip = "申请成功,我们将在一分钟内完成审核" + if apply_action.blank? + ApplyAction.create(:user_id => User.current.id, :status => 1, :container_type => "TrialAuthorization", :apply_reason => params[:apply_reason]) + else + apply_action.update_attributes(:status => 1) + end + else + @tip = "申请成功,我们将在一个工作日内完成审核" ApplyAction.create(:user_id => User.current.id, :status => 0, :container_type => "TrialAuthorization", :apply_reason => params[:apply_reason]) end + respond_to do |format| format.js end diff --git a/app/views/account/apply_trail.js.erb b/app/views/account/apply_trail.js.erb index c7b789ae5..82cdc09cb 100644 --- a/app/views/account/apply_trail.js.erb +++ b/app/views/account/apply_trail.js.erb @@ -1 +1 @@ -$("body").append('<%= j( render :partial => 'welcome/one_btn_mask_pop', :locals => {:btn => "确定", :tip1 => "申请成功,我们将在一个工作日内完成审核", :url => "#{my_account_path()}"}) %>'); \ No newline at end of file +$("body").append('<%= j( render :partial => 'welcome/one_btn_mask_pop', :locals => {:btn => "确定", :tip1 => @tip, :url => "#{my_account_path()}"}) %>'); \ No newline at end of file