From 4342286d6983e18e110c661fdc4ac3e4b2a7ca68 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 8 Jun 2017 09:24:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../account/_has_authentication.html.erb      |  2 +-
 app/views/my/account.html.erb                 | 24 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/views/account/_has_authentication.html.erb b/app/views/account/_has_authentication.html.erb
index 4244df0c5..f42f6ca6b 100644
--- a/app/views/account/_has_authentication.html.erb
+++ b/app/views/account/_has_authentication.html.erb
@@ -5,7 +5,7 @@
     已认证
   <% end %>
 </div>
-<% if !@user.authentication && @apply_user_auth && @apply_user_auth.status == 0 %>
+<% if false %>
     <%= render :partial => "welcome/one_btn_mask_pop",
                :locals => {
                        :tip1 => "更多功能，需要经过管理员的授权审核",
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index cb28f7e1a..4c2aed71b 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -181,14 +181,18 @@
                 已认证
               </span>
             <% else %>
-              <span class="color-grey ml20">
-                <i class="fa fa-times-circle-o" aria-hidden="true"></i>
-                未认证
-              </span>
-                <span class="color-orange ml20">
-                <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
-                认证中
-              </span>
+                <% apply_auth = ApplyUserAuthentication.where(:user_id => @user.id).last %>
+                <% if apply_auth && apply_auth.status == 0 %>
+                    <span class="color-orange ml20">
+                        <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+                        认证中
+                    </span>
+                <% else %>
+                    <span class="color-grey ml20">
+                        <i class="fa fa-times-circle-o" aria-hidden="true"></i>
+                        未认证
+                    </span>
+                <% end %>
             <% end %>
           </p>
         </li>
@@ -245,9 +249,9 @@
     <% title = "" %>
     <% language = "" %>
 <% end %>
-<% if @force %>
+<% if false %>
     <%= render :partial => "welcome/guidance_mask" %>
-<% elsif @auth %>
+<% elsif false %>
     <%= render :partial => 'welcome/two_btn_mask_pop',
                :locals => {
                    :btn1 => "试用申请",