From 9c649f78ca41023879aa5161369afbcf95091c0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sun, 17 Nov 2019 09:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/admins/sidebar.scss       | 16 +++++-----------
 app/assets/stylesheets/cooperative/sidebar.scss  |  7 +++++--
 public/react/src/modules/user/AccountProfile.js  |  2 +-
 .../react/src/modules/user/account/AccountNav.js |  2 +-
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/assets/stylesheets/admins/sidebar.scss b/app/assets/stylesheets/admins/sidebar.scss
index d6560f9ae..fe1a47def 100644
--- a/app/assets/stylesheets/admins/sidebar.scss
+++ b/app/assets/stylesheets/admins/sidebar.scss
@@ -6,15 +6,6 @@
   transition: all 0.5s;
   overflow-y: scroll;
 
-  .sidebar-header {
-    .sidebar-header-logo {
-      img {
-        max-width: 130px !important;
-        max-height: 40px !important;
-        overflow: hidden;
-        }
-    }
-  }
   &::-webkit-scrollbar {
     display:none
   }
@@ -95,8 +86,11 @@
       align-items: center;
 
       & > img {
-        width: 40px;
-        height: auto;
+        //width: 40px;
+        //height: auto;
+        max-width: 130px !important;
+        max-height: 40px !important;
+        overflow: hidden;
       }
 
       & > .logo-label {
diff --git a/app/assets/stylesheets/cooperative/sidebar.scss b/app/assets/stylesheets/cooperative/sidebar.scss
index e943acd90..9879f2442 100644
--- a/app/assets/stylesheets/cooperative/sidebar.scss
+++ b/app/assets/stylesheets/cooperative/sidebar.scss
@@ -86,8 +86,11 @@
       align-items: center;
 
       & > img {
-        width: 40px;
-        height: auto;
+        //width: 40px;
+        //height: auto;
+        max-width: 130px !important;
+        max-height: 40px !important;
+        overflow: hidden;
       }
 
       & > .logo-label {
diff --git a/public/react/src/modules/user/AccountProfile.js b/public/react/src/modules/user/AccountProfile.js
index 2626b4d75..04c9e51f4 100644
--- a/public/react/src/modules/user/AccountProfile.js
+++ b/public/react/src/modules/user/AccountProfile.js
@@ -67,7 +67,7 @@ render() {
 					<div className="task-popup-content">
 						<p className="task-popup-text-center font-16"> {content || '您需要去完善您的个人资料，才能使用此功能'}</p>
 						<div className="clearfix mt30 edu-txt-center">
-							<a  className="task-btn mr30" onClick={()=>this.gotoback()}>取消</a>
+							<a  className="task-btn mr30" onClick={()=>this.gotoback()}>{this.props.AccountProfiletype&&this.props.AccountProfiletype===true?"稍后完善":"取消"}</a>
 							<a className="task-btn task-btn-orange"  href={ okHref || "/account/profile/edit" }> {okText || '立即完善'}</a>
 						</div>
 					</div>
diff --git a/public/react/src/modules/user/account/AccountNav.js b/public/react/src/modules/user/account/AccountNav.js
index 5e2c397cd..e069cdeb2 100644
--- a/public/react/src/modules/user/account/AccountNav.js
+++ b/public/react/src/modules/user/account/AccountNav.js
@@ -82,7 +82,7 @@ class AccountNav extends Component {
               <React.Fragment>
                 <div className="accountInfo">
                   <AccountImg src={basicInfo.avatar_url} {...this.props}></AccountImg>
-                  <span className="name">{basicInfo.name || (current_user ? current_user.login : '')}</span>
+                  {/*<span className="name">{basicInfo.name || (current_user ? current_user.login : '')}</span>*/}
                   <span className="role">{basicInfo.technical_title}</span>
                 </div>