Authored by 郭成尧

Merge branch 'feature/refundApply' into release/5.5

@@ -369,9 +369,9 @@ const getOrders = (params) => { @@ -369,9 +369,9 @@ const getOrders = (params) => {
369 } 369 }
370 370
371 /* 申请退款 */ 371 /* 申请退款 */
372 - if (parseInt(value.payment_type, 10) === 1 &&  
373 - value.payment_status === 'Y' &&  
374 - 4 <= parseInt(value.status, 10) <= 5) { 372 + if (_.find(value.links, o => {
  373 + return o === 'refundApply';
  374 + })) {
375 Object.assign(perOrder, { 375 Object.assign(perOrder, {
376 refundApply: true 376 refundApply: true
377 }); 377 });
@@ -328,10 +328,9 @@ const orderDetailData = (uid, orderCode) => { @@ -328,10 +328,9 @@ const orderDetailData = (uid, orderCode) => {
328 } 328 }
329 329
330 /* 申请退款 */ 330 /* 申请退款 */
331 - if (orderDetail.isMultiPackage === 'N' &&  
332 - parseInt(orderDetail.paymentType, 10) === 1 &&  
333 - orderDetail.paymentStatus === 'Y' &&  
334 - 4 <= parseInt(orderDetail.status, 10) <= 5) { 331 + if (_.find(orderDetail.links, o => {
  332 + return o === 'refundApply';
  333 + })) {
335 Object.assign(orderDetail, { 334 Object.assign(orderDetail, {
336 refundApply: true 335 refundApply: true
337 }); 336 });