fe / yohobuywap-node · Commits

Go to a project

Authored by 陈峰
Commit 74c6f4cab9f75d5e15ba325acb89d7fa9250200b 2 parents 7f85ef05 d84dddf4

Merge branch 'master' of http://git.yoho.cn/fe/yohobuywap-node

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
... ... @@ -64,7 +64,7 @@ const _getOrderStatus = (order, showLogistics) => {
/* 待付款 */
Object.assign(result, {
unpaid: true,
payUrl: helpers.urlFormat('/home/orders/pay', {order_code: order.order_code})
payUrl: helpers.urlFormat('/home/orders/pay', {order_code: order.orderCode})
});
break;
case 1:
... ... @@ -87,7 +87,7 @@ const _getOrderStatus = (order, showLogistics) => {
/* 是否门票 */
if (order.virtualType && parseInt(order.virtualType, 10) === 3) {
Object.assign(result, {
qrcode: helpers.urlFormat(`/home/QRcode/${order.order_code}`)
qrcode: helpers.urlFormat(`/home/QRcode/${order.orderCode}`)
});
} else {
Object.assign(result, _assignExpressInfo(showLogistics, order));
... ... @@ -103,7 +103,7 @@ const _getOrderStatus = (order, showLogistics) => {
/* 是否门票 */
if (order.virtual_type && parseInt(order.virtual_type, 10) === 3) {
Object.assign(result, {
qrcode: helpers.urlFormat(`/home/QRcode/${order.order_code}`)
qrcode: helpers.urlFormat(`/home/QRcode/${order.orderCode}`)
});
} else {
Object.assign(result, _assignExpressInfo(showLogistics, order));
... ...