From c00933b0ca4e34a2ff90b4da884f23a1f53a91df Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 16 Oct 2020 11:36:01 +0800 Subject: [PATCH 1/3] change2 --- src/forums/css/All.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forums/css/All.scss b/src/forums/css/All.scss index d2a134734..dc7ea4ea5 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; From 67ccc2ebe5570abdd33dc63849505524ea10845d Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 16 Oct 2020 14:46:31 +0800 Subject: [PATCH 2/3] Change List Count --- src/forums/Component/ListItem.jsx | 2 +- src/forums/css/All.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/forums/Component/ListItem.jsx b/src/forums/Component/ListItem.jsx index ca4007328..b9ff7e9e9 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 dc7ea4ea5..2e43b98d4 100644 --- a/src/forums/css/All.scss +++ b/src/forums/css/All.scss @@ -12,7 +12,7 @@ color: #ccc; } } - & > a:last-child { + & > a:last-child {w border-bottom: none; } } From 107b6ed95e0d959934a4d18acebf03dbe9dce78c Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 16 Oct 2020 17:12:28 +0800 Subject: [PATCH 3/3] Change NewHeader active --- src/forums/css/All.scss | 2 +- src/modules/tpm/NewHeader.js | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/forums/css/All.scss b/src/forums/css/All.scss index 2e43b98d4..dc7ea4ea5 100644 --- a/src/forums/css/All.scss +++ b/src/forums/css/All.scss @@ -12,7 +12,7 @@ color: #ccc; } } - & > a:last-child {w + & > a:last-child { border-bottom: none; } } diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index 8afb611da..b7c8f0183 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