Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/educoder into develop

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;
+        //width: 40px;
-        height: auto;
+        //height: auto;
+        max-width: 130px !important;
+        max-height: 40px !important;
+        overflow: hidden;
       }
 
       & > .logo-label {

app/assets/stylesheets/cooperative/sidebar.scss

@@ -86,8 +86,11 @@
       align-items: center;
 
       & > img {
-        width: 40px;
+        //width: 40px;
-        height: auto;
+        //height: auto;
+        max-width: 130px !important;
+        max-height: 40px !important;
+        overflow: hidden;
       }
 
       & > .logo-label {

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>

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>