fe / yohobuywap-node · Commits

Go to a project

Authored by yyq
Commit 07ec759f70c8cbed6e728925cfe24b9d0c8c461e 1 parent 1a2c2577

detail limit

Inline Side-by-side
Showing 2 changed files with 7 additions and 2 deletions
@@ -77,7 +77,7 @@ function detail(req, res, next) { @@ -77,7 +77,7 @@ function detail(req, res, next) {
77 77
78 req.ctx(YoLuckService).getDetail(id, uid).then(result => { 78 req.ctx(YoLuckService).getDetail(id, uid).then(result => {
79 if (result.error) { 79 if (result.error) {
80 - return next(result.error); 80 + return Promise.reject(result.error);
81 } 81 }
82 82
83 res.render('yoluck/detail', { 83 res.render('yoluck/detail', {
@@ -188,7 +188,7 @@ class YoLuckService extends global.yoho.BaseModel { @@ -188,7 +188,7 @@ class YoLuckService extends global.yoho.BaseModel {
188 return result.data; 188 return result.data;
189 } catch (e) { 189 } catch (e) {
190 return { 190 return {
191 - error: '出错了' 191 + error: e
192 }; 192 };
193 } 193 }
194 } 194 }
@@ -223,6 +223,11 @@ class YoLuckService extends global.yoho.BaseModel { @@ -223,6 +223,11 @@ class YoLuckService extends global.yoho.BaseModel {
223 223
224 const result = {}; 224 const result = {};
225 225
  226 + if (r1.error) {
  227 + result.error = r1.error;
  228 + return result;
  229 + }
  230 +
226 result.userName = userName || _.get(r4, 'data.nickname', '') || ''; 231 result.userName = userName || _.get(r4, 'data.nickname', '') || '';
227 result.actPrizeId = actPrizeId; 232 result.actPrizeId = actPrizeId;
228 result.product = !r1.error ? r1 : {}; 233 result.product = !r1.error ? r1 : {};