Browse Source

空调页面刷新

程志平 3 years ago
parent
commit
46dce280f5
2 changed files with 9 additions and 21 deletions
  1. 1 1
      pages.json
  2. 8 20
      pagesAir/shareAir/shareAir.vue

+ 1 - 1
pages.json

@@ -94,7 +94,7 @@
 				"path": "shareAir/shareAir",
 				"style": {
 					"navigationBarTitleText": "共享空调",
-					"enablePullDownRefresh": false
+					"enablePullDownRefresh": true
 				}
 			}, {
 				"path": "addAir/addAir",

+ 8 - 20
pagesAir/shareAir/shareAir.vue

@@ -50,9 +50,7 @@
 			</view>
 		</view>
 		<view class="list-air" v-else>
-			<scroll-view scroll-y="true" :style="{height: screenHeight}" refresher-enabled="true"
-				:refresher-threshold="100" refresher-background="#FFF" :refresher-triggered="triggered"
-				@refresherrestore="onRestore" @refresherrefresh="scroll_to_refresh">
+			<scroll-view scroll-y="true" :style="{height: screenHeight}">
 				<view class="list-items" v-for="(item, index) in airs" :key="index">
 					<view v-if="item.on === true" class="item-air"
 						@longpress="itemLongPress($event, item.time, item.air_ip)">
@@ -152,7 +150,6 @@
 				screenHeight: '', // 屏幕的高度
 				options: 0,
 				time_string: '其他人员使用中',
-				triggered: false,
 				test: this.$store.state.test
 			};
 		},
@@ -238,6 +235,13 @@
 				uni.hideLoading();
 			}, 3000);
 		},
+		onPullDownRefresh() {
+			var _this = this;
+			// 获取基本信息
+			_this.get_base_info(_this.options, 'onShow');
+			// 查询绑定的空调(更新列表)
+			_this.select_banding_airs();
+		},
 		methods: {
 			/**
 			 * 查询绑定的空调
@@ -837,22 +841,6 @@
 					}
 				}
 			},
-			scroll_to_refresh() {
-				var _this = this;
-				// 获取基本信息
-				_this.get_base_info(_this.options, 'onShow');
-				// 查询绑定的空调(更新列表)
-				_this.select_banding_airs();
-
-				if (_this._freshing)
-					return;
-
-				_this._freshing = true;
-				setTimeout(() => {
-					_this.triggered = false;
-					_this._freshing = false;
-				}, 1000);
-			},
 			onRestore() {
 				this.triggered = true; // 需要重置
 			},