From 27fce794c424640252e63d6ca7af7d388b947fc0 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 21 Jul 2021 19:46:23 +0800
Subject: [PATCH] no message

---
 pages/process/agent-list/index.js   | 4 ++--
 pages/process/order-info/index.js   | 7 +++++++
 pages/process/outside-info/index.js | 7 +++++++
 pages/process/template/index.wxml   | 2 ++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pages/process/agent-list/index.js b/pages/process/agent-list/index.js
index 45434dd..4151cd9 100644
--- a/pages/process/agent-list/index.js
+++ b/pages/process/agent-list/index.js
@@ -92,9 +92,9 @@ Scene({
   lookItem: function (e) {
     var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
     if(item.orderType == 1){
-      wx.navigateTo({ url: `/pages/process/order-info/index?agent=1&id=${item.orderId}` })
+      wx.navigateTo({ url: `/pages/process/order-info/index?agent=1&id=${item.orderId}&status=${item.status}` })
     } else {
-      wx.navigateTo({ url: `/pages/process/outside-info/index?agent=1&id=${item.orderId}` })
+      wx.navigateTo({ url: `/pages/process/outside-info/index?agent=1&id=${item.orderId}&status=${item.status}` })
     }
     
   }
diff --git a/pages/process/order-info/index.js b/pages/process/order-info/index.js
index bfa4296..f585b32 100644
--- a/pages/process/order-info/index.js
+++ b/pages/process/order-info/index.js
@@ -13,6 +13,7 @@ Scene({
    */
   data: {
     safeBottom: app.globalData.safeBottom,
+    status: 0,
     form: null,
     agent: 0,
     title: '过磅详情'
@@ -24,6 +25,9 @@ Scene({
     if(options.agent){
       this.data.agent = Number(options.agent)
     }
+    if(options.status){
+      this.data.status = Number(options.status)
+    }
     if(options.id){
       this.fetchOrderInfo(options.id)
     }
@@ -43,6 +47,9 @@ Scene({
       } else if(result.data.status == 5){
         this.data.title = '已完成'
       }
+      if(this.data.status || this.data.status == 0){
+        result.data.paymentOrderInfo.receivableStatus = this.data.status
+      }
       if(result.data.paymentOrderInfo.receivablePrice){
         if(result.data.paymentOrderInfo.paidPrice){
           result.data.paymentOrderInfo.lessPrice = math.minus(result.data.paymentOrderInfo.receivablePrice, result.data.paymentOrderInfo.paidPrice)
diff --git a/pages/process/outside-info/index.js b/pages/process/outside-info/index.js
index 2b7b526..0e6f87f 100644
--- a/pages/process/outside-info/index.js
+++ b/pages/process/outside-info/index.js
@@ -13,6 +13,7 @@ Scene({
    */
   data: {
     safeBottom: app.globalData.safeBottom,
+    status: null,
     agent: 0,
     id: null,
     form: null,
@@ -29,6 +30,9 @@ Scene({
     if(options.agent){
       this.data.agent = Number(options.agent)
     }
+    if(options.status){
+      this.data.status = Number(options.status)
+    }
     event.on('OrderMessage', this, this.onEvent)
   },
   onEvent: function(message){
@@ -62,6 +66,9 @@ Scene({
           imageList.push({url: result.data.orderImageList[index]})
         }
       }
+      if(this.data.status || this.data.status == 0){
+        result.data.paymentOrderInfo.receivableStatus = this.data.status
+      }
       if(result.data.paymentOrderInfo.receivablePrice){
         if(result.data.paymentOrderInfo.paidPrice){
           result.data.paymentOrderInfo.lessPrice = math.minus(result.data.paymentOrderInfo.receivablePrice, result.data.paymentOrderInfo.paidPrice)
diff --git a/pages/process/template/index.wxml b/pages/process/template/index.wxml
index b00331f..d35686f 100644
--- a/pages/process/template/index.wxml
+++ b/pages/process/template/index.wxml
@@ -113,6 +113,8 @@
       return '待还款'
     } else if(paymentOrderInfo.receivableStatus == 1) {
       return '已还款'
+    }  else if(paymentOrderInfo.receivableStatus == 2) {
+      return '部分还款'
     } else if(paymentOrderInfo.lessPrice > 0) {
       return '部分还款'
     } else if(paymentOrderInfo.paidPrice > 0 && paymentOrderInfo.lessPrice == 0) {