fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit 47878ca3d43b62c53284efa7953054eedf680a4b 1 parent 0efd82e9

scroll-modified

Inline Side-by-side
Showing 3 changed files with 8 additions and 5 deletions
@@ -437,7 +437,6 @@ const getComments = (req, res, next) => { @@ -437,7 +437,6 @@ const getComments = (req, res, next) => {
437 article_id: req.query.article_id, 437 article_id: req.query.article_id,
438 page: req.query.page 438 page: req.query.page
439 }).then(result => { 439 }).then(result => {
440 - console.log(result);  
441 return res.render('info/comments', { 440 return res.render('info/comments', {
442 comments: result, 441 comments: result,
443 layout: false 442 layout: false
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 * @Author: Targaryen 2 * @Author: Targaryen
3 * @Date: 2017-05-25 14:36:33 3 * @Date: 2017-05-25 14:36:33
4 * @Last Modified by: Targaryen 4 * @Last Modified by: Targaryen
5 - * @Last Modified time: 2017-06-02 10:27:40 5 + * @Last Modified time: 2017-06-02 10:51:56
6 */ 6 */
7 const $ = require('yoho-jquery'); 7 const $ = require('yoho-jquery');
8 const article_id = $('#guangDetail').data('id'); 8 const article_id = $('#guangDetail').data('id');
@@ -52,7 +52,7 @@ const getComments = () => { @@ -52,7 +52,7 @@ const getComments = () => {
52 * 当scroll到1/2$goodsContainer高度后继续请求下一页数据 52 * 当scroll到1/2$goodsContainer高度后继续请求下一页数据
53 */ 53 */
54 const scrollHandler = function() { 54 const scrollHandler = function() {
55 - if ($(window).scrollTop() > $comments.height() * 0.6) { 55 + if ($(window).scrollTop() > $('#guangDetail').height() * 0.6) {
56 getComments(); 56 getComments();
57 } 57 }
58 }; 58 };
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 * @Author: Targaryen 2 * @Author: Targaryen
3 * @Date: 2017-05-25 15:49:46 3 * @Date: 2017-05-25 15:49:46
4 * @Last Modified by: Targaryen 4 * @Last Modified by: Targaryen
5 - * @Last Modified time: 2017-06-02 10:39:09 5 + * @Last Modified time: 2017-06-02 10:43:21
6 */ 6 */
7 7
8 .guang-detail-page .comments { 8 .guang-detail-page .comments {
@@ -55,7 +55,11 @@ @@ -55,7 +55,11 @@
55 .comments-list { 55 .comments-list {
56 padding-bottom: 40px; 56 padding-bottom: 40px;
57 margin: 30px; 57 margin: 30px;
58 - border-bottom: 1px solid #eee; 58 + border-bottom: 1px solid #b0b0b0;
  59 +
  60 + &:last-child {
  61 + border-bottom: none;
  62 + }
59 63
60 .avatar { 64 .avatar {
61 float: left; 65 float: left;