From 8055a5e2e7a078cb361ce7fae8cc6cae9154af0d Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Thu, 3 Jan 2019 11:01:53 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=89=B9=E4=BB=B7=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=3D=E5=B8=82=E5=9C=BA=E6=B4=BB=E5=8A=A8=202=E3=80=81=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E6=8B=85=E4=BF=9D=E7=9A=84=E5=9B=9E=E6=AC=BE=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E5=8F=AF=E8=83=BD=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../approvalDetail/approvalDetail.js              | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

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;
     }