From e3b064ac7d732f1a094bde7b0db0013777d888e9 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Tue, 11 May 2021 09:50:31 +0800
Subject: [PATCH] =?UTF-8?q?finally=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BAthen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/agent/ability-list/index.js     | 2 +-
 pages/agent/factory-fragment/index.js | 2 +-
 pages/agent/focus-fragment/index.js   | 2 +-
 pages/agent/order-list/index.js       | 2 +-
 pages/agent/select-list/index.js      | 2 +-
 pages/client/factory-list/index.js    | 2 +-
 pages/client/order-list/index.js      | 3 +--
 pages/home/customer-list/index.js     | 2 +-
 pages/home/factory-list/index.js      | 2 +-
 pages/message/card-list/index.js      | 2 +-
 pages/message/index/index.js          | 2 +-
 pages/process/agent-list/index.js     | 2 +-
 pages/process/check-list/index.js     | 2 +-
 pages/process/order-list/index.js     | 2 +-
 pages/process/outside-list/index.js   | 4 ++--
 pages/process/payment-list/index.js   | 2 +-
 pages/setting/paper-list/index.js     | 2 +-
 pages/settlement/bill-list/index.js   | 2 +-
 pages/storage/order-list/index.js     | 2 +-
 pages/storage/pound-list/index.js     | 3 +--
 20 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/pages/agent/ability-list/index.js b/pages/agent/ability-list/index.js
index e89f1de..3e730fc 100644
--- a/pages/agent/ability-list/index.js
+++ b/pages/agent/ability-list/index.js
@@ -50,7 +50,7 @@ Scene({
       }
     }).catch(err => {
       this.setData({ requesting: false, finished: true, loading: false })
-    }).finally(() => {
+    }).then(() => {
       this.refresh = this.refresh || this.selectComponent('#refresh')
       this.refresh.setRefresh(false)
     })
diff --git a/pages/agent/factory-fragment/index.js b/pages/agent/factory-fragment/index.js
index e596587..a6dfc05 100644
--- a/pages/agent/factory-fragment/index.js
+++ b/pages/agent/factory-fragment/index.js
@@ -97,7 +97,7 @@ Component({
         }
       }).catch(err => {
         this.setData({ requesting: false, finished: true, loading: false, })
-      }).finally(() => {
+      }).then(() => {
         this.refresh = this.refresh || this.selectComponent('#refresh')
         this.refresh.setRefresh(false)
       })
diff --git a/pages/agent/focus-fragment/index.js b/pages/agent/focus-fragment/index.js
index 46134b7..491c459 100644
--- a/pages/agent/focus-fragment/index.js
+++ b/pages/agent/focus-fragment/index.js
@@ -74,7 +74,7 @@ Component({
         }
       }).catch(err => {
         this.setData({ requesting: false, finished: true, loading: false, })
-      }).finally(() => {
+      }).then(() => {
         this.refresh = this.refresh || this.selectComponent('#refresh')
         this.refresh.setRefresh(false)
       })
diff --git a/pages/agent/order-list/index.js b/pages/agent/order-list/index.js
index 071930d..46e20d9 100644
--- a/pages/agent/order-list/index.js
+++ b/pages/agent/order-list/index.js
@@ -88,7 +88,7 @@ Scene({
     }).catch(err => {
       this.setData({ requesting: false, loading: false })
       util.showToast(err)
-    }).finally(() => {
+    }).then(() => {
       this.refresh = this.refresh || this.selectComponent('#refresh')
       this.refresh.setRefresh(false)
     })
diff --git a/pages/agent/select-list/index.js b/pages/agent/select-list/index.js
index 0a26d31..25e9e44 100644
--- a/pages/agent/select-list/index.js
+++ b/pages/agent/select-list/index.js
@@ -52,7 +52,7 @@ Scene({
     }).catch(err => {
       this.setData({ requesting: false, loading: false })
       util.showToast(err)
-    }).finally(() => {
+    }).then(() => {
       this.refresh = this.refresh || this.selectComponent('#refresh')
       this.refresh.setRefresh(false)
     })
