diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index 236c695f1..cb9058dee 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -154,7 +154,7 @@ class MyController < ApplicationController if @user.nickname.nil? || @user.lastname.nil? || ue.try(:identity).nil? || ue.try(:location).nil? || ue.try(:location).nil? @require_auth = true else - if User.current.certification != 1 && (@trail_authentication.blank? || (@trail_authentication.status == 2 && (@trail_authentication.updated_at.to_i + 24*60*60) < Time.now.to_i)) + if User.current.certification != 1 && (@trail_authentication.blank? || (@trail_authentication.status == 2 && (@trail_authentication.updated_at.to_i + 5*60) < Time.now.to_i)) @require_trail_auth = true end end diff --git a/app/views/layouts/base_edu_account.html.erb b/app/views/layouts/base_edu_account.html.erb index 34b1a6a08..370aed93e 100644 --- a/app/views/layouts/base_edu_account.html.erb +++ b/app/views/layouts/base_edu_account.html.erb @@ -42,9 +42,9 @@
试用申请已提交,我们将在一个工作日内完成审核
- <% elsif User.current.certification == 2 || (@trail_authentication.status == 2 && (@trail_authentication.updated_at.to_i + 24*60*60) > Time.now.to_i) %> + <% elsif User.current.certification == 2 || (@trail_authentication.status == 2 && (@trail_authentication.updated_at.to_i + 5*60) > Time.now.to_i) %>
- 您的试用申请已被拒绝,原因:<%= @trail_authentication.reason %>,请于24小时后重新申请 + 您的试用申请已被拒绝,原因:<%= @trail_authentication.reason %>,请于5分钟后重新申请
<% end %> <% end %>