Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

public/react/src/modules/tpm/NewHeader.js

@@ -735,7 +735,7 @@ submittojoinclass=(value)=>{
 								position: absolute;
 								top: -2px;
 								background: #fff;
-								z-index: 2;
+								z-index:10000;
 								right: 185px;
 								}
 								`
@@ -795,7 +795,7 @@ submittojoinclass=(value)=>{
                 <a onClick={()=>this.educoderlogin()}  className="mr5 color-white">登录</a>
                 <em className="vertical-line"></em>
                 <a href={"/register"} className="mr5 color-white">注册</a>
-            </span> :user.login===""?<span className="font-15 fr mt17 ml20">
+            </span> :user.login===""?<span className="font-15 fr mt17 ml20 mr25">
                 <a onClick={()=>this.educoderlogin()}  className="mr5 color-white">登录</a>
                 <em className="vertical-line"></em>
                 <a href={"/register"} className="mr5 color-white">注册</a>