Merge branch 'qCloud' of git.yoho.cn:fe/yohobuywap-node into qCloud

@@ -8,7 +8,6 @@ var $ = require('yoho-jquery');
 
 
 var info = require('./info-common');
 var info = require('./info-common');
 
 
-require('../common');
 var loadMore = info.loadMore;
 var loadMore = info.loadMore;
 
 
 var winH = $(window).height();
 var winH = $(window).height();
@@ -24,9 +23,11 @@ var setting = {
 };
 };
 
 
 var $infos = $('#info-list');
 var $infos = $('#info-list');
+var getDynamicData = require('./list-dynamic');
 
 
 require('../common');
 require('../common');
-require('./list-dynamic');
+
+getDynamicData.getDynamicData();
 
 
 info.initInfosEvt($infos);
 info.initInfosEvt($infos);
 
 

@@ -21,11 +21,12 @@ var $infoList = $('#info-list'),
     $curNav = $nav.children('.focus'),
     $curNav = $nav.children('.focus'),
     curType = $curNav.data('type');
     curType = $curNav.data('type');
 
 
-require('../common');
-require('./list-dynamic');
+var getDynamicData = require('./list-dynamic');
 
 
 var state = {};
 var state = {};
 
 
+require('../common');
+
 if ($loadMoreInfo.length > 0) {
 if ($loadMoreInfo.length > 0) {
     $loading = $loadMoreInfo.children('.loading');
     $loading = $loadMoreInfo.children('.loading');
     $noMore = $loadMoreInfo.children('.no-more');
     $noMore = $loadMoreInfo.children('.no-more');
@@ -50,6 +51,8 @@ info.initInfosEvt($infoList);
             end: false
             end: false
         };
         };
     });
     });
+
+    getDynamicData.getDynamicData();
 }());
 }());
 $nav.bind('contextmenu', function(e) {
 $nav.bind('contextmenu', function(e) {
     return false;
     return false;

@@ -18,12 +18,13 @@ var $loading = $(''),
     $noMore = $(''),
     $noMore = $(''),
     $swiper = $('');
     $swiper = $('');
 
 
-require('../common');
-
 var searching = false;
 var searching = false;
 var mySwiper = {};
 var mySwiper = {};
 
 
 var isLoading = false;
 var isLoading = false;
+var getDynamicData = require('./list-dynamic');
+
+require('../common');
 
 
 ellipsis.init();
 ellipsis.init();
 
 
@@ -250,6 +251,7 @@ function loadMore($container, opt, url) {
 
 
                 $loading.removeClass('hide');// 显示空屏加载时hide的隐藏
                 $loading.removeClass('hide');// 显示空屏加载时hide的隐藏
 
 
+                getDynamicData.getDynamicData();
                 window.rePosFooter();// 插入内容后重新计算底部位置
                 window.rePosFooter();// 插入内容后重新计算底部位置
             }
             }
 
 

@@ -21,10 +21,10 @@ function getDynamicByIds(ids) {
 
 
         // 标签列表
         // 标签列表
         data.query = qs.query;
         data.query = qs.query;
-    } else if (qs.type) {
+    } else if (qs.id) {
 
 
         // 逛首页type
         // 逛首页type
-        data.type = qs.type;
+        data.type = qs.id;
     } else if (!qs.author_id) {
     } else if (!qs.author_id) {
 
 
         // 非编辑页的情况下，为逛首页默认type=0
         // 非编辑页的情况下，为逛首页默认type=0
@@ -59,27 +59,27 @@ function renderData(data) {
 
 
                 // 点赞状态
                 // 点赞状态
                 if (it.isPraise === 'Y') {
                 if (it.isPraise === 'Y') {
-                    $it.find('.like-btn').addClass('liked');
+                    $it.find('.like-btn').addClass('like');
                 } else {
                 } else {
-                    $it.find('.like-btn').removeClass('liked');
+                    $it.find('.like-btn').removeClass('like');
                 }
                 }
 
 
                 // 点赞数目
                 // 点赞数目
                 $it.find('.like-count').text(it.praise_num);
                 $it.find('.like-count').text(it.praise_num);
 
 
                 // 评论数目
                 // 评论数目
-                $it.find('.like-count').text(it.comment_num);
+                // $it.find('.like-count').text(it.comment_num);
             }
             }
         }
         }
     }
     }
 }
 }
 
 
-(function() {
+function getDynamicData() {
     'use strict';
     'use strict';
 
 
     var idArr = [];
     var idArr = [];
 
 
-    $msgs.find('.guang-info').each(function() {
+    $('.info-list').not('.hide').find('.guang-info').each(function() {
         var id = $(this).data('id');
         var id = $(this).data('id');
 
 
         if (id) {
         if (id) {
@@ -88,4 +88,8 @@ function renderData(data) {
     });
     });
 
 
     getDynamicByIds(idArr.join(',')).then(renderData);
     getDynamicByIds(idArr.join(',')).then(renderData);
-}());
+}
+
+module.exports = {
+    getDynamicData
+};