From a0fb5dcea1dd0c7721b20d01d95632713b0fd475 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Mon, 24 May 2021 11:52:38 +0800
Subject: [PATCH] no message

---
 pages/process/order-info/index.wxml | 10 +++++-----
 pages/process/order-list/index.wxml | 11 +++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml
index e1ac6ec..f31a09d 100644
--- a/pages/process/order-info/index.wxml
+++ b/pages/process/order-info/index.wxml
@@ -51,7 +51,7 @@
   <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">废纸品类</view>
-      <view class="text-gray">{{form.productName}}</view>
+      <view class="text-gray">{{form.productName || '- -'}}</view>
     </view>
   </van-cell>
   <van-cell>
@@ -75,7 +75,7 @@
   <van-cell wx:if="{{form.deductWeight}}">
     <view slot="title" class="flex flex-justify">
       <view class="text-black">扣重(公斤)</view>
-      <view class="text-gray">-{{form.deductWeight}}</view>
+      <view class="text-gray">-{{form.deductWeight }}</view>
     </view>
   </van-cell>
   <van-cell wx:if="{{form.deductPercent}}">
@@ -87,16 +87,16 @@
   <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">定价员</view>
-      <view class="text-gray">{{form.inspectionPerson || ''}}</view>
+      <view class="text-gray">{{form.inspectionPerson || '- -'}}</view>
     </view>
   </van-cell>
   <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">定价时间</view>
-      <view class="text-gray">{{form.inspectionTime || ''}}</view>
+      <view class="text-gray">{{form.inspectionTime || '- -'}}</view>
     </view>
   </van-cell>
-  <van-cell>
+  <van-cell wx:if="{{form.totalWeighingPicture && form.totalWeighingPicture.length}}">
     <view slot="title" class="text-black">
       <view>过毛重照片</view>
       <view class="flex" style="margin-top:18rpx">
diff --git a/pages/process/order-list/index.wxml b/pages/process/order-list/index.wxml
index a371a76..662e1ff 100644
--- a/pages/process/order-list/index.wxml
+++ b/pages/process/order-list/index.wxml
@@ -65,10 +65,13 @@
               <view class="text-df text-gray" wx:elif="{{item.status == 6}}">已关闭</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 class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.status == 6}}">
+            <view class="text-sm text-gray">过磅时间：{{item.createTime || ''}}</view>
+          </view>
+          <view class="flex flex-justify" style="margin-top:12rpx" wx:else>
+            <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>