From e58101af1b33832a7925acd38615b5a8f3eed244 Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Fri, 30 Nov 2018 13:17:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E4=B8=BA?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=97=B6=EF=BC=8C=E6=AC=A0=E6=AC=BE=E5=8D=95?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=97=A5=E6=9C=9F=20=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../debitNoteDetail/debitNoteDetail.js        | 20 ++++++++-----------
 .../debitNoteDetail/debitNoteDetail.wxml      |  4 ++--
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/pages/debitNoteList/debitNoteDetail/debitNoteDetail.js b/pages/debitNoteList/debitNoteDetail/debitNoteDetail.js
index e001e36..0be576e 100644
--- a/pages/debitNoteList/debitNoteDetail/debitNoteDetail.js
+++ b/pages/debitNoteList/debitNoteDetail/debitNoteDetail.js
@@ -8,19 +8,12 @@ var confirmDebitNote = "/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/DebitNoteRp
 
 Page({
   data: {
-    // ConfirmTime:'',
-    // Customer_Name: '',
-    // Remark: '',
-    // ID: '',
-    // AccountingUnit_Name: '',
-    // Date: '',
-    // Employee_Name: '',
-    // Money: '',
+
     item:{},
     ConfirmTime: '',
     Date: '',
-    orderState:false,
-  },
+    orderState:false
+    },
 
   onLoad: function(options) {
     var that =this;
@@ -32,10 +25,13 @@ Page({
     };
 
     let method = getDebitNoteDetail;
-    let params = ["1"];
+    let params = [orderID];
     network.requestLoading(method, params, function (res) {
       var backDate = timechage.formatTimeTwo(res.result.Date.substring(6, 19), 'Y/M/D');
-      var backConfirmTime = timechage.formatTimeTwo(res.result.ConfirmTime.substring(6, 19), 'Y/M/D');
+      if (res.result.ConfirmTime){
+        var backConfirmTime = timechage.formatTimeTwo(res.result.ConfirmTime.substring(6, 19), 'Y/M/D');
+
+      }
       that.setData({
         item: res.result,
         Date: backDate,
diff --git a/pages/debitNoteList/debitNoteDetail/debitNoteDetail.wxml b/pages/debitNoteList/debitNoteDetail/debitNoteDetail.wxml
index 6e5feb0..d1acb39 100644
--- a/pages/debitNoteList/debitNoteDetail/debitNoteDetail.wxml
+++ b/pages/debitNoteList/debitNoteDetail/debitNoteDetail.wxml
@@ -21,12 +21,12 @@
   </view>
   <view class='lineView'></view>
 
-  <view class='baseitem'>
+  <view class='baseitem' wx:if='{{!orderState}}'>
     <view class='baseitem_key'>确认日期</view>
     <view class='baseitem_value'>{{ConfirmTime}}
     </view>
   </view>
-  <view class='lineView'></view>
+  <view class='lineView' wx:if='{{!orderState}}'></view>
 
   <view class='baseitem'>
     <view class='baseitem_key'>日期</view>