fe / yohobuywap-node · Commits

Go to a project

Authored by Aiden Xu
Commit 28df646c7d6627749e5476fcf89a0a93a6ec890a 1 parent 38e0e2fa

分期订单

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
@@ -304,14 +304,14 @@ const orderDetail = (req, res, next) => { @@ -304,14 +304,14 @@ const orderDetail = (req, res, next) => {
304 isCurrFee: true, 304 isCurrFee: true,
305 helpers: { 305 helpers: {
306 isPaymentComplete: function(status, options) { 306 isPaymentComplete: function(status, options) {
307 - if (status === 2) { // 已结清 307 + if (status === 2 || status ===4 || status === 5) { // 已结清/已取消
308 return options.fn(this); 308 return options.fn(this);
309 } 309 }
310 310
311 return options.inverse(this); 311 return options.inverse(this);
312 }, 312 },
313 isPaymentIncomplete: function(status, options) { 313 isPaymentIncomplete: function(status, options) {
314 - if (status !== 2) { // 其他状态 314 + if (status !== 2 && status !== 4 && status !== 5) { // 其他状态
315 return options.fn(this); 315 return options.fn(this);
316 } 316 }
317 317
@@ -46,8 +46,8 @@ repayment.setFee(0); @@ -46,8 +46,8 @@ repayment.setFee(0);
46 */ 46 */
47 $('.status').each(function() { 47 $('.status').each(function() {
48 var text = $(this).text().trim(); 48 var text = $(this).text().trim();
49 - var fade = text.match(/已还款|已退款|已结清|订单取消/) || [];  
50 - var expire = text.match(/逾期/) || []; 49 + var fade = text.match(/已退货|结清|已取消/) || [];
  50 + var expire = text.match(/已逾期/) || [];
51 51
52 if (fade.length > 0) { 52 if (fade.length > 0) {
53 $(this).addClass('faded'); 53 $(this).addClass('faded');