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

@@ -172,8 +172,12 @@ class BuyNowController {
                 use_yoho_coin: req.body.use_yoho_coin
                 use_yoho_coin: req.body.use_yoho_coin
             });
             });
 
 
-            result.data.use_yoho_coin = paymentProcess.transPrice(_.get(result, 'data.use_yoho_coin'));
-            result.data.yohoCoinCompute = paymentProcess.yohoCoinCompute(result.data);
+            let finalResult = _.get(result, 'data', {});
+
+            if (finalResult) {
+                _.set(finalResult, 'use_yoho_coin', paymentProcess.transPrice(_.get(result, 'data.use_yoho_coin')));
+                _.set(finalResult, 'yohoCoinCompute', paymentProcess.yohoCoinCompute(result.data));
+            }
             return res.json(result.data);
             return res.json(result.data);
         })().catch(next);
         })().catch(next);
     }
     }

@@ -6,6 +6,7 @@
 
 
 'use strict';
 'use strict';
 
 
+const _ = require('lodash');
 const helpers = global.yoho.helpers;
 const helpers = global.yoho.helpers;
 
 
 // const utils = '../../../utils';
 // const utils = '../../../utils';
@@ -122,7 +123,7 @@ module.exports = class extends global.yoho.BaseModel {
                     let adList = result.data[0].data;
                     let adList = result.data[0].data;
                     let build = [];
                     let build = [];
 
 
-                    adList.forEach(ad => {
+                    _.forEach(adList, ad => {
                         build.push({
                         build.push({
                             img: helpers.image(ad.src, 640, 240),
                             img: helpers.image(ad.src, 640, 240),
                             url: ad.url
                             url: ad.url

@@ -285,7 +285,7 @@ class DetailModel extends global.yoho.BaseModel {
 
 
                         if (getArticleContent[i].text && textPosition === 1) {
                         if (getArticleContent[i].text && textPosition === 1) {
                             descriptionText = _.get(getArticleContent[i], 'text.data.text');
                             descriptionText = _.get(getArticleContent[i], 'text.data.text');
-                            _.set(result, 'getArticle.descriptionText', descriptionText.replace(/<\/?[^>]*>/g, ''));
+                            _.set(result, 'getArticle.descriptionText', _.replace(descriptionText, /<\/?[^>]*>/g, ''));
                             textPosition++;
                             textPosition++;
                         }
                         }
                     }
                     }

@@ -139,10 +139,10 @@ exports.recordContent = (req, res, next) => {
 
 
     req.ctx(indexModel).recordContent(uid, udid, page, limit).then((result) => {
     req.ctx(indexModel).recordContent(uid, udid, page, limit).then((result) => {
 
 
-        if (result.browseRecord && result.browseRecord.length === 0) {
+        if (result && result.browseRecord && result.browseRecord.length === 0) {
             res.json(false);
             res.json(false);
         } else {
         } else {
-            res.render('browse-record-content', Object.assign({
+            res.render('browse-record-content', _.assign({
                 layout: false
                 layout: false
             }, result));
             }, result));
         }
         }

@@ -274,7 +274,7 @@ const local = {
 
 
         passport.authenticate('local', (err, user) => {
         passport.authenticate('local', (err, user) => {
             if (err || !user) {
             if (err || !user) {
-                if (err.code === 4189) {
+                if (_.get(err, 'code') === 4189) {
                     let obj = {
                     let obj = {
                         code: 4189,
                         code: 4189,
                         message: err || '登录出错请重试',
                         message: err || '登录出错请重试',

@@ -416,9 +416,10 @@ const getCategoryGoods = (req, res, next) => {
     params.limit = 24;
     params.limit = 24;
 
 
     req.ctx(searchModel).getCategoryGoods(params).then((result) => {
     req.ctx(searchModel).getCategoryGoods(params).then((result) => {
-        if (result.data.product_list && result.data.product_list.length > 0) {
+        let productList = _.get(result, 'data.product_list', []);
 
 
-            let product_list = productProcess.processProductList(result.data.product_list || [], {
+        if (productList.length > 0) {
+            let product_list = productProcess.processProductList(productList, {
                 isApp: params.isApp || (params.appVersion && params.appVersion !== 'false'),
                 isApp: params.isApp || (params.appVersion && params.appVersion !== 'false'),
                 gender: _coverChannel[params.coverChannel],
                 gender: _coverChannel[params.coverChannel],
                 showSimilar: params.shop_id || params.material === 'true' ? false : true
                 showSimilar: params.shop_id || params.material === 'true' ? false : true
@@ -427,7 +428,7 @@ const getCategoryGoods = (req, res, next) => {
             res.render('search/page', {
             res.render('search/page', {
                 layout: false,
                 layout: false,
                 new: product_list,
                 new: product_list,
-                total: result.data.total,
+                total: _.get(result, 'data.total', 0)
             });
             });
         } else {
         } else {
             res.json({});
             res.json({});

@@ -525,7 +525,9 @@ const pushGoodsInfo = (finalDetail, goodsList, isApp) => {
         if (value.collocation) {
         if (value.collocation) {
             _.forEach(value.collocation, (item, subKey) => {
             _.forEach(value.collocation, (item, subKey) => {
                 _.forEach(item.goods, (thItem, thKey) => {
                 _.forEach(item.goods, (thItem, thKey) => {
+                    if (thItem) {
                         finalDetail[key].collocation[subKey].goods[thKey] = goodsObj[thItem.id];
                         finalDetail[key].collocation[subKey].goods[thKey] = goodsObj[thItem.id];
+                    }
                 });
                 });
             });
             });
         }
         }