fe / yohobuy-node · Merge Requests

Added 1 commit:

加上异常捕获

使用Object.assign()

then数据处理方法有可能没有返回，建议if else 处理数据，最后返回处理完数据的json

退换货还是coin？？？

Added 1 commit:

Status changed to merged

mentioned in commit 9f6e3ae5

                      if (!width || !height) {
                          width = 2600;
                          height = 60;
+                     }
+                 }
                  banner.src = helpers.image(banner.src, width, height, 2);
                  banner.url = banner.url;
                  res.jsonp({
                      code: 200,
                      data: banner
                  });
+             }
+         }
      });

                  return null;
              });
              let userNum = yield passportModel.getUserInfoNum(uid).then(ret => {
                  if (ret && ret.code === 200) {
                      return ret.data;
+                 }
              });
              // 个人信息调用失败返回
              if (profile) {
                  userInfo.result = 1;
                  // 个人资料
                  userInfo.profileName = _.get(profile, 'profile_name', '');

   * @author: gxh<xuhui.ge@yoho.cn>
   * @date: 2016/11/30
   */
  'use strict';
  const getBannerModel = require('../models/getBanner');
  const helpers = global.yoho.helpers;
  const index = (req, res) => {
      let contentCode = req.query.content_code || '';
      let width = req.query.width || '';
      let height = req.query.height || '';
      getBannerModel.getResource(contentCode).then(data => {

+                 }
                  // 待处理订单
                  userInfo.order = _.get(userNum, 'wait_pay_num + wait_cargo_num + send_cargo_num', 0);
                  // 我的收藏
                  userInfo.favorite = _.get(userNum, 'brand_favorite_total', 0);
                  // 我的优惠券
                  userInfo.coupon = _.get(userNum, 'coupon_num', 0);
                  // 我的有货币
                  userInfo.coin = _.get(userNum, 'yoho_coin_num', 0);
                  // 我的退换货
                  userInfo.coin = _.get(userNum, 'refund_exchange_num', 0);

Feature/getbanner action