From 1b443163d5b3e9ef493fa864ea9789ed2aae40fd Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 6 May 2021 20:41:36 +0800
Subject: [PATCH] no message

---
 pages/agent/order-list/index.js   | 8 --------
 pages/storage/order-info/index.js | 8 +++++++-
 pages/storage/order-list/index.js | 4 ++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pages/agent/order-list/index.js b/pages/agent/order-list/index.js
index 7e88725..071930d 100644
--- a/pages/agent/order-list/index.js
+++ b/pages/agent/order-list/index.js
@@ -93,14 +93,6 @@ Scene({
       this.refresh.setRefresh(false)
     })
   },
-  lookItem: function (e) {
-    var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
-    if(item.status == 1){
-      wx.navigateTo({ url: `/pages/storage/order-settlement/index?id=${item.weightNoteId}` })
-    } else [
-      wx.navigateTo({ url: `/pages/storage/order-info/index?id=${item.weightNoteId}` })
-    ]
-  },
   onUnload: function(){
     event.remove('OrderMessage', this)
   }
diff --git a/pages/storage/order-info/index.js b/pages/storage/order-info/index.js
index aeb3af5..c537e8b 100644
--- a/pages/storage/order-info/index.js
+++ b/pages/storage/order-info/index.js
@@ -67,12 +67,18 @@ Scene({
               this.data.auditable = true
             }
           }
+          var activeNames = ['1']
+          if(result.data.outboundDeliveryOrder.status == 2){
+            activeNames = ['2']
+          } else if(result.data.outboundDeliveryOrder.status == 3){
+            activeNames = ['2', '1']
+          }
           this.setData({ 
             safeBottom: app.globalData.safeBottom, 
             poundInfo: result.data.weightNote, 
             orderInfo: result.data.outboundDeliveryOrder,
             auditable: this.data.auditable,
-            activeNames: result.data.outboundDeliveryOrder.status >= 2 ? ['2'] : ['1']
+            activeNames: activeNames
           })
         }
         wx.hideLoading()
diff --git a/pages/storage/order-list/index.js b/pages/storage/order-list/index.js
index a6f133f..4ce8c7c 100644
--- a/pages/storage/order-list/index.js
+++ b/pages/storage/order-list/index.js
@@ -140,9 +140,9 @@ Scene({
   lookItem: function (e) {
     var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
     if(item.status == 1){
-      wx.navigateTo({ url: `/pages/storage/order-settlement/index?id=${item.weightNoteId}` })
+      wx.navigateTo({ url: `/pages/storage/order-settlement/index?id=${item.id}` })
     } else [
-      wx.navigateTo({ url: `/pages/storage/order-info/index?id=${item.weightNoteId}` })
+      wx.navigateTo({ url: `/pages/storage/order-info/index?id=${item.id}` })
     ]
   },
   onUnload: function(){