diff --git a/src/components/mouseMenu/main.less b/src/components/mouseMenu/main.less index 32a0a525..dd3ab159 100644 --- a/src/components/mouseMenu/main.less +++ b/src/components/mouseMenu/main.less @@ -17,10 +17,9 @@ width: 100%; line-height: 40px; &:hover{ - background: #f00; + background: #f6f7f8; color: #296bef; } - } .mouse_menuactive{ font-weight: bold; diff --git a/src/pages/exchangepage/template/main.js b/src/pages/exchangepage/template/main.js index 5468167d..87951183 100644 --- a/src/pages/exchangepage/template/main.js +++ b/src/pages/exchangepage/template/main.js @@ -109,7 +109,9 @@ export default class mytemplate extends React.Component { this.setState({ toTopFlag: true }); this.setState({ toTopshow: false }); let isBottom = event.target.scrollHeight - event.target.clientHeight; - if (Math.round(isBottom) == Math.round(event.target.scrollTop)) { + console.log('到底了',Math.round(isBottom)); + console.log('设备高度',Math.round(event.target.scrollTop)); + if (Math.round(isBottom)+1 == Math.round(event.target.scrollTop)) { let endreq = this.state.endreq; if (endreq) { let page = this.state.page;//请求 @@ -122,7 +124,7 @@ export default class mytemplate extends React.Component { let preResult = this.state.system_template; getSystemTemplate(data).then(res => { handelResponse(res, (req, msg) => { - if (req.data.length > 0) { + if (0