From 9a45b7f42bc9fa285e38dc9bed566f123aaf3040 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Wed, 17 Apr 2024 14:49:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=AF=93=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/irentList/irentList.js              | 21 +++++++++++++++++++++
 pages/irentList/irentList.json            |  3 +--
 pages/irentList/irentList.wxml            |  4 +---
 template/listOperations/listOperations.js |  1 -
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/pages/irentList/irentList.js b/pages/irentList/irentList.js
index e3e4ceb..c5b7753 100644
--- a/pages/irentList/irentList.js
+++ b/pages/irentList/irentList.js
@@ -230,13 +230,34 @@ Page({
      * 页面相关事件处理函数--监听用户下拉动作
      */
     onPullDownRefresh: function () {
+        this.data.school = ''
+        this.data.brands.value = ''
+        this.data.roomlistings.value = ''
+        this.data.roomtype.value = ''
         this.setData({
             listPage: 1,
             page: {
                 next_page: 1
             },
+            school: '',
+            brands: this.data.brands,
+            roomlistings: this.data.roomlistings,
+            roomtype: this.data.roomtype,
+            money: {
+                rent_min: 0,
+                rent_max: ''
+            },
             data: []
         })
+
+        const listOperations = this.selectComponent('#list-operations-components')
+        const conditionObj = listOperations.data.conditionObj || {}
+        for (const key in conditionObj) {
+            if (conditionObj[key]?.valueText) conditionObj[key].valueText = ''
+        }
+        listOperations.setData({
+            conditionObj
+        })
         this.getList()
         wx.stopPullDownRefresh();
     },
diff --git a/pages/irentList/irentList.json b/pages/irentList/irentList.json
index 36e1d34..d1822b8 100644
--- a/pages/irentList/irentList.json
+++ b/pages/irentList/irentList.json
@@ -13,6 +13,5 @@
         "list-operations": "/template/listOperations/listOperations",
         "xin-head-swiper": "/template/xinHeadSwiper/xinHeadSwiper",
         "QRCodePop": "/template/QRCodePop/QRCodePop"
-    },
-    "enablePullDownRefresh": false
+    }
 }
\ No newline at end of file
diff --git a/pages/irentList/irentList.wxml b/pages/irentList/irentList.wxml
index efc2581..fbfd8a6 100644
--- a/pages/irentList/irentList.wxml
+++ b/pages/irentList/irentList.wxml
@@ -9,9 +9,7 @@
 
     <template is="irenCouponReceive" data="{{ irentCouponBig:irentCouponBig,hideCoupon:hideCoupon,irenCouponReceive:irenCouponReceive }}"></template>
     <view class='irent-list-box'>
-
         <view class="header-bj"></view>
-
         <view id="list-header-search">
             <template is="list-header-search" data="{{ isNeedMap: isMapFindState }}"></template>
         </view>
@@ -32,7 +30,7 @@
         </view>
 
         <view id="list-operations" class="list-operations {{ operationsTop ? 'list-operations-top' : '' }}" style="top: {{ screen_data.totalTopHeight }}px;">
-            <list-operations tabTitle="品牌公寓" operationstype="student" money="{{ money }}" brands="{{ brands }}" screen_data="{{ screen_data }}" roomtype="{{ roomtype }}" roomlistings="{{ roomlistings }}" bindsubmit="submitOperations"></list-operations>
+            <list-operations id="list-operations-components" tabTitle="品牌公寓" operationstype="student" money="{{ money }}" brands="{{ brands }}" screen_data="{{ screen_data }}" roomtype="{{ roomtype }}" roomlistings="{{ roomlistings }}" bindsubmit="submitOperations"></list-operations>
         </view>
 
         <view class='house-list'>
diff --git a/template/listOperations/listOperations.js b/template/listOperations/listOperations.js
index 7befb4f..0ee94ec 100644
--- a/template/listOperations/listOperations.js
+++ b/template/listOperations/listOperations.js
@@ -15,7 +15,6 @@ Component({
                 this.setData({
                     conditionObj
                 })
-                // console.log("conditionObj", this.data.conditionObj);
             }
         },
         // roomtype: Object,