diff --git a/pages/client/factory-list/index.js b/pages/client/factory-list/index.js
index 1b42967..87f5937 100644
--- a/pages/client/factory-list/index.js
+++ b/pages/client/factory-list/index.js
@@ -53,7 +53,7 @@ Page({
     }).catch(err => {
       this.setData({ requesting: false, loading: false })
       util.showToast(err)
-    }).finally(() => {
+    }).then(() => {
       this.refresh = this.refresh || this.selectComponent('#refresh')
       this.refresh.setRefresh(false)
     })
diff --git a/pages/client/order-list/index.js b/pages/client/order-list/index.js
index 8155635..872b0ad 100644
--- a/pages/client/order-list/index.js
+++ b/pages/client/order-list/index.js
@@ -97,8 +97,7 @@ Page({
       }
     }).catch(err => {
       this.setData({ requesting: false, loading: false })
-      console.log(err)
-    }).finally(() => {
+    }).then(() => {
       this.refresh = this.refresh || this.selectComponent('#refresh')
       this.refresh.setRefresh(false)
     })
diff --git a/pages/home/customer-list/index.js b/pages/home/customer-list/index.js
index 602b0e3..279514b 100644
--- a/pages/home/customer-list/index.js
+++ b/pages/home/customer-list/index.js
@@ -73,7 +73,7 @@ Scene({
     }).catch(err => {
       this.setData({ requesting: false, loading: false })
       util.showToast(err)
-    }).finally(() => {
+    }).then(() => {
       this.refresh = this.refresh || this.selectComponent('#refresh')
       this.refresh.setRefresh(false)
     })
diff --git a/pages/home/factory-list/index.js b/pages/home/factory-list/index.js
index 0d938ad..3472450 100644
--- a/pages/home/factory-list/index.js
+++ b/pages/home/factory-list/index.js
@@ -91,7 +91,7 @@ Scene({
     }).catch(err => {
       this.setData({ requesting: false, loading: false })
       util.showToast(err)
-    }).finally(() => {
+    }).then(() => {
       this.refresh = this.refresh || this.selectComponent('#refresh')
       this.refresh.setRefresh(false)
     })
diff --git a/pages/message/card-list/index.js b/pages/message/card-list/index.js
index 3be8c26..e0640d3 100644
--- a/pages/message/card-list/index.js
+++ b/pages/message/card-list/index.js
@@ -62,7 +62,7 @@ Scene({
     }).catch(err => {
       this.setData({ requesting: false, loading: false })
       util.showToast(err)
-    }).finally(() => {
+    }).then(() => {
       this.refresh = this.refresh || this.selectComponent('#refresh')
       this.refresh.setRefresh(false)
     })
diff --git a/pages/message/index/index.js b/pages/message/index/index.js
index f6f4b9a..8fc2f6e 100644
--- a/pages/message/index/index.js
+++ b/pages/message/index/index.js
@@ -70,7 +70,7 @@ Component({
       }).catch(err => {
         this.setData({ requesting: false, loading: false })
         util.showToast(err)
-      }).finally(() => {
+      }).then(() => {
         this.refresh = this.refresh || this.selectComponent('#refresh')
         this.refresh.setRefresh(false)
       })
diff --git a/pages/process/agent-list/index.js b/pages/process/agent-list/index.js
index 46a5234..5710b13 100644
--- a/pages/process/agent-list/index.js
+++ b/pages/process/agent-list/index.js
@@ -84,7 +84,7 @@ Scene({
     }).catch(err => {
       this.setData({ requesting: false, loading: false })
       util.showToast(err)
-    }).finally(() => {
+    }).then(() => {
       this.refresh = this.refresh || this.selectComponent('#refresh')
       this.refresh.setRefresh(false)
     })
diff --git a/pages/process/check-list/index.js b/pages/process/check-list/index.js
index 2cf0ef8..14827fa 100644
--- a/pages/process/check-list/index.js
+++ b/pages/process/check-list/index.js
@@ -69,7 +69,7 @@ Scene({
     }).catch(err => {
       this.setData({ requesting: false, loading: false })
       util.showToast(err)
-    }).finally(() => {
+    }).then(() => {
       this.refresh = this.refresh || this.selectComponent('#refresh')
       this.refresh.setRefresh(false)
     })
diff --git a/pages/process/order-list/index.js b/pages/process/order-list/index.js
index f3871be..66011a5 100644
--- a/pages/process/order-list/index.js
+++ b/pages/process/order-list/index.js
@@ -95,7 +95,7 @@ Scene({
     }).catch(err => {
       this.setData({ requesting: false, loading: false })
       util.showToast(err)
-    }).finally(() => {
+    }).then(() => {
       this.refresh = this.refresh || this.selectComponent('#refresh')
       this.refresh.setRefresh(false)
     })
diff --git a/pages/process/outside-list/index.js b/pages/process/outside-list/index.js
index f40bee0..be664f3 100644
--- a/pages/process/outside-list/index.js
+++ b/pages/process/outside-list/index.js
@@ -95,7 +95,7 @@ Scene({
     }).catch(err => {
       this.setData({ requesting: false, loading: false })
       util.showToast(err)
-    }).finally(() => {
+    }).then(() => {
       this.refresh = this.refresh || this.selectComponent('#refresh')
       this.refresh.setRefresh(false)
     })
@@ -155,7 +155,7 @@ Scene({
     wx.navigateTo({ url: '/pages/process/order-price/index?id=' + e.currentTarget.dataset.id })
   },
   addOutside: function(e){
-    wx.navigateTo({ url: '/pages/process/outside-check/index' })
+    wx.navigateTo({ url: '/pages/process/outside-add/index' })
   },
   onUnload: function(){
     event.remove('OrderMessage', this)
diff --git a/pages/process/payment-list/index.js b/pages/process/payment-list/index.js
index eb5bb36..2f9fba2 100644
--- a/pages/process/payment-list/index.js
+++ b/pages/process/payment-list/index.js
@@ -79,7 +79,7 @@ Scene({
     }).catch(err => {
       this.setData({ requesting: false, loading: false })
       util.showToast(err)
-    }).finally(() => {
+    }).then(() => {
       this.refresh = this.refresh || this.selectComponent('#refresh')
       this.refresh.setRefresh(false)
     })
diff --git a/pages/setting/paper-list/index.js b/pages/setting/paper-list/index.js
index a061247..8fb7926 100644
--- a/pages/setting/paper-list/index.js
+++ b/pages/setting/paper-list/index.js
@@ -63,7 +63,7 @@ Scene({
     }).catch(err => {
       this.setData({ requesting: false, loading: false })
       util.showToast(err)
-    }).finally(() => {
+    }).then(() => {
       this.refresh = this.refresh || this.selectComponent('#refresh')
       this.refresh.setRefresh(false)
     })
diff --git a/pages/settlement/bill-list/index.js b/pages/settlement/bill-list/index.js
index 0bde491..0aa7dc3 100644
--- a/pages/settlement/bill-list/index.js
+++ b/pages/settlement/bill-list/index.js
@@ -52,7 +52,7 @@ Scene({
     }).catch(err => {
       this.setData({ requesting: false, loading: false })
       util.showToast(err)
-    }).finally(() => {
+    }).then(() => {
       this.refresh = this.refresh || this.selectComponent('#refresh')
       this.refresh.setRefresh(false)
     })
diff --git a/pages/storage/order-list/index.js b/pages/storage/order-list/index.js
index 4ce8c7c..57200e9 100644
--- a/pages/storage/order-list/index.js
+++ b/pages/storage/order-list/index.js
@@ -84,7 +84,7 @@ Scene({
     }).catch(err => {
       this.setData({ requesting: false, loading: false })
       util.showToast(err)
-    }).finally(() => {
+    }).then(() => {
       this.refresh = this.refresh || this.selectComponent('#refresh')
       this.refresh.setRefresh(false)
     })
diff --git a/pages/storage/pound-list/index.js b/pages/storage/pound-list/index.js
index c63e485..fcb8b63 100644
--- a/pages/storage/pound-list/index.js
+++ b/pages/storage/pound-list/index.js
@@ -82,10 +82,9 @@ Scene({
         this.setData({ finished: true, requesting: false, loading: false })
       }
     }).catch(err => {
-      console.log(err)
       this.setData({ requesting: false, loading: false })
       util.showToast(err)
-    }).finally(() => {
+    }).then(() => {
       this.refresh = this.refresh || this.selectComponent('#refresh')
       this.refresh.setRefresh(false)
     })