From ec9e28a4add1af3ea8666ba00a7dafe63f392dbe Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 1 Sep 2017 19:55:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E7=BC=BA=E9=99=B7=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
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 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 3db2dfb64..236c695f1 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -151,7 +151,7 @@ class MyController < ApplicationController
     ue = @user.user_extensions
     @trail_authentication = ApplyAction.where(:user_id => User.current.id, :container_type => "TrialAuthorization").order("created_at desc").first
     @authentication = @user.authentication
-    if @user.nickname.nil? || @user.lastname.nil? || ue.identity.nil? || ue.location.nil? || ue.school_id.nil?
+    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))
diff --git a/app/views/layouts/base_edu_account.html.erb b/app/views/layouts/base_edu_account.html.erb
index 6891cb314..34b1a6a08 100644
--- a/app/views/layouts/base_edu_account.html.erb
+++ b/app/views/layouts/base_edu_account.html.erb
@@ -42,7 +42,7 @@
             <div class="alert alert-orange mb15 mt15" style="width: 1180px; margin:20px auto;">
               试用申请已提交，我们将在一个工作日内完成审核
             </div>
-        <% elsif @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 + 24*60*60) > Time.now.to_i) %>
             <div class="alert alert-orange mb15 mt15" style="width: 1180px; margin:20px auto;">
               您的试用申请已被拒绝，原因：<%= @trail_authentication.reason %>，请于24小时后重新申请
             </div>