Merge branch 'dev_hjm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm

# Conflicts:
#	public/react/src/modules/user/usersInfo/InfosBanner.js

public/react/src/modules/user/usersInfo/InfosBanner.js

@@ -95,16 +95,20 @@ class InfosBanner extends Component{
                 to={`/users/${username}/paths`}>实践课程</Link>
             </li>
             <li className={`${moduleName == 'projects' ? 'active' : '' }`}>
-            <Link
+              <Link
                 onClick={() => this.setState({moduleName: 'projects'})}
                 to={`/users/${username}/projects`}>项目</Link>
             </li>
-
             <li className={`${moduleName == 'package' ? 'active' : '' }`}>
               <Link
                 onClick={() => this.setState({moduleName: 'package'})}
                 to={`/users/${username}/package`}>众包</Link>
             </li>
+            <li className={`${moduleName == 'videoes' ? 'active' : '' }`}>
+              <Link
+                onClick={() => this.setState({moduleName: 'videoes'})}
+                to={`/users/${username}/videoes`}>视频</Link>
+            </li>
           </div>
         </div>
       </div>

public/react/src/modules/user/usersInfo/common/CRoundSelect.js

@@ -46,7 +46,7 @@ function CRoundSelect (props) {
     let index = findIndexByKey(sortKey)
     return (
         <React.Fragment>
-        <div className="" style={{position: 'relative'}}>
+        <div className="" style={{position: 'relative', lineHeight: '24px'}}>
 
             {/* onMouseOut={onToggleOpen} */}
             <div className="trigger" onMouseOver={() => onToggleOpen(true)} >

public/react/src/modules/user/usersInfo/video/InfosVideo.css

@@ -94,6 +94,7 @@
 .toolbarRow {
     justify-content: space-between;
     padding: 0 8px;
+    margin-bottom: 6px;
 }
 /* 跳转按钮 */
 .infoVideo .toUploadBtn {