From 8d09ea9e240aed5b3dbbc397f5038e527cd4297d Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 6 Sep 2017 09:14:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E7=94=A8=E7=94=B3=E8=AF=B7=E8=A2=AB?=
 =?UTF-8?q?=E6=8B=92=E7=BB=9D=E5=90=8E=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD?=
 =?UTF-8?q?=E4=B8=8E=E9=87=8D=E6=96=B0=E8=AF=95=E7=94=A8=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A7=E5=88=B6=E6=97=B6=E9=97=B4=E7=94=B124?=
 =?UTF-8?q?=E5=B0=8F=E6=97=B6=E6=94=B9=E4=B8=BA5=E5=88=86=E9=92=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/my_controller.rb            | 2 +-
 app/views/layouts/base_edu_account.html.erb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 @@
             <div class="alert alert-orange mb15 mt15" style="width: 1180px; margin:20px auto;">
               试用申请已提交，我们将在一个工作日内完成审核
             </div>
-        <% 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) %>
             <div class="alert alert-orange mb15 mt15" style="width: 1180px; margin:20px auto;">
-              您的试用申请已被拒绝，原因：<%= @trail_authentication.reason %>，请于24小时后重新申请
+              您的试用申请已被拒绝，原因：<%= @trail_authentication.reason %>，请于5分钟后重新申请
             </div>
         <% end %>
     <% end %>