From 6b354c23a67a8229fc02192c723b5a26204df7b3 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Wed, 24 May 2023 14:06:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/common/common.wxml                    |   1 -
 pages/index/index.js                        |   4 +-
 pages/index/index.wxml                      |   2 +-
 pages/irentList/irentList.js                |   2 +-
 pages/personList/personList.js              |   3 +-
 pages/quarantineLists/quarantineLists.js    |   1 -
 pages/search/search.js                      | 872 ++++++++++----------
 pages/search/search.json                    |  20 +-
 pages/search/search.wxml                    | 184 ++---
 pages/search/search.wxss                    | 511 ++++++------
 template/commonList/commonList.js           |   4 +-
 template/commonList/commonList.wxml         |   6 +-
 template/commonList/commonList.wxss         |   8 +-
 template/listOperations/listOperations.wxml |   3 +-
 template/listOperations/listOperations.wxss |   6 +
 15 files changed, 780 insertions(+), 847 deletions(-)

diff --git a/pages/common/common.wxml b/pages/common/common.wxml
index a20417f..911cdbe 100644
--- a/pages/common/common.wxml
+++ b/pages/common/common.wxml
@@ -141,7 +141,6 @@
 <!-- 个人房源列表 -->
 <template name="personalList">
   <navigator class='info-list personalList' url="../show/show?tid={{ item.tid }}&uniqid={{ item.uniqid }}&cityid={{ item.currency == '港元' ? 1 : 0}}">
-    <!-- <form bindsubmit="send_form_id" report-submit='true' data-types="confirm" class='submit-form'> -->
     <view class="submit-form">
       <view class="personalList-top">
         <view class='title'>
diff --git a/pages/index/index.js b/pages/index/index.js
index f075341..650a114 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -251,9 +251,7 @@ Page({
             advertisingtype
         } = e.currentTarget.dataset
 
-        // miucms.request(app.globalData.config.FormidInsert, {
-        let requestUrl = advertisingtype == 'slideshow' ? `${app.globalData.baseURL}/tenement/v2/api/ad/click` : app.globalData.config.FormidInsert
-        // miucms.request(app.globalData.baseURL + '/tenement/v2/api/ad/click', {
+        let requestUrl = advertisingtype == 'lazyloading' ? `${app.globalData.baseURL}/tenement/v2/api/ad/click` : app.globalData.config.FormidInsert
         miucms.request(requestUrl, {
             statid
         }).then(res => {})
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index c1ada8d..9f6f241 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -272,7 +272,7 @@
 
 <!-- 广告 -->
 <template name="adv">
-    <image class="pinterest-list-item" mode="widthFix" bindload="pinterestImgLoad" lazy-load="{{ true }}" src="{{ item.imageLocal || item.image }}" bindtap="handleSwiper" data-advertisingtype="{{ 'slideshow' }}" data-statid="{{ item.statid }}" data-id="{{ item.id }}" data-url="{{ item.path || item.url }}"></image>
+    <image class="pinterest-list-item" mode="widthFix" bindload="pinterestImgLoad" lazy-load="{{ true }}" src="{{ item.imageLocal || item.image }}" bindtap="handleSwiper" data-appid="{{ item.appid }}" data-finderUserName="{{ item.finderUserName }}" data-feedId="{{ item.feedId }}"  data-advertisingtype="{{ 'lazyloading' }}" data-statid="{{ item.statid }}" data-id="{{ item.id }}" data-url="{{ item.path || item.url }}"></image>
 </template>
 
 <!-- 公寓 -->
diff --git a/pages/irentList/irentList.js b/pages/irentList/irentList.js
index 7bae6ff..0b082ad 100644
--- a/pages/irentList/irentList.js
+++ b/pages/irentList/irentList.js
@@ -64,7 +64,7 @@ Page({
         initState: false,
         topTitle: "",
 
-        isNewVersions: true,
+        isNewVersions: false,
     },
     onPageScroll(e) {
         if (e.scrollTop > 1000 && !this.data.showTOTOP) {
diff --git a/pages/personList/personList.js b/pages/personList/personList.js
index cfbe9e9..52bc3af 100644
--- a/pages/personList/personList.js
+++ b/pages/personList/personList.js
@@ -119,8 +119,7 @@ Page({
         listTab: {},
         initState: false,
 
-
-        isNewVersions: true,
+        isNewVersions: false,
 
     },
     onPageScroll(e) {
diff --git a/pages/quarantineLists/quarantineLists.js b/pages/quarantineLists/quarantineLists.js
index 2e9292b..ee045f6 100644
--- a/pages/quarantineLists/quarantineLists.js
+++ b/pages/quarantineLists/quarantineLists.js
@@ -4,7 +4,6 @@ var config = {};
 var miucms = require('../../utils/miucms.js');
 var WxParse = require('../../wxParse/wxParse.js');
 Page({
-
   /**
    * 页面的初始数据
    */
diff --git a/pages/search/search.js b/pages/search/search.js
index e2eb77a..e2589cd 100644
--- a/pages/search/search.js
+++ b/pages/search/search.js
@@ -4,460 +4,426 @@ var config = {};
 var miucms = require('../../utils/miucms.js');
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        isloding: true,
-        showTOTOP: false,
-        kw: '',
-        log: [],
-        hot: [],
-        focus: false,
-        list: [],
-        search: true,
-        loading: false,
-        complete: false,
-        status: 0,
-        q: '',
-        options: {},
-        // tab: 'hongkongrental',
-        tab: 'personal',
-        tabList: {
-            personal: "个人房源",
-            intermediary: "中介房源",
-            studentapartment: "学生公寓",
-        },
-        otherrental: {
-            page: {
-                next_page: 1
-            },
-            list: [],
-            loading: false
-        },
-        hongkongrental: {
-            page: {
-                next_page: 1
-            },
-            list: [],
-            loading: false
-        },
-        studentapartment: {
-            page: {
-                next_page: 1
-            },
-            list: [],
-            loading: false
-        },
-        screen_data: {},
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    isloding: true,
+    showTOTOP: false,
+    kw: '',
+    log: [],
+    hot: [],
+    focus: false,
+    list: [],
+    search: false,
+    loading: false,
+    complete: false,
+    status: 0,
+    q: '',
+    options: {},
+    tab: 'hongkongrental',
+    otherrental: {
+      page: {
+        next_page: 1
+      },
+      list: [],
+      loading: false
     },
-    onPageScroll(e) {
-        if (e.scrollTop > 1000 && !this.data.showTOTOP) {
-            this.setData({
-                showTOTOP: true
-            })
-        } else if (e.scrollTop < 1000 && this.data.showTOTOP) {
-            this.setData({
-                showTOTOP: false
-            })
-        }
+    hongkongrental: {
+      page: {
+        next_page: 1
+      },
+      list: [],
+      loading: false
     },
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: function (options) {
-        var that = this;
-        this.setData({
-            focus: options.kw ? false : true,
-            kw: options.kw || '',
-            tab: options.tab || 'hongkongrental'
-        })
-        this.get_config()
-        wx.getStorage({
-            key: 'searchHistoryList',
-            success: function (res) {
-                that.setData({
-                    log: res.data || []
-                })
-            },
-        })
-
-    },
-    get_config() {
-        var that = this;
-        if (app.globalData.config.lists) {
-            config = app.globalData.config;
-
-            that.setData({
-                status: app.globalData.status,
-                screen_data: app.globalData.screen_data,
-            })
-            that.get_content()
-            if (that.data.kw.trim().length > 0) that.submit()
-
-        } else {
-            setTimeout(function () {
-                that.get_config()
-            }, 200)
-        }
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-        if (!app.globalData.config.lists) {
-            return false
-        }
-        this.getDatas()
-    },
-    cancle() {
-        var pages = getCurrentPages();
-        if (pages.length == 1) {
-            wx.reLaunch({
-                url: `/pages/index/index`
-            });
-        } else {
-            wx.navigateBack(); //返回上一页
-        }
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
-        const that = this;
-        let url = `/pages/search/search?kw=${that.data.kw}&tab=${that.data.tab}`;
-        return {
-            path: url,
-            // title: '寄托港校租房',
-            title: app.globalData.topTitle,
-
-        }
-    },
-
-    input: function (e) {
-        this.setData({
-            kw: e.detail.value
-        })
-    },
-    // 提交
-    submit: function () {
-        // this.data.kw = this.data.kw.trim();
-        if (this.data.kw == '') {
-            wx.showToast({
-                title: '请输入内容~',
-                icon: 'none'
-            })
-            return false
-        }
-        if (this.data.log.indexOf(this.data.kw) == -1) {
-            // 未存在历史记录列表中
-            this.data.log.unshift(this.data.kw)
-            // 最多存10条内容
-            if (this.data.log.length > 10) {
-                this.data.log.length = 10
-            }
-            this.setData({
-                log: this.data.log
-            })
-            wx.setStorage({
-                key: 'searchHistoryList',
-                data: this.data.log,
-            })
-        }
-        this.clearAllData()
-        this.clear_list()
-    },
-    // 清空历史记录
-    clear_keywords: function () {
-        let that = this;
-        wx.showModal({
-            title: '提示',
-            content: '确定删除全部记录？',
-            confirmColor: '#bc322f',
-            success: function (res) {
-                if (res.confirm === true) {
-                    if (!app.globalData.config || !app.globalData.config.lists) {
-                        return false
-                    }
-                    miucms.request(app.globalData.config.lists.removesearchlog, {}).then(data => {
-
-                        if (data.extraparam.mode == 'right') {
-                            that.setData({
-                                log: []
-                            })
-                            wx.setStorage({
-                                key: 'searchHistoryList',
-                                data: [],
-                            })
-                        }
-                    })
-
-                }
-            }
-        })
-
-    },
-    // 获取热词
-    get_content: function () {
-        var that = this;
-        var sendData = Object.assign({}, this.data.options, {
-            session: wx.getStorageSync('session'),
-        })
-        miucms.request(app.globalData.config.lists.search, {}).then(data => {
-            that.setData({
-                hot: data.hot,
-                isloding: false
-            })
-        }).catch(res => {})
-
-    },
-    // 点击热词或者历史记录item
-    select_kw: function (e) {
-        wx.pageScrollTo({
-            scrollTop: 0,
-            duration: 200,
-        })
-        var kw = e.currentTarget.dataset.kw;
-        this.setData({
-            kw: kw
-        })
-        this.clearAllData()
-        app.globalData.kw = kw;
-        this.clear_list()
-    },
-    clearAllData() {
-        // 清空所有数据
-        this.setData({
-            otherrental: {
-                page: {
-                    next_page: 1
-                },
-                list: [],
-                loading: false
-            },
-            hongkongrental: {
-                page: {
-                    next_page: 1
-                },
-                list: [],
-                loading: false
-            },
-            studentapartment: {
-                page: {
-                    next_page: 1
-                },
-                list: [],
-                loading: false
-            }
-        })
-    },
-    // 清空list
-    clear_list: function () {
-        let tab = this.data.tab;
-        this.data[tab] = {
-            page: {
-                next_page: 1
-            },
-            list: [],
-            loading: false
-        }
-        this.setTabData()
-        this.searchKW()
-    },
-    // setData
-    setTabData() {
-        let tab = this.data.tab;
-        switch (tab) {
-            case 'otherrental':
-                this.setData({
-                    otherrental: this.data.otherrental
-                })
-                break;
-            case 'studentapartment':
-                this.setData({
-                    studentapartment: this.data.studentapartment
-                })
-                break;
-            case 'hongkongrental':
-                this.setData({
-                    hongkongrental: this.data.hongkongrental
-                })
-                break;
-        }
-    },
-    searchdata: '',
-    // 搜索关键词
-    searchKW: function () {
-        var that = this;
-        if (!app.globalData.config.search) {
-            return false
-        }
-        this.setData({
-            loading: true
-        })
-        console.log("this.data.kw", this.data.kw);
-        miucms.request(app.globalData.config.search.global, {
-            // miucms.request(`${app.globalData.baseURL}/tenement/housingresources/lists`, {
-            'keyword': this.data.kw
-        }).then(data => {
-            // console.log("data", data);
-            if (data.code != 200) {
-                wx.showToast({
-                    title: data.message,
-                    icon: 'none'
-                })
-
-                that.setData({
-                    loading: false,
-                    otherrental: {
-                        page: {
-                            next_page: 0
-                        },
-                        list: [],
-                        loading: false
-                    },
-                    hongkongrental: {
-                        page: {
-                            next_page: 0
-                        },
-                        list: [],
-                        loading: false
-                    },
-                    studentapartment: {
-                        page: {
-                            next_page: 0
-                        },
-                        list: [],
-                        loading: false
-                    }
-                })
-                return false
-            }
-            let count = data.data.count;
-            this.searchdata = data.data.searchdata;
-            for (let i in data.data.count) {
-                if (data.data.count[i] == 0) {
-                    this.data[i].page.next_page = 0;
-                } else {
-                    this.data[i].page.next_page = 1;
-                }
-            }
-            this.setData({
-                search: true,
-                otherrental: this.data.otherrental,
-                studentapartment: this.data.studentapartment,
-                hongkongrental: this.data.hongkongrental,
-                loading: false,
-                kw: data.data.keyword
-            })
-            this.getDatas()
-        }).catch(res => {})
-
-    },
-
-    // 搜索初始化
-    searchKW() {
-        miucms.wxget(`${app.globalData.baseURL}/tenement/v2/api/search`, {
-            'keyword': this.data.kw
-        }).then(res => {
-            console.log(res);
-            if (res.code != 200) return
-            let data = res.data
-            console.log(data, 0);
-            let {
-                personal,
-                intermediary,
-                studentapartment
-            } = data
-
-            this.setData({
-                personal,
-                intermediary,
-                studentapartment,
-            })
-
-        })
-
-    },
-
-    //  清空
-    clearKW() {
-        this.setData({
-            kw: '',
-            focus: true
-        })
-    },
-    // 更换tab
-    changeTab(e) {
-        this.setData({
-            tab: e.currentTarget.dataset.tab
-        })
-        let tab = this.data.tab;
-        if (!this.data[tab].page.next_page || this.data[tab].list.length > 0) {
-            // 如果当前tab下数量为0 ，则不再加载
-            return false;
-        }
-        this.getKWdata()
-    },
-    // 搜索相关tab关键词
-    getDatas() {
-        let tab = this.data.tab;
-        if (!this.data[tab].page.next_page) {
-            // 如果当前tab下数量为0 ，则不再加载
-            return false;
-        }
-        this.getKWdata()
-    },
-    getKWdata() {
-
-        let urlObj = {
-            otherrental: app.globalData.config.search.otherrental,
-            // hongkongrental: app.globalData.config.search.hongkongrental,
-            hongkongrental: `${app.globalData.baseURL}/tenement/housingresources/lists`,
-            studentapartment: app.globalData.config.search.studentapartment,
-        }
-        let tab = this.data.tab;
-        let url = urlObj[tab];
-        this.data[tab].loading = true;
-        this.setTabData()
-        miucms.request(url, {
-            'searchdata': this.searchdata,
-            page: this.data[tab].page.next_page
-        }).then(data => {
-            // console.log(data);
-            this.data[tab].list = this.data[tab].list.concat(data.data.data);
-            this.data[tab].loading = false;
-
-            if (data.data.data.length > 0) {
-                this.data[tab].page.next_page += 1;
-            } else {
-                this.data[tab].page.next_page = 0;
-            }
-            this.setTabData()
-        }).catch(res => {})
-    },
-    // 点击广告
-    clickAD(e) {
-        miucms.clickAD(e.detail.id)
-    },
-    // 关闭广告
-    closeAD(e) {
-        let index = e.currentTarget.dataset.index;
-        let tab = e.currentTarget.dataset.tab;
-
-        this.data[tab].list.splice(index, 1)
-        if (tab == 'hongkongrental') {
-            this.setData({
-                hongkongrental: this.data.hongkongrental
-            })
-        } else {
-            this.setData({
-                otherrental: this.data.otherrental
-            })
-        }
-
-        miucms.closeAD(e.detail.id)
+    studentapartment: {
+      page: {
+        next_page: 1
+      },
+      list: [],
+      loading: false
     }
+  },
+  onPageScroll(e) {
+    if (e.scrollTop > 1000 && !this.data.showTOTOP) {
+      this.setData({
+        showTOTOP: true
+      })
+    } else if (e.scrollTop < 1000 && this.data.showTOTOP) {
+      this.setData({
+        showTOTOP: false
+      })
+    }
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this;
+    this.setData({
+      focus: options.kw ? false : true,
+      kw: options.kw || '',
+      tab: options.tab || 'hongkongrental'
+    })
+    this.get_config()
+    wx.getStorage({
+      key: 'searchHistoryList',
+      success: function (res) {
+        that.setData({
+          log: res.data || []
+        })
+      },
+    })
+
+  },
+  get_config() {
+    var that = this;
+    if (app.globalData.config.lists) {
+      config = app.globalData.config;
+
+      that.setData({
+        status: app.globalData.status
+      })
+      that.get_content()
+      if (that.data.kw.trim().length > 0) {
+        that.submit()
+      }
+    } else {
+      setTimeout(function () {
+        that.get_config()
+      }, 200)
+    }
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    if (!app.globalData.config.lists) {
+      return false
+    }
+    this.getDatas()
+  },
+  cancle() {
+    var pages = getCurrentPages();
+    if (pages.length == 1) {
+      wx.reLaunch({
+        url: `/pages/index/index`
+      });
+    } else {
+      wx.navigateBack(); //返回上一页
+    }
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+    const that = this;
+    let url = `/pages/search/search?kw=${that.data.kw}&tab=${that.data.tab}`;
+    return {
+      path: url,
+      title: '寄托香港租房',
+
+    }
+  },
+
+  input: function (e) {
+    this.setData({
+      kw: e.detail.value
+    })
+  },
+  // 提交
+  submit: function () {
+    // this.data.kw = this.data.kw.trim();
+    if (this.data.kw == '') {
+      wx.showToast({
+        title: '请输入内容~',
+        icon: 'none'
+      })
+      return false
+    }
+    if (this.data.log.indexOf(this.data.kw) == -1) {
+      // 未存在历史记录列表中
+      this.data.log.unshift(this.data.kw)
+      // 最多存10条内容
+      if (this.data.log.length > 10) {
+        this.data.log.length = 10
+      }
+      this.setData({
+        log: this.data.log
+      })
+      wx.setStorage({
+        key: 'searchHistoryList',
+        data: this.data.log,
+      })
+    }
+    this.clearAllData()
+    this.clear_list()
+  },
+  // 清空历史记录
+  clear_keywords: function () {
+    let that = this;
+    wx.showModal({
+      title: '提示',
+      content: '确定删除全部记录？',
+      confirmColor: '#bc322f',
+      success: function (res) {
+        if (res.confirm === true) {
+          if (!app.globalData.config || !app.globalData.config.lists) {
+            return false
+          }
+          miucms.request(app.globalData.config.lists.removesearchlog, {}).then(data => {
+
+            if (data.extraparam.mode == 'right') {
+              that.setData({
+                log: []
+              })
+              wx.setStorage({
+                key: 'searchHistoryList',
+                data: [],
+              })
+            }
+          })
+
+        }
+      }
+    })
+
+  },
+  // 获取热词
+  get_content: function () {
+    var that = this;
+    var sendData = Object.assign({}, this.data.options, {
+      session: wx.getStorageSync('session'),
+    })
+    miucms.request(app.globalData.config.lists.search, {}).then(data => {
+      that.setData({
+        hot: data.hot,
+        isloding: false
+      })
+    }).catch(res => {})
+
+  },
+  // 点击热词或者历史记录item
+  select_kw: function (e) {
+    wx.pageScrollTo({
+      scrollTop: 0,
+      duration: 200,
+    })
+    var kw = e.currentTarget.dataset.kw;
+    this.setData({
+      kw: kw
+    })
+    this.clearAllData()
+    app.globalData.kw = kw;
+    this.clear_list()
+  },
+  clearAllData() {
+    // 清空所有数据
+    this.setData({
+      otherrental: {
+        page: {
+          next_page: 1
+        },
+        list: [],
+        loading: false
+      },
+      hongkongrental: {
+        page: {
+          next_page: 1
+        },
+        list: [],
+        loading: false
+      },
+      studentapartment: {
+        page: {
+          next_page: 1
+        },
+        list: [],
+        loading: false
+      }
+    })
+  },
+  // 清空list
+  clear_list: function () {
+    let tab = this.data.tab;
+    this.data[tab] = {
+      page: {
+        next_page: 1
+      },
+      list: [],
+      loading: false
+    }
+    this.setTabData()
+    this.searchKW()
+  },
+  // setData
+  setTabData() {
+    let tab = this.data.tab;
+    switch (tab) {
+      case 'otherrental':
+        this.setData({
+          otherrental: this.data.otherrental
+        })
+        break;
+      case 'studentapartment':
+        this.setData({
+          studentapartment: this.data.studentapartment
+        })
+        break;
+      case 'hongkongrental':
+        this.setData({
+          hongkongrental: this.data.hongkongrental
+        })
+        break;
+    }
+  },
+  searchdata: '',
+  // 搜索关键词
+  searchKW: function () {
+    var that = this;
+    if (!app.globalData.config.search) {
+      return false
+    }
+    this.setData({
+      loading: true
+    })
+    console.log("this.data.kw", this.data.kw);
+    miucms.request(app.globalData.config.search.global, {
+      // miucms.request(`${app.globalData.baseURL}/tenement/housingresources/lists`, {
+      'keyword': this.data.kw
+    }).then(data => {
+      // console.log("data", data);
+      if (data.code != 200) {
+        wx.showToast({
+          title: data.message,
+          icon: 'none'
+        })
+
+        that.setData({
+          loading: false,
+          otherrental: {
+            page: {
+              next_page: 0
+            },
+            list: [],
+            loading: false
+          },
+          hongkongrental: {
+            page: {
+              next_page: 0
+            },
+            list: [],
+            loading: false
+          },
+          studentapartment: {
+            page: {
+              next_page: 0
+            },
+            list: [],
+            loading: false
+          }
+        })
+        return false
+      }
+      let count = data.data.count;
+      this.searchdata = data.data.searchdata;
+      for (let i in data.data.count) {
+        if (data.data.count[i] == 0) {
+          this.data[i].page.next_page = 0;
+        } else {
+          this.data[i].page.next_page = 1;
+        }
+      }
+      this.setData({
+        search: true,
+        otherrental: this.data.otherrental,
+        studentapartment: this.data.studentapartment,
+        hongkongrental: this.data.hongkongrental,
+        loading: false,
+        kw: data.data.keyword
+      })
+      this.getDatas()
+    }).catch(res => {})
+
+  },
+  //  清空
+  clearKW() {
+    this.setData({
+      kw: '',
+      focus: true
+    })
+  },
+  // 更换tab
+  changeTab(e) {
+    this.setData({
+      tab: e.currentTarget.dataset.tab
+    })
+    let tab = this.data.tab;
+    if (!this.data[tab].page.next_page || this.data[tab].list.length > 0) {
+      // 如果当前tab下数量为0 ，则不再加载
+      return false;
+    }
+    this.getKWdata()
+  },
+  // 搜索相关tab关键词
+  getDatas() {
+    let tab = this.data.tab;
+    if (!this.data[tab].page.next_page) {
+      // 如果当前tab下数量为0 ，则不再加载
+      return false;
+    }
+    this.getKWdata()
+  },
+  getKWdata() {
+
+    let urlObj = {
+      otherrental: app.globalData.config.search.otherrental,
+      // hongkongrental: app.globalData.config.search.hongkongrental,
+      hongkongrental: `${app.globalData.baseURL}/tenement/housingresources/lists`,
+      studentapartment: app.globalData.config.search.studentapartment,
+    }
+    let tab = this.data.tab;
+    let url = urlObj[tab];
+    this.data[tab].loading = true;
+    this.setTabData()
+    miucms.request(url, {
+      'searchdata': this.searchdata,
+      page: this.data[tab].page.next_page
+    }).then(data => {
+      // console.log(data);
+      this.data[tab].list = this.data[tab].list.concat(data.data.data);
+      this.data[tab].loading = false;
+
+      if (data.data.data.length > 0) {
+        this.data[tab].page.next_page += 1;
+      } else {
+        this.data[tab].page.next_page = 0;
+      }
+      this.setTabData()
+    }).catch(res => {})
+  },
+  // 点击广告
+  clickAD(e) {
+    miucms.clickAD(e.detail.id)
+  },
+  // 关闭广告
+  closeAD(e) {
+    let index = e.currentTarget.dataset.index;
+    let tab = e.currentTarget.dataset.tab;
+
+    this.data[tab].list.splice(index, 1)
+    if (tab == 'hongkongrental') {
+      this.setData({
+        hongkongrental: this.data.hongkongrental
+      })
+    } else {
+      this.setData({
+        otherrental: this.data.otherrental
+      })
+    }
+
+    miucms.closeAD(e.detail.id)
+  }
 })
\ No newline at end of file
diff --git a/pages/search/search.json b/pages/search/search.json
index c8d284a..1d73251 100644
--- a/pages/search/search.json
+++ b/pages/search/search.json
@@ -1,13 +1,11 @@
 {
-    "navigationBarTitleText": "搜索",
-    "enablePullDownRefresh": false,
-    "usingComponents": {
-        "header-nav": "../../template/headerNav/index",
-        "brands-item": "../irentList/listItem/listItem",
-        "to-top": "../../template/toTop/toTop",
-        "ads": "../show/ads/ads",
-        "house-item": "../restOfWorld/houseItem/houseItem",
-        "list-operations": "/template/listOperations/listOperations",
-        "common-list": "/template/commonList/commonList"
-    }
+  "navigationBarTitleText": "搜索",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "header-nav": "../../template/headerNav/index",
+    "brands-item":"../irentList/listItem/listItem",
+    "to-top": "../../template/toTop/toTop",
+    "ads": "../show/ads/ads",
+    "house-item": "../restOfWorld/houseItem/houseItem"
+  }
 }
\ No newline at end of file
diff --git a/pages/search/search.wxml b/pages/search/search.wxml
index ff3083a..0500d9b 100644
--- a/pages/search/search.wxml
+++ b/pages/search/search.wxml
@@ -1,111 +1,91 @@
-<import src="../common/common.wxml" />
+<import src="../common/common.wxml"/>
 <view class="container" wx:if="{{ !isloding }}">
-    <to-top wx:if="{{ showTOTOP }}"></to-top>
-    <header-nav bgcolor="rgba(246, 246, 246, 1)" notShowIndex="{{ true }}" inner-text="Some text">搜索</header-nav>
-    <view class='header flexacenter'>
-        <form class="flexacenter" bindsubmit="submit" report-submit='true' data-types="confirm">
-            <image class="search-btn" src="../../img/search-icon.svg"></image>
-            <input placeholder='搜索房源或输入房源ID' placeholder-class='placeholder' confirm-type='search' value='{{kw}}' bindinput='input' bindconfirm='submit' focus="{{ focus }}"></input>
-            <view class="clear" bindtap="clearKW" hidden="{{ kw.length==0 }}">
-                <image class="clear-icon" src="/img/gray-cross.png"></image>
-            </view>
-        </form>
-        <view wx:if="{{ search }}" bindtap='cancle' class='navigator'>取消</view>
-        <view class="navigator color-red" bindtap='submit' wx:if="{{ !search }}">搜索</view>
+ <to-top wx:if="{{ showTOTOP }}"></to-top>
+  <header-nav inner-text="Some text">搜索</header-nav>
+  <view class='header'>
+    <form bindsubmit="submit" report-submit='true'data-types="confirm">
+      
+      <image class="search-btn" src="../../img/search-6.png"></image>
+      <input placeholder='试试输入地段、学校等关键词' placeholder-class='placeholder' confirm-type='search' value='{{kw}}' bindinput='input' bindconfirm='submit' focus="{{focus}}"></input>
+      <view class="clear" bindtap="clearKW" hidden="{{ kw.length==0 }}">
+        <view class="close"><image src="/img/close-f.png"></image></view>
+      </view>
+    </form>
+    <view wx:if="{{ search }}" bindtap='cancle' class='navigator'>取消</view>
+    <view class="navigator color-red" bindtap='submit' wx:if="{{ !search }}" >搜索</view>
+    
+  </view>
+  <view class="border-top20" wx:if="{{ !search }}">
+    <view class='keywords history' wx:if="{{ log.length>0 }}" >
+      <view class='name'>
+        历史搜索
+        <view class="del" bindtap='clear_keywords'><image src="/img/del-6.png"></image></view>
+        
+      </view>
+      <view class='box' >
+        <view wx:for="{{ log }}" wx:key="index" bindtap='select_kw' data-kw="{{ item }}" class='label'>{{ item }}</view>
+      </view>
     </view>
-
-    <view class="border-top20" wx:if="{{ !search }}">
-        <view class='keywords history' wx:if="{{ log.length>0 }}">
-            <view class='name'>
-                历史搜索
-                <view class="del" bindtap='clear_keywords'>
-                    <image src="/img/del-6.png"></image>
-                </view>
-
-            </view>
-            <view class='box'>
-                <view wx:for="{{ log }}" wx:key="index" bindtap='select_kw' data-kw="{{ item }}" class='label'>{{ item }}</view>
-            </view>
-        </view>
-        <view class='keywords' wx:if="{{ hot.length>0}}">
-            <view class='name'>
-                热门搜索
-            </view>
-            <view class='box'>
-                <view wx:for="{{ hot }}" wx:key="index" bindtap='select_kw' data-kw="{{ item }}" class='label'>{{ item }}</view>
-            </view>
-        </view>
+    <view class='keywords' wx:if="{{ hot.length>0}}" >
+      <view class='name'>
+        热门搜索
+      </view>
+      <view class='box'>
+        <view wx:for="{{ hot }}" wx:key="index" bindtap='select_kw' data-kw="{{ item }}" class='label'>{{ item }}</view>
+      </view>
     </view>
-    <block wx:if="{{ search }}">
-        <view class="tab-box">
-            <view class="tab  {{ tab == index ? 'active' :'' }}" wx:for="{{ tabList }}" bindtap="changeTab" data-tab="hongkongrental">
-                <view class="text">{{ item }}</view>
-            </view>
-        </view>
-        <view class="tab-box" wx:if="{{ false }}">
-            <view class="{{tab =='hongkongrental' ? 'tab active' :'tab'}}" bindtap="changeTab" data-tab="hongkongrental">
-                <view class="text">个人房源 3 </view>
-            </view>
-            <view class="{{tab =='studentapartment' ? 'tab active' :'tab'}}" bindtap="changeTab" data-tab="studentapartment">
-                <view class="text">品牌公寓</view>
-            </view>
-            <!-- <view class="{{tab =='otherrental' ? 'tab active' :'tab'}}" bindtap="changeTab" data-tab="otherrental"><view class="text">世界各地房源</view></view> -->
-            <!-- <view class="{{tab =='otherrental' ? 'tab active' :'tab'}}" bindtap="changeTab" data-tab="otherrental"><view class="text">其他地区房源</view></view> -->
-            <view class="{{tab =='otherrental' ? 'tab active' :'tab'}}" bindtap="changeTab" data-tab="otherrental">
-                <view class="text">求房源</view>
-            </view>
-        </view>
-
-        <list-operations tabTitle="个人房源" property="{{ property }}" school="{{ school }}" types="{{ types }}" location="{{ location }}" operationstype="housing" money="{{ money }}" brands="{{ brands }}" screen_data="{{ screen_data }}" roomtype="{{ roomtype }}" roomlistings="{{ roomlistings }}" bindsubmit="submitOperations" bindsubmit="submitarea"></list-operations>
-
-        <block wx:for="{{ hongkongrental.list }}">
-            <common-list item="{{ item }}"></common-list>
+  </view>
+  <block wx:if="{{ search }}">
+    <view class="tab-box">
+      <view class="{{tab =='hongkongrental' ? 'tab active' :'tab'}}" bindtap="changeTab" data-tab="hongkongrental"><view class="text">个人房源</view></view>
+      <view class="{{tab =='studentapartment' ? 'tab active' :'tab'}}" bindtap="changeTab" data-tab="studentapartment"><view class="text">品牌公寓</view></view>
+      <!-- <view class="{{tab =='otherrental' ? 'tab active' :'tab'}}" bindtap="changeTab" data-tab="otherrental"><view class="text">世界各地房源</view></view> -->
+      <!-- <view class="{{tab =='otherrental' ? 'tab active' :'tab'}}" bindtap="changeTab" data-tab="otherrental"><view class="text">其他地区房源</view></view> -->
+      <view class="{{tab =='otherrental' ? 'tab active' :'tab'}}" bindtap="changeTab" data-tab="otherrental"><view class="text">求房源</view></view>
+    </view>
+    <template is="loading" wx:if="{{ loading }}"></template>
+    <view hidden="{{ tab !='hongkongrental'}}" class="hongkongrental">
+      <view class='list list2'>
+        <block wx:for="{{ hongkongrental.list }}" wx:key="index">
+          <template is="personalList" wx:if="{{ !item.isad }}" data="{{ item:item }}"/>
+          <ads isList="true" wx:if="{{ item.isad }}" data-tab="hongkongrental" data-index="{{ index }}" bindclickAD="clickAD" bindcloseAD="closeAD" item="{{ item }}"></ads>
         </block>
-
-
-        <template is="loading" wx:if="{{ loading }}"></template>
-        <view hidden="{{ tab !='hongkongrental'}}" class="hongkongrental">
-            <view class='list list2'>
-                <block wx:for="{{ hongkongrental.list }}" wx:key="index">
-                    <template is="personalList" wx:if="{{ !item.isad }}" data="{{ item:item }}" />
-                    <ads isList="true" wx:if="{{ item.isad }}" data-tab="hongkongrental" data-index="{{ index }}" bindclickAD="clickAD" bindcloseAD="closeAD" item="{{ item }}"></ads>
-                </block>
-            </view>
-            <template is="loading" wx:if="{{ hongkongrental.loading }}"></template>
-            <template is="nocontent" wx:if="{{ !hongkongrental.loading && hongkongrental.list.length==0}}"></template>
-        </view>
-        <view class="studentapartment" hidden="{{ tab !='studentapartment'}}">
-            <block wx:for="{{ studentapartment.list }}" wx:key="index">
-                <brands-item item="{{ item }}"></brands-item>
-            </block>
-            <template is="loading" wx:if="{{ studentapartment.loading }}"></template>
-            <template is="nocontent" wx:if="{{ !studentapartment.loading && studentapartment.list.length==0}}"></template>
-        </view>
-        <view class="otherrental {{ !otherrental.loading && otherrental.list.length==0 ?'otherrental-empty':''}}" hidden="{{ tab !='otherrental'}}">
-            <block wx:for="{{ otherrental.list }}" wx:key="index">
-
-                <navigator wx:if="{{ !item.isad }}" url="/pages/show/show?tid={{ item.tid }}&uniqid={{ item.uniqid }}">
-                    <house-item item="{{ item }}" isSearchPage="true"></house-item>
-                </navigator>
-                <ads isList="true" wx:if="{{ item.isad }}" data-index="{{ index }}" bindclickAD="clickAD" data-tab="otherrental" bindcloseAD="closeAD" item="{{ item }}"></ads>
-            </block>
-            <template is="loading" wx:if="{{ otherrental.loading }}"></template>
-            <template is="nocontent" wx:if="{{ !otherrental.loading && otherrental.list.length==0}}"></template>
-        </view>
-    </block>
+      </view>
+      <template is="loading" wx:if="{{ hongkongrental.loading }}"></template>
+      <template is="nocontent" wx:if="{{ !hongkongrental.loading && hongkongrental.list.length==0}}"></template>    
+    </view>
+    <view class="studentapartment" hidden="{{ tab !='studentapartment'}}">
+      <block wx:for="{{ studentapartment.list }}" wx:key="index">
+        <brands-item item="{{ item }}"></brands-item>
+      </block>
+      <template is="loading" wx:if="{{ studentapartment.loading }}"></template>
+      <template is="nocontent" wx:if="{{ !studentapartment.loading && studentapartment.list.length==0}}"></template> 
+    </view>
+    <view class="otherrental {{ !otherrental.loading && otherrental.list.length==0 ?'otherrental-empty':''}}" hidden="{{ tab !='otherrental'}}">
+      <block wx:for="{{ otherrental.list }}" wx:key="index" >
+      
+        <navigator wx:if="{{ !item.isad }}"  url="/pages/show/show?tid={{ item.tid }}&uniqid={{ item.uniqid }}">
+          <house-item item="{{ item }}" isSearchPage="true"></house-item>
+        </navigator>
+        <ads isList="true" wx:if="{{ item.isad }}" data-index="{{ index }}" bindclickAD="clickAD" data-tab="otherrental" bindcloseAD="closeAD" item="{{ item }}"></ads>
+      </block>
+      <template is="loading" wx:if="{{ otherrental.loading }}"></template>
+      <template is="nocontent" wx:if="{{ !otherrental.loading && otherrental.list.length==0}}"></template>
+    </view>
+  </block>
 </view>
 <template name="loading">
-    <view class="loading">
-        <view></view>
-        <view></view>
-        <view></view>
-        <view></view>
-        <view></view>
-    </view>
+  <view class="loading" >
+    <view></view>
+    <view></view>
+    <view></view>
+    <view></view>
+    <view></view>
+  </view>
 </template>
 <template name="nocontent">
-    <view class='nocontent'>
-        <image src="/img/nocontent.png" class='file'></image>
-        没有找到相关信息
-    </view>
+  <view class='nocontent'>
+    <image src="/img/nocontent.png" class='file'></image> 
+    没有找到相关信息
+  </view>  
 </template>
\ No newline at end of file
diff --git a/pages/search/search.wxss b/pages/search/search.wxss
index 002dcfe..54b93e8 100644
--- a/pages/search/search.wxss
+++ b/pages/search/search.wxss
@@ -1,437 +1,428 @@
-.container {
-    background-color: rgba(245, 245, 245, 1);
-}
-
+/* pages/search/search.wxss */
 .header {
-    /* border-bottom: 1px solid #f2f2f2; */
-    padding: 20rpx 30rpx 48rpx;
-    font-size: 0;
-
-    background-color: rgba(246, 246, 246, 1);
+  border-bottom: 1px solid #f2f2f2;
+  padding: 20rpx 20rpx;
+  font-size: 0;
 }
 
 .border-top20 {
-    /* border-top: 10rpx solid #f2f2f2; */
+  border-top: 10rpx solid #f2f2f2;
 }
 
 .header form {
-    /* display: inline-block; */
-    background: #fff;
-    /* width: calc(100% - 80rpx); */
-    width: 588rpx;
-    height: 84rpx;
-    /* line-height: 40rpx; */
-    padding: 0 30rpx;
-    /* border-radius: 8rpx; */
-    box-sizing: border-box;
-    vertical-align: middle;
-    color: #333;
-    position: relative;
-    border-radius: 306rpx;
-    box-shadow: 0 0 12rpx rgba(0, 0, 0, 0.0784313725490196);
+  display: inline-block;
+  background: #f2f2f2;
+  width: calc(100% - 80rpx);
+  height: 92rpx;
+  line-height: 40rpx;
+  padding: 25rpx 30rpx;
+  border-radius: 8rpx;
+  box-sizing: border-box;
+  vertical-align: middle;
+  color: #666;
+  position: relative;
 }
 
 .header .search-btn {
-    width: 30rpx;
-    height: 30rpx;
-    vertical-align: sub;
-    /* display: inline-block; */
-    /* vertical-align: middle; */
+  width: 32rpx;
+  height: 32rpx;
+  display: inline-block;
+  vertical-align: middle;
 }
 
 .header input {
-    display: inline-flex;
-    /* width: 100%; */
-    /* flex: 1; */
-    /* height: 40rpx; */
-    /* height: 100%; */
-    height: 84rpx;
-    font-size: 28rpx;
-    /* vertical-align: middle; */
-    padding: 0 10rpx;
-    box-sizing: border-box;
+  display: inline-block;
+  width: calc(100% - 82rpx);
+  height: 40rpx;
+  font-size: 28rpx;
+  vertical-align: middle;
+  padding: 0 10rpx;
+  box-sizing: border-box;
 }
 
 .header .clear {
-    position: absolute;
-    right: 0;
-    top: 50%;
-    padding: 30rpx;
-    transform: translateY(-50%);
+  position: absolute;
+  right: 0;
+  top: 50%;
+  padding: 30rpx;
+  transform: translateY(-50%);
 }
 
-.header .clear .clear-icon {
-    width: 30rpx;
-    height: 30rpx;
+.header .clear .close {
+  width: 28rpx;
+  height: 28rpx;
+  border-radius: 50%;
+  background: #c2c2c2;
+  padding: 7rpx;
+  text-align: center;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+}
+
+.header .clear .close image {
+  width: 12rpx;
+  height: 12rpx;
 }
 
 .header navigator {
-    font-size: 30rpx;
-    display: inline-block;
-    width: 80rpx;
-    text-align: right;
-    vertical-align: middle;
+  font-size: 30rpx;
+  display: inline-block;
+  width: 80rpx;
+  text-align: right;
+  vertical-align: middle;
 }
 
 .header .navigator {
-    font-size: 30rpx;
-    display: inline-block;
-    width: 80rpx;
-    text-align: right;
-    vertical-align: middle;
+  font-size: 30rpx;
+  display: inline-block;
+  width: 80rpx;
+  text-align: right;
+  vertical-align: middle;
 }
 
 .keywords {
-    padding: 40rpx 0rpx 0rpx;
+  padding: 40rpx 0rpx 0rpx;
 }
 
 .keywords .name {
-    font-size: 24rpx;
-    color: #7F7F7F;
-    padding-left: 20rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 30rpx;
+  color: #ccc;
+  padding-left: 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 30rpx;
 }
 
 .keywords .label {
-    margin: 0 20rpx 20rpx 0;
-    background: #f2f2f2;
-    line-height: 72rpx;
-    border-radius: 10rpx;
-    display: inline-block;
-    padding: 0 36rpx;
-    font-size: 26rpx;
-    color: #000000;
-    word-break: break-word;
+  margin: 0 20rpx 20rpx 0;
+  background: #f2f2f2;
+  line-height: 72rpx;
+  border-radius: 10rpx;
+  display: inline-block;
+  padding: 0 36rpx;
+  font-size: 26rpx;
+  color: #666;
+  word-break: break-word;
 }
 
 .history {
-    padding-left: 0;
-    /* border-bottom: 1px solid #e8e8e8; */
-    padding-bottom: 20rpx;
-    padding-top: 28rpx;
+  padding-left: 0;
+  border-bottom: 1px solid #e8e8e8;
+  padding-bottom: 20rpx;
+  padding-top: 28rpx;
 }
 
 .history .name {
-    margin-bottom: 10rpx;
+  margin-bottom: 10rpx;
 }
 
 .history.keywords .label {
-    /* background: transparent;
+  /* background: transparent;
   padding: 0 20rpx;
   line-height: 40rpx; */
 }
 
 .keywords .box {
-    /* margin-right: -20rpx; */
-    text-align: justify;
-    font-size: 0;
-    padding-left: 20rpx;
+  /* margin-right: -20rpx; */
+  text-align: justify;
+  font-size: 0;
+  padding-left: 20rpx;
 }
 
 .history.keywords .box {
-    /* padding-left: 0; */
+  /* padding-left: 0; */
 }
 
 .keywords .del {
-    display: inline-flex;
-    padding: 20rpx;
+  display: inline-flex;
+  padding: 20rpx;
 }
 
 .keywords .del image {
-    width: 26rpx;
-    height: 26rpx;
+  width: 26rpx;
+  height: 26rpx;
 }
 
 .nocontent {
-    text-align: center;
-    font-size: 28rpx;
-    color: #ccc;
-    line-height: 60rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #ccc;
+  line-height: 60rpx;
 }
 
 button {
-    background: transparent;
-    border: none;
-    position: absolute;
-    width: 32rpx;
-    height: 32rpx;
-    left: 30rpx;
-    top: 25rpx;
-    z-index: 100000;
-    padding: 0;
+  background: transparent;
+  border: none;
+  position: absolute;
+  width: 32rpx;
+  height: 32rpx;
+  left: 30rpx;
+  top: 25rpx;
+  z-index: 100000;
+  padding: 0;
 }
 
 button::after {
-    border: none;
-    padding: 0;
-    background: transparent;
+  border: none;
+  padding: 0;
+  background: transparent;
 }
 
 button:hover {
-    background: transparent
+  background: transparent
 }
 
 .nocontent {
-    text-align: center;
-    font-size: 28rpx;
-    color: #999;
-    background: #f3f4f5;
-    height: 640rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
+  text-align: center;
+  font-size: 28rpx;
+  color: #999;
+  background: #f3f4f5;
+  height: 640rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
 }
 
 .file {
-    width: 158rpx;
-    height: 110rpx;
-    display: block;
-    margin: 0 auto 8rpx;
+  width: 158rpx;
+  height: 110rpx;
+  display: block;
+  margin: 0 auto 8rpx;
 }
 
 .color-red {
-    color: #C63E3A;
+  color: #C63E3A;
 }
 
 .getuserbtn {
-    height: 100%;
-    background: transparent;
-    z-index: 1000;
-    width: 100%;
-    margin: 0;
-    position: static;
+  height: 100%;
+  background: transparent;
+  z-index: 1000;
+  width: 100%;
+  margin: 0;
+  position: static;
 
 }
 
 .tab-box {
-    display: flex;
-    border-bottom: 1px solid #e8e8e8;
-    background-color: rgba(245, 245, 245, 1);
+  display: flex;
+  border-bottom: 1px solid #e8e8e8;
 }
 
 .tab-box .tab {
-    display: inline-flex;
-    /* flex: 1; */
-    justify-content: center;
-
-    font-size: 30rpx;
-    padding: 0 30rpx;
+  display: inline-flex;
+  flex: 1;
+  justify-content: center;
 }
 
 .tab-box .text {
-    position: relative;
-    /* height: 106rpx; */
-    display: inline-flex;
-    align-items: center;
-    padding: 12rpx 0;
-
-}
-
-.tab-box .active {
-    font-weight: 650;
-
+  position: relative;
+  height: 106rpx;
+  display: inline-flex;
+  align-items: center;
 }
 
 .tab-box .active .text::after {
-    content: "";
-    display: block;
-    position: absolute;
-    left: 0;
-    bottom: -4rpx;
-    background-color: rgb(255, 192, 95);
-    width: 100%;
-    height: 7.5rpx;
-    border-radius: 7rpx;
+  content: "";
+  display: block;
+  position: absolute;
+  left: 0;
+  bottom: -4rpx;
+  background-color: rgb(255, 192, 95);
+  width: 100%;
+  height: 7rpx;
+  border-radius: 7rpx;
 }
 
 .studentapartment {
-    background: #f3f4f5;
-    padding: 16rpx 30rpx;
-    min-height: calc(100vh - 300rpx);
-    box-sizing: border-box;
+  background: #f3f4f5;
+  padding: 16rpx 30rpx;
+  min-height: calc(100vh - 300rpx);
+  box-sizing: border-box;
 }
 
 .otherrental {
-    background: #f3f4f5;
-    padding: 16rpx 0rpx;
-    min-height: calc(100vh - 300rpx);
-    box-sizing: border-box;
+  background: #f3f4f5;
+  padding: 16rpx 0rpx;
+  min-height: calc(100vh - 300rpx);
+  box-sizing: border-box;
 }
 
 .otherrental-empty {
-    background: #f3f4f5;
+  background: #f3f4f5;
 }
 
 .hongkongrental {
-    background: #f3f4f5;
-    padding: 16rpx 0rpx;
-    min-height: calc(100vh - 300rpx);
-    box-sizing: border-box;
+  background: #f3f4f5;
+  padding: 16rpx 0rpx;
+  min-height: calc(100vh - 300rpx);
+  box-sizing: border-box;
 }
 
 .hongkongrental .list {
-    background: #fff;
+  background: #fff;
 }
 
 .personalList .region {
-    height: 44rpx;
-    padding: 0 18rpx;
-    border-radius: 18rpx;
-    background-color: #f2f2f2;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 22rpx;
-    color: #555555;
+  height: 44rpx;
+  padding: 0 18rpx;
+  border-radius: 18rpx;
+  background-color: #f2f2f2;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 22rpx;
+  color: #555555;
 }
 
 .personalList .tips {
-    margin-top: 28rpx;
-    color: #555555;
-    font-size: 22rpx;
+  margin-top: 28rpx;
+  color: #555555;
+  font-size: 22rpx;
 }
 
 .personalList .footer {
-    color: #343434;
+  color: #343434;
 }
 
 .personalList .money {
-    margin-top: 32rpx;
-    font-size: 26rpx;
-    line-height: 26rpx;
+  margin-top: 32rpx;
+  font-size: 26rpx;
+  line-height: 26rpx;
 }
 
 .personalList {
-    border-bottom: 15rpx solid #eee;
+  border-bottom: 15rpx solid #eee;
 }
 
 .personalList .footer {
-    height: 90rpx;
-    line-height: 90rpx;
-    border-top: 2rpx dashed #d0d0d0;
-    padding-left: 30rpx;
-    padding-right: 30rpx;
-    margin-top: 40rpx;
-    align-items: center;
+  height: 90rpx;
+  line-height: 90rpx;
+  border-top: 2rpx dashed #d0d0d0;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  margin-top: 40rpx;
+  align-items: center;
 }
 
 .personalList .submit-form {
-    padding-left: 0;
-    padding-right: 0;
-    padding-bottom: 0;
-    padding-top: 38rpx;
+  padding-left: 0;
+  padding-right: 0;
+  padding-bottom: 0;
+  padding-top: 38rpx;
 }
 
 .personalList .personalList-top {
-    padding: 0 30rpx;
+  padding: 0 30rpx;
 }
 
 .personalList .personalList-avatar {
-    width: 34rpx;
-    height: 34rpx;
-    border-radius: 50rpx;
+  width: 34rpx;
+  height: 34rpx;
+  border-radius: 50rpx;
 }
 
 .personalList .l {
-    display: flex;
-    align-items: center;
-    height: 90rpx;
-    line-height: 90rpx;
+  display: flex;
+  align-items: center;
+  height: 90rpx;
+  line-height: 90rpx;
 }
 
 .personalList .personalList-name {
-    font-size: 28rpx;
-    padding: 0 24rpx 0 20rpx;
+  font-size: 28rpx;
+  padding: 0 24rpx 0 20rpx;
 }
 
+
+.personalList .authentication-icon {
+    width: 125rpx;
+    height: 34rpx;
+  }
+
 .personalList .agent {
-    color: #343434;
-    background-color: #fff;
-    border: 2rpx solid #d3d3d3;
-    display: flex;
-    align-content: center;
+  color: #343434;
+  background-color: #fff;
+  border: 2rpx solid #d3d3d3;
+  display: flex;
+  align-content: center;
 }
 
 .personalList .footer-right {
-    height: 36rpx;
-    line-height: 36rpx;
-    display: flex;
-    align-items: center;
-    padding: 0 18rpx;
-    border-radius: 8rpx;
-    background-color: #e8f4ff;
-    color: #5eb1ff;
+  height: 36rpx;
+  line-height: 36rpx;
+  display: flex;
+  align-items: center;
+  padding: 0 18rpx;
+  border-radius: 8rpx;
+  background-color: #e8f4ff;
+  color: #5eb1ff;
 }
 
 .personalList .housingInfo {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
 
 .personalList .housingSite {
-    flex: 1;
+  flex: 1;
 }
 
 .personalList .housingMedia {
-    width: 200rpx;
-    height: 150rpx;
-    margin-left: 10rpx;
-    position: relative;
+  width: 200rpx;
+  height: 150rpx;
+  margin-left: 10rpx;
+  position: relative;
 }
 
 .personalList .housingMedia image {
-    width: 200rpx;
-    height: 150rpx;
-    border-radius: 15rpx;
+  width: 200rpx;
+  height: 150rpx;
+  border-radius: 15rpx;
 }
 
 .personalList .orientation {
-    width: 35rpx;
-    height: 35rpx;
-    margin-right: 10rpx;
+  width: 35rpx;
+  height: 35rpx;
+  margin-right: 10rpx;
 }
 
 .personalList .tips .i:not(:last-child):after {
-    background-color: #555555;
+  background-color: #555555;
 }
 
 .personalList .title {
-    font-weight: bold;
-    line-height: 38rpx;
+  font-weight: bold;
+  line-height: 38rpx;
 }
 
 .personalList .housingVideo {
-    width: 200rpx;
-    height: 150rpx;
-    margin-left: 10rpx;
-    border-radius: 15rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    overflow: hidden;
+  width: 200rpx;
+  height: 150rpx;
+  margin-left: 10rpx;
+  border-radius: 15rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
 }
 
 .personalList .housingVideo .playBtn-bj {
-    position: absolute;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 200rpx;
-    height: 150rpx;
-    background: rgba(0, 0, 0, 0.5);
+  position: absolute;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 200rpx;
+  height: 150rpx;
+  background: rgba(0, 0, 0, 0.5);
 }
 
 .personalList .housingVideo .playBtn {
-    width: 46rpx;
-    height: 46rpx;
-    border-radius: 50rpx;
-}
-
-.header1 {}
-
-.header1 .header1-input {}
\ No newline at end of file
+  width: 46rpx;
+  height: 46rpx;
+  border-radius: 50rpx;
+}
\ No newline at end of file
diff --git a/template/commonList/commonList.js b/template/commonList/commonList.js
index 2d872e3..fe1838e 100644
--- a/template/commonList/commonList.js
+++ b/template/commonList/commonList.js
@@ -7,9 +7,7 @@ Component({
         item: {
             type: Object,
             observer(res) {
-                console.log(res);
-                let tabList = []
-                
+                // let tabList = []
             }
         }
     },
diff --git a/template/commonList/commonList.wxml b/template/commonList/commonList.wxml
index 14241fb..54ed281 100644
--- a/template/commonList/commonList.wxml
+++ b/template/commonList/commonList.wxml
@@ -28,8 +28,8 @@
                 </view>
             </view>
             <view class="right flexflex">
-                <image wx:if="{{ item.isvideo == 0 }}" class="image" mode="widthFix" src="{{ item.imageurl }}"></image>
-                <view wx:else class="video flexflex">
+                <image wx:if="{{ item.ispic }}" class="image" mode="widthFix" src="{{ item.imageurl }}"></image>
+                <view wx:elif="{{ item.isvideo }}" class="video flexflex">
                     <view class="mask"></view>
                     <image class="image" mode="widthFix" src="{{ item.imageurl }}"></image>
                     <image class="video-icon" src="/img/videoplay.png"></image>
@@ -44,7 +44,7 @@
             <view class="name">{{ item.author }}</view>
             <view class="label flexcenter" wx:if="{{ item.intermediary }}">{{ item.intermediary }}</view>
             <!-- <view class="label flexcenter">男生</view> -->
-            <image class="user-tag" mode="widthFix" src="/img/intermediary-agent.png"></image>
+            <!-- <image class="user-tag" mode="widthFix" src="/img/intermediary-agent.png"></image> -->
         </view>
 
         <view class="footer-right">
diff --git a/template/commonList/commonList.wxss b/template/commonList/commonList.wxss
index 7ca22ee..195efa5 100644
--- a/template/commonList/commonList.wxss
+++ b/template/commonList/commonList.wxss
@@ -4,8 +4,8 @@
 .item {
     position: relative;
     background-color: #fff;
-    margin: 0 28rpx;
-    border-radius: 24rpx;
+    margin: 0 28rpx 24rpx;
+    border-radius: 24rpx 40rpx 24rpx 24rpx;
     box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.0784313725490196);
 }
 
@@ -28,11 +28,9 @@
 
 .top-right-corner .top-right-corner-content {
     background-color: #fff;
-    border-radius: 0 35rpx 0 0;
-
+    border-radius: 0 40rpx 0 0;
     width: 100%;
     height: 100%;
-
 }
 
 .title {
diff --git a/template/listOperations/listOperations.wxml b/template/listOperations/listOperations.wxml
index 721f4dd..cf5f96c 100644
--- a/template/listOperations/listOperations.wxml
+++ b/template/listOperations/listOperations.wxml
@@ -9,7 +9,8 @@
     <view class="page-action-item flexcenter bold" bindtap="setValue" data-key="conditionState" data-value="{{ index }}">
         <block wx:if="{{ item['valueText'] }}">{{ item['valueText'] }}</block>
         <view wx:else class="unselected">{{ item.name }}</view>
-        <view class="page-action-circle flexcenter">
+        <image wx:if="{{ index == 'orderby' }}" class="page-action-sort-icon" mode="widthFix" src="/img/sort-icon.png"></image>
+        <view wx:else class="page-action-circle flexcenter">
             <image class="page-action-circle-icon" mode="widthFix" src="/img/arrow-gray.png"></image>
         </view>
     </view>
diff --git a/template/listOperations/listOperations.wxss b/template/listOperations/listOperations.wxss
index c60ac6c..b6b63a1 100644
--- a/template/listOperations/listOperations.wxss
+++ b/template/listOperations/listOperations.wxss
@@ -61,6 +61,12 @@
     color: #7F7F7F;
 }
 
+.page-action-sort-icon {
+    width: 30rpx;
+    height: 30rpx;
+    margin-left: 9rpx;
+}
+
 .page-action-bar .page-action-circle.pitch {
     background-color: #000;
     transform: rotate(180deg);