From 2d8f407e2612b79d94f52f3dd4b922785c0dfbb1 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Thu, 29 Jun 2023 16:33:52 +0800
Subject: [PATCH] =?UTF-8?q?4.0=E7=89=88=E6=9C=AC=E4=B8=8A=E7=BA=BF?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=9C=B0=E5=9B=BE=E6=89=BE=E6=88=BF=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/edit/edit.js                     |  2 -
 pages/index/index.js                   |  1 +
 pages/irentDetail/irentDetail.wxml     |  2 +-
 pages/irentDetail/irentDetail.wxss     | 35 +---------------
 pages/messageCenter/messageCenter.js   | 12 +++++-
 pages/messageCenter/messageCenter.wxml | 58 ++++++++++++++------------
 pages/messageCenter/messageCenter.wxss | 21 +++++++++-
 pages/restOfWorld/restOfWorld.js       | 11 +++--
 pages/restOfWorld/restOfWorld.wxml     |  5 ++-
 pages/search/search.js                 | 51 ++++++++++++++--------
 pages/search/search.wxml               | 36 +++-------------
 pages/show/show.js                     | 36 +++++-----------
 pages/user/user.wxml                   |  1 -
 13 files changed, 125 insertions(+), 146 deletions(-)

diff --git a/pages/edit/edit.js b/pages/edit/edit.js
index f0695bb..874cf34 100644
--- a/pages/edit/edit.js
+++ b/pages/edit/edit.js
@@ -2079,8 +2079,6 @@ Page({
 
     chooseLocation: function (e) {
         let that = this
-        // this.choosel()
-        // return
         // 因为 PC端 不能使用 wx.chooseLocation 组件，需要判断打开地图插件还是组件
         if (this.data.isPC) this.choosel()
         else {
diff --git a/pages/index/index.js b/pages/index/index.js
index 208ecfa..31cb21d 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -190,6 +190,7 @@ Page({
             listPage: 1,
             pagevalue: 0,
         })
+        this.getListDataState = false 
         this.leftHeight = 0
         this.rightHeight = 0
         this.getListData()
diff --git a/pages/irentDetail/irentDetail.wxml b/pages/irentDetail/irentDetail.wxml
index 6202a5c..a6bddfa 100644
--- a/pages/irentDetail/irentDetail.wxml
+++ b/pages/irentDetail/irentDetail.wxml
@@ -116,7 +116,7 @@
             <view class="apartment-tips-text flexacenter">公寓/酒店/中介房源推广合作请联系： <view class="" style="text-decoration: underline;" bindtap="copy" data-value="ad@gter.net">ad@gter.net</view></view>
         </view>
 
-        <view class="apartment-block" id="dual-brand" wx:key="{{ withSameBrand.length }}">
+        <view class="apartment-block" id="dual-brand" wx:if="{{ withSameBrand.length }}">
             <template is="apartment-head" data="{{ title:'同品牌推荐', imgUrl:'/img/same-brand-recommendation.png' }}"></template>
             <view class="apartment-list flexcenter">
                 <template is="apartment-item" wx:for="{{ withSameBrand }}" wx:key="index" data="{{ item }}"></template>
diff --git a/pages/irentDetail/irentDetail.wxss b/pages/irentDetail/irentDetail.wxss
index b8c0780..8b9fd92 100644
--- a/pages/irentDetail/irentDetail.wxss
+++ b/pages/irentDetail/irentDetail.wxss
@@ -59,7 +59,6 @@
     vertical-align: middle;
     background: transparent;
     border: none;
-
 }
 
 .share-box .item:after {
@@ -78,7 +77,6 @@
 .images image {
     width: 100%;
     display: block;
-
 }
 
 .share-box .tips {
@@ -139,7 +137,6 @@
 }
 
 .info-box .title {
-
     font-size: 40rpx
 }
 
@@ -157,7 +154,6 @@
 .house-classify .title {}
 
 .house-classify .color-red {
-    /* font-size: 30rpx; */
     color: #C63E3A;
     display: inline-block;
     margin: 0 6rpx;
@@ -212,7 +208,6 @@ map {
 map .clickmap {
     width: 100%;
     height: 100%;
-    /* z-index: -1; */
 }
 
 .add-title {
@@ -222,7 +217,6 @@ map .clickmap {
 .block-box {
     margin: 0 0 0 40rpx;
     padding: 40rpx 40rpx 40rpx 0;
-
 }
 
 .intro {
@@ -233,10 +227,6 @@ map .clickmap {
     line-height: 48rpx;
 }
 
-.block-box:not(:last-child) {
-    /* border-bottom: 1px solid #e4e4e4; */
-}
-
 .intro .item {
     min-height: 48rpx;
     line-height: 48rpx;
@@ -246,7 +236,6 @@ map .clickmap {
     display: flex;
     align-items: top;
     margin-top: 40rpx;
-
 }
 
 .traffic image {
@@ -255,7 +244,6 @@ map .clickmap {
     margin-right: 18rpx;
     position: relative;
     top: 10rpx;
-
 }
 
 .traffic .text {
@@ -272,8 +260,6 @@ map .clickmap {
 .facility {
     padding: 40rpx 0 40rpx 0rpx;
     border-radius: 10rpx;
-
-    /* box-shadow: 1px 1px 8px 3px #e4e4e4; */
 }
 
 .facility .item {
@@ -292,7 +278,6 @@ map .clickmap {
     margin-right: 18rpx;
     position: relative;
     top: 8rpx;
-
 }
 
 .facility .item .text {
@@ -309,10 +294,8 @@ map .clickmap {
 
 .facility .item .text .i {
     display: inline-flex;
-    /*flex:0 0 120rpx;*/
     margin: 0 30rpx 10rpx 0;
     align-items: center;
-
 }
 
 .facility .item .text image {
@@ -327,7 +310,6 @@ map .clickmap {
 }
 
 .tomap {
-    /* position: relative; */
     white-space: nowrap;
     padding-right: 60rpx;
     overflow: hidden;
@@ -407,14 +389,11 @@ map .clickmap {
 .around-school-alert .title .text {
     display: inline-flex;
     justify-content: center;
-
     flex: 1;
     padding: 36rpx 0 36rpx 52rpx;
-
 }
 
 .around-school-alert .close {
-    /* position: absolute; */
     right: 0;
     top: 0;
     width: 52rpx;
@@ -446,7 +425,6 @@ map .clickmap {
 
 .around-school-alert .school .icon,
 .school-list .li .school .icon {
-    /* position: absolute; */
     left: -50rpx;
     top: 8rpx;
     width: 25rpx;
@@ -624,7 +602,6 @@ map .clickmap {
 }
 
 .serviceWindow .QRCode-box .QRCode-item {
-    /* height: 475rpx; */
     height: 430rpx;
     display: flex;
     flex-direction: column;
@@ -802,6 +779,7 @@ map .clickmap {
     position: relative;
     box-shadow: 0 0 12rpx rgba(0, 0, 0, 0.0823529411764706);
     position: relative;
+    padding-bottom: 55rpx;
 }
 
 .container .arc {
@@ -813,17 +791,6 @@ map .clickmap {
     transform: translateY(-100%);
 }
 
-/* .container .content::after {
-    content: "";
-    width: 100rpx;
-    height: 100rpx;
-    background-color: aqua;
-    position: absolute;
-    top: 0;
-    right: 0;
-    transform: translateY(-100%);
-} */
-
 .media-module {
     margin-bottom: 48rpx;
 }
diff --git a/pages/messageCenter/messageCenter.js b/pages/messageCenter/messageCenter.js
index e76628f..170413d 100644
--- a/pages/messageCenter/messageCenter.js
+++ b/pages/messageCenter/messageCenter.js
@@ -63,9 +63,9 @@ Page({
             wx.hideLoading()
             if (res.code == 200) {
                 let data = res.data
+
                 data.data && data.data.forEach(element => {
                     element.message = element.message.trim()
-                    // if (element.message.length >= 40) element['littleMessage'] = element.message.slice(0, 42) + '...'
                 });
 
                 for (let i = 0; i < data.data.length; i++) {
@@ -195,9 +195,17 @@ Page({
     onReachBottom: function () {
         this.getList()
     },
-    
+
     copy(e) {
         let value = e.currentTarget.dataset.value
         miucms.copy(this.data.wechat.wechat)
     },
+
+    // 公共跳转
+    publicJumps(e) {
+        let url = e.currentTarget.dataset.url
+        wx.navigateTo({
+            url: `/pages/webViewwebweb/index?url=${ url }`,
+        })
+    },
 })
\ No newline at end of file
diff --git a/pages/messageCenter/messageCenter.wxml b/pages/messageCenter/messageCenter.wxml
index a31db3f..69b65ce 100644
--- a/pages/messageCenter/messageCenter.wxml
+++ b/pages/messageCenter/messageCenter.wxml
@@ -36,35 +36,39 @@
 
     <!-- 信息 -->
     <view class="information-box {{ isNewVersions ? 'information-new' : '' }}">
-        <view class="information-item" wx:for="{{ list }}" wx:key="index">
-            <view class="time"><text>{{ item.timestamp }}</text>
-                <image wx:if="{{ item.isread == 0 }}" mode="widthFix" src="../../img/u20.png"></image>
-            </view>
-            <view code="true" class="information-title">
-                <view class="information-message" style="display: inline; word-break: break-all;">{{ item.message }}</view>
-                <!-- <view class="information-message" style="display: inline; word-break: break-all;">{{ item.littleMessage || item.message }}</view>
-                <view wx:if="{{ item.reportshowState == 0 &&( item.data.reportnummessage && item.data.reportnummessage.length != 0) || item.littleMessage }}" class="name-tips-close-btn" bindtap="cutUnfoldState" data-index="{{ index }}">
-                    <image src="/img/u124.svg"></image>
-                </view> -->
-            </view>
-            <view class="information-cause-box" wx:if="{{ item.reportshowState != 0 }}">
-                <view class="information-cause-item" wx:for="{{ item.data.reportnummessage}}" wx:for-item="it" wx:key="it">- {{ it }}</view>
-            </view>
-            <view class="resource-information" wx:if="{{ item.data.id }}">
-                <image wx:if="{{ item.data.status != 1}}" class="resource-information-top-icon" src="/img/u75.png" mode="widthFix"></image>
-                <view class="resource-title" bindtap="{{ item.data.status == 1 ? 'jumpDetails' : 'jumpUserPost' }}" data-uniqid="{{ item.data.uniqid }}" data-tenementcertifiedstatus="{{ item.data.tenementcertifiedstatus }}"><text>{{ item.data.subject }}</text>
-                    <image class="pic" wx:if="{{ item.data.isimage == 1 }}" src="/img/pics.jpg" mode="widthFix"></image>
+        <block wx:for="{{ list }}" wx:key="index">
+            <view class="information-item" wx:if="{{ item.event == 'certapplication' }}">
+                <view class="time"><text>{{ item.timestamp }}</text>
+                    <image wx:if="{{ item.isread == 0 }}" mode="widthFix" src="../../img/u20.png"></image>
+                </view>
+                <view code="true" class="information-title">
+                    <view class="information-message" style="display: inline; word-break: break-all;">{{ item.message }}</view>
+                </view>
+                <view class="go-authenticate-btn flexcenter" bindtap="publicJumps" data-url="{{ item.url }}">
+                    去认证
+                    <view class="clickInputLeftArrow"></view>
                 </view>
-                <view class="resource-id">房源ID：{{ item.data.id }}</view>
             </view>
-        </view>
+            <view class="information-item" wx:else>
+                <view class="time"><text>{{ item.timestamp }}</text>
+                    <image wx:if="{{ item.isread == 0 }}" mode="widthFix" src="../../img/u20.png"></image>
+                </view>
+                <view code="true" class="information-title">
+                    <view class="information-message" style="display: inline; word-break: break-all;">{{ item.message }}</view>
+                </view>
+                <view class="information-cause-box" wx:if="{{ item.reportshowState != 0 }}">
+                    <view class="information-cause-item" wx:for="{{ item.data.reportnummessage}}" wx:for-item="it" wx:key="it">- {{ it }}</view>
+                </view>
+                <view class="resource-information" wx:if="{{ item.data.id }}">
+                    <image wx:if="{{ item.data.status != 1}}" class="resource-information-top-icon" src="/img/u75.png" mode="widthFix"></image>
+                    <view class="resource-title" bindtap="{{ item.data.status == 1 ? 'jumpDetails' : 'jumpUserPost' }}" data-uniqid="{{ item.data.uniqid }}" data-tenementcertifiedstatus="{{ item.data.tenementcertifiedstatus }}"><text>{{ item.data.subject }}</text>
+                        <image class="pic" wx:if="{{ item.data.isimage == 1 }}" src="/img/pics.jpg" mode="widthFix"></image>
+                    </view>
+                    <view class="resource-id">房源ID：{{ item.data.id }}</view>
+                </view>
+            </view>
+        </block>
 
-        <!-- <image class="service flexflex" mode="widthFix" wx:if="{{ wechat['service'] }}" show-menu-by-longpress src="{{ wechat['service'] }}"></image> -->
-
-        <!-- 到底了 -->
-        <!-- <view class="onEarth" wx:if="{{ list.length }}">
-            到底了
-        </view> -->
     </view>
 
     <!-- 消息为空时 -->
@@ -81,7 +85,7 @@
         <view class="query-text flexacenter">有疑问？来找<image class="query-img" mode="widthFix" src="/img/smiling-face.png"></image>{{ wechat.nickname }}！</view>
         <view class="query-btn flexcenter" bindtap="copy" data-value="{{ wechat['wechat'] }}">复制微信号</view>
     </view>
-    
+
     <view class="popup-bj" wx:if="{{ popupState }}" bindtap="attention">
         <view class="popup-box" catchtap="popup-box">
             <image catchtap="attention" class="close-icon" src="/img/plusgrey.png"></image>
diff --git a/pages/messageCenter/messageCenter.wxss b/pages/messageCenter/messageCenter.wxss
index 2b564f7..9d2097e 100644
--- a/pages/messageCenter/messageCenter.wxss
+++ b/pages/messageCenter/messageCenter.wxss
@@ -84,7 +84,7 @@
 
 .information-box .information-title {
     font-size: 30rpx;
-    line-height: 65rpx;
+    line-height: 50rpx;
     color: #7f7f7f;
     padding-bottom: 20rpx;
     white-space: pre-line;
@@ -359,4 +359,23 @@
     border: 2rpx solid #333333;
     margin-top: 25.5rpx;
     border-radius: 50rpx;
+}
+
+.go-authenticate-btn {
+    height: 100rpx;
+    color: #000000;
+    border-top: 1rpx solid #ebebeb;
+    margin-left: -30rpx;
+    margin-bottom: -30rpx;
+    width: 690rpx;
+    font-weight: bold;
+}
+
+.clickInputLeftArrow {
+    width: 17rpx;
+    height: 17rpx;
+    border-bottom: 2rpx solid #000000;
+    border-right: 2rpx solid #000000;
+    transform: rotate(-45deg);
+    margin-left: 5px;
 }
\ No newline at end of file
diff --git a/pages/restOfWorld/restOfWorld.js b/pages/restOfWorld/restOfWorld.js
index 28a2945..f4fd7e7 100644
--- a/pages/restOfWorld/restOfWorld.js
+++ b/pages/restOfWorld/restOfWorld.js
@@ -67,7 +67,7 @@ Page({
 
         headerSearchTop: false,
         totalSum: 0, // 数据总数
-
+        allowsearch: false, // 是否需要筛选
         isNewVersions: true,
 
     },
@@ -327,7 +327,8 @@ Page({
                 location: this.data.location,
                 types: this.data.types,
                 property: data.data.property,
-                cityList: data.data.cityList
+                cityList: data.data.cityList,
+                allowsearch: data.data.allowsearch,
             })
             wx.setStorage({
                 key: 'countryList',
@@ -603,7 +604,11 @@ Page({
             url,
         })
     },
-
+    publicJumpsSearch() {
+        wx.navigateTo({
+            url: "/pages/search/search?isAskingSearch=true",
+        })
+    },
 
 
 })
\ No newline at end of file
diff --git a/pages/restOfWorld/restOfWorld.wxml b/pages/restOfWorld/restOfWorld.wxml
index d13d684..a32b850 100644
--- a/pages/restOfWorld/restOfWorld.wxml
+++ b/pages/restOfWorld/restOfWorld.wxml
@@ -2,7 +2,8 @@
 <view class="container">
     <header-nav notShowIndex="{{ true }}" bgcolor="{{ headerSearchTop ? '#fff' : 'transparent' }}">求房源</header-nav>
     <view class="header-bj"></view>
-    <view wx:if="{{ identity == 1 }}" style="position: relative;" bindtap="publicJumps" data-url="/pages/search/search?isAskingSearch=true">
+    <view wx:if="{{ allowsearch }}" style="position: relative;">
+        <view class="" style="width: 100%;height: 100%;position: absolute;z-index: 111;" catchtap="publicJumps" data-url="/pages/search/search?isAskingSearch=true"></view>
         <view wx:if="{{ intermediary != 1 }}" catchtap="setValue" data-key="authenticationPopState" data-value="{{ true }}" class="mengcheng"></view>
         <template is="list-header-search" data="{{ kw:'', isNeedMap: false,disabled: true }}"></template>
     </view>
@@ -11,7 +12,7 @@
         <xin-head-swiper bindrecordSwiperHeight="recordSwiperHeight" data="{{ attachment }}"></xin-head-swiper>
     </view>
 
-    <view wx:if="{{ identity == 1 }}" id="list-operations" class="list-operations {{ operationsTop ? 'list-operations-top' : '' }}" style="top: {{ screen_data.totalTopHeight }}px;">
+    <view wx:if="{{ allowsearch }}" id="list-operations" class="list-operations {{ operationsTop ? 'list-operations-top' : '' }}" style="top: {{ screen_data.totalTopHeight }}px;">
         <!-- <view id="list-operations" class="list-operations {{ operationsTop ? 'list-operations-top' : '' }}" style="top: {{ screen_data.totalTopHeight }}px;"> -->
         <view wx:if="{{ intermediary != 1 }}" class="mengcheng" bindtap="setValue" data-key="authenticationPopState" data-value="{{ true }}"></view>
         <list-operations tabTitle="求房源" property="{{ property }}" school="{{ school }}" types="{{ types }}" location="{{ {data:langs.location} }}" operationstype="askinghousing" money="{{ money }}" brands="{{ brands }}" screen_data="{{ screen_data }}" roomtype="{{ roomtype }}" roomlistings="{{ roomlistings }}" bindsubmit="submitOperations"></list-operations>
diff --git a/pages/search/search.js b/pages/search/search.js
index de716f4..d6a5761 100644
--- a/pages/search/search.js
+++ b/pages/search/search.js
@@ -207,7 +207,7 @@ Page({
             let tab = this.data.tab
             data.forEach(ele => {
                 // 这个是将 详情键 替换语言包里的值
-                let list = ['type', 'rentalduration', 'intermediary', "property", "elevator", "sunshinearea", "gender"]
+                let list = ['type', 'rentalduration', 'intermediary', "property", "elevator", "sunshinearea", "gender", "publishergender"]
                 if (Array.isArray(ele['floor'])) list.push('floor') //  判断 楼层是否需要 替换值, 因为在求房源里是多个值
                 let differentNames = { // 需要替换的 键名
                     "intermediary": "intermediary_text"
@@ -217,7 +217,7 @@ Page({
 
                 list.forEach(element => {
                     if (ele[element] == -1) {} else if (ele[element] == 0) ele[differentNames[element] ? differentNames[element] : element] = '不限' //  当 值为 [0] 时为不限
-                    else ele[differentNames[element] ? differentNames[element] : element] = langs[element][ele[element]]
+                    else ele[differentNames[element] ? differentNames[element] : element] = langs[element == 'publishergender' ? 'gender' : element][ele[element]]
                 })
                 let tabArr = ["gptype", "type", "elevator", "sunshinearea", "gender"]
                 let tabList = []
@@ -236,10 +236,10 @@ Page({
                     ele['locationList'] = locationList
                 } else if (location[pendingData]) ele['location'] = `${location[Math.trunc(pendingData)]}  >  ${location[pendingData]}`
             })
-            let tabData = this.data[tab]["list"] || []
+            let tabData = this.data[this.data.isAskingSearch ? 'asking' : tab]["list"] || []
             tabData = tabData.concat(data)
             this.setData({
-                [`${tab}.list`]: tabData,
+                [`${this.data.isAskingSearch ?  'asking' : tab}.list`]: tabData,
             })
         }
     },
@@ -249,7 +249,12 @@ Page({
      */
     onReachBottom: function () {
         if (!app.globalData.config.lists) return false
-        this.getResultList()
+        if (this.data.isAskingSearch) {
+            this.askingHousingSearch()
+        } else {
+            this.getResultList()
+        }
+        // this.getResultList()
     },
     cancle() {
         var pages = getCurrentPages();
@@ -281,6 +286,7 @@ Page({
     // 提交
     submit: function () {
         // this.data.kw = this.data.kw.trim();
+        console.log(this.data.kw, "this.data.kw");
         if (this.data.kw == '') {
             wx.showToast({
                 title: '请输入内容~',
@@ -303,6 +309,15 @@ Page({
                 data: this.data.log,
             })
         }
+        console.log("this.data.isAskingSearch", this.data.isAskingSearch);
+        if (this.data.isAskingSearch) {
+            this.data.asking = {
+                data: [],
+                page: 1
+            }
+            this.askingHousingSearch()
+        }
+
         this.clearAllData()
         this.clear_list()
     },
@@ -427,9 +442,8 @@ Page({
     // 搜索关键词
     searchKW: function () {
         var that = this;
-        if (!app.globalData.config.search) {
-            return false
-        }
+        if (!app.globalData.config.search) return false
+
         this.setData({
             loading: true
         })
@@ -494,7 +508,6 @@ Page({
 
     // 搜索初始化 新的 自动覆盖上面的
     searchKW() {
-
         // 特殊处理
         if (this.data.isAskingSearch) {
             this.askingHousingSearch()
@@ -520,9 +533,6 @@ Page({
 
             }
 
-
-
-
             this.setData({
                 ...data
             })
@@ -556,11 +566,13 @@ Page({
         miucms.request(url, requestData).then(res => {
             if (res.code != 200) return
             let data = res.data
+
             let concreteData = data.data
             if (concreteData) this.handleDetailData(concreteData)
 
             tabData['page'] = data.page * data.limit >= data.count ? 0 : data.page + 1
             tabData['count'] = data.count
+            console.log("tabData", tabData);
             this.setData({
                 search: true,
                 [tab]: tabData,
@@ -595,6 +607,8 @@ Page({
     // 求房源的中介搜索
     askingHousingSearch() {
         let asking = this.data.asking
+        if (asking['page'] == 0) return
+
         let requestData = {
             keyword: this.data.kw,
             ...this.requestData,
@@ -618,9 +632,6 @@ Page({
             })
 
         })
-
-
-
     },
 
     // 新筛选 的 整合中转
@@ -645,8 +656,14 @@ Page({
             requestData["brand"] = requestData['value']
             this.data.brands.value = requestData['value']
         }
-
-        this.getResultList()
+        console.log(this.data.isAskingSearch, "isAskingSearch");
+        if (this.data.isAskingSearch) {
+            this.data.asking = {
+                data: [],
+                page: 1
+            }
+            this.askingHousingSearch()
+        } else this.getResultList()
 
         this.setData({
             brands: this.data.brands,
diff --git a/pages/search/search.wxml b/pages/search/search.wxml
index 3e66126..f7b75ef 100644
--- a/pages/search/search.wxml
+++ b/pages/search/search.wxml
@@ -49,7 +49,11 @@
             </view>
         </view>
         <list-operations tabTitle="搜索" property="{{ property }}" school="{{ school }}" types="{{ types }}" location="{{ location }}" operationstype="{{ operationstype }}" money="{{ money }}" brands="{{ brands }}" screen_data="{{ screen_data }}" roomtype="{{ roomtype }}" roomlistings="{{ roomlistings }}" bindsubmit="submitOperations"></list-operations>
-        <block wx:if="{{ tab == 'personal' }}">
+        <block wx:if="{{ tab == 'personal' && isAskingSearch }}">
+            <common-list wx:for="{{ asking.list }}" wx:key="index" item="{{ item }}"></common-list>
+            <template wx:if="{{ asking.count == 0 }}" is="empty-icon"></template>
+        </block>
+        <block wx:if="{{ tab == 'personal' && !isAskingSearch }}">
             <common-list wx:for="{{ personal.list }}" wx:key="index" item="{{ item }}"></common-list>
             <template wx:if="{{ personal.count == 0 }}" is="empty-icon"></template>
         </block>
@@ -68,36 +72,6 @@
 
         <template is="loading" wx:if="{{ resultListLoad }}"></template>
 
-        <block wx:if="{{ false }}">
-            <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>
-
     </block>
 </view>
 <template name="loading">
diff --git a/pages/show/show.js b/pages/show/show.js
index 693bac5..87b96dc 100644
--- a/pages/show/show.js
+++ b/pages/show/show.js
@@ -392,11 +392,9 @@ Page({
             let location = langs.location // 遍历替换区域的值  所有房源
             let pendingData = info['location'] || ''
             let locationList = []
-            console.log("location", pendingData);
             if (Array.isArray(pendingData)) {
                 for (const key in location) {
                     if (pendingData.indexOf(key) != -1) {
-                        console.log("Math.trunc(key) != key", Math.trunc(key) != key, key);
                         locationList.push({
                             head: location[Math.trunc(key)],
                             end: Math.trunc(key) != key ? location[key] : '不限',
@@ -410,7 +408,6 @@ Page({
                 })
             }
 
-
             info['locationList'] = locationList
 
             let basicRequirementsList = this.data.basicRequirementsList
@@ -529,7 +526,6 @@ Page({
             })
             return false
         }
-        // if(this.data.info.images && this.data.info.images.length>0){
         // 有圖片，去到分享頁面
         this.setData({
             share: true,
@@ -661,15 +657,12 @@ Page({
     },
     // 去地图
     to_map: function (e) {
-        if (this.data.QRCodeState) {
-            return
-        }
-        var that = this;
+        if (this.data.QRCodeState) return
+
         var latitude = Number(e.currentTarget.dataset.latitude);
         var longitude = Number(e.currentTarget.dataset.longitude);
-        if (latitude == '') {
-            return false
-        }
+        if (latitude == '') return false
+
         var address = e.currentTarget.dataset.address;
         wx.openLocation({
             latitude: latitude,
@@ -747,15 +740,12 @@ Page({
     },
     // 统计点击
     stat(isOpen) {
-        if (this.data.irenCouponReceive.stat === null) {
-            return false
-        }
+        if (this.data.irenCouponReceive.stat === null) return false
+
         miucms.request(app.globalData.config.studentapartment.stat, {
             stat: this.data.irenCouponReceive.stat,
             isOpen
-        }).then(res => {
-
-        }).catch(res => {})
+        }).then(res => {}).catch(res => {})
     },
     // 放大，缩小现金券
     showIrentCoupon() {
@@ -763,9 +753,7 @@ Page({
             irentCouponBig: !this.data.irentCouponBig,
             hideCoupon: false
         })
-        if (!this.data.irentCouponBig) {
-            app.globalData.irentCouponBig = false;
-        }
+        if (!this.data.irentCouponBig) app.globalData.irentCouponBig = false;
 
     },
 
@@ -798,11 +786,9 @@ Page({
             if (res.code != 200) return
             let data = res.data
             let adsTop = []
-            if (data.adspos.option == 1) {
-                adsTop.push(data.data[0])
-            } else if (data.adspos.option == 0) {
-                adsTop = data.data
-            }
+            if (data.adspos.option == 1) adsTop.push(data.data[0])
+            else if (data.adspos.option == 0) adsTop = data.data
+
             that.setData({
                 adsTop,
                 adsposOption: data.adspos.option
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 18ba235..a12c949 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -170,7 +170,6 @@
                 <view class='table'>
                     <view class='cell' bindtap='add_to_fav' data-index="{{ index }}" data-uniqid="{{ item.uniqid }}" data-token="{{ item.token }}">
                         <image class='star' src="../../img/star.png" />取消收藏
-                        <!-- <image class='star' src="../../img/staro.png" wx:if="{{ !item.isfav }}"/> -->
                     </view>
                 </view>
             </view>