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() {

{content || '您需要去完善您的个人资料,才能使用此功能'}

- this.gotoback()}>取消 + this.gotoback()}>{this.props.AccountProfiletype&&this.props.AccountProfiletype===true?"稍后完善":"取消"} {okText || '立即完善'}
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 {
- {basicInfo.name || (current_user ? current_user.login : '')} + {/*{basicInfo.name || (current_user ? current_user.login : '')}*/} {basicInfo.technical_title}