fe / yohobuywap-node · Commits

Go to a project

Authored by ccbikai(👎🏻🍜)
Commit 755d93ca8630570dfeb4c092a8b65a58a3d3fdf0 2 parents ce7ba2ec b79ede51

Merge branch 'hotfix/orderDetailUrl'

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
@@ -64,7 +64,7 @@ const _getOrderStatus = (order, showLogistics) => { @@ -64,7 +64,7 @@ const _getOrderStatus = (order, showLogistics) => {
64 /* 待付款 */ 64 /* 待付款 */
65 Object.assign(result, { 65 Object.assign(result, {
66 unpaid: true, 66 unpaid: true,
67 - payUrl: helpers.urlFormat('/home/orders/pay', {order_code: order.order_code}) 67 + payUrl: helpers.urlFormat('/home/orders/pay', {order_code: order.orderCode})
68 }); 68 });
69 break; 69 break;
70 case 1: 70 case 1:
@@ -87,7 +87,7 @@ const _getOrderStatus = (order, showLogistics) => { @@ -87,7 +87,7 @@ const _getOrderStatus = (order, showLogistics) => {
87 /* 是否门票 */ 87 /* 是否门票 */
88 if (order.virtualType && parseInt(order.virtualType, 10) === 3) { 88 if (order.virtualType && parseInt(order.virtualType, 10) === 3) {
89 Object.assign(result, { 89 Object.assign(result, {
90 - qrcode: helpers.urlFormat(`/home/QRcode/${order.order_code}`) 90 + qrcode: helpers.urlFormat(`/home/QRcode/${order.orderCode}`)
91 }); 91 });
92 } else { 92 } else {
93 Object.assign(result, _assignExpressInfo(showLogistics, order)); 93 Object.assign(result, _assignExpressInfo(showLogistics, order));
@@ -103,7 +103,7 @@ const _getOrderStatus = (order, showLogistics) => { @@ -103,7 +103,7 @@ const _getOrderStatus = (order, showLogistics) => {
103 /* 是否门票 */ 103 /* 是否门票 */
104 if (order.virtual_type && parseInt(order.virtual_type, 10) === 3) { 104 if (order.virtual_type && parseInt(order.virtual_type, 10) === 3) {
105 Object.assign(result, { 105 Object.assign(result, {
106 - qrcode: helpers.urlFormat(`/home/QRcode/${order.order_code}`) 106 + qrcode: helpers.urlFormat(`/home/QRcode/${order.orderCode}`)
107 }); 107 });
108 } else { 108 } else {
109 Object.assign(result, _assignExpressInfo(showLogistics, order)); 109 Object.assign(result, _assignExpressInfo(showLogistics, order));