'merge-master'

@@ -77,7 +77,7 @@ const getConsults = (id, page, limit) => {
     }).then(result => {
         let data = {};
 
-        if (result.data && result.data.list) {
+        if (result && result.data && result.data.list) {
             Object.assign(data, {
                 list: _formatConsultsList(result.data.list),
                 pageTotal: result.data.page_total,
@@ -100,8 +100,8 @@ let _processComment = (data) => {
 
     _.forEach(data.pageResponse.list, (item) => {
         result.comments.push({
-            userName: item.userInfo.nickName,
-            desc: `${item.goods.color_name}/${item.goods.size_name}`,
+            userName: item.userInfo ? item.userInfo.nickName : '',
+            desc: item.goods ? `${item.goods.color_name}/${item.goods.size_name}` : '',
             content: item.content,
             time: helpers.dateFormat('YYYY-MM-DD HH:mm:ss', new Date(item.createTime * 1000))
         });
@@ -121,7 +121,7 @@ let getCommentInfo = (params) => {
     }, params), {
         cache: true
     }).then((result) => {
-        if (result.code === 200) {
+        if (result && result.code === 200) {
             return _processComment(result.data);
         }
 
@@ -205,7 +205,7 @@ let addConsult = (uid, productId, content) => {
     };
 
     return api.post('', params).then(result => {
-        if (result.code !== 200) {
+        if (!result || !result.code || result.code !== 200) {
             return false;
         }
         return result;