From c84dbc705acac2ff3a2fefe919c1d0ec26916403 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Mon, 19 Jul 2021 20:15:34 +0800
Subject: [PATCH] no message

---
 pages/process/order-info/index.js   |  8 ++++++++
 pages/process/outside-info/index.js |  7 +++++++
 pages/process/template/index.wxml   | 32 ++++++++++++++++++++++-------
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/pages/process/order-info/index.js b/pages/process/order-info/index.js
index 14f66b4..bfa4296 100644
--- a/pages/process/order-info/index.js
+++ b/pages/process/order-info/index.js
@@ -3,6 +3,7 @@ import Scene from '../../index/scene'
 import Dialog from '../../../components/dialog/dialog'
 import { cancelOrder, repeatOrder, getFactoryOrderInfo, checkingOrder, printOrder} from "../../../api/saas"
 const event = require('../../../utils/event')
+const math = require('../../../utils/math')
 const util = require('../../../utils/util')
 const app = getApp()
 
@@ -42,6 +43,13 @@ Scene({
       } else if(result.data.status == 5){
         this.data.title = '已完成'
       }
+      if(result.data.paymentOrderInfo.receivablePrice){
+        if(result.data.paymentOrderInfo.paidPrice){
+          result.data.paymentOrderInfo.lessPrice = math.minus(result.data.paymentOrderInfo.receivablePrice, result.data.paymentOrderInfo.paidPrice)
+        } else {
+          result.data.paymentOrderInfo.lessPrice = 0.00
+        }
+      }
       this.setData({ 
         safeBottom: app.globalData.safeBottom, 
         form: result.data, 
diff --git a/pages/process/outside-info/index.js b/pages/process/outside-info/index.js
index 7c64843..2b7b526 100644
--- a/pages/process/outside-info/index.js
+++ b/pages/process/outside-info/index.js
@@ -62,6 +62,13 @@ Scene({
           imageList.push({url: result.data.orderImageList[index]})
         }
       }
+      if(result.data.paymentOrderInfo.receivablePrice){
+        if(result.data.paymentOrderInfo.paidPrice){
+          result.data.paymentOrderInfo.lessPrice = math.minus(result.data.paymentOrderInfo.receivablePrice, result.data.paymentOrderInfo.paidPrice)
+        } else {
+          result.data.paymentOrderInfo.lessPrice = 0.00
+        }
+      }
       this.setData({ form: result.data, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0, agent: this.data.agent, imageList,safeBottom: app.globalData.safeBottom })
     }).catch(err => {
       wx.hideLoading()
diff --git a/pages/process/template/index.wxml b/pages/process/template/index.wxml
index 5044452..ce1fa30 100644
--- a/pages/process/template/index.wxml
+++ b/pages/process/template/index.wxml
@@ -11,8 +11,26 @@
       </view>
       <view class="text-black text-sg text-bold" style="margin-left: 12rpx">代收结算信息</view>
     </view>
-    <view class="text-sg" style="margin-left:12rpx">{{agentStatus(form.paymentOrderInfo)}}</view>
+    <view class="text-sg text-blue">{{agentStatus(form.paymentOrderInfo)}}</view>
   </view>
+  <van-cell>
+    <view slot="title" class="flex flex-justify">
+      <view class="text-black">应付总金额(元)</view>
+      <view class="text-gray">{{form.paymentOrderInfo.receivablePrice}}</view>
+    </view>
+  </van-cell>
+  <van-cell>
+    <view slot="title" class="flex flex-justify" wx:if="{{form.paymentOrderInfo.paidPrice}}">
+      <view class="text-black">已付金额(元)</view>
+      <view class="text-gray">{{form.paymentOrderInfo.paidPrice}}</view>
+    </view>
+  </van-cell>
+  <van-cell>
+    <view slot="title" class="flex flex-justify" wx:if="{{form.paymentOrderInfo.lessPrice}}">
+      <view class="text-black">待付金额(元)</view>
+      <view class="text-gray">{{form.paymentOrderInfo.lessPrice}}</view>
+    </view>
+  </van-cell>
   <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">结算方式</view>
@@ -61,12 +79,6 @@
       <view class="text-gray">{{formate.formateAmount(form.paymentOrderInfo.totalPrice, 2)}}</view>
     </view>
   </van-cell>
-  <van-cell>
-    <view slot="title" class="flex flex-justify">
-      <view class="text-black">应付总金额(元)</view>
-      <view class="text-gray">{{form.paymentOrderInfo.receivablePrice}}</view>
-    </view>
-  </van-cell>
   <view style="height:16rpx"></view>
   <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%);">
@@ -85,6 +97,12 @@
       return '待还款'
     } else if(paymentOrderInfo.receivableStatus == 1) {
       return '已还款'
+    } else if(paymentOrderInfo.lessPrice > 0) {
+      return '部分还款'
+    } else if(paymentOrderInfo.paidPrice > 0 && paymentOrderInfo.lessPrice == 0) {
+      return '已还款'
+    } else if(paymentOrderInfo.paidPrice <= 0) {
+      return '待还款'
     }
     return ''
 	}