From 2e5389afa5648b45bb981c1076c82b8d0aeada4b Mon Sep 17 00:00:00 2001
From: caolc <572275724@qq.com>
Date: Fri, 11 Nov 2022 09:24:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=9B=9E=E6=98=BE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=88=97=E8=A1=A8=E5=88=B7=E6=96=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BagStation/pages/components/price-tab.vue  |  3 +--
 main.js                                    |  2 +-
 pages/tabbar/order/orderList/orderList.vue | 10 +++++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/BagStation/pages/components/price-tab.vue b/BagStation/pages/components/price-tab.vue
index 2c2b13c..56a7684 100644
--- a/BagStation/pages/components/price-tab.vue
+++ b/BagStation/pages/components/price-tab.vue
@@ -115,8 +115,7 @@
 					// console.log(String(value).split('.')[1].substring(2,4),String(value).split('.')[1].length,'*-*-*-*-');
 					// console.log( Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}`)+0.01,'************');
 					// return String(value).split('.')[1]&&String(value).split('.')[1].length>2? Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}`)+0.01 :Number(value).toFixed(2);
-					return String(value).split('.')[1]&&String(value).split('.')[1].length>2? 
-					 Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}${Number(String(value).split('.')[1].substr(2))==0?'':9}`).toFixed(2) :Number(value).toFixed(2);
+					return String(value).split('.')[1]&&String(value).split('.')[1].length>2?Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}${Number(String(value).split('.')[1].substr(2))==0?'':9}`).toFixed(2) :Number(value).toFixed(2);
 				} else {
 					return Number(value).toFixed(2)
 				} 
diff --git a/main.js b/main.js
index b1b6784..9086bcc 100644
--- a/main.js
+++ b/main.js
@@ -88,7 +88,7 @@ Vue.prototype.olitype = function(value){
 }
 Vue.prototype.moneyIntercept = function(value){
 		if (value != 'xxx.x') {
-								return String(value).split('.')[1]&&String(value).split('.')[1].length>2?Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}${Number(String(value).split('.')[1].substr(2))==0?'':9}`).toFixed(2) :Number(value).toFixed(2);
+		return String(value).split('.')[1]&&String(value).split('.')[1].length>2?Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}${Number(String(value).split('.')[1].substr(2))==0?'':9}`).toFixed(2) :Number(value).toFixed(2);
 		} else {
 			return Number(value).toFixed(2)
 		}
diff --git a/pages/tabbar/order/orderList/orderList.vue b/pages/tabbar/order/orderList/orderList.vue
index 13d0bc5..5fef76a 100644
--- a/pages/tabbar/order/orderList/orderList.vue
+++ b/pages/tabbar/order/orderList/orderList.vue
@@ -145,9 +145,9 @@
 			}else{
 				this.getOrder(this.ative)
 			}
-			setTimeout(function() {
-				uni.stopPullDownRefresh()
-			}, 1000);
+			// setTimeout(function() {
+			// 	uni.stopPullDownRefresh()
+			// }, 1000);
 		},
 		onReachBottom() {
 			console.log('这里是onReachBottom')
@@ -227,6 +227,8 @@
 							this.status.loadOrderStatus = 'load'
 						}
 					}
+				}).finally(()=>{
+						uni.stopPullDownRefresh()
 				})
 			},
 			
@@ -268,6 +270,8 @@
 							this.status.loadOrderStatus = 'load'
 						}
 					}
+				}).finally(()=>{
+						uni.stopPullDownRefresh()
 				})
 			},
 			changeHaed(code){