merge to bd7e1b

src/forge/users/Infos.js

@@ -306,7 +306,7 @@ class Infos extends Component {
                   }
                 </div>
               </div>
-              {current_user && user && user.login === current_user.login ? (
+              {/* {current_user && user && user.login === current_user.login ? (
                 <div className="bgcF">
                   <div className="list-l-Menu">
                     <li className={project_type && project_type === "notice" ? "active" : ""}>
@@ -371,14 +371,6 @@ class Infos extends Component {
                         <span className="font-16 color-grey-3">CI服务</span>
                       </p>
                     </li>
-                    {/* <li className={project_type && project_type === "CDService" ? "active" : ""}  onClick={() => this.change_devops_type("CDService")}>
-                      <p>
-                        <span className="font-16">CD服务</span>
-                        <span className="color-blue">
-                          {user && user.common_projects_count}
-                        </span>
-                      </p>
-                    </li> */}
                   </ul>
                 </div>
               }
@@ -396,7 +388,7 @@ class Infos extends Component {
                     </p>
                   </li>
                 </div>
-              </div>
+              </div> */}
             </div>
             <div className="list-right">
               { !route_type && menuKey &&

src/modules/tpm/TPMIndexHOC.js

@@ -69,6 +69,7 @@ export function TPMIndexHOC(WrappedComponent) {
 
 			///请求定制化的信息
 			this.getAppdata();
+			window.scrollTo(0,0);
 		}
 
 
@@ -267,12 +268,14 @@ export function TPMIndexHOC(WrappedComponent) {
 					>
 						<div className="newContainer newContainers">
 							{!publicNav && <div style={{height:"58px"}}></div> }
-							{
-								current_user &&
-								<WrappedComponent initCommonState={(user) => this.initCommonState(user)}
-									{...this.props} {...this.state} {...common} >
-								</WrappedComponent>
-							}
+							<div style={{minHeight:"60vh"}}>
+								{
+									current_user &&
+									<WrappedComponent initCommonState={(user) => this.initCommonState(user)}
+										{...this.props} {...this.state} {...common} >
+									</WrappedComponent>
+								}
+							</div>
 						</div>
 					</Spin>
 					<NewFooter {...this.state} {...this.props} />