Authored by 郭成尧

Merge branch 'feature/refundApply' into release/5.5

... ... @@ -369,9 +369,9 @@ const getOrders = (params) => {
}
/* 申请退款 */
if (parseInt(value.payment_type, 10) === 1 &&
value.payment_status === 'Y' &&
4 <= parseInt(value.status, 10) <= 5) {
if (_.find(value.links, o => {
return o === 'refundApply';
})) {
Object.assign(perOrder, {
refundApply: true
});
... ...
... ... @@ -328,10 +328,9 @@ const orderDetailData = (uid, orderCode) => {
}
/* 申请退款 */
if (orderDetail.isMultiPackage === 'N' &&
parseInt(orderDetail.paymentType, 10) === 1 &&
orderDetail.paymentStatus === 'Y' &&
4 <= parseInt(orderDetail.status, 10) <= 5) {
if (_.find(orderDetail.links, o => {
return o === 'refundApply';
})) {
Object.assign(orderDetail, {
refundApply: true
});
... ...