Merge branch 'feature/guang' of http://git.yoho.cn/fe/yohobuy-node into feature/guang

@@ -286,7 +286,23 @@ exports.listDynamicData = (req, res) => {
 
 
     let udid = ghelper.getUdid(req, res);
     let udid = ghelper.getUdid(req, res);
 
 
-    guangModel.getDynamicDataByIds(ids, udid, req.user.uid).then(ret => {
+    let other = {};
+    let query = req.query.query,
+        type = req.query.type;
+
+    if (req.user.uid) {
+        other.uid = req.user.uid;
+    }
+
+    if (query) {
+        other.query = query;
+    }
+
+    if (type) {
+        other.type = type;
+    }
+
+    guangModel.getDynamicDataByIds(ids, udid, other).then(ret => {
         res.send(ret);
         res.send(ret);
     });
     });
 };
 };

@@ -843,21 +843,35 @@ const getDynamicDataById = (id, uid, udid) => {
 /**
 /**
  * 获取制指定文章的动态信息
  * 获取制指定文章的动态信息
  * @param ids
  * @param ids
+ * @param udid
+ * @param other [Obejct] 包含uid,query,type等非必传参数
  * @returns {Promise.<T>|*}
  * @returns {Promise.<T>|*}
  */
  */
-const getDynamicDataByIds = (ids, udid, uid) => {
+const getDynamicDataByIds = (ids, udid, other) => {
     let params = {
     let params = {
-        ids: ids,
+        articleIds: ids,
         udid: udid
         udid: udid
     };
     };
 
 
-    if (uid) {
+    if (other.uid) {
         _.assign(params, {
         _.assign(params, {
-            uid: uid
+            uid: other.uid
         });
         });
     }
     }
 
 
-    return serviceApi.get('', params, {cache: true});
+    if (other.query) {
+        _.assign(params, {
+            query: other.query
+        });
+    }
+
+    if (other.type) {
+        _.assign(params, {
+            type: other.type
+        });
+    }
+
+    return serviceApi.get('guang/api/*/article/getSimpleArticleList', params, {cache: true});
 };
 };
 
 
 module.exports = {
 module.exports = {

@@ -15,6 +15,9 @@ require('./img-blink');
 
 
 require('./right-side');
 require('./right-side');
 
 
+// page cache下更新点赞状态、点赞数、评论数、阅读数
+require('./list-dynamic');
+
 $('#slider').slider(); // 初始化slider
 $('#slider').slider(); // 初始化slider
 
 
 $(document).pjax('.pjax-link, .msg-pager a', '#pjax-container', {
 $(document).pjax('.pjax-link, .msg-pager a', '#pjax-container', {

@@ -7,15 +7,34 @@ var $ = require('yoho-jquery');
 
 
 var $msgs = $('#msg-list');
 var $msgs = $('#msg-list');
 
 
+require('../common');
+
 function getDynamicByIds(ids) {
 function getDynamicByIds(ids) {
     'use strict';
     'use strict';
+    var data = {
+        ids: ids
+    };
+
+    var qs = window.queryString();
+
+    if (qs.query) {
+
+        // 标签列表
+        data.query = qs.query;
+    } else if (qs.type) {
+
+        // 逛首页type
+        data.type = qs.type;
+    } else if (!qs.author_id) {
+
+        // 非编辑页的情况下，为逛首页默认type=0
+        data.type = '0';
+    }
 
 
     return $.ajax({
     return $.ajax({
         type: 'GET',
         type: 'GET',
         url: '/guang/info/listData',
         url: '/guang/info/listData',
-        data: {
-            ids: ids
-        }
+        data: data
     });
     });
 }
 }
 
 
@@ -28,12 +47,12 @@ function renderData(data) {
 
 
     var list;
     var list;
 
 
-    if (data && data.code === 200 && (list = data.artList)) {
+    if (data && data.code === 200 && (list = data.data.artList)) {
         for (i = 0; i < list.length; i++) {
         for (i = 0; i < list.length; i++) {
             it = list[i];
             it = list[i];
 
 
-            if (it && it.id) {
-                $it = $('.msg-content[data-id=' + it.id + ']', $msgs);
+            if (it && it.articleId) {
+                $it = $('.msg-content[data-id=' + it.articleId + ']', $msgs);
 
 
                 // 浏览数目
                 // 浏览数目
                 $it.find('.page-view em').text(it.views_num);
                 $it.find('.page-view em').text(it.views_num);
@@ -55,7 +74,7 @@ function renderData(data) {
     }
     }
 }
 }
 
 
-function refreshData() {
+(function() {
     'use strict';
     'use strict';
 
 
     var idArr = [];
     var idArr = [];
@@ -69,6 +88,4 @@ function refreshData() {
     });
     });
 
 
     getDynamicByIds(idArr.join(',')).then(renderData);
     getDynamicByIds(idArr.join(',')).then(renderData);
-}
-
-refreshData();
+}());

@@ -7,3 +7,6 @@
 require('./msg');
 require('./msg');
 require('./img-blink');
 require('./img-blink');
 require('./right-side');
 require('./right-side');
+
+// page cache下更新点赞状态、点赞数、评论数、阅读数
+require('./list-dynamic');