From eb7366f400867d3f401fe60f06d848d6d1448457 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 17 十月 2022 17:41:56 +0800
Subject: [PATCH] 2022.10.17

---
 base/behaviors/b_loadingStatus.js |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/base/behaviors/b_loadingStatus.js b/base/behaviors/b_loadingStatus.js
index ebbd92d..ec08a60 100644
--- a/base/behaviors/b_loadingStatus.js
+++ b/base/behaviors/b_loadingStatus.js
@@ -9,17 +9,29 @@
     perPage: 10,
     totalCount: 0,
     loading: false,
-    needLoadMore: false
+    needLoadMore: false,
+    timeout: false
   },
+  timeoutId: '',
+  lastLoading: false,
   observers: {
     'loading': function (loading) {
+      if (this.lastLoading == loading) return
       if (loading) {
+        clearTimeout(this.timeoutId)
         this._loadStart()
         this._loading()
-        setTimeout(() => { this.setData({loading: false}) }, 20000);
+        this.timeoutId = setTimeout(() => { 
+          this.setData({
+            loading: false,
+            timeout: true
+          })
+        }, 10000);
       } else {
+        clearTimeout(this.timeoutId)
         this._loadComplete()
       }
+      this.lastLoading = loading
     },
     'cPage, tPage': function (cPage, tPage) {
       this.setData({

--
Gitblit v1.9.3