morii
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev_wenba' of https://git.trustie.net/jasder/forgeplus-react into dev_wenba

This commit is contained in:
caishi 2020-10-19 11:46:34 +08:00
parent c04b2ed5f6 107b6ed95e
commit 54fc16ddad
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/forums/Component/ListItem.jsx
View File

@ -66,7 +66,7 @@ export default ({ memos , current_user , calbackFunc , confirm }) => {
<span>
<span class="icon-wrap">
<i class="iconfont icon-zhengyan font-18"></i>
<span class="span-text">{item.replies_count}</span>
<span class="span-text">{item.viewed_count}</span>
</span>
<span class="icon-wrap">
<i class="iconfont icon-dianzan2 font-14"></i>

2
src/forums/css/All.scss
View File

@ -21,7 +21,7 @@
}
.BestUl {
padding: 15px 25px;
height: 288px;
min-height: 288px;
li {
padding: 6px 0px 5px 13px;
position: relative;

14
src/modules/tpm/NewHeader.js
View File

@ -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