From 69787c79fcd361eb55ad3395355cfc782db6960c Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Fri, 27 Aug 2021 10:14:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/process/order-list/index.wxml   |  6 +++---
 pages/process/order-price/index.wxml  | 10 ++++++----
 pages/process/outside-add/index.wxml  | 13 ++++++-------
 pages/process/outside-list/index.wxml |  2 +-
 pages/process/payment/index.wxml      |  2 +-
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/pages/process/order-list/index.wxml b/pages/process/order-list/index.wxml
index 41788f0..b3051f7 100644
--- a/pages/process/order-list/index.wxml
+++ b/pages/process/order-list/index.wxml
@@ -58,7 +58,7 @@
           </view>
           <view class="flex flex-justify" style="margin-top:12rpx">
             <view class="text-sm text-black" style="margin-left:80rpx">结算金额(元)：</view>
-            <view class="text-sm text-black">{{item.adjustedPrice || '- -'}}</view>
+            <view class="text-sm text-black">{{item.adjustedPrice || item.settlePrice || '- -'}}</view>
           </view>
           <image class="item-icon" src="/assets/image/icon-finish.png" wx:if="{{item.status == 5}}"></image>
           <image class="item-icon" src="/assets/image/icon-delete.png" wx:if="{{item.status == 6}}"></image>
@@ -76,8 +76,8 @@
             bind:click="paymentItem" wx:if="{{item.status == 4 && admin}}">去支付</van-button>
           <van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:200rpx" data-page="{{pageIndex}}" data-index="{{index}}"
             bind:click="paymentItem" wx:if="{{item.status == 42 && admin}}">去结算</van-button>
-          <van-button round type="primary" custom-style="margin-left:24rpx;height:64rpx;width:200rpx" data-id="{{item.id}}"
-            bind:click="loggerItem" wx:if="{{item.status == 6}}">恢复订单</van-button>
+          <!-- <van-button round type="primary" custom-style="margin-left:24rpx;height:64rpx;width:200rpx" data-id="{{item.id}}"
+            bind:click="loggerItem" wx:if="{{item.status == 6}}">恢复订单</van-button> -->
           <van-button round type="default" custom-style="margin-left:24rpx;height:64rpx;width:200rpx" data-id="{{item.id}}"
             bind:click="loggerItem" wx:if="{{item.status == 5 || item.status == 6}}">查看日志</van-button>
         </view>
diff --git a/pages/process/order-price/index.wxml b/pages/process/order-price/index.wxml
index c0de98c..0546793 100644
--- a/pages/process/order-price/index.wxml
+++ b/pages/process/order-price/index.wxml
@@ -32,8 +32,11 @@
 </view>
 <view wx:elif="{{form && step == 2}}">
   <view class="flex flex-center bg-white" style="justify-content: flex-start;padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">
-    <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 class="flex flex-center" style="flex: 1;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>
+    <view class="text-red text-cancel" style="padding:4rpx 0rpx 4rpx 4rpx" bindtap="cancelOrder">取消订单</view>
   </view>
   <van-cell>
     <view slot="title" class="flex flex-justify">
@@ -147,8 +150,7 @@
 </view>
 
 <submit-layout wx:if="{{form && step == 2}}">
-  <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="cancelOrder">取消订单</van-button>
-  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="priceOrder">提交订单</van-button>
+  <van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="priceOrder">提交订单</van-button>
 </submit-layout>
 
 <van-dialog id="van-dialog" />
diff --git a/pages/process/outside-add/index.wxml b/pages/process/outside-add/index.wxml
index 0cf6645..26c24a7 100644
--- a/pages/process/outside-add/index.wxml
+++ b/pages/process/outside-add/index.wxml
@@ -4,8 +4,11 @@
 </cu-custom>
 
 <view class="flex flex-center bg-white" style="justify-content: flex-start;padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">
-  <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 class="flex flex-center" style="flex: 1;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>
+  <view class="text-red text-cancel" style="padding:4rpx 0rpx 4rpx 4rpx" bindtap="cancelOrder" wx:if="{{form.scrapPaperReceiptId}}">取消订单</view>
 </view>
 <van-cell clickable center is-link bind:click="chooseCustomer">
   <view slot="title" class="flex flex-justify">
@@ -83,11 +86,7 @@
 </scroll-view>
 
 <view style="height:16rpx"></view>
-<submit-layout wx:if="{{form.scrapPaperReceiptId}}">
-  <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="cancelOrder">取消订单</van-button>
-  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="submitForm">提交订单</van-button>
-</submit-layout>
-<submit-layout wx:else>
+<submit-layout>
   <van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="submitForm">提交订单</van-button>
 </submit-layout>
 
diff --git a/pages/process/outside-list/index.wxml b/pages/process/outside-list/index.wxml
index 6ea8081..0853c35 100644
--- a/pages/process/outside-list/index.wxml
+++ b/pages/process/outside-list/index.wxml
@@ -54,7 +54,7 @@
           </view>
           <view class="flex flex-justify" style="margin-top:12rpx">
             <view class="text-sm text-black" style="margin-left:80rpx">结算金额(元)：</view>
-            <view class="text-sm text-black">{{item.adjustedPrice || '- -'}}</view>
+            <view class="text-sm text-black">{{item.adjustedPrice || item.settlePrice || '- -'}}</view>
           </view>
           <image class="item-icon" src="/assets/image/icon-finish.png" wx:if="{{item.orderStatus == 5}}"></image>
           <image class="item-icon" src="/assets/image/icon-delete.png" wx:if="{{item.orderStatus == 6}}"></image>
diff --git a/pages/process/payment/index.wxml b/pages/process/payment/index.wxml
index e4ad59b..dddddd5 100644
--- a/pages/process/payment/index.wxml
+++ b/pages/process/payment/index.wxml
@@ -61,7 +61,7 @@
       <view class="text-sm text-gray" style="line-height:54rpx">
         <text>品类：{{item.productName}}</text>
         <text style="margin-left:24rpx">重量：{{item.settleWeight}}公斤</text>
-        <text style="margin-left:24rpx">金额：{{formate.formateAmount(item.adjustedPrice, 2)}}元</text>
+        <text style="margin-left:24rpx">金额：{{formate.formateAmount(item.adjustedPrice || item.settlePrice, 2)}}元</text>
       </view>
     </view>
   </view>