From 0efb9608a32203d42aa937b31022384d0dae2830 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Sat, 1 Dec 2018 13:54:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=8D=95=E6=9C=AA=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=B7=B2=E5=AE=A1=E6=A0=B8=20=E6=94=B9=E6=88=90=20?=
 =?UTF-8?q?=E6=9C=AA=E7=A1=AE=E8=AE=A4=E5=B7=B2=E7=A1=AE=E8=AE=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../debitNoteList/debitNoteDetail/debitNoteDetail.js |  2 +-
 pages/debitNoteList/debitNoteList.js                 | 12 ++++++------
 pages/debitNoteList/debitNoteList.wxml               |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pages/debitNoteList/debitNoteDetail/debitNoteDetail.js b/pages/debitNoteList/debitNoteDetail/debitNoteDetail.js
index 0be576e..b873ea4 100644
--- a/pages/debitNoteList/debitNoteDetail/debitNoteDetail.js
+++ b/pages/debitNoteList/debitNoteDetail/debitNoteDetail.js
@@ -18,7 +18,7 @@ Page({
   onLoad: function(options) {
     var that =this;
     let orderID = Number(options.ID);
-    if (options.State == "未审核"){
+    if (options.State == "未确认"){
       that.setData({
         orderState:true,
       });
diff --git a/pages/debitNoteList/debitNoteList.js b/pages/debitNoteList/debitNoteList.js
index 0c342ce..f0d1412 100644
--- a/pages/debitNoteList/debitNoteList.js
+++ b/pages/debitNoteList/debitNoteList.js
@@ -7,7 +7,7 @@ var CheckedPageIndex = 0
 var CheckedPageSize = 10
 var getList = '/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/DebitNoteRpc/GetDebitNoteList'
 
-// 未审核订单列表
+// 未确认订单列表
 function getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, successaction) {
   let getArr = [];
   let method = getList;
@@ -37,7 +37,7 @@ function getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, successact
     for (var i = 0; i < array.length; i++) {
       var dmo = {
   
-        orderState: "未审核",
+        orderState: "未确认",
         ID: array[i].ID,
         Money: array[i].Money,
         Date: timechage.formatTimeTwo(array[i].Date.substring(6, 19), 'Y/M/D'),
@@ -52,7 +52,7 @@ function getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, successact
   })
 }
 
-// 已审核订单列表
+// 已确认订单列表
 function getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize) {
   let getArr = [];
   let method = getList;
@@ -76,7 +76,7 @@ function getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize) {
     for (var i = 0; i < array.length; i++) {
       var dmo = {
         //添加单据状态的传递，在详情页面判断此值，进行是否允许提交的操作
-        orderState: "已审核",
+        orderState: "已确认",
         ID: array[i].ID,
         Money: array[i].Money,
         Date: timechage.formatTimeTwo(array[i].Date.substring(6, 19), 'Y/M/D'),
@@ -156,7 +156,7 @@ Page({
   },
 
 
-  //未审核订单滑动到底部加载
+  //未确认订单滑动到底部加载
   unCheckedScrollLower: function (event) {
     var that = this;
     UnCheckPageIndex = UnCheckPageIndex + 1;
@@ -165,7 +165,7 @@ Page({
     });
   },
 
-  //已审核订单滑动到底部加载
+  //已确认订单滑动到底部加载
   CheckedScrollLower: function (event) {
     var that = this;
     CheckedPageIndex = CheckedPageIndex + 1;
diff --git a/pages/debitNoteList/debitNoteList.wxml b/pages/debitNoteList/debitNoteList.wxml
index 28d4ca0..d1b47e6 100644
--- a/pages/debitNoteList/debitNoteList.wxml
+++ b/pages/debitNoteList/debitNoteList.wxml
@@ -1,11 +1,11 @@
 <!--pages/debitNoteList/debitNoteList.wxml-->
 <view class="swiper-tab">
-  <view class="swiper-tab-list {{currentTab==0 ? 'on' : ''}}" data-current="0" bindtap="swichNav">未审核</view>
-  <view class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" data-current="1" bindtap="swichNav">已审核</view>
+  <view class="swiper-tab-list {{currentTab==0 ? 'on' : ''}}" data-current="0" bindtap="swichNav">未确认</view>
+  <view class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" data-current="1" bindtap="swichNav">已确认</view>
 </view>
 
 <swiper current="{{currentTab}}" class="swiper-box" style='height:{{winHeight -95}}px' duration="300" bindchange="bindChange">
-  <!-- 未审核 -->
+  <!-- 未确认 -->
   <swiper-item class="swiper-items1">
     <scroll-view scroll-x="false" scroll-y="true" class='scroll-views' bindscrolltolower="unCheckedScrollLower">
     <view class='backGroundContainer'>
@@ -15,7 +15,7 @@
     </view>      
     </scroll-view>
   </swiper-item>
-  <!-- 已审核 -->
+  <!-- 已确认 -->
   <swiper-item class="swiper-items2">
     <scroll-view scroll-x="false" scroll-y="true" class='scroll-views' bindscrolltolower="CheckedScrollLower">
     <view class='backGroundContainer'>