From 13466b2b9879c58d3eb4de93be498c257aa8e4ba Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Fri, 27 Aug 2021 16:06:42 +0800
Subject: [PATCH] no message

---
 pages/storage/order-info/index.wxml       | 18 +++++++++---------
 pages/storage/order-settlement/index.wxml |  5 ++---
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pages/storage/order-info/index.wxml b/pages/storage/order-info/index.wxml
index 70aa625..3727c32 100644
--- a/pages/storage/order-info/index.wxml
+++ b/pages/storage/order-info/index.wxml
@@ -69,13 +69,13 @@
         <view style="height:30rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
         <view class="text-black text-sg text-bold" style="margin-left: 12rpx">过磅信息</view>
       </view>
-      <van-cell wx:if="{{poundInfo.firstWeight}}" border="{{false}}">
+      <van-cell border="{{false}}">
         <view slot="title" class="flex flex-justify">
           <view class="text-black">第一次过磅（皮重）</view>
           <view class="text-gray">重量（公斤）：{{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>
         </view>
       </van-cell>
-      <view class="bg-white flex flex-justify" style="padding:{{poundInfo.firstWeight ? 0 : 24}}rpx 32rpx 0rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}">
+      <view class="bg-white flex flex-justify" style="padding: 0rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}">
         <van-image wx:for="{{poundInfo.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
           data-url="{{item}}" fit="cover" data-type="0" src="{{item}}" bind:click="viewImage">
           <view class="image-load" slot="loading">
@@ -83,14 +83,13 @@
           </view>
         </van-image>
       </view>
-      <view class="van-hairline--top" style="height:1px;margin-top: 24rpx;margin-left: 24rpx" wx:if="{{poundInfo.secondWeight}}"></view>
-      <van-cell wx:if="{{poundInfo.secondWeight}}" border="{{false}}">
+      <van-cell border="{{false}}">
         <view slot="title" class="flex flex-justify">
           <view class="text-black">第二次过磅（毛重）</view>
           <view class="text-gray">重量（公斤）：{{formate.maxWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>
         </view>
       </van-cell>
-      <view class="bg-white flex flex-justify" style="padding:{{poundInfo.secondWeight ? 0 : 24}}rpx 32rpx 0rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}">
+      <view class="bg-white flex flex-justify" style="padding: 0rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}">
         <van-image wx:for="{{poundInfo.totalWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
           data-url="{{item}}" fit="cover" data-type="1" src="{{item}}" bind:click="viewImage">
           <view class="image-load" slot="loading">
@@ -238,18 +237,19 @@
       </van-cell>
       <!-- <van-field label="备注" type="textarea" input-align="right" readonly autosize border="{{ false }}" /> -->
     </van-collapse-item>
+    <view class="margin-top"></view>
     <van-collapse-item content-class="collapse-item" name="1">
       <view slot="title" class="flex flex-center" style="justify-content: flex-start;">
         <view style="height:30rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
         <view class="text-black text-sg text-bold" style="margin-left: 12rpx">过磅信息</view>
       </view>
-      <van-cell border="{{false}}" wx:if="{{poundInfo.firstWeight}}">
+      <van-cell border="{{false}}">
         <view slot="title" class="flex flex-justify">
           <view class="text-black">第一次过磅（皮重）</view>
           <view class="text-gray">重量（公斤）：{{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>
         </view>
       </van-cell>
-      <view class="bg-white flex flex-justify" style="padding:{{poundInfo.firstWeight ? 0 : 24}}rpx 32rpx 0rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}">
+      <view class="bg-white flex flex-justify" style="padding: 0rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}">
         <van-image wx:for="{{poundInfo.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
           data-url="{{item}}" fit="cover" data-type="0" src="{{item}}" bind:click="viewImage">
           <view class="image-load" slot="loading">
@@ -257,13 +257,13 @@
           </view>
         </van-image>
       </view>
-      <van-cell wx:if="{{poundInfo.secondWeight}}" border="{{false}}">
+      <van-cell border="{{false}}">
         <view slot="title" class="flex flex-justify">
           <view class="text-black">第二次过磅（毛重）</view>
           <view class="text-gray">重量（公斤）：{{formate.maxWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>
         </view>
       </van-cell>
-      <view class="bg-white flex flex-justify" style="padding: {{poundInfo.secondWeight ? 0 : 24}}rpx 32rpx 0rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}">
+      <view class="bg-white flex flex-justify" style="padding: 0rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}">
         <van-image wx:for="{{poundInfo.totalWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
           data-url="{{item}}" fit="cover" data-type="1" src="{{item}}" bind:click="viewImage">
           <view class="image-load" slot="loading">
diff --git a/pages/storage/order-settlement/index.wxml b/pages/storage/order-settlement/index.wxml
index 163fafc..89988aa 100644
--- a/pages/storage/order-settlement/index.wxml
+++ b/pages/storage/order-settlement/index.wxml
@@ -101,7 +101,7 @@
       <view style="height:30rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
       <view class="text-black text-sg text-bold" style="margin-left: 12rpx">过磅信息</view>
     </view>
-    <van-cell wx:if="{{poundInfo.firstWeight}}"  border="{{false}}">
+    <van-cell  border="{{false}}">
       <view slot="title" class="flex flex-justify">
         <view class="text-black">第一次过磅（皮重）</view>
         <view class="text-gray">重量（公斤）：{{formate.minWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>
@@ -115,8 +115,7 @@
         </view>
       </van-image>
     </view>
-    <view class="van-hairline--top" style="height:1px;margin-top: 24rpx;margin-left: 24rpx" wx:if="{{poundInfo.secondWeight}}"></view>
-    <van-cell wx:if="{{poundInfo.secondWeight}}" border="{{false}}">
+    <van-cell border="{{false}}">
       <view slot="title" class="flex flex-justify">
         <view class="text-black">第二次过磅（毛重）</view>
         <view class="text-gray">重量（公斤）：{{formate.maxWeight(poundInfo.firstWeight, poundInfo.secondWeight)}}</view>