没时间不显示

src/components/order/index.vue

@@ -125,8 +125,8 @@
 				}
 			},
 			showCountTime() {
-				return [1, 2, 3].indexOf(this.orderType) != -1 || (this.orderType == 0 && this.orderData
-					.orderBusinessType != 'R')
+				return ([1, 2, 3].indexOf(this.orderType) != -1 || (this.orderType == 0 && this.orderData
+					.orderBusinessType != 'R')) && this.orderData.currentOverTime
 			},
 			showTime() {
 				return [4, 5, 6].indexOf(this.orderType) != -1

src/pages/order/index.vue

@@ -184,7 +184,7 @@
 			// 页面数据
 			getOrderList(index) {
 				// 状态处理
-				// this.pageNumber += 1
+				this.pageNumber += 1
 				this.loaded = false
 				var param = {
 					pageNumber: this.pageNumber,
@@ -234,6 +234,7 @@
 						self.triggered = false;
 						self._freshing = false;
 						if (res.data.list) {
+							res.data.list[0].currentOverTime = undefined
 							self.orderList.push(...res.data.list)
 							if (self.list[self.types[res.data.type]]) {
 								self.list[self.types[res.data.type]].total = res.data.total