From 2a228df9ce3e558cc04e50585916e007a23557ad Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 31 Mar 2021 10:56:03 +0800
Subject: [PATCH] no message

---
 pages/process/agent-list/index.wxml |  2 +-
 pages/process/check-list/index.wxml | 16 +++---
 pages/process/index/index.js        |  2 +
 pages/process/index/index.wxml      |  2 +-
 pages/process/order-list/index.js   |  3 +-
 pages/process/order-list/index.wxml | 83 ++++++++++++++++-------------
 6 files changed, 60 insertions(+), 48 deletions(-)

diff --git a/pages/process/agent-list/index.wxml b/pages/process/agent-list/index.wxml
index cebcbc2..0fe5ce1 100644
--- a/pages/process/agent-list/index.wxml
+++ b/pages/process/agent-list/index.wxml
@@ -24,7 +24,7 @@
         <view class="flex flex-justify">
           <text class="text-sg text-black">客户名称：{{item.customerPersonName}}</text>
           <view class="flex" >
-            <van-tag plain round type="danger" wx:if="{{item.status == 0 && item.periodStatus == 2}}">已逾期</van-tag>
+            <van-tag plain round type="danger" wx:if="{{item.status == 0 && item.isOverdue == 1}}">已逾期</van-tag>
             <view class="text-df" style="color:#FA541C;margin-left:12rpx" wx:if="{{item.status == 0}}">待还款</view>
             <view class="text-df" style="color:#028A00;margin-left:12rpx" wx:if="{{item.status == 1}}">已还款</view>
           </view>
diff --git a/pages/process/check-list/index.wxml b/pages/process/check-list/index.wxml
index 54ffb29..d94e53a 100644
--- a/pages/process/check-list/index.wxml
+++ b/pages/process/check-list/index.wxml
@@ -22,7 +22,15 @@
             <text>客户名称：{{item.factoryCustomerName}}</text>
             <text wx:if="{{item.status != 1 && item.factoryCustomerMobile}}">({{item.factoryCustomerMobile}})</text>
           </view>
-          <view class="text-sm text-gray" style="margin-top:12rpx">毛重：{{item.totalWeight}}公斤</view>
+          <view class="text-sm text-gray" style="margin-top:12rpx" wx:if="{{item.status == 1}}">毛重：{{item.totalWeight}}公斤</view>
+          <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.status == 2}}">
+            <view class="text-sm text-gray">品类：{{item.productName}}</view>
+            <view class="text-sm text-gray">毛重：{{item.totalWeight}}公斤</view>
+          </view>
+          <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.status == 3}}">
+            <view class="text-sm text-gray">品类：{{item.productName}}</view>
+            <view class="text-sm text-gray">金额：{{item.settlePrice}}元</view>
+          </view>
         </view>
         <view class="flex flex-center" wx:if="{{item.status == 1}}" style="height: 88rpx">
           <van-button plain type="default" custom-style="height:64rpx;width:132rpx" data-id="{{item.id}}"
@@ -34,12 +42,6 @@
           <van-button plain type="info" custom-style="height:64rpx;width:132rpx" data-id="{{item.id}}"
             bind:click="checkOrder">审核</van-button>
         </view>
-        <view class="flex flex-center" wx:if="{{item.status == 4}}">
-          <view class="text-df" style="color:#FA541C">待付款</view>
-        </view>
-        <view class="flex flex-center" wx:if="{{item.status == 5}}">
-          <view class="text-df" style="color:#028A00">已完成</view>
-        </view>
       </view>
     </view>
   </view>
diff --git a/pages/process/index/index.js b/pages/process/index/index.js
index 8cbf016..2a5c175 100644
--- a/pages/process/index/index.js
+++ b/pages/process/index/index.js
@@ -77,6 +77,8 @@ Component({
       } 
       if(e.currentTarget.dataset.status == 3){
         wx.navigateTo({ url: '/pages/process/payment-list/index?status=' + e.currentTarget.dataset.status })
+      } else if(e.currentTarget.dataset.status == 4){
+        wx.navigateTo({ url: '/pages/process/order-list/index?status=' + e.currentTarget.dataset.status })
       } else {
         wx.navigateTo({ url: '/pages/process/check-list/index?status=' + e.currentTarget.dataset.status })
       }
diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml
index 94fe81b..a7ce6e0 100644
--- a/pages/process/index/index.wxml
+++ b/pages/process/index/index.wxml
@@ -18,7 +18,7 @@
         <view class="text-black text-sg text-bold">收货统计</view>
         <view class="flex flex-center" bindtap="showSheet">
           <view class="text-black text-sm" style="margin-right:8rpx">今日</view>
-          <van-icon name="arrow-down" />
+          <!-- <van-icon name="arrow-down" /> -->
         </view>
       </view>
       <view class="flex" style="padding:0rpx 0rpx 24rpx 0rpx">
diff --git a/pages/process/order-list/index.js b/pages/process/order-list/index.js
index 809fd18..f762b82 100644
--- a/pages/process/order-list/index.js
+++ b/pages/process/order-list/index.js
@@ -49,12 +49,13 @@ Page({
         this.data.title = '已完成订单'
         this.data.form.funcType = 6
         this.data.form.status = 5
+        this.data.tabIndex = 7
       } else if(this.data.form.funcType == 5){
         this.data.title = '已关闭订单'
       }
     }
     event.on('OrderMessage', this, this.onEvent)
-    this.setData({ height: app.globalData.fragmentHeight - 90, title: this.data.title })
+    this.setData({ height: app.globalData.fragmentHeight - 90, title: this.data.title, tabIndex: this.data.tabIndex })
     this.fetchOrderList()
   },
   onEvent: function(message){
diff --git a/pages/process/order-list/index.wxml b/pages/process/order-list/index.wxml
index 8df370f..2f06168 100644
--- a/pages/process/order-list/index.wxml
+++ b/pages/process/order-list/index.wxml
@@ -20,48 +20,55 @@
       <view style="background-color:#f3f3f3;" wx:if="{{item.tipsTime}}">
         <text class="text-sg" style="line-height:64rpx;padding-left:32rpx">{{item.tipsTime}}</text>
       </view>
-      <view class="flex flex-justify item-content" data-page="{{pageIndex}}" data-index="{{index}}" bindtap="lookItem">
-        <view style="height: 88rpx">
-          <view class="flex flex-center text-sg text-black">
-            <text>客户名称：{{item.factoryCustomerName}}</text>
-            <text wx:if="{{item.status != 1 && item.factoryCustomerMobile}}">({{item.factoryCustomerMobile}})</text>
+      <view class="item-content" data-page="{{pageIndex}}" data-index="{{index}}" bindtap="lookItem">
+        <view class="flex flex-justify" wx:if="{{item.status == 1 || item.status == 2  || item.status == 3}}">
+          <view style="height: 88rpx">
+            <view class="flex flex-center text-sg text-black">
+              <text>客户名称：{{item.factoryCustomerName}}</text>
+              <text wx:if="{{item.status != 1 && item.factoryCustomerMobile}}">({{item.factoryCustomerMobile}})</text>
+            </view>
+            <view class="text-sm text-gray" style="margin-top:12rpx" wx:if="{{item.status == 1}}">毛重：{{item.totalWeight}}公斤</view>
+            <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.status == 2}}">
+              <view class="text-sm text-gray">品类：{{item.productName}}</view>
+              <view class="text-sm text-gray">毛重：{{item.totalWeight}}公斤</view>
+            </view>
+            <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.status == 3}}">
+              <view class="text-sm text-gray">品类：{{item.productName}}</view>
+              <view class="text-sm text-gray">金额：{{item.settlePrice}}元</view>
+            </view>
           </view>
-          <view class="text-sm text-gray" style="margin-top:12rpx" wx:if="{{item.status == 1}}">毛重：{{item.totalWeight}}公斤</view>
-          <view class="flex flex-justify" style="margin-top:12rpx" wx:elif="{{item.status == 2}}">
-            <text class="text-sm text-gray">品类：{{item.productName}}</text>
-            <text class="text-sm text-gray"></text>
-            <text class="text-sm text-gray"></text>
+          <view class="flex flex-center" wx:if="{{item.status == 1}}" style="height: 88rpx">
+            <van-button plain type="default" custom-style="height:64rpx;width:132rpx" data-id="{{item.id}}"
+              bind:click="cancelOrder">取消</van-button>
+            <van-button plain type="info" custom-style="margin-left:24rpx;height:64rpx;width:132rpx" data-id="{{item.id}}"
+              bind:click="priceOrder">定价</van-button>
           </view>
-          <view class="flex flex-justify" style="margin-top:12rpx" wx:else>
-            <text class="text-sm text-gray">品类：{{item.productName}}</text>
-            <text class="text-sm text-gray"></text>
-            <text class="text-sm text-gray"></text>
+          <view class="flex flex-center" wx:elif="{{item.status ==2}}">
+            <view class="text-df text-black">待过皮重</view>
+          </view>
+          <view class="flex flex-center" wx:if="{{item.status == 3}}" style="height: 88rpx">
+            <van-button plain type="info" custom-style="height:64rpx;width:132rpx" data-id="{{item.id}}"
+              bind:click="checkOrder">审核</van-button>
           </view>
         </view>
-        <view class="flex flex-center" wx:if="{{item.status == 1}}" style="height: 88rpx">
-          <van-button plain type="default" custom-style="height:64rpx;width:132rpx" data-id="{{item.id}}"
-            bind:click="cancelOrder">取消</van-button>
-          <van-button plain type="info" custom-style="margin-left:24rpx;height:64rpx;width:132rpx" data-id="{{item.id}}"
-            bind:click="priceOrder">定价</van-button>
-        </view>
-        <view class="flex flex-center" wx:if="{{item.status == 3}}" style="height: 88rpx">
-          <van-button plain type="info" custom-style="height:64rpx;width:132rpx" data-id="{{item.id}}"
-            bind:click="checkOrder">审核</van-button>
-        </view>
-        <view class="flex flex-center" wx:elif="{{item.status ==2}}">
-          <view class="text-df text-black">待过皮重</view>
-        </view>
-        <view class="flex flex-center" wx:elif="{{item.status == 4}}">
-          <view class="text-df" style="color:#FA541C">待付款</view>
-        </view>
-        <view class="flex flex-center" wx:elif="{{item.status == 41}}">
-          <view class="text-df" style="color:#028A00">代付中</view>
-        </view>
-        <view class="flex flex-center" wx:elif="{{item.status == 42}}">
-          <view class="text-df" style="color:#028A00">待结算</view>
-        </view>
-        <view class="flex flex-center" wx:elif="{{item.status == 5}}">
-          <view class="text-df" style="color:#028A00">已完成</view>
+        <view wx:else>
+          <view class="flex flex-justify">
+            <view class="flex flex-center">
+              <text>客户名称：{{item.factoryCustomerName}}</text>
+              <text wx:if="{{item.factoryCustomerMobile}}">({{item.factoryCustomerMobile}})</text>
+            </view>
+            <view class="flex" >
+              <view class="text-df" style="color:#FA541C" wx:if="{{item.status == 4}}">待付款</view>
+              <view class="text-df" style="color:#028A00" wx:elif="{{item.status == 41}}">代付中</view>
+              <view class="text-df" style="color:#028A00" wx:elif="{{item.status == 42}}">待结算</view>
+              <view class="text-df" style="color:#028A00" wx:elif="{{item.status == 5}}">已完成</view>
+            </view>
+          </view>
+          <view class="flex flex-justify" style="margin-top:12rpx">
+            <view class="text-sm text-gray">品类：{{item.productName}}</view>
+            <view class="text-sm text-gray">重量：{{item.settleWeight}}公斤</view>
+            <view class="text-sm text-gray">金额：{{item.settlePrice}}元</view>
+          </view>
         </view>
       </view>
     </view>