Authored by zhangxiaoru

exchange

@@ -109,37 +109,38 @@ const getProductInfo = (req, res, next) => { @@ -109,37 +109,38 @@ const getProductInfo = (req, res, next) => {
109 }; 109 };
110 110
111 const exchangeDeatail = (req, res) => { 111 const exchangeDeatail = (req, res) => {
112 - let id = 125946;  
113 - let uid = 8050560;  
114 -  
115 - returns.getExchangeDetailData(id, uid).then(result => {  
116 - res.display('index', {  
117 - page: 'exchange-detail',  
118 - isMe: true,  
119 - content: {  
120 - nav: mcHandler.getMeCrumb('我的退/换货'),  
121 - navigation: mcHandler.getSideMenu('我的退/换货'),  
122 - banner: 'http://placehold.it/{width}x{height}',  
123 -  
124 - exchange: {  
125 - finish: true,  
126 - way: '上门送货',  
127 - goodsList: [  
128 - {  
129 - goodsImage: '',  
130 - productName: 'fdefwfwefwrefverfref',  
131 - colorName: '',  
132 - sizeName: '',  
133 - num: '',  
134 - reasonName: '',  
135 - newColorName: '蓝色',  
136 - newSizeName: 'M',  
137 - }  
138 - ]  
139 - } 112 + // let id = 125946;
  113 + // let uid = 8050560;
  114 +
  115 + // returns.getExchangeDetailData(id, uid).then(result => {
  116 + res.display('index', {
  117 + page: 'exchange-detail',
  118 + isMe: true,
  119 + content: {
  120 + nav: mcHandler.getMeCrumb('我的退/换货'),
  121 + navigation: mcHandler.getSideMenu('我的退/换货'),
  122 + banner: 'http://placehold.it/{width}x{height}',
  123 +
  124 + exchange: {
  125 + finish: true,
  126 + way: '上门送货',
  127 + goodsList: [
  128 + {
  129 + goodsImage: '',
  130 + productName: 'fdefwfwefwrefverfref',
  131 + colorName: '',
  132 + sizeName: '',
  133 + num: '',
  134 + reasonName: '',
  135 + newColorName: '蓝色',
  136 + newSizeName: 'M'
  137 + }
  138 + ]
140 } 139 }
141 - }); 140 + }
142 }); 141 });
  142 +
  143 + // });
143 }; 144 };
144 145
145 module.exports = { 146 module.exports = {
@@ -11,7 +11,8 @@ const camelCase = global.yoho.camelCase; @@ -11,7 +11,8 @@ const camelCase = global.yoho.camelCase;
11 const _ = require('lodash'); 11 const _ = require('lodash');
12 const mcHandler = require('./menu-crumb-handler'); 12 const mcHandler = require('./menu-crumb-handler');
13 const returnsAPI = require('./returns-api'); 13 const returnsAPI = require('./returns-api');
14 -const logger = global.yoho.logger; 14 +
  15 +// const logger = global.yoho.logger;
15 16
16 const helpers = global.yoho.helpers; 17 const helpers = global.yoho.helpers;
17 18
@@ -112,7 +113,7 @@ const _setDefaultStatus = (type) => { @@ -112,7 +113,7 @@ const _setDefaultStatus = (type) => {
112 }; 113 };
113 114
114 return resData; 115 return resData;
115 -} 116 +};
116 117
117 const _setReturnStatus = (list, half) => { 118 const _setReturnStatus = (list, half) => {
118 let resData = {}; 119 let resData = {};
@@ -229,11 +230,10 @@ const _setExchangeDetailData = (data) => { @@ -229,11 +230,10 @@ const _setExchangeDetailData = (data) => {
229 list.auditSuccess = true; 230 list.auditSuccess = true;
230 break; 231 break;
231 case 40: 232 case 40:
232 - resData.finish = true; 233 + list.finish = true;
233 list.auditSuccess = true; 234 list.auditSuccess = true;
234 break; 235 break;
235 default: 236 default:
236 - resData.audit = true;  
237 break; 237 break;
238 } 238 }
239 239
@@ -275,7 +275,7 @@ const getRefundDetailData = (applyId, uid) => { @@ -275,7 +275,7 @@ const getRefundDetailData = (applyId, uid) => {
275 if (result.data) { 275 if (result.data) {
276 // console.log(_setRefundDetailData(result.data)); 276 // console.log(_setRefundDetailData(result.data));
277 277
278 - Object.assign(resData.refundDetail, _setReturnStatus(result.data.statusList));//头部 278 + Object.assign(resData.refundDetail, _setReturnStatus(result.data.statusList));// 头部
279 279
280 Object.assign(resData.refundDetail, _setRefundDetailData(result.data)); 280 Object.assign(resData.refundDetail, _setRefundDetailData(result.data));
281 } 281 }
@@ -360,14 +360,14 @@ const getExchangeDetailData = (id, uid) => { @@ -360,14 +360,14 @@ const getExchangeDetailData = (id, uid) => {
360 if (result.data) { 360 if (result.data) {
361 // console.log(_setRefundDetailData(result.data)); 361 // console.log(_setRefundDetailData(result.data));
362 362
363 - Object.assign(exchangeData.exchangeDetail, _setReturnStatus(result.data.statusList));//头部 363 + Object.assign(exchangeData.exchangeDetail, _setReturnStatus(result.data.statusList));// 头部
364 364
365 Object.assign(exchangeData.exchangeDetail, _setExchangeDetailData(result.data)); 365 Object.assign(exchangeData.exchangeDetail, _setExchangeDetailData(result.data));
366 366
367 // Object.assign(exchangeData.exchangeDetail, camelCase(result.data)); 367 // Object.assign(exchangeData.exchangeDetail, camelCase(result.data));
368 } 368 }
369 369
370 - console.log(exchangeData) 370 + // console.log(exchangeData);
371 return {returns: exchangeData}; 371 return {returns: exchangeData};
372 }); 372 });
373 }; 373 };