|
@@ -79,7 +79,8 @@ const _getOrderStatus = (order, showLogistics) => { |
|
@@ -79,7 +79,8 @@ const _getOrderStatus = (order, showLogistics) => { |
79
|
|
79
|
|
80
|
/* 已付款状态不给查看物流 URL */
|
80
|
/* 已付款状态不给查看物流 URL */
|
81
|
Object.assign(result, {
|
81
|
Object.assign(result, {
|
82
|
- unreceived: true
|
82
|
+ unreceived: true,
|
|
|
83
|
+ payAly: true
|
83
|
});
|
84
|
});
|
84
|
break;
|
85
|
break;
|
85
|
case 4:
|
86
|
case 4:
|
|
@@ -87,7 +88,8 @@ const _getOrderStatus = (order, showLogistics) => { |
|
@@ -87,7 +88,8 @@ const _getOrderStatus = (order, showLogistics) => { |
87
|
|
88
|
|
88
|
/* 已发货状态,给查看物流或二维码URL */
|
89
|
/* 已发货状态,给查看物流或二维码URL */
|
89
|
Object.assign(result, {
|
90
|
Object.assign(result, {
|
90
|
- unreceived: true
|
91
|
+ unreceived: true,
|
|
|
92
|
+ payAly: true
|
91
|
});
|
93
|
});
|
92
|
|
94
|
|
93
|
/* 是否门票 */
|
95
|
/* 是否门票 */
|
|
@@ -103,7 +105,8 @@ const _getOrderStatus = (order, showLogistics) => { |
|
@@ -103,7 +105,8 @@ const _getOrderStatus = (order, showLogistics) => { |
103
|
|
105
|
|
104
|
/* 已成功订单,给查看物流或二维码URL */
|
106
|
/* 已成功订单,给查看物流或二维码URL */
|
105
|
Object.assign(result, {
|
107
|
Object.assign(result, {
|
106
|
- completed: true
|
108
|
+ completed: true,
|
|
|
109
|
+ payAly: true
|
107
|
});
|
110
|
});
|
108
|
|
111
|
|
109
|
/* 是否门票 */
|
112
|
/* 是否门票 */
|
|
@@ -119,6 +122,10 @@ const _getOrderStatus = (order, showLogistics) => { |
|
@@ -119,6 +122,10 @@ const _getOrderStatus = (order, showLogistics) => { |
119
|
break;
|
122
|
break;
|
120
|
}
|
123
|
}
|
121
|
} else {
|
124
|
} else {
|
|
|
125
|
+ Object.assign(result, {
|
|
|
126
|
+ payAly: true,
|
|
|
127
|
+ paymentName: (order.paymentName !== '') ? order.paymentName : '货到付款'
|
|
|
128
|
+ });
|
122
|
|
129
|
|
123
|
/* 订单为货到付款订单时,计算订单状态。(货到付款没有待付款状态) */
|
130
|
/* 订单为货到付款订单时,计算订单状态。(货到付款没有待付款状态) */
|
124
|
switch (order.status) {
|
131
|
switch (order.status) {
|