'咨询常见问题'

@@ -64,7 +64,7 @@ const _formatConsultsList = (data) => {
  * @limit  {[number]} 每页咨询数量
  * @limit  {[number]} 每页咨询数量
  * @return {[object]}
  * @return {[object]}
  */
  */
-const _getConsults = (id, page, limit) => {
+const getConsults = (id, page, limit) => {
     let params = {
     let params = {
         method: 'app.consult.li',
         method: 'app.consult.li',
         product_id: id,
         product_id: id,
@@ -160,7 +160,7 @@ let comments = (params) => {
 let consults = (params) => {
 let consults = (params) => {
     return api.all([
     return api.all([
         _getCommonConsult(),
         _getCommonConsult(),
-        _getConsults(params.product_id, 1, 60)
+        getConsults(params.product_id, 1, 60)
     ]).then(result => {
     ]).then(result => {
         let data = {
         let data = {
             link: `/product/detail/consultform?product_id=${params.product_id}`
             link: `/product/detail/consultform?product_id=${params.product_id}`
@@ -217,5 +217,6 @@ module.exports = {
     comments,  // 商品详情相关-购买评价
     comments,  // 商品详情相关-购买评价
     consults,  // 商品详情相关-购买咨询
     consults,  // 商品详情相关-购买咨询
     addConsult,  // 商品详情相关-添加咨询
     addConsult,  // 商品详情相关-添加咨询
-    upvoteConsult // 咨询点赞
+    upvoteConsult, // 咨询点赞
+    getConsults // 获取咨询
 };
 };

@@ -245,17 +245,6 @@ const _detailDataPkg = (origin, uid, vipLevel, ua) => {
         consultsNum: 0
         consultsNum: 0
     };
     };
 
 
-    if (origin.consultBoWrapper) {
-        dest.feedbacks.consultsNum = origin.consultBoWrapper.consultTotal;
-        _.forEach(origin.consultBoWrapper.consultBoList, function(value) {
-            dest.feedbacks.consults.push({
-                question: value.ask,
-                time: value.askTime,
-                answer: value.answer
-            });
-        });
-    }
-
     let consultParams = {
     let consultParams = {
         product_id: origin.id
         product_id: origin.id
     };
     };
@@ -608,7 +597,8 @@ let getProductData = (data) => {
                 comment.getCommentInfo({
                 comment.getCommentInfo({
                     productId: result.id
                     productId: result.id
                 }),
                 }),
-                _getCommonConsult()
+                _getCommonConsult(),
+                comment.getConsults(result.id, 1, 2)
             ]).then((info) => {
             ]).then((info) => {
                 result.promotionBoList = info[1];
                 result.promotionBoList = info[1];
 
 
@@ -617,7 +607,7 @@ let getProductData = (data) => {
 
 
                 Object.assign(finalResult.feedbacks, info[2]);
                 Object.assign(finalResult.feedbacks, info[2]);
 
 
-                if (!_.isEmpty(info[3]) && !_.get(info[2], 'feedbacks.consultsNum', 0)) {
+                if (!info[4].total && !_.isEmpty(info[3]) && !_.get(info[2], 'feedbacks.consultsNum', 0)) {
                     Object.assign(finalResult.feedbacks, {
                     Object.assign(finalResult.feedbacks, {
                         commonConsults: true,
                         commonConsults: true,
                         consultsNum: true,
                         consultsNum: true,
@@ -625,6 +615,16 @@ let getProductData = (data) => {
                     });
                     });
                 }
                 }
 
 
+                if (info[4]) {
+                    finalResult.feedbacks.consultsNum  = parseInt(info[4].total, 10);
+
+                    Object.assign(finalResult.feedbacks, {
+                        commonConsults: false,
+                        consultsNum:  parseInt(info[4].total, 10),
+                        consults: _.take(info[4].list, 2)
+                    });
+                }
+
                 return finalResult;
                 return finalResult;
             });
             });