diff --git a/src/forums/Component/ListItem.jsx b/src/forums/Component/ListItem.jsx index ca400732..b9ff7e9e 100644 --- a/src/forums/Component/ListItem.jsx +++ b/src/forums/Component/ListItem.jsx @@ -66,7 +66,7 @@ export default ({ memos , current_user , calbackFunc , confirm }) => { - {item.replies_count} + {item.viewed_count} diff --git a/src/forums/css/All.scss b/src/forums/css/All.scss index d2a13473..dc7ea4ea 100644 --- a/src/forums/css/All.scss +++ b/src/forums/css/All.scss @@ -21,7 +21,7 @@ } .BestUl { padding: 15px 25px; - height: 288px; + min-height: 288px; li { padding: 6px 0px 5px 13px; position: relative; diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index 8afb611d..b7c8f018 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -575,19 +575,11 @@ class NewHeader extends Component { matchpaths = (url) => { const { match } = this.props; if(url){ - if (url === '/forums' && match.path === '/forums') { + if (url.indexOf('forums') > -1 && match.path.indexOf('forums') > -1) { return true - } else if (url.startsWith('/projects') && match.path.startsWith('/projects')) { + } else if (url.indexOf('projects') > -1 && match.path.indexOf('projects') > -1) { return true - } else if (url.startsWith('/paths') && match.path.startsWith('/paths')) { - return true - } else if (url.startsWith('/courses') && match.path.startsWith('/courses')) { - return true - } else if (url.startsWith('/competitions') && match.path.startsWith('/competitions')) { - return true - } else if (url.startsWith('/statistics') && match.path.startsWith('/statistics')) { - return true - } else if (url.startsWith('/users') && match.path.startsWith('/users')) { + } else if (url.indexOf('users') > -1 && match.path.indexOf('users') > -1) { return true } else { return false