diff --git a/pages/waitForApproval/approvalDetail/approvalDetail.js b/pages/waitForApproval/approvalDetail/approvalDetail.js index e60a499..afadcf2 100644 --- a/pages/waitForApproval/approvalDetail/approvalDetail.js +++ b/pages/waitForApproval/approvalDetail/approvalDetail.js @@ -103,7 +103,7 @@ Page({ case "销售-业务担保": method = businessGuaranteeMethod; break; - case "销售-特价申请": + case "销售-市场活动": method = specialOrderApplyMethod; break; } @@ -144,7 +144,7 @@ Page({ that.businessGuarantee(array, detailInfoTemplate, formTitleTemplate); break; - case "销售-特价申请": + case "销售-市场活动": formTitleTemplate = "specialOrderApplyTitleTemplate"; detailInfoTemplate = "specialOrderApplyTemplate"; that.specialOrderApply(array, detailInfoTemplate, formTitleTemplate); @@ -206,6 +206,11 @@ Page({ // 业务担保数据解析 businessGuarantee: function(result, infoTemplate, titleTemplate) { + var backDate =''; + if (result.CashBackDate) { + backDate =timechage.formatTimeTwo(result.CashBackDate.substring(6, 19), 'Y/M/D h:m') + + } var formTitle = { //返回的订单ID orderID: result.ID, @@ -218,7 +223,7 @@ Page({ // 担保日期 GuaranteeDate: timechage.formatTimeTwo(result.GuaranteeDate.substring(6, 19), 'Y/M/D h:m'), // 承诺回款日期 - CashBackDate: timechage.formatTimeTwo(result.CashBackDate.substring(6, 19), 'Y/M/D h:m'), + CashBackDate: backDate, // 担保金额 GuaranteeMoney: result.GuaranteeMoney, } @@ -346,7 +351,7 @@ Page({ case "销售-业务担保": method = businessGuaranteeForward; break; - case "销售-特价申请": + case "销售-市场活动": method = specialOrderApplyForward; break; } @@ -377,7 +382,7 @@ Page({ case "销售-业务担保": method = businessGuaranteeBackward; break; - case "销售-特价申请": + case "销售-市场活动": method = specialOrderApplyBackward; break; }