From 17dec7ee819289f25ab63fe44c2459a12bb4397e Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Tue, 9 Mar 2021 22:14:54 +0800
Subject: [PATCH] no message

---
 pages/agent/detail/index.js   | 3 +++
 pages/agent/detail/index.wxml | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pages/agent/detail/index.js b/pages/agent/detail/index.js
index 6a40987..65c4f45 100644
--- a/pages/agent/detail/index.js
+++ b/pages/agent/detail/index.js
@@ -38,6 +38,9 @@ Page({
           }
           this.data.cancel = false
         }
+        if(element.activityOrderAuditPassNum == 2){
+          element.finalSettlePrice = math.plus(element.finalPayMoney, element.preSettleMoney)
+        }
       }
       this.setData({orderInfo: result.data, safeBottom: app.globalData.safeBottom, cancel: this.data.cancel })
       wx.hideLoading()
diff --git a/pages/agent/detail/index.wxml b/pages/agent/detail/index.wxml
index c714fbc..c725851 100644
--- a/pages/agent/detail/index.wxml
+++ b/pages/agent/detail/index.wxml
@@ -126,7 +126,7 @@
 		   </view>
 		   <view class="flex text-sg" style="justify-content: flex-end;margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx">
 		      <text class="text-black text-bold">总收款金额：</text>
-		      <text style="color:#F5222D">{{formate.formateAmount(item.settlePrice)}}元</text>
+		      <text style="color:#F5222D">{{formate.formateAmount(item.finalSettlePrice)}}元</text>
 		    </view>
 	  	</view>
 	  </view>
@@ -159,7 +159,7 @@
 		</view>
 	</view>
 
-	<view class="bg-white margin-top" style="padding:24rpx 30rpx">
+	<view class="bg-white margin-top" style="padding:24rpx 30rpx" wx:if="{{orderInfo.millSupplierId}}">
 		<view class="text-df text-gray" style="border-bottom:2rpx solid #f3f3f3;padding-bottom:24rpx">送货信息</view>
 		<view class="flex flex-justify text-sg" style="margin-top:20rpx">
 			<text class="text-black">纸厂开户账号</text>
@@ -435,9 +435,9 @@
 </view>
 <view style="height:16rpx"></view>
 
-<view style="height:{{116 + safeBottom}}rpx;" wx:if="{{orderInfo && cancel && (orderInfo.status == 50 || orderInfo.status == 51)}}"></view>
+<view style="height:{{116 + safeBottom}}rpx;" wx:if="{{orderInfo && ((cancel && orderInfo.status == 51) || orderInfo.status == 50)}}"></view>
 <view class="cu-bar bg-white foot flex flex-center" style="height:{{100 + safeBottom}}rpx;padding: 32rpx 32rpx {{safeBottom + 32}}rpx 32rpx;justify-content: flex-end"
-	wx:if="{{orderInfo && cancel && (orderInfo.status == 50 || orderInfo.status == 51)}}">
+	wx:if="{{orderInfo && ((cancel && orderInfo.status == 51) || orderInfo.status == 50)}}">
 	<wux-button outline style="margin-right:24rpx" type="assertive" size="small" bind:click="refuseOrder" wx:if="{{orderInfo.status == 51}}">更改预约</wux-button>
 	<wux-button outline type="stable" size="small" bind:click="cancelOrder" wx:if="{{orderInfo.status == 50 || orderInfo.status == 51}}">取消订单</wux-button>
 </view>