Merge branch 'feature/giftcard' into release/6.1

@@ -6,6 +6,8 @@
 
 'use strict';
 
+const _ = require('lodash');
+const co = Promise.coroutine;
 const headerModel = require('../../../doraemon/models/header'); // 头部model
 const chatQaModel = require('../models/chatQa');
 
@@ -68,31 +70,36 @@ exports.keySearch = (req, res, next) => {
 };
 
 exports.qaDetail = (req, res, next) => {
-
+    let title = req.query.title || '问题详情';
     let headerData = headerModel.setNav({
-        navTitle: '问题详情'
+        navTitle: title
     });
-
     let responseData = {
         pageHeader: headerData,
         module: 'service',
         page: 'chat-qa',
-        title: '问题详情 | Yoho!Buy有货 | 潮流购物逛不停',
+        title: `${title} | Yoho!Buy有货 | 潮流购物逛不停`,
         width750: true,
-        pageFooter: true
+        pageFooter: true,
+        isApp: req.yoho.isApp
     };
 
-    let params = {
-        sonId: req.query.sonId,
-        parentId: req.query.parentId,
-        keyword: req.query.keyword
-    };
+    co(function* () {
+        let detailData = {};
 
-    chatQaModel.qaDetail(params).then((result) => {
+        if (req.query.id) { // 有 ID 直接通过 ID 取数据
+            let detailApi = yield chatQaModel.getDetailById(req.query.id);
 
-        res.render('chat/qa-detail', Object.assign(result, responseData));
+            detailData = _.get(detailApi, 'data.helpdetail_list[0]');
+        } else {
+            let params = {
+                sonId: req.query.sonId,
+                parentId: req.query.parentId,
+                keyword: req.query.keyword
+            };
 
-    }).catch(next);
+            detailData = yield chatQaModel.qaDetail(params);
+        }
+        return res.render('chat/qa-detail', _.assign(responseData, detailData));
+    })().catch(next);
 };
-
-

@@ -99,10 +99,21 @@ const qaDetail = (params) => {
                 }
             }
         }
+
         return resu;
     });
 };
 
+/**
+ * 通过 ID 获取帮助详情
+ */
+const getDetailById = (id) => {
+    return api.get('', {
+        method: 'app.helper.detail',
+        id: id
+    });
+};
+
 const qaSearch = () => {
 
     return api.all([
@@ -125,5 +136,6 @@ module.exports = {
     index,
     qaSearch,
     qaDetail,
+    getDetailById,
     keySearch
 };

@@ -9,5 +9,7 @@
 			<div class="text">{{{content}}}</div>
 		</div>
 	</div>
-	{{> chat/chat-gm}}
+	{{#unless isApp}}
+		{{> chat/chat-gm}}
+	{{/unless}}
 </div>