From f7ed87953753d8727c83813121427b3ffaa2f7d9 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Wed, 5 Jul 2023 16:56:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A7=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/edit/edit.wxml                          |    2 +-
 pages/index/index.js                          |    1 -
 pages/index/index.wxml                        |    2 +-
 pages/irentDetail/irentDetail.js              |    1 -
 pages/irentDetail/irentDetail.wxml            |  137 +--
 pages/irentDetail/irentDetail.wxss            |    2 +-
 pages/irentList/irentList.js                  |    1 -
 pages/irentList/irentList.wxml                |    5 +-
 pages/messageCenter/messageCenter.js          |   16 -
 pages/messageCenter/messageCenter.wxml        |   51 +-
 pages/messageCenter/messageCenter.wxss        |   49 -
 pages/personList/personList.js                |   14 +-
 pages/personList/personList.wxml              |    4 +-
 pages/personList/tab/tab.js                   |    2 -
 pages/personList/tab/tab.wxml                 |   17 +-
 pages/personList/tab/tab.wxss                 |   93 --
 pages/restOfWorld/restOfWorld.js              |   17 +-
 pages/search/search.js                        |    2 -
 pages/show/show.js                            |    1 -
 pages/show/show.wxml                          | 1089 ++++-------------
 pages/show/show.wxss                          |    8 -
 pages/user/user.js                            |  161 ++-
 pages/user/user.wxml                          |  363 ++----
 pages/user/user.wxss                          |    1 -
 .../setAvatarNickname/setAvatarNickname.js    |    4 -
 template/fixFooter/fixFooter.js               |   40 +-
 template/headSwiper/headSwiper.js             |    1 -
 27 files changed, 439 insertions(+), 1645 deletions(-)

diff --git a/pages/edit/edit.wxml b/pages/edit/edit.wxml
index 55a02e7..c254f93 100644
--- a/pages/edit/edit.wxml
+++ b/pages/edit/edit.wxml
@@ -113,8 +113,8 @@
             <!-- 所在区域 -->
             <view class="edit-option-item">
                 <block wx:for="{{ fieldinfo.address }}" wx:key="index">
-                    <!-- <template wx:if="{{ item.field == 'school' && nearSchoolList.length > 0 }}" is="nearbySchool" data="{{ item, nearSchoolList,index }}"></template> -->
                     <template wx:if="{{ verified == 1 && newinfo[item.field] }}" is="clickInput-unchangeable" data="{{ item,it:'address',index,newinfo,fieldinfo,newcity}}"></template>
+                    <view wx:elif="{{ item.field == 'address' && !newinfo['location'] }}"></view>
                     <template wx:else is="clickInputUnderArrow" data="{{ item,it:'address',index,newinfo,fieldinfo,newcity}}"></template>
                 </block>
 
diff --git a/pages/index/index.js b/pages/index/index.js
index ee6f8e5..1b75b26 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -47,7 +47,6 @@ Page({
         miniProgram: "23231",
         isMapFindState: false,
 
-        isNewVersions: true,
     },
 
     /**
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index fa3de99..af7c5b0 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -139,7 +139,7 @@
         </view>
     </view>
 
-    <fix-footer isNewVersions="{{ isNewVersions }}" unreadMessages="{{ unreadMessages }}" bottomLift="{{ bottomLift }}"></fix-footer>
+    <fix-footer unreadMessages="{{ unreadMessages }}" bottomLift="{{ bottomLift }}"></fix-footer>
     <view class='video-box' wx:if="{{ video }}">
         <video src="{{ video }}" custom-cache="{{false}}" autoplay='true'>
             <cover-view bindtap="closePage" style="top:{{ screen_data.statusBarHeight -5 }}px;height:{{ screen_data.titleBarHeight +10 }}px;width:{{ screen_data.titleBarHeight +10 }}px" class="cover">
diff --git a/pages/irentDetail/irentDetail.js b/pages/irentDetail/irentDetail.js
index 82f7706..60885df 100644
--- a/pages/irentDetail/irentDetail.js
+++ b/pages/irentDetail/irentDetail.js
@@ -64,7 +64,6 @@ Page({
         operationsTop: false,
 
 
-        isNewVersions: true,
 
     },
     timer: null,
diff --git a/pages/irentDetail/irentDetail.wxml b/pages/irentDetail/irentDetail.wxml
index a6bddfa..b7e56f8 100644
--- a/pages/irentDetail/irentDetail.wxml
+++ b/pages/irentDetail/irentDetail.wxml
@@ -1,12 +1,12 @@
 <import src="../common/common.wxml" />
 <import src="../../wxParse/wxParse.wxml" />
-<view class="container {{ isNewVersions ? 'newContainer' : '' }}" wx:if="{{ !isloding }}">
+<view class="container  newContainer" wx:if="{{ !isloding }}">
     <header-nav bgcolor="{{ operationsTop ? '#fff' : 'transparent' }}">公寓详情</header-nav>
     <view class="bj"></view>
     <view class="content">
         <image class="arc" src="/img/arc-shadow.png"></image>
         <view class="media-module">
-            <head-swiper isNewVersions="{{ isNewVersions }}" attachment="{{ attachment }}" bindplay="playVideo" bindclose="closeVideo" pages="apartmentDetail"></head-swiper>
+            <head-swiper attachment="{{ attachment }}" bindplay="playVideo" bindclose="closeVideo" pages="apartmentDetail"></head-swiper>
         </view>
 
         <view class="tab-box flexacenter">
@@ -113,7 +113,8 @@
 
         <view class="apartment-tips">
             <view class="apartment-tips-text">温馨提示：房源信息均由公寓方/酒店提供并对其真实性、合法性等负责，平台不负责甄别和审核具体内容真实性和有效性等，请务必仔细核实相关信息，谨防上当受骗。</view>
-            <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 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:if="{{ withSameBrand.length }}">
@@ -126,134 +127,9 @@
 
     <template is="irenCouponReceive" data="{{ irentCouponBig:irentCouponBig,hideCoupon:hideCoupon,irenCouponReceive:irenCouponReceive }}"></template>
     <view></view>
-    <block wx:if="{{ !isNewVersions }}">
-        <view class='info-box'>
-            <view class='title'>{{ data.title }}</view>
-            <view class='sub'>{{ data.introduction }}</view>
-        </view>
-        <view class='house-classify'>
-            <view class='title'>房间类型</view>
-            <view class='ul'>
-                <view class='li' wx:for="{{ data.specifications }}" wx:key="index">
-                    <view class='left'>
-                        <view class='name'>{{ item.title }}</view>
-                        <view class='price' wx:if="{{ item.value }}">
-                            <view class='color-red'>{{ item.value }}</view>HK$
-                        </view>
-                    </view>
-                    <view class='right'>
-                        <form bindsubmit="send_form_id" data-title="{{ item.title }}" report-submit='true' data-types="confirm" class='submit-form'>{{data.booking && data.booking.button}}
-                            <button form-type="submit" hover-class="none" type="default" size="mini"></button>
-                        </form>
-                    </view>
-                </view>
-            </view>
-        </view>
-        <view class='position block-box'>
-            <view class='title'>地理位置及交通</view>
-            <view class='traffic' bindtap='to_map'>
-                <image src='../../img/traffic-location.png'></image>
-                <view class='text'>
-                    <view class='intro'>
-                        <view class="item tomap">
-                            <view>{{ data.address }}</view>
-                            <image src='../../img/back.png'></image>
-                        </view>
-                    </view>
-                </view>
-            </view>
-            <map latitude='{{ coordinate[0] }}' longitude='{{ coordinate[1] }}' markers="{{ markers }}">
-                <view class='clickmap' bindtap='to_map'></view>
-            </map>
-            <!-- 香港的附近学校只在有地图的时候出现 -->
-            <block wx:if="{{ data.pointData.length>0 }}">
-                <view class="aroundSchool">
-                    <view class="li" wx:for="{{ data.pointData }}" wx:if="{{ index<3 }}" wx:key="index">
-                        <view class="schoolname">{{ item.name}}</view>
-                        <view class="distance">{{ item.recently_text }}</view>
-                    </view>
-                </view>
-                <view class="showmore" wx:if="{{ data.pointData &&data.pointData.length>0 }}" bindtap="showSchoolAlert" data-show="1">显示更多</view>
-            </block>
-            <view class='traffic'>
-                <image src='../../img/traffic.png'></image>
-                <view class='text'>
-                    <view class='intro'>
-                        <text decode="true">{{ traffic }}</text>
-                    </view>
-
-                </view>
-            </view>
-        </view>
-        <view class='block-box' wx:if="{{ data.life.length>0 }}">
-            <view class='title'>生活</view>
-            <view class='intro'>
-                <text decode="true">{{ life }}</text>
-            </view>
-        </view>
-        <view class='block-box' wx:if="{{ data.consumption.length>0 }}">
-            <view class='title'>消费水平</view>
-            <view class='intro'>
-                <text decode="true">{{ consumption }}</text>
-            </view>
-        </view>
-        <view class='block-box' wx:if="{{ data.facilities }}">
-            <view class='title'>公寓设施</view>
-            <view class='facility'>
-                <view class='item' wx:if="{{ data.facilities.public.length>0 }}">
-                    <image class='logo' src="../../img/facility.png"></image>
-                    <view class='text'>
-                        <view class='i' wx:for="{{ data.facilities.public }}" wx:key="index">
-                            <image src="../../img/dui.png"></image>{{ item }}
-                        </view>
-                    </view>
-                </view>
-                <view class='item' wx:if="{{ data.facilities.kitchen.length>0 }}">
-                    <image class='logo' src="../../img/kitchen.png"></image>
-                    <view class='text'>
-                        <view class='i' wx:for="{{ data.facilities.kitchen }}" wx:key="index">
-                            <image src="../../img/dui.png"></image>{{ item }}
-                        </view>
-                    </view>
-                </view>
-                <view class='item' wx:if="{{ data.facilities.lavatory.length>0 }}">
-                    <image class='logo' src="../../img/toilet.png"></image>
-                    <view class='text'>
-                        <view class='i' wx:for="{{ data.facilities.lavatory }}" wx:key="index">
-                            <image src="../../img/dui.png"></image>{{ item }}
-                        </view>
-                    </view>
-                </view>
-            </view>
-        </view>
-        <view class='block-box' wx:if="{{ data.message.length>0 }}">
-            <view class='title'>房源详情</view>
-            <view class='intro'>
-                <text decode="true">{{ message }}</text>
-            </view>
-        </view>
-
-        <view class='block-box' wx:if="{{ data.brand.length>0 }}">
-            <view class='title'>品牌介绍</view>
-            <view class='intro'>
-                <image class='imageurl' mode="widthFix" src="{{ data.company.imageurl }}"></image>
-                <text decode="true">{{ brand }}</text>
-            </view>
-        </view>
-
-        <view wx:if="{{ withSameBrand.length>0 }}" class="with-same-brand">
-            <view class="same-title">同品牌推荐</view>
-            <block wx:for="{{ withSameBrand }}" wx:key="index" wx:if="{{ item.uniqid !=uniqid }}">
-                <list-item item="{{ item }}" listTab="{{ listTab }}"></list-item>
-            </block>
-        </view>
-    </block>
 
     <!-- v4 的新底部栏 -->
     <view class="bottom-bar flexacenter" style="padding-bottom: {{ bottomLift }}rpx;">
-        <!-- <view class="bottom-bar-item bottom-bar-collect flexcenter">
-            <image class="bottom-bar-icon" mode="widthFix" src="/img/u1970.png"></image>6
-        </view> -->
         <view class="bottom-bar-item bottom-bar-share flexcenter" catchtap="share_pic">
             <image class="bottom-bar-icon" mode="widthFix" src="/img/u1975.png"></image>转发
         </view>
@@ -363,10 +239,7 @@
                 <image class="serviceWindow-bottom-bj" src="/img/u1506.svg" mode="widthFix"></image>
                 <view class="serviceWindow-hint-outer">
                     <view class="serviceWindow-hint-inside">
-                        <block wx:if="{{ isNewVersions }}">
-                            轻点二维码<image class="arrows" src="/img/u1803.svg"></image>长按识别添加客服<image class="arrows" src="/img/u1803.svg"></image>备注“寄托”
-                        </block>
-                        <block wx:else>{{ tips }}</block>
+                        轻点二维码<image class="arrows" src="/img/u1803.svg"></image>长按识别添加客服<image class="arrows" src="/img/u1803.svg"></image>备注“寄托”
                     </view>
                 </view>
             </view>
diff --git a/pages/irentDetail/irentDetail.wxss b/pages/irentDetail/irentDetail.wxss
index 8b9fd92..3326fba 100644
--- a/pages/irentDetail/irentDetail.wxss
+++ b/pages/irentDetail/irentDetail.wxss
@@ -1190,7 +1190,7 @@ map .clickmap {
     width: 100vw;
     height: 135rpx;
     background-color: #fff;
-    z-index: 2;
+    z-index: 11;
     border-top: 1rpx solid #d7d7d7;
     justify-content: space-between;
     box-sizing: content-box;
diff --git a/pages/irentList/irentList.js b/pages/irentList/irentList.js
index 13bb92a..bb5d5f0 100644
--- a/pages/irentList/irentList.js
+++ b/pages/irentList/irentList.js
@@ -64,7 +64,6 @@ Page({
         initState: false,
         topTitle: "",
         consultState: false, // 咨询弹窗状态
-        isNewVersions: true,
     },
 
     headerSearchTopHeight: 10,
diff --git a/pages/irentList/irentList.wxml b/pages/irentList/irentList.wxml
index 6184e17..b5522cf 100644
--- a/pages/irentList/irentList.wxml
+++ b/pages/irentList/irentList.wxml
@@ -5,7 +5,6 @@
         <image class="to-top-icon" src="/img/totop.png" mode="widthFix"></image>
     </view>
     <!-- <to-top wx:if="{{ showTOTOP }}"></to-top> -->
-    <!-- <header-nav inner-text="Some text">{{ isNewVersions? '香港房源' : topTitle }}</header-nav> -->
     <header-nav bgcolor="{{ headerSearchTop ? '#fff' : 'transparent' }}">香港租房</header-nav>
 
     <template is="irenCouponReceive" data="{{ irentCouponBig:irentCouponBig,hideCoupon:hideCoupon,irenCouponReceive:irenCouponReceive }}"></template>
@@ -21,7 +20,7 @@
         <view style="height: 48rpx; width: 100vw;"></view>
 
         <view class="tab-box">
-            <tab isNewVersions="{{ isNewVersions }}" StudentapartmentNew="{{ StudentapartmentNew }}" page="irentList" listTab="{{ listTab }}"></tab>
+            <tab StudentapartmentNew="{{ StudentapartmentNew }}" page="irentList" listTab="{{ listTab }}"></tab>
         </view>
 
         <view id="annex-school" class="annex-school flexacenter">
@@ -34,7 +33,7 @@
 
 
         <view id="list-operations" class="list-operations {{ operationsTop ? 'list-operations-top' : '' }}" style="top: {{ screen_data.totalTopHeight }}px;">
-            <list-operations tabTitle="品牌公寓" isNewVersions="{{ isNewVersions }}" operationstype="student" money="{{ money }}" brands="{{ brands }}" screen_data="{{ screen_data }}" roomtype="{{ roomtype }}" roomlistings="{{ roomlistings }}" bindsubmit="submitOperations"></list-operations>
+            <list-operations 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/pages/messageCenter/messageCenter.js b/pages/messageCenter/messageCenter.js
index 170413d..4e320df 100644
--- a/pages/messageCenter/messageCenter.js
+++ b/pages/messageCenter/messageCenter.js
@@ -17,7 +17,6 @@ Page({
         operationsTop: false,
         screen_data: {},
         wechat: {},
-        isNewVersions: true,
 
     },
 
@@ -72,21 +71,6 @@ Page({
                     data.data[i]['reportshowState'] = 0
                 }
 
-                if (this.data.isNewVersions) {
-                    // data.data = [{
-                    //     timestamp: "2023-06-05",
-                    //     isread: 0,
-                    //     littleMessage: "测试",
-                    //     reportshowState: 0,
-                    //     data: {
-                    //         subject: "这是测试的标题",
-                    //         reportnummessage: ["测试的数据"],
-                    //         id: 15
-                    //     },
-                    // }]
-                    // data.issubscribe = 0
-                }
-
                 this.setData({
                     list: this.data.list.concat(data.data),
                     page: data.count > data.page * data.limit ? this.data.page + 1 : 0,
diff --git a/pages/messageCenter/messageCenter.wxml b/pages/messageCenter/messageCenter.wxml
index 69b65ce..c1dc838 100644
--- a/pages/messageCenter/messageCenter.wxml
+++ b/pages/messageCenter/messageCenter.wxml
@@ -1,41 +1,26 @@
 <import src="../common/common.wxml" />
 
 <view class="container">
-    <block wx:if="{{ isNewVersions }}">
-        <header-nav wx:if="{{ operationsTop }}" bgcolor="{{'#fff' }}" backSrc="{{ '' }}" notShowIndex="{{ true }}" isNoNeedHolder="{{ true }}" borderBottom="{{ true }}">{{ '系统通知' }}</header-nav>
-        <header-nav wx:else bgcolor="{{ 'transparent' }}" backSrc="{{ '/img/back-white.svg' }}" notShowIndex="{{ true }}" isNoNeedHolder="{{ true }}"></header-nav>
+    <header-nav wx:if="{{ operationsTop }}" bgcolor="{{'#fff' }}" backSrc="{{ '' }}" notShowIndex="{{ true }}" isNoNeedHolder="{{ true }}" borderBottom="{{ true }}">{{ '系统通知' }}</header-nav>
+    <header-nav wx:else bgcolor="{{ 'transparent' }}" backSrc="{{ '/img/back-white.svg' }}" notShowIndex="{{ true }}" isNoNeedHolder="{{ true }}"></header-nav>
 
-        <view class="header flexflex">
-            <image class="message-circle message-small" mode="widthFix" src="/img/message-small-circle.svg"></image>
-            <image class="message-circle message-great" mode="widthFix" src="/img/message-great-circle.svg"></image>
-            <view class="flexcenter">
-                <image class="header-icon" mode="widthFix" src="https://oss.gter.net/Zvt57TuJSUvkyhw-xG7Y2l-S_54rc37qqsgFptxhXa6RWi26P-BuTQxFEbKQ49kb8MVYZjQ0Mjk~"></image>
-                <image class="header-text" mode="widthFix" src="https://oss.gter.net/Zvt57TuJSUvkyhw-xG7Y2l-S_54rc3_qqsgFptxhXa6RWi26P-BuTVNGRrbH7tkb8MVYZjQ0Mjk~"></image>
-            </view>
-        </view>
-        <view class="attention-box flexacenter" wx:if="{{ issubscribe == 0 }}">
-            <text>关注寄托服务号，第一时间收到消息通知</text>
-            <view bindtap="attention" class="attention-btn flexcenter">关注</view>
+    <view class="header flexflex">
+        <image class="message-circle message-small" mode="widthFix" src="/img/message-small-circle.svg"></image>
+        <image class="message-circle message-great" mode="widthFix" src="/img/message-great-circle.svg"></image>
+        <view class="flexcenter">
+            <image class="header-icon" mode="widthFix" src="https://oss.gter.net/Zvt57TuJSUvkyhw-xG7Y2l-S_54rc37qqsgFptxhXa6RWi26P-BuTQxFEbKQ49kb8MVYZjQ0Mjk~"></image>
+            <image class="header-text" mode="widthFix" src="https://oss.gter.net/Zvt57TuJSUvkyhw-xG7Y2l-S_54rc3_qqsgFptxhXa6RWi26P-BuTVNGRrbH7tkb8MVYZjQ0Mjk~"></image>
         </view>
+    </view>
+    <view class="attention-box flexacenter" wx:if="{{ issubscribe == 0 }}">
+        <text>关注寄托服务号，第一时间收到消息通知</text>
+        <view bindtap="attention" class="attention-btn flexcenter">关注</view>
+    </view>
+
 
-    </block>
-    <block wx:else>
-        <header-nav></header-nav>
-        <view class="head">
-            <view class="head-icon">
-                <image mode="widthFix" src="../../img/u16.png"></image>
-            </view>
-            系统通知
-        </view>
-        <!-- 提示关注服务号 -->
-        <view class="hintAttention" wx:if="{{ issubscribe == 0 }}">
-            <text>关注寄托服务号，第一时间收到消息通知</text>
-            <view bindtap="attention" class="attention-btn">关注</view>
-        </view>
-    </block>
 
     <!-- 信息 -->
-    <view class="information-box {{ isNewVersions ? 'information-new' : '' }}">
+    <view class="information-box information-new">
         <block wx:for="{{ list }}" wx:key="index">
             <view class="information-item" wx:if="{{ item.event == 'certapplication' }}">
                 <view class="time"><text>{{ item.timestamp }}</text>
@@ -72,11 +57,7 @@
     </view>
 
     <!-- 消息为空时 -->
-    <view class="empty-box" wx:if="{{ list.length == 0 && !isNewVersions }}">
-        <image src="/img/u6.png" mode="widthFix" class="empty"></image>
-        <text class="noMessage">暂无消息</text>
-    </view>
-    <view class="vacancy-box" wx:if="{{ list.length == 0 && isNewVersions }}">
+    <view class="vacancy-box" wx:if="{{ list.length == 0 }}">
         <template is="empty-icon" data="{{ hint: '暂无消息' }}"></template>
     </view>
 
diff --git a/pages/messageCenter/messageCenter.wxss b/pages/messageCenter/messageCenter.wxss
index 9d2097e..d607ca7 100644
--- a/pages/messageCenter/messageCenter.wxss
+++ b/pages/messageCenter/messageCenter.wxss
@@ -5,55 +5,6 @@
     background-color: rgba(246, 246, 246, 1);
 }
 
-.head {
-    height: 225rpx;
-    width: 750rpx;
-    background-color: #2c6cd2;
-    font-size: 44rpx;
-    color: #fff;
-    display: flex;
-    align-items: center;
-    padding: 0 30rpx;
-}
-
-.head-icon {
-    width: 90rpx;
-    height: 90rpx;
-    border-radius: 50%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    background-color: #dfefff;
-    margin-right: 20rpx;
-
-}
-
-.head-icon image {
-    width: 52rpx;
-    height: 44rpx;
-}
-
-.hintAttention {
-    height: 90rpx;
-    line-height: 90rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #e5e8f0;
-    color: #333;
-    padding: 0 30rpx;
-}
-
-.hintAttention .attention-btn {
-    height: 50rpx;
-    line-height: 50rpx;
-    border: 2rpx solid #d7d7d7;
-    border-radius: 40rpx;
-    color: #2c6cd2;
-    font-size: 26rpx;
-    padding: 0 26rpx;
-}
-
 .information-box {
     background-color: #fff;
 }
diff --git a/pages/personList/personList.js b/pages/personList/personList.js
index 8c2f8b8..59fee87 100644
--- a/pages/personList/personList.js
+++ b/pages/personList/personList.js
@@ -131,7 +131,6 @@ Page({
         totalSum: 0, // 数据总数
         isMapFindState: false,
 
-        isNewVersions: true,
     },
 
     headerSearchTopHeight: 10,
@@ -231,8 +230,6 @@ Page({
 
             app.globalData['langs'] ? '' : this.getDtailsLangs()
 
-            // if (!this.data.isNewVersions) this.getgroupSearch();
-
             let screen_data = this.data.screen_data
             let windowWidth = screen_data['windowWidth']; //获取设备屏幕宽度
             this.headerSearchTopHeight = (windowWidth / 750) * Number(20)
@@ -492,7 +489,6 @@ Page({
         })
 
         var that = this;
-        let isNewVersions = this.data.isNewVersions
         let url = `/tenement/v2/api/lists`
 
         miucms.request(`${app.globalData.baseURL}${url}`, sendData).then(data => {
@@ -506,13 +502,6 @@ Page({
 
             this.handleDetailData(data.data)
 
-            // if (!isNewVersions) {
-            //     that.data.lists = that.data.lists.concat(data.data)
-            //     this.setData({
-            //         lists: that.data.lists,
-            //     })
-            // }
-
             that.setData({
                 totalSum: data.count,
                 // lists: that.data.lists,
@@ -813,8 +802,7 @@ Page({
     },
     // 提交出租方式
     submittype(e) {
-        if (this.data.isNewVersions) this.data.types.value = e.detail.types
-        else this.data.types.value = e.detail.data;
+        this.data.types.value = e.detail.types
 
         this.setData({
             types: this.data.types,
diff --git a/pages/personList/personList.wxml b/pages/personList/personList.wxml
index 3690f10..0535e2c 100644
--- a/pages/personList/personList.wxml
+++ b/pages/personList/personList.wxml
@@ -13,10 +13,10 @@
     <!-- 临时隔断用的  -->
     <view style="height: 48rpx; width: 100vw;"></view>
 
-    <tab isNewVersions="{{ isNewVersions }}" StudentapartmentNew="{{ StudentapartmentNew }}" page="{{ intermediary == 0 ? 'personList' : 'quarantineLists' }}" listTab="{{ listTab }}"></tab>
+    <tab StudentapartmentNew="{{ StudentapartmentNew }}" page="{{ intermediary == 0 ? 'personList' : 'quarantineLists' }}" listTab="{{ listTab }}"></tab>
 
     <!-- 新的 -->
-    <view id="list-operations" class="list-operations {{ operationsTop ? 'list-operations-top' : '' }}" wx:if="{{ isNewVersions }}" style="top: {{ screen_data.totalTopHeight - 1 }}px;">
+    <view id="list-operations" class="list-operations {{ operationsTop ? 'list-operations-top' : '' }}" style="top: {{ screen_data.totalTopHeight - 1 }}px;">
         <list-operations tabTitle="{{ intermediary == 1 ? '中介' : '个人' }}房源" property="{{ property }}" school="{{ school }}" types="{{ types }}" location="{{ location }}" operationstype="{{ intermediary == 1 ? 'intermediaryhousing' : 'personhousing' }}" money="{{ money }}" brands="{{ brands }}" screen_data="{{ screen_data }}" roomtype="{{ roomtype }}" roomlistings="{{ roomlistings }}" bindsubmit="submitOperations"></list-operations>
     </view>
 
diff --git a/pages/personList/tab/tab.js b/pages/personList/tab/tab.js
index 1a1dcb6..53dadb7 100644
--- a/pages/personList/tab/tab.js
+++ b/pages/personList/tab/tab.js
@@ -7,14 +7,12 @@ Component({
         StudentapartmentNew: Boolean,
         page: String,
         listTab: Object,
-        isNewVersions: Boolean
     },
 
     /**
      * 组件的初始数据
      */
     data: {
-        // isNewVersions: true,
         tabList: [{
             name: "个人房源",
             value: "personList",
diff --git a/pages/personList/tab/tab.wxml b/pages/personList/tab/tab.wxml
index 66fa0c6..c237cf7 100644
--- a/pages/personList/tab/tab.wxml
+++ b/pages/personList/tab/tab.wxml
@@ -1,18 +1,3 @@
-<view class="tab-list flexacenter" wx:if="{{ isNewVersions }}">
+<view class="tab-list flexacenter">
     <view class="tab-item flexcenter {{ page == item.value ? 'pitch' : '' }}" wx:for="{{ tabList }}" wx:key="index" bindtap="toPage" data-page="{{ item.value }}" data-url="{{ item.url }}">{{ item.name }}</view>
-</view>
-
-<view class='irent-tab-box tab-box' wx:else>
-    <view class="{{ page=='personList'? 'tab active' :'tab'}}" data-page="personList" bindtap="toPage">
-        <view class="text">个人房源</view>
-    </view>
-
-    <view class="{{ page=='quarantineLists'? 'tab active' :'tab'}}" bindtap="toIntermediaryPage">
-        <view class="text">{{ '中介房源' }}</view>
-    </view>
-
-    <view class="{{ page=='irentList'? 'tab active' :'tab'}}" data-page="irentList" bindtap="toPage">
-        <view class="text">品牌公寓</view>
-        <image src="/img/new.png" wx:if="{{ StudentapartmentNew }}" class='new'></image>
-    </view>
 </view>
\ No newline at end of file
diff --git a/pages/personList/tab/tab.wxss b/pages/personList/tab/tab.wxss
index 37c0848..fd3ee35 100644
--- a/pages/personList/tab/tab.wxss
+++ b/pages/personList/tab/tab.wxss
@@ -1,98 +1,6 @@
 /* pages/index/tab/tab.wxss */
 @import '/app.wxss';
 
-.tab-box {
-  /* border-top: 1px solid #e4e4e4; */
-  line-height: 128rpx;
-  height: 128rpx;
-  background: #f2f2f2;
-  font-size: 0;
-  text-align: center;
-  color: #666;
-}
-
-.tab-box .tab {
-  display: inline-flex;
-  flex: 1;
-  font-size: 34rpx;
-}
-
-.tab.active {
-  background: #fff;
-  color: #333;
-  font-weight: bold;
-}
-
-.tab .text {
-  position: relative;
-  width: auto;
-  display: inline-flex;
-}
-
-.tab.active .text:after {
-  content: '';
-  width: 100%;
-  position: absolute;
-  /* bottom:-4rpx; */
-  bottom: -2rpx;
-  left: 0;
-  height: 8rpx;
-  background: rgb(255, 192, 95);
-  border-radius: 8rpx;
-
-}
-
-.irent-tab-box {
-  height: 120rpx;
-  display: flex;
-  border-bottom: 2rpx solid #d5d5d5;
-  background: #fff;
-}
-
-.irent-tab-box .tab {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-
-}
-
-.irent-tab-box .new {
-  position: absolute;
-  right: 0;
-  top: 0;
-  width: 90rpx;
-  height: 90rpx;
-}
-
-.irent-tab-box .new image {
-  width: 80rpx;
-  height: 80rpx;
-}
-
-.irent-tab-box .icon-box {
-  width: 84rpx;
-  height: 84rpx;
-  margin-right: 24rpx;
-  display: inline-flex;
-  border-radius: 50%;
-  align-items: center;
-  justify-content: center;
-}
-
-.irent-tab-box .personal {
-  background-color: #a8bed9;
-}
-
-.irent-tab-box .apartment {
-  background: #ddd;
-}
-
-.irent-tab-box image {
-  width: 50rpx;
-  height: 50rpx;
-}
-
 .tab-list {
   height: 73rpx;
   background: linear-gradient(2.84217e-14deg, rgb(232, 244, 255) -4%, rgb(176, 216, 255) 148%);
@@ -102,7 +10,6 @@
   font-size: 30rpx;
   color: #000000;
   margin-bottom: 15rpx;
-
 }
 
 .tab-list .tab-item {
diff --git a/pages/restOfWorld/restOfWorld.js b/pages/restOfWorld/restOfWorld.js
index b2d61da..8d3e384 100644
--- a/pages/restOfWorld/restOfWorld.js
+++ b/pages/restOfWorld/restOfWorld.js
@@ -70,8 +70,6 @@ Page({
         allowsearch: false, // 是否需要筛选
         isMapFindState: false,
 
-        isNewVersions: true,
-
     },
     headerSearchTopHeight: 10,
     onPageScroll(e) {
@@ -270,17 +268,13 @@ Page({
     requestData: {}, // 请求参数
     get_list() {
         var that = this;
-        // let isNewVersions = this.data.isNewVersions
-        // if (isNewVersions) {
         if (this.data.page == 0) return
-        // }
         wx.showLoading({
             title: '加载中...',
         })
         this.setData({
             loading: true
         })
-        // let url = isNewVersions ? `${app.globalData.baseURL}/tenement/v2/api/lists` : app.globalData.config.otherlist.init
         let url = `${app.globalData.baseURL}/tenement/v2/api/lists`
         let requestData = {
             page: 1,
@@ -289,13 +283,6 @@ Page({
 
         requestData = Object.assign(requestData, this.requestData)
 
-        // requestData = Object.assign(requestData, this.data.moreCondition.data, {
-        //     page: this.data.page,
-        //     'type': this.data.types.value * 1,
-        //     orderby: this.data.orderby.value,
-        //     cityid: this.data.city.uniqid,
-        // })
-
         miucms.request(url, requestData).then(data => {
             data = data.data
             let list = data.data
@@ -544,7 +531,7 @@ Page({
         let user = app.globalData['user']
         let miniProgram = app.globalData['miniProgram']
         if (user['uid']) {
-            if (!user['nickname']) {
+            if (!user['nickname'] || !user['avatar']) {
                 wx.navigateTo({
                     url: '/pagesLoginRequired/pages/setAvatarNickname/setAvatarNickname',
                 })
@@ -612,6 +599,4 @@ Page({
             url: "/pages/search/search?isAskingSearch=true",
         })
     },
-
-
 })
\ No newline at end of file
diff --git a/pages/search/search.js b/pages/search/search.js
index 36af1fd..90dac54 100644
--- a/pages/search/search.js
+++ b/pages/search/search.js
@@ -122,8 +122,6 @@ Page({
 
         isMapFindState: false,
 
-        isNewVersions: true,
-
     },
 
     operationsHeight: 50,
diff --git a/pages/show/show.js b/pages/show/show.js
index 87b96dc..273a424 100644
--- a/pages/show/show.js
+++ b/pages/show/show.js
@@ -105,7 +105,6 @@ Page({
         attestationElseResource: [], // 发布者其他房源
         bgColorObj: app.globalData.bgColorObj,
         wechat: {},
-        isNewVersions: true,
 
     },
     to_share() {
diff --git a/pages/show/show.wxml b/pages/show/show.wxml
index b77b9fb..fe9203f 100644
--- a/pages/show/show.wxml
+++ b/pages/show/show.wxml
@@ -20,869 +20,259 @@
         <go-login bindislogin="islogin"></go-login>
     </block>
 
-    <block wx:if="{{ isNewVersions }}">
-        <header-nav inner-text="Some text" bgcolor="{{ operationsTop ? '#fff' : 'transparent' }}">房源详情</header-nav>
-        <view class="bj">
-            <image class="bj-left" mode="widthFix" src="/img/show-head-left.svg"></image>
-            <image class="bj-right" mode="widthFix" src="/img/show-head-right.svg"></image>
-        </view>
-        <view class="housing-info flexacenter">
-            <image class="housing-info-avatar" mode="widthFix" src="{{ info.avatar }}"></image>
-            <view class="housing-info-right flexflex">
-                <view class="housing-info-name flexacenter">
-                    {{ info.author }}
-                    <image wx:if="{{ isintermediary == 1 }}" class="housing-info-identity-icon" src="/img/certifying-agent.png"></image>
-                    <view wx:else class="housing-info-identity">{{ info.intermediary_text }}</view>
-                </view>
-                <view class="housing-info-update flexacenter">{{ info.updatetimeText }}更新
-                    <block wx:if="{{ verifiedlistingcount > 1 && info['intermediary'] != 1 }}">
-                        <view class="vertical">|</view>认证房源×{{ verifiedlistingcount }}
-                    </block>
-                    <block wx:if="{{ intermediarylistingcount > 1 && info['intermediary'] == 1 }}">
-                        <view class="vertical">|</view>房源×{{ intermediarylistingcount }}
-                    </block>
-                </view>
+    <header-nav inner-text="Some text" bgcolor="{{ operationsTop ? '#fff' : 'transparent' }}">房源详情</header-nav>
+    <view class="bj">
+        <image class="bj-left" mode="widthFix" src="/img/show-head-left.svg"></image>
+        <image class="bj-right" mode="widthFix" src="/img/show-head-right.svg"></image>
+    </view>
+    <view class="housing-info flexacenter">
+        <image class="housing-info-avatar" mode="widthFix" src="{{ info.avatar }}"></image>
+        <view class="housing-info-right flexflex">
+            <view class="housing-info-name flexacenter">
+                {{ info.author }}
+                <image wx:if="{{ isintermediary == 1 }}" class="housing-info-identity-icon" src="/img/certifying-agent.png"></image>
+                <view wx:else class="housing-info-identity">{{ info.intermediary_text }}</view>
             </view>
-        </view>
-
-        <view class="housing-information certification resource-beg">
-            <view class="HResource-box HResource-box1">
-                <view class="advanced-markup flexacenter {{ isintermediary == 1 ? 'advanced-intermediary' : '' }}" wx:if="{{ info.verified == 1 || isintermediary == 1 }}">
-                    <view class="advanced-markup-left flexacenter ">
-                        <image class="advanced-markup-icon" mode="widthFix" src="/img/certified-listings-icon.png"></image>
-                        <image class="advanced-markup-identifying" mode="widthFix" src="/img/certified-listings.png"></image>
-                        <image class="advanced-markup-icon advanced-intermediary-icon" mode="widthFix" src="/img/certified-intermediary.png"></image>
-                        <view class="advanced-intermediary-name">认证中介</view>
-                    </view>
-
-                    <view class="advanced-markup-right flexacenter">
-                        <image class="advanced-markup-tick" mode="widthFix" src="/img/tick.svg"></image>
-                        <view class="advanced-markup-name">{{ info['intermediary'] != 1 ? '房产证明' : '真实牌照' }}</view>
-                        <image class="advanced-markup-tick" mode="widthFix" src="/img/tick.svg"></image>
-                        <view class="advanced-markup-name">{{ info['intermediary'] != 1 ? '房东身份证' : '身份证明' }}</view>
-                    </view>
-                </view>
-                <view class='title'>{{ info.subject }}</view>
-                <!-- 房源月租 -->
-                <view class="HResource-rentAndId">
-                    <view class="rent">
-                        <view class="rent-label flexcenter" wx:if="{{ info['intermediary'] == 6 }}">预算</view>
-                        <view id="unit" class="unit">{{ info.currency || "HK$"}}</view>
-                        <view class="money">{{ info.rent }}</view>
-                        <view class="month">/{{ info.rentalperiod }}</view>
-                    </view>
-                </view>
-
-                <!-- 房源详细信息 -->
-                <view class="HResource-detail">
-                    <view class="HResource-header">
-                        <!-- 租房类型、合租整租  房间 -->
-                        <template is="HResource-header-item" data="{{ name: info.gptype,value: info.type }}"></template>
-                        <!-- 租期 -->
-                        <template is="HResource-header-item" data="{{ name: '租期', value: info.rentalduration != 0 ? info.rentalduration: '不限' }}"></template>
-                        <!-- 起租日期 -->
-                        <template is="HResource-header-item" data="{{ name: '起租日期',value: info.leasetime || '随时' }}"></template>
-                    </view>
-                </view>
-
-                <!-- 图片和视频 -->
-                <view class="media-box" wx:if="{{ (info.video && info.video.length != 0) || (info.picturegroup && info.picturegroup.length != 0) }}">
-                    <view class="housing-information-media-top flexacenter">
-                        <block wx:if="{{ info.video && info.video.length != 0 }}">
-                            <image class="housing-information-media-icon1" src="/img/u1737.png" mode="widthFix"></image>
-                            <view class="housing-information-media-quantity flexcenter">{{ info.video.length }}</view>
-                        </block>
-                        <block wx:if="{{ info.picturegroup && info.picturegroup.length != 0 }}">
-                            <image class="housing-information-media-icon" src="/img/u1738.png" mode="widthFix"></image>
-                            <view class="housing-information-media-quantity flexcenter">{{ info.picturegroup.length }}</view>
-                        </block>
-                    </view>
-                    <view class="media-content">
-                        <scroll-view class="scroll-view_H" scroll-x="true" style="width: 100%">
-                            <block wx:if="{{ info.video && info.video.length>0 }}">
-                                <view class="media-item media-video" wx:for="{{ info.video }}" wx:key="index" bindtap="show_video" data-src="{{ item.url }}">
-                                    <image class="media-video-bj" src="{{ item.image }}"></image>
-                                    <view class="media-video-play">
-                                        <image class="media-video-play-icon" mode="widthFix" src="/img/videoplay.png"></image>
-                                        <view class="size">{{ item.size }}</view>
-                                    </view>
-                                </view>
-                            </block>
-                            <block wx:if="{{ info.images && info.images.length>0 }}">
-                                <view class="media-item" wx:for="{{ info.picturegroup }}" wx:key="index">
-                                    <image mode="heightFix" src="{{ item.thumbnail }}" bindtap="preview_img" lazy-load="true" data-index="{{ index }}"></image>
-                                </view>
-                            </block>
-                        </scroll-view>
-                    </view>
-                </view>
-
-                <!-- 基本要求 -->
-                <view class="HResource-item basic-ask-for">
-                    <view class="HResource-item-head flexacenter">
-                        <image class="HResource-item-head-icon" src="/img/ask-for.png" mode="widthFix"></image>
-                        基本{{ info['intermediary'] == 6 ? '要求' : '信息' }}
-                    </view>
-                    <view class="HResource-item-list {{ info['intermediary'] == 6 ? 'basic-list-aLine' : 'basic-list-twoLine' }}">
-                        <block wx:for="{{ basicRequirementsObj }}" wx:key="index">
-                            <view class="basic-item-Line flexacenter {{ index == basicRequirementsObj.length - 1 ? 'flex1' : '' }}" wx:if="{{ item.value }}">
-                                <view class="basic-Line-key">{{ item.name }}</view>
-                                <view class="basic-Line-value flex1 flexacenter" wx:if="{{ m.isArray(item.value) }}">
-                                    <block wx:for="{{ item.value }}" wx:for-item="it" wx:for-index="ind" wx:key="ind">
-                                        {{ it }}<text class="vertical" wx:if="{{ ind != item.value.length - 1 }}"></text>
-                                    </block>
-                                </view>
-                                <view class="basic-Line-value flex1" wx:else>{{ item.value }}</view>
-                            </view>
-                        </block>
-
-                    </view>
-                </view>
-
-                <!-- 目标区域 -->
-                <view class="HResource-item" wx:if="{{ info.intermediary == 6 }}">
-                    <view class="HResource-item-head flexacenter">
-                        <image class="HResource-item-head-icon" src="/img/u1695.png" mode="widthFix"></image>
-                        目标区域
-                    </view>
-                    <view class="HResource-item-list target-area-list">
-                        <view class="target-area-item flexacenter" wx:for="{{ info.locationList }}" wx:key="index">
-                            {{ item.head }}<view class="target-area-arrows flexcenter">
-                                <image class="target-area-arrows-icon" mode="widthFix" src="/img/Back.svg"></image>
-                            </view>{{ item.end }}
-                        </view>
-                    </view>
-                </view>
-                <!-- 地址 -->
-                <view class="location-box" wx:elif="{{ info.intermediary != 6 && info.location }}">
-                    <view class="location-header">
-                        <image class="location-icon" mode="widthFix" src="/img/u1695.png"></image>
-                        {{ info.locationList[0].head + ' > ' + info.locationList[0].end }}
-                    </view>
-                    <!-- 地图 -->
-                    <block wx:if="{{ info.cityid==1 && info.point && info.point.length==2 && info.point[0]>0 && info.point[1]>0 }}">
-                        <view class="location">
-                            <map class="map" latitude='{{ info.point[0] }}' longitude='{{ info.point[1] }}' markers="{{ markers }}"></map>
-                            <view class="location-bj" catchtouchmove="locationmove" bindtap='to_map' data-longitude="{{ info.point[1] || '' }}" data-latitude="{{ info.point[0] || '' }}">
-                                <view class="location-site" wx:if="{{ info.address }}">
-                                    <image class="tracingPoint" mode="widthFix" src="/img/u1704.png"></image>
-                                    <view class="location-name">{{ info.address }}</view>
-                                    <image class="location-arrows" mode="widthFix" src="/img/u353.svg"></image>
-                                </view>
-                            </view>
-                        </view>
-                        <!-- 附近学校 -->
-                        <view class="school" bindtap="negation" data-key="academyState">
-                            <block wx:for="{{ info.pointData }}" wx:key="index">
-                                <view class="school-item" wx:if="{{ index < 7 }}">
-                                    <text class="school-name">{{ item.alias }}</text>
-                                    <text class="school-distance">{{ item.recently_distance }}km</text>
-                                </view>
-                            </block>
-                            <!-- 更多 -->
-                            <view class="school-item more">
-                                <text class="school-name">更多</text>
-                                <image class="more-icon" mode="widthFix" src="/img/u1908.svg"></image>
-                            </view>
-                        </view>
-                    </block>
-                </view>
-
-                <!-- 求租描述 -->
-                <view class="HResource-item" wx:if="{{ info.introduction }}">
-                    <view class="HResource-item-head flexacenter">
-                        <image class="HResource-item-head-icon" src="/img/description-rent.png" mode="widthFix"></image>{{ info.intermediary == 6 ? '求租描述' : '更多介绍' }}
-                    </view>
-                    <view class="HResource-item-list rent-seeking-description">
-                        <template is="wxParse" data="{{ wxParseData:info.introduction.nodes }}" />
-                    </view>
-                </view>
-
-                <!-- 房源数据 -->
-                <view class="HResource-item">
-                    <template is="HResourceState" data="{{ info }}"></template>
-                </view>
-
-                <!-- 免责声明 -->
-                <template is="disclaimer" data="{{ info,wechat }}"></template>
-                <image wx:if="{{ service && !isNewVersions }}" show-menu-by-longpress class="popularize" bindtap="copyy" src="{{ service }}" mode="widthFix"></image>
-                <!-- 底部 -->
-                <template is="footer1" data="{{ info,isfav,bottomLift,bottomUnitState }}"></template>
-
-                <!-- 联系方式弹窗 -->
-                <view class="root-portal" style="display: flex;align-items: flex-end;" bindtap="negation" data-key="contactInformationState" wx:if="{{ contactInformationState }}" catchtouchmove="locationmove">
-                    <!-- <template is="root-portal" data="{{ info }}"></template> -->
-                    <template is="new-contact-information" data="{{ info,contactValue }}"></template>
-
-                </view>
-            </view>
-        </view>
-
-        <view class="housing-contact" wx:if="{{ contacts }}">
-            <view class="housing-contact-title">房源联系人</view>
-            <view class="housing-contact-box flexflex">
-                <image class="housing-contact-avatar" mode="widthFix" src="{{ contacts.avatar }}"></image>
-                <view class="housing-contact-content flexflex">
-                    <view class="housing-contact-name flexacenter">{{ contacts.nickname }}
-                        <image class="housing-contact-icon" mode="widthFix" src="/img/certifying-agent.png"></image>
-                    </view>
-                    <view class="housing-contact-detail">
-                        <view wx:if="{{ contacts.businesscard }}" class="contact-business-card flexcenter" bindtap="showBusinessCard">
-                            <image class="contact-business-card-icon" mode="widthFix" src="/img/business-card-icon.png"></image>
-                            名片
-                        </view>
-                        <view wx:if="{{ contacts.proxynumber }}" class="housing-contact-item">代理人牌照号：{{ contacts.proxynumber }}</view>
-                        <view wx:if="{{ contacts.companyname }}" class="housing-contact-item">所属公司：{{ contacts.companyname }}</view>
-                        <view wx:if="{{ contacts.companyaddress }}" class="housing-contact-item">公司地址：{{ contacts.companyaddress }}</view>
-                        <view wx:if="{{ contacts.companylicensenumber }}" class="housing-contact-item">公司牌照号：{{ contacts.companylicensenumber }}</view>
-                    </view>
-                </view>
-            </view>
-        </view>
-
-        <!-- 其他认证房源 -->
-        <view class="other-information else-box" wx:if="{{ attestationElseResource.length != 0 }}">
-            <view class="other-information-name flexacenter">发布者的其他{{ info['intermediary'] == 1 ? '' : '认证' }}房源<view class="else-quantity">({{ attestationElseResource.length }})</view>
-            </view>
-            <block wx:for="{{ attestationElseResource }}">
-                <common-list item="{{ item }}"></common-list>
-            </block>
-        </view>
-
-        <!-- 附近房源 -->
-        <view class="other-information nearby-listings" wx:if="{{ listDataLeft.length != 0 }}">
-            <!-- 列表 -->
-            <view class="other-information-name flexacenter">附近房源</view>
-            <view class="pinterest-list flexflex">
-                <view id="pinterest-list-left" class="pinterest-list-left flex1">
-                    <block wx:for="{{ listDataLeft }}" wx:key="index">
-                        <template wx:if="{{item.type == 'adv'}}" is="adv" data="{{ item }}"></template>
-                        <!-- <template wx:elif="{{item.type == 'apartment'}}" is="apartment" data="{{ item,bgColorObj }}"></template> -->
-                        <template wx:elif="{{item.type == 'apartment'}}" is="apartmentApartment" data="{{ item,bgColorObj }}"></template>
-                        <template wx:else is="general" data="{{ item,bgColorObj }}"></template>
-                    </block>
-                </view>
-                <view id="pinterest-list-right" class="pinterest-list-right flex1" style="display:flex;flex-direction:column;align-items: flex-end;">
-                    <block wx:for="{{ listDataRight }}" wx:key="index">
-                        <template wx:if="{{item.type == 'adv'}}" is="adv" data="{{ item }}"></template>
-                        <!-- <template wx:elif="{{item.type == 'apartment'}}" is="apartment" data="{{ item,bgColorObj }}"></template> -->
-                        <template wx:elif="{{item.type == 'apartment'}}" is="apartmentApartment" data="{{ item,bgColorObj }}"></template>
-                        <template wx:else is="general" data="{{ item,bgColorObj }}"></template>
-                    </block>
-                </view>
-            </view>
-        </view>
-
-        <view style="width: 100vw;height: 50rpx;background: rgba(238, 239, 242, 1);"></view>
-
-    </block>
-    <block wx:else>
-        <header-nav inner-text="Some text" bindgoIsMessage="goIsMessage" bgcolor="{{ groupid == 19 ? 'rgba(238, 239, 242, 1)' : ''}}">信息详情</header-nav>
-        <!-- 广告位置 -->
-        <view class="advertisingSpace">
-            <block wx:if="{{ adsposOption == 0}}">
-                <image bindtap="statisticsTopAds" data-id="{{ adsTop.id }}" mode="widthFix" src="{{ adsTop.image }}"></image>
-            </block>
-            <block wx:if="{{ adsposOption == 1}}">
-                <swiper autoplay="{{ true }}" duration="1000" current="{{ current }}" interval="3000" circular style="height: {{ imgheights[current] }}rpx;" bindchange="onSlideChangeEnd">
-                    <swiper-item wx:for="{{ adsTop }}" wx:key="index" class="picture-swiper-item" bindtap="statisticsTopAds" data-id="{{ item.id }}">
-                        <image id="seiper-image" mode="widthFix" src="{{ item.image }}" bindload="imageLoaded" data-index="{{ index }}"></image>
-                    </swiper-item>
-                </swiper>
-            </block>
-        </view>
-
-        <view class="certification resource-beg" wx:if="{{ info.intermediary == 6 }}">
-            <view class="header" wx:if="{{ groupid == 19 }}">
-                <view class="header-left">
-                    <image class="landlord-avatar" src="{{ info.avatar }}"></image>
-                    <view class="landlord-info" bindtap="goScrollToEles">
-                        <view class="landlord-name">{{ info.author }}</view>
-                        <view class="" style="display: flex;align-items: center;">共 <text class="bold">{{ listingcount }}</text> 个房源 <image wx:if="{{ listingcount > 1}}" class="arr-bottom" src="/img/u1764.svg"></image>
-                        </view>
-                    </view>
-                </view>
-                <image class="authentication-icon" bindtap="goApprove" mode="widthFix" src="/img/u30.png"></image>
-            </view>
-
-            <view class="HResource-box {{ groupid != 19 ? 'HResource-box1' : ''}}">
-                <view class='title' wx:if="{{ groupid != 19 }}">
-                    <image class='authentication' wx:if="{{ info.verified == 1 }}" style="height: 40rpx;" mode="heightFix" src="/img/authentication.jpg" />
-                    {{ info.subject }}
-                </view>
-
-                <view class='user-info' wx:if="{{ groupid != 19 }}">
-                    <image src="{{ info.avatar }}"></image> {{ info.author }}
-                    <image wx:if="{{ groupid == 19 }}" class="authentication-icon" mode="widthFix" src="/img/u30.png"></image>
-                    <view wx:else class='agent flexcenter'>{{ info.intermediary_text }}</view>
-                    <view class='is_rent_btn' wx:if="{{ info.status == 2 }}">已出租</view>
-                </view>
-
-                <view class="HResource-title" wx:if="{{ groupid == 19 }}">
-                    <image class='authentication' wx:if="{{ info.verified == 1 }}" style="height: 40rpx;" mode="heightFix" src="/img/authentication.jpg" />
-                    {{ info.subject }}
-                </view>
-                <!-- 房源月租和id -->
-                <view class="HResource-rentAndId">
-                    <view class="rent">
-                        <view class="rent-label flexcenter">预算</view>
-                        <view id="unit" class="unit">{{ info.currency || "HK$"}}</view>
-                        <view class="money">{{ info.rent }}</view>
-                        <view class="month">
-                            /{{ info.rentalperiod }}
-                        </view>
-                    </view>
-                </view>
-
-                <!-- 房源详细信息 -->
-                <view class="HResource-detail">
-                    <view class="HResource-header">
-                        <!-- 租房类型、合租整租  房间 -->
-                        <template is="HResource-header-item" data="{{ name: info.gptype,value: info.type }}"></template>
-                        <!-- 租期 -->
-                        <template is="HResource-header-item" data="{{ name: '租期', value: info.rentalduration != 0 ? info.rentalduration: '不限' }}"></template>
-                        <!-- 起租日期 -->
-                        <template is="HResource-header-item" data="{{ name: '起租日期',value: info.leasetime || '随时' }}"></template>
-                    </view>
-                </view>
-
-                <!-- 基本要求 -->
-                <view class="HResource-item basic-ask-for">
-                    <view class="HResource-item-head flexacenter">
-                        <image class="HResource-item-head-icon" src="/img/ask-for.png" mode="widthFix"></image>
-                        基本要求
-                    </view>
-                    <view class="HResource-item-list basic-list-aLine">
-                        <block wx:for="{{ basicRequirementsList }}" wx:key="index">
-                            <view class="basic-item-aLine flexacenter" wx:if="{{ info[index] != null && info[index] != undefined && info[index] != '' }}">
-                                <view class="basic-aLine-key">{{ item }}</view>
-                                <view class="basic-aLine-value flex1" wx:if="{{ index == 'acreage' }}">{{ info[index] + ' 平方呎' }}</view>
-                                <view class="basic-aLine-value flex1" wx:elif="{{ (index == 'sunshinearea' || index == 'property') && info[index] != 0 }}">
-                                    <block wx:for="{{ info[index] }}" wx:for-item="it" wx:for-index="ind" wx:key="ind">
-                                        {{ langs[index][it] }} {{ ind == info[index].length - 1 ? '' : '/' }}
-                                    </block>
-                                </view>
-                                <view class="basic-aLine-value flex1" wx:elif="{{ (index == 'sunshinearea' || index == 'property') && info[index] == 0 }}">
-                                    不限
-                                </view>
-                                <view class="basic-aLine-value flex1" wx:elif="{{ index == 'gender' || index == 'publishergender' }}">
-                                    {{ langs['gender'][info[index]] }}</view>
-                                <view class="basic-aLine-value flex1" wx:elif="{{ index == 'elevator' }}">
-                                    {{ langs[index][info[index]] }}
-                                </view>
-                                <view class="basic-aLine-value flex1" wx:else>{{ info[index] }}</view>
-                            </view>
-                        </block>
-
-                    </view>
-                </view>
-
-                <!-- 目标区域 -->
-                <view class="HResource-item">
-                    <view class="HResource-item-head flexacenter">
-                        <image class="HResource-item-head-icon" src="/img/ask-for.png" mode="widthFix"></image>
-                        目标区域
-                    </view>
-
-                    <view class="HResource-item-list target-area-list">
-                        <view class="target-area-item flexacenter" wx:for="{{ info.locationList }}" wx:key="index">
-                            {{ item.head }}<view class="target-area-arrows flexcenter">
-                                <image class="target-area-arrows-icon" mode="widthFix" src="/img/Back.svg"></image>
-                            </view>{{ item.end }}
-                        </view>
-                    </view>
-
-                </view>
-
-                <!-- 求租描述 -->
-                <view class="HResource-item" wx:if="{{ info.introduction }}">
-                    <view class="HResource-item-head flexacenter">
-                        <image class="HResource-item-head-icon" src="/img/ask-for.png" mode="widthFix"></image>
-                        求租描述
-                    </view>
-                    <view class="HResource-item-list rent-seeking-description">
-                        <template is="wxParse" data="{{wxParseData:info.introduction.nodes }}" />
-                    </view>
-                </view>
-
-                <!-- 房源数据 -->
-                <view class="HResource-item">
-                    <template is="HResourceState" data="{{ info }}"></template>
-                </view>
-
-                <!-- 免责声明 -->
-                <template is="disclaimer" data="{{ info,wechat }}"></template>
-                <image wx:if="{{ service && !isNewVersions }}" show-menu-by-longpress class="popularize" bindtap="copyy" src="{{ service }}" mode="widthFix"></image>
-                <!-- 底部 -->
-                <template is="footer1" data="{{ info,isfav,bottomLift,bottomUnitState }}"></template>
-
-                <!-- 联系方式弹窗 -->
-                <view class="root-portal" wx:if="{{ contactInformationState }}" catchtouchmove="locationmove">
-                    <template is="root-portal" data="{{ info }}"></template>
-                </view>
-            </view>
-        </view>
-        <!-- 认证房东的页面 -->
-        <block wx:elif="{{ info.cityid == 1 }}">
-            <view class="certification">
-                <view class="header" wx:if="{{ groupid == 19 }}">
-                    <view class="header-left">
-                        <image class="landlord-avatar" src="{{ info.avatar }}"></image>
-                        <view class="landlord-info" bindtap="goScrollToEles">
-                            <view class="landlord-name">{{ info.author }}</view>
-                            <view class="" style="display: flex;align-items: center;">共 <text class="bold">{{ listingcount }}</text> 个房源 <image wx:if="{{ listingcount > 1}}" class="arr-bottom" src="/img/u1764.svg"></image>
-                            </view>
-                        </view>
-                    </view>
-                    <image class="authentication-icon" bindtap="goApprove" mode="widthFix" src="/img/u30.png"></image>
-                </view>
-
-                <view class="HResource-box {{ groupid != 19 ? 'HResource-box1' : ''}}">
-                    <view class='title' wx:if="{{ groupid != 19 }}">
-                        <image class='authentication' wx:if="{{ info.verified == 1 }}" style="height: 40rpx;" mode="heightFix" src="/img/authentication.jpg" />
-                        {{ info.subject }}
-                    </view>
-
-                    <view class='user-info' wx:if="{{ groupid != 19 }}">
-                        <image src="{{ info.avatar }}"></image> {{ info.author }}
-                        <image wx:if="{{ groupid == 19 }}" class="authentication-icon" mode="widthFix" src="/img/u30.png"></image>
-                        <view wx:else class='agent flexcenter'>{{ info.intermediary_text }}</view>
-                        <view class='is_rent_btn' wx:if="{{ info.status==2}}">已出租</view>
-                    </view>
-
-                    <view class="HResource-title" wx:if="{{ groupid == 19 }}">
-                        <image class='authentication' wx:if="{{ info.verified == 1 }}" style="height: 40rpx;" mode="heightFix" src="/img/authentication.jpg" />
-                        {{ info.subject }}
-                    </view>
-                    <!-- 房源月租和id -->
-                    <view class="HResource-rentAndId">
-                        <view class="rent">
-                            <view class="unit">{{ info.currency || "HK$"}}</view>
-                            <view class="money">{{ info.rent }}</view>
-                            <view class="month">
-                                /{{ info.rentalperiod }}
-                            </view>
-                        </view>
-                        <view class="HResource-id" bindtap="copy" data-num="id" data-hint="已复制房源ID">
-                            房源ID：{{ info.id }}
-                        </view>
-                    </view>
-
-                    <!-- 房源详细信息 -->
-                    <view class="HResource-detail">
-                        <view class="HResource-header">
-                            <!-- 租房类型、合租整租  房间 -->
-                            <template is="HResource-header-item" data="{{ name: info.gptype,value: info.type }}"></template>
-                            <!-- 租期 -->
-                            <template is="HResource-header-item" data="{{ name: '租期', value: info.rentalduration != 0 ? info.rentalduration: '不限' }}"></template>
-                            <!-- 起租日期 -->
-                            <template is="HResource-header-item" data="{{ name: '起租日期',value: info.leasetime || '随时' }}"></template>
-                        </view>
-                        <view class="HResource-detail-content-item">
-                            <template wx:if="{{ info.property }}" is="HResource-detail-tier" data="{{ name: '房屋类型', value: langs['property'][info.property] }}"></template>
-                            <template wx:if="{{ info.floor }}" is="HResource-detail-tier1" data="{{ name:'所在楼层', value1: info.floor,value2: langs['elevator'][info['elevator']] }}"></template>
-                            <template wx:if="{{ info.sunshinearea }}" is="HResource-detail-tier" data="{{ name:'晾晒区', value: langs['sunshinearea'][info['sunshinearea']] }}"></template>
-                            <template wx:if="{{ info.acreage }}" is="HResource-detail-tier" data="{{ name:'面积', value: info.acreage + (info.cityid==1 ? ' 平方呎':' 平方米') }}"></template>
-                            <template wx:if="{{ info.gender }}" is="HResource-detail-tier" data="{{ name:'性别要求', value: langs['gender'][info.gender] }}"></template>
-                        </view>
-                    </view>
-
-                    <!-- 图片和视频 -->
-                    <view class="media-box" wx:if="{{ (info.video && info.video.length != 0) || (info.picturegroup && info.picturegroup.length != 0) }}">
-                        <view class="media-header">
-                            <block wx:if="{{ info.video && info.video.length != 0 }}">
-                                <image class="video-icon" mode="widthFix" src="/img/u1737.png"></image>
-                                <text class="media-num">{{ info.video.length }}</text>
-                            </block>
-                            <block wx:if="{{ info.images && info.images.length != 0 }}">
-                                <image class="pic-icon" mode="widthFix" src="/img/u1738.png"></image>
-                                <text class="media-num">{{ info.picturegroup.length }}</text>
-                            </block>
-                        </view>
-                        <view class="media-content">
-                            <scroll-view class="scroll-view_H" scroll-x="true" style="width: 100%">
-                                <block wx:if="{{ info.video && info.video.length>0 }}">
-                                    <view class="media-item media-video" wx:for="{{ info.video }}" wx:key="index" bindtap="show_video" data-src="{{ item.url }}">
-                                        <image class="media-video-bj" src="{{ item.image }}"></image>
-                                        <view class="media-video-play">
-                                            <image class="media-video-play-icon" src="/img/videoplay.png"></image>
-                                            <view class="size">{{ item.size }}</view>
-                                        </view>
-                                    </view>
-                                </block>
-                                <block wx:if="{{ info.images && info.images.length>0 }}">
-                                    <view class="media-item" wx:for="{{ info.picturegroup }}" wx:key="index">
-                                        <image mode="heightFix" src="{{ item.thumbnail }}" bindtap="preview_img" lazy-load="true" data-index="{{ index }}"></image>
-                                    </view>
-                                </block>
-                            </scroll-view>
-                        </view>
-                    </view>
-
-                    <!-- 地址 -->
-                    <view class="location-box">
-                        <view class="location-header">
-                            <image class="location-icon" mode="widthFix" src="/img/u1695.png"></image>
-                            {{ info.locationList[0].head + ' > ' + info.locationList[0].end }}
-                        </view>
-                        <!-- 地图 -->
-                        <block wx:if="{{info.cityid==1 && info.point && info.point.length==2 && info.point[0]>0 && info.point[1]>0 }}">
-                            <view class="location">
-                                <map class="map" latitude='{{ info.point[0] }}' longitude='{{ info.point[1] }}' markers="{{ markers }}"></map>
-                                <view class="location-bj" catchtouchmove="locationmove" bindtap='to_map' data-longitude="{{ info.point[1] || '' }}" data-latitude="{{ info.point[0] || '' }}">
-                                    <view class="location-site" wx:if="{{ info.address }}">
-                                        <image class="tracingPoint" mode="widthFix" src="/img/u1704.png"></image>
-                                        <view class="location-name">{{ info.address }}</view>
-                                        <image class="location-arrows" mode="widthFix" src="/img/u353.svg"></image>
-                                    </view>
-                                </view>
-                            </view>
-                            <!-- 附近学校 -->
-                            <view class="school" bindtap="negation" data-key="academyState">
-                                <block wx:for="{{ info.pointData }}" wx:key="index">
-                                    <view class="school-item" wx:if="{{ index < 7 }}">
-                                        <text class="school-name">{{ item.alias }}</text>
-                                        <text class="school-distance">{{ item.recently_distance }}km</text>
-                                    </view>
-                                </block>
-                                <!-- 更多 -->
-                                <view class="school-item more">
-                                    <text class="school-name">更多</text>
-                                    <image class="more-icon" src="/img/u1908.svg"></image>
-                                </view>
-                            </view>
-                        </block>
-                    </view>
-
-                    <!-- 个人情况介绍 -->
-                    <view class="information-box" wx:if="{{ info.introduction }}">
-                        <view class="information-title">个人情况介绍</view>
-                        <view class="information-content">
-                            <template is="wxParse" data="{{wxParseData:info.introduction.nodes }}" />
-                        </view>
-                    </view>
-
-                    <!-- 其他描述 -->
-                    <view class="otherDescription-box" wx:if="{{ info.message }}">
-                        <view class="otherDescription-title">其他描述</view>
-                        <view class="otherDescription-content">
-                            <template is="wxParse" data="{{wxParseData:info.message.nodes }}" />
-                        </view>
-                    </view>
-
-                    <!-- 浏览量等 -->
-                    <template is="HResourceState" data="{{ info }}"></template>
-
-                    <!-- 温馨提示 -->
-                    <view class="hint-box">
-                        <view class='disclaimer'>温馨提示：房源信息及身份认证资料，均由平台用户提供，发布者对其真实性、合法性等负责，平台不负责甄别和审核具体内容真实性和有效性等，请务必仔细核实相关信息，谨防上当受骗。</view>
-                        <view class='ad-contact' bindtap="copyWebsite">公寓/酒店/中介房源推广合作请联系ad@gter.net</view>
-                    </view>
-                </view>
-
-                <image wx:if="{{ service && !isNewVersions }}" show-menu-by-longpress class="popularize" bindtap="copyy" src="{{ service }}" mode="widthFix"></image>
-                <view class="housing-contact" wx:if="{{ contacts }}">
-                    <view class="housing-contact-title">房源联系人</view>
-                    <view class="housing-contact-box flexflex">
-                        <image class="housing-contact-avatar" src="https://oss.gter.net/avatar/97KwEWIDY-QTHTXcpEbnWQxaRv6Xz0ll1wRhYWNh/middle?random=1685100263"></image>
-                        <view class="housing-contact-content flexflex">
-                            <view class="housing-contact-name flexacenter">梁麗霞 Zoe Leung
-                                <image class="housing-contact-icon" mode="widthFix" src="/img/certifying-agent.png"></image>
-                            </view>
-                            <view class="housing-contact-detail">
-                                <view class="contact-business-card flexcenter">
-                                    <image class="contact-business-card-icon" mode="widthFix" src="/img/business-card-icon.png"></image>
-                                    名称
-                                </view>
-                                <view class="housing-contact-item">代理人牌照号：S-110563</view>
-                                <view class="housing-contact-item">所属公司：晋诚地产</view>
-                                <view class="housing-contact-item">公司地址：深井丽都花园地下5A铺</view>
-                                <view class="housing-contact-item">公司牌照号：C-095034</view>
-                            </view>
-                        </view>
-                    </view>
-                </view>
-
-                <!-- 其他房源 -->
-                <view class="else" id="else" wx:if="{{ groupid == 19 && listingcount != 1}}">
-                    <view class="else-title">Ta的其他房源<text style="font-weight: 500;">（{{ listingcount - 1 }}）</text></view>
-                    <view class="else-list">
-                        <block wx:for="{{ elseResourceData }}" wx:key="index">
-                            <template is="personalList" data="{{ item }}"></template>
-                        </block>
-                    </view>
-                </view>
-
-                <!-- 底部操作栏 -->
-                <template is="footer1" data="{{ bottomLift, info, isfav,bottomUnitState }}"></template>
-
-                <!-- 联系方式弹窗 -->
-                <view class="root-portal" wx:if="{{ contactInformationState }}" catchtouchmove="locationmove">
-                    <template is="root-portal" data="{{ info }}"></template>
-                </view>
-            </view>
-        </block>
-        <block wx:else>
-            <view class='toptips'>
-                <view class='i'>
-                    <image class='eye' src="../../img/eye.png" />{{ info.count_view || '-' }}
-                </view>
-                <view class='i'>
-                    <image class='star' src="../../img/star.png" />{{ info.count_fav }}
-                </view>
-                <view class='i'>
-                    <image class='time' src="../../img/time.png" />{{ info.updatetime }}更新
-                </view>
-            </view>
-            <view class='title'>
-                {{ info.subject }}
-                <image class='isvideo' wx:if="{{ info.video&& info.video.length>0 }}" src="../../img/videologo.png" />
-                <image class='img' wx:if="{{ info.images&& info.images.length>0 }}" src="../../img/pics.jpg" />
-                <!-- <image class='ischecked' wx:if="{{ info.verified==1 }}" src="../../img/ischecktext.png" /> -->
-            </view>
-            <view class='user-info'>
-                <image src="{{ info.avatar }}"></image> {{ info.author }}
-                <image wx:if="{{ groupid == 19 }}" mode="heightFix" class="authentication-icon" src="/img/u30.png"></image>
-                <view wx:else class='agent flexcenter'>{{ info.intermediary_text }}</view>
-                <view class='is_rent_btn' wx:if="{{ info.status==2}}">已出租</view>
-            </view>
-            <view class='table'>
-                <view class='cell'>
-                    <view>{{ info.gptype }}</view>
-                    <view class='red'>{{ info.type }}</view>
-                </view>
-                <view class='cell'>
-                    <view>{{ info.currency || "HK$"}}/{{ info.rentalperiod }}</view>
-                    <view class='num'>{{ info.rent }}</view>
-                </view>
-            </view>
-            <view class='item-box'>
-                <view class='item'>
-                    <view class='name'>房屋类型</view>
-                    <view class='c'>{{ info.property }}</view>
-                </view>
-                <view class='item'>
-                    <view class='name'>所在楼层</view>
-                    <view class='c'>{{ info.floor }}</view>
-                </view>
-                <view class='item' wx:if="{{ info.acreage }}">
-                    <view class='name'>面积</view>
-                    <view class='c'>{{ info.acreage }}（平方{{info.cityid==1 ? "呎":"米"}}）</view>
-                </view>
-                <view class='item'>
-                    <view class='name'>性别要求</view>
-                    <view class='c'>{{ info.gender }}</view>
-                </view>
-                <view class='item'>
-                    <view class='name'>出租时长</view>
-                    <view class='c'>{{ info.rentalduration != 0 ? info.rentalduration: '不限' }}</view>
-                </view>
-                <view class='item'>
-                    <view class='name'>起租日期</view>
-                    <view class='c'>{{ info.leasetime || "随时" }}</view>
-                </view>
-            </view>
-            <view class="map-box" id="contract">
-                <view class='name'>地理位置</view>
-                <block>
-                    <!-- 区域 -->
-                    <view class='traffic'>
-                        <image src='/img/quyu.png'></image>
-                        <view class='text'>
-                            <view class='intro'>
-                                <view class="item tomap">
-                                    <view>{{ info.cityid==1 ? info.location :((info.country || '') +' > ' + (info.city || '')) }}</view>
-                                </view>
-                            </view>
-                        </view>
-                    </view>
-                    <!-- 地址 -->
-                    <view class='traffic' wx:if="{{ info.address }}" bindtap='to_map' data-longitude="{{ info.point[1] || '' }}" data-latitude="{{ info.point[0] || '' }}">
-                        <image src='../../img/traffic-location.png'></image>
-                        <view class='text'>
-                            <view class='intro'>
-                                <view class="item tomap">
-                                    <view>{{ info.address }}</view>
-                                    <image src='../../img/back.png' wx:if="{{ info.cityid==1 && info.point && info.point.length==2 && info.point[0]>0 && info.point[1]>0}}">
-                                    </image>
-                                </view>
-                            </view>
-                        </view>
-                    </view>
-                    <!-- 地图 香港且有坐标，坐标>0才出现 -->
-                    <block wx:if="{{info.cityid==1 && info.point && info.point.length==2 && info.point[0]>0 && info.point[1]>0 }}">
-                        <map latitude='{{ info.point[0] }}' longitude='{{ info.point[1] }}' markers="{{ markers }}">
-                            <cover-view class='clickmap' bindtap='to_map' data-longitude="{{ info.point[1] }}" data-latitude="{{ info.point[0] }}"></cover-view>
-                        </map>
-                        <!-- 香港的附近学校只在有地图的时候出现 -->
-                        <view class="aroundSchool">
-                            <view class="li" wx:for="{{ info.pointData }}" wx:if="{{ index<3 }}" wx:key="index">
-                                <view class="schoolname">{{ item.name}}</view>
-                                <view class="distance">{{ item.recently_text }}</view>
-                            </view>
-                        </view>
-                        <view class="showmore" wx:if="{{ info.pointData &&info.pointData.length>0 }}" bindtap="showSchoolAlert" data-show="1">显示更多</view>
-                    </block>
-
+            <view class="housing-info-update flexacenter">{{ info.updatetimeText }}更新
+                <block wx:if="{{ verifiedlistingcount > 1 && info['intermediary'] != 1 }}">
+                    <view class="vertical">|</view>认证房源×{{ verifiedlistingcount }}
                 </block>
-                <block wx:if="{{ info.cityid!=1 && info.school.length>0 }}">
-                    <view class='traffic'>
-                        <image src='/img/school.png' class="around-school-img"></image>
-                        <view class='text'>
-                            <view class='intro'>
-                                <view class="item tomap">
-                                    <view>附近学校</view>
+                <block wx:if="{{ intermediarylistingcount > 1 && info['intermediary'] == 1 }}">
+                    <view class="vertical">|</view>房源×{{ intermediarylistingcount }}
+                </block>
+            </view>
+        </view>
+    </view>
+
+    <view class="housing-information certification resource-beg">
+        <view class="HResource-box HResource-box1">
+            <view class="advanced-markup flexacenter {{ isintermediary == 1 ? 'advanced-intermediary' : '' }}" wx:if="{{ info.verified == 1 || isintermediary == 1 }}">
+                <view class="advanced-markup-left flexacenter ">
+                    <image class="advanced-markup-icon" mode="widthFix" src="/img/certified-listings-icon.png"></image>
+                    <image class="advanced-markup-identifying" mode="widthFix" src="/img/certified-listings.png"></image>
+                    <image class="advanced-markup-icon advanced-intermediary-icon" mode="widthFix" src="/img/certified-intermediary.png"></image>
+                    <view class="advanced-intermediary-name">认证中介</view>
+                </view>
+
+                <view class="advanced-markup-right flexacenter">
+                    <image class="advanced-markup-tick" mode="widthFix" src="/img/tick.svg"></image>
+                    <view class="advanced-markup-name">{{ info['intermediary'] != 1 ? '房产证明' : '真实牌照' }}</view>
+                    <image class="advanced-markup-tick" mode="widthFix" src="/img/tick.svg"></image>
+                    <view class="advanced-markup-name">{{ info['intermediary'] != 1 ? '房东身份证' : '身份证明' }}</view>
+                </view>
+            </view>
+            <view class='title'>{{ info.subject }}</view>
+            <!-- 房源月租 -->
+            <view class="HResource-rentAndId">
+                <view class="rent">
+                    <view class="rent-label flexcenter" wx:if="{{ info['intermediary'] == 6 }}">预算</view>
+                    <view id="unit" class="unit">{{ info.currency || "HK$"}}</view>
+                    <view class="money">{{ info.rent }}</view>
+                    <view class="month">/{{ info.rentalperiod }}</view>
+                </view>
+            </view>
+
+            <!-- 房源详细信息 -->
+            <view class="HResource-detail">
+                <view class="HResource-header">
+                    <!-- 租房类型、合租整租  房间 -->
+                    <template is="HResource-header-item" data="{{ name: info.gptype,value: info.type }}"></template>
+                    <!-- 租期 -->
+                    <template is="HResource-header-item" data="{{ name: '租期', value: info.rentalduration != 0 ? info.rentalduration: '不限' }}"></template>
+                    <!-- 起租日期 -->
+                    <template is="HResource-header-item" data="{{ name: '起租日期',value: info.leasetime || '随时' }}"></template>
+                </view>
+            </view>
+
+            <!-- 图片和视频 -->
+            <view class="media-box" wx:if="{{ (info.video && info.video.length != 0) || (info.picturegroup && info.picturegroup.length != 0) }}">
+                <view class="housing-information-media-top flexacenter">
+                    <block wx:if="{{ info.video && info.video.length != 0 }}">
+                        <image class="housing-information-media-icon1" src="/img/u1737.png" mode="widthFix"></image>
+                        <view class="housing-information-media-quantity flexcenter">{{ info.video.length }}</view>
+                    </block>
+                    <block wx:if="{{ info.picturegroup && info.picturegroup.length != 0 }}">
+                        <image class="housing-information-media-icon" src="/img/u1738.png" mode="widthFix"></image>
+                        <view class="housing-information-media-quantity flexcenter">{{ info.picturegroup.length }}</view>
+                    </block>
+                </view>
+                <view class="media-content">
+                    <scroll-view class="scroll-view_H" scroll-x="true" style="width: 100%">
+                        <block wx:if="{{ info.video && info.video.length>0 }}">
+                            <view class="media-item media-video" wx:for="{{ info.video }}" wx:key="index" bindtap="show_video" data-src="{{ item.url }}">
+                                <image class="media-video-bj" src="{{ item.image }}"></image>
+                                <view class="media-video-play">
+                                    <image class="media-video-play-icon" mode="widthFix" src="/img/videoplay.png"></image>
+                                    <view class="size">{{ item.size }}</view>
                                 </view>
                             </view>
+                        </block>
+                        <block wx:if="{{ info.images && info.images.length>0 }}">
+                            <view class="media-item" wx:for="{{ info.picturegroup }}" wx:key="index">
+                                <image mode="heightFix" src="{{ item.thumbnail }}" bindtap="preview_img" lazy-load="true" data-index="{{ index }}"></image>
+                            </view>
+                        </block>
+                    </scroll-view>
+                </view>
+            </view>
+
+            <!-- 基本要求 -->
+            <view class="HResource-item basic-ask-for">
+                <view class="HResource-item-head flexacenter">
+                    <image class="HResource-item-head-icon" src="/img/ask-for.png" mode="widthFix"></image>
+                    基本{{ info['intermediary'] == 6 ? '要求' : '信息' }}
+                </view>
+                <view class="HResource-item-list {{ info['intermediary'] == 6 ? 'basic-list-aLine' : 'basic-list-twoLine' }}">
+                    <block wx:for="{{ basicRequirementsObj }}" wx:key="index">
+                        <view class="basic-item-Line flexacenter {{ index == basicRequirementsObj.length - 1 ? 'flex1' : '' }}" wx:if="{{ item.value }}">
+                            <view class="basic-Line-key">{{ item.name }}</view>
+                            <view class="basic-Line-value flex1 flexacenter" wx:if="{{ m.isArray(item.value) }}">
+                                <block wx:for="{{ item.value }}" wx:for-item="it" wx:for-index="ind" wx:key="ind">
+                                    {{ it }}<text class="vertical" wx:if="{{ ind != item.value.length - 1 }}"></text>
+                                </block>
+                            </view>
+                            <view class="basic-Line-value flex1" wx:else>{{ item.value }}</view>
+                        </view>
+                    </block>
+
+                </view>
+            </view>
+
+            <!-- 目标区域 -->
+            <view class="HResource-item" wx:if="{{ info.intermediary == 6 }}">
+                <view class="HResource-item-head flexacenter">
+                    <image class="HResource-item-head-icon" src="/img/u1695.png" mode="widthFix"></image>
+                    目标区域
+                </view>
+                <view class="HResource-item-list target-area-list">
+                    <view class="target-area-item flexacenter" wx:for="{{ info.locationList }}" wx:key="index">
+                        {{ item.head }}<view class="target-area-arrows flexcenter">
+                            <image class="target-area-arrows-icon" mode="widthFix" src="/img/Back.svg"></image>
+                        </view>{{ item.end }}
+                    </view>
+                </view>
+            </view>
+            <!-- 地址 -->
+            <view class="location-box" wx:elif="{{ info.intermediary != 6 && info.location }}">
+                <view class="location-header">
+                    <image class="location-icon" mode="widthFix" src="/img/u1695.png"></image>
+                    {{ info.locationList[0].head + ' > ' + info.locationList[0].end }}
+                </view>
+                <!-- 地图 -->
+                <block wx:if="{{ info.cityid==1 && info.point && info.point.length==2 && info.point[0]>0 && info.point[1]>0 }}">
+                    <view class="location">
+                        <map class="map" latitude='{{ info.point[0] }}' longitude='{{ info.point[1] }}' markers="{{ markers }}"></map>
+                        <view class="location-bj" catchtouchmove="locationmove" bindtap='to_map' data-longitude="{{ info.point[1] || '' }}" data-latitude="{{ info.point[0] || '' }}">
+                            <view class="location-site" wx:if="{{ info.address }}">
+                                <image class="tracingPoint" mode="widthFix" src="/img/u1704.png"></image>
+                                <view class="location-name">{{ info.address }}</view>
+                                <image class="location-arrows" mode="widthFix" src="/img/u353.svg"></image>
+                            </view>
                         </view>
                     </view>
-                    <view class="school-list">
-                        <view class="li" wx:for="{{ info.school }}" wx:key="index">
-                            <view class="point"></view>
-                            <view class="school">
-                                <view class="name">{{ item.name }}</view>
-                                <view class="gate">{{ item.distance }}</view>
+                    <!-- 附近学校 -->
+                    <view class="school" bindtap="negation" data-key="academyState">
+                        <block wx:for="{{ info.pointData }}" wx:key="index">
+                            <view class="school-item" wx:if="{{ index < 7 }}">
+                                <text class="school-name">{{ item.alias }}</text>
+                                <text class="school-distance">{{ item.recently_distance }}km</text>
                             </view>
+                        </block>
+                        <!-- 更多 -->
+                        <view class="school-item more">
+                            <text class="school-name">更多</text>
+                            <image class="more-icon" mode="widthFix" src="/img/u1908.svg"></image>
                         </view>
                     </view>
                 </block>
             </view>
-            <view id="relation">
-                <view class='wechart' wx:if="{{ info.wechat }}">
-                    <view class='name'>微信号</view>
-                    <view class='num'>{{ info.wechat }}</view>
-                    <view class='btn' data-num="wechat" bindtap="copy">
-                        <image class='copy' src="../../img/copy-blue.png" />
-                    </view>
-                </view>
-                <view class='wechart' wx:if="{{ info.wechatdata.aid > 0 }}">
-                    <view class='name'>微信二维码</view>
-                    <view class='num'>{{ '点击右侧图标打开二维码' }}</view>
-                    <view class='btn' bindtap="openQRCode">
-                        <image class='copy' src="../../img/u16.svg" />
-                    </view>
-                </view>
-                <view class='wechart' wx:if="{{ info.whatsapp }}">
-                    <view class='name'>WhatsApp</view>
-                    <view class='num'>{{ info.whatsapp }}</view>
-                    <view class='btn' data-num="whatsapp" bindtap="copy">
-                        <image class='copy' src="../../img/copy-blue.png" />
-                    </view>
-                </view>
-                <view class='wechart' wx:if="{{ info.tel }}">
-                    <view class='name'>电话号码</view>
-                    <view class='num'>{{ info.tel }}</view>
-                    <view class='btn' data-num="tel" bindtap="call_us">
-                        <image class='copy' src="../../img/call-blue.png" />
-                    </view>
-                </view>
-            </view>
-            <view class='info'>
-                <view class='name'>
-                    个人情况介绍
-                </view>
-                <view class='conent'>
-                    <template is="wxParse" data="{{wxParseData:info.introduction.nodes }}" />
-                </view>
-            </view>
-            <view class='info'>
-                <view class='name'>
-                    其他描述
-                </view>
-                <view class='conent'>
-                    <template is="wxParse" data="{{wxParseData:info.message.nodes }}" />
-                    <!-- <view class="color-9" wx:if="!info.message || !info.message.nodes">暂无</view> -->
-                </view>
-            </view>
-            <view wx:if="{{ info.video && info.video.length>0 }}" class="video-box">
-                <view class='name'>共{{ info.video.length }}个视频</view>
-                <view wx:for="{{ info.video }}" wx:key="index" class='item' data-src="{{ item.url }}" bindtap='show_video'>
-                    <image src='../../img/videoplay.png'></image>
-                    <view class='num'>{{ item.size }}</view>
-                </view>
-            </view>
-            <view wx:if="{{ info.images && info.images.length>0 }}">
-                <view class="images" wx:for="{{ info.images }}" wx:key="index">
-                    <image src="{{ item }}" style="height:{{image_height[index]}}px" bindload="imageLoad" mode="aspectFill" bindtap='preview_img' data-index="{{ index }}" />
-                </view>
-            </view>
-            <view class="house-id" bindtap="copy" data-num="id">
-                <view class="id">房源ID：{{ info.id }}</view>
-                <view>轻点即可复制此编号</view>
-            </view>
-            <ads item="{{ adv }}" wx:if="{{ adv }}" bindclickAD="clickAD" bindcloseAD="closeAD"></ads>
-            <view class='disclaimer'>温馨提示：房源信息及身份认证资料，均由平台用户提供，发布者对其真实性、合法性等负责，平台不负责甄别和审核具体内容真实性和有效性等，请务必仔细核实相关信息，谨防上当受骗。</view>
-            <view class='ad-contact' bindtap="copyWebsite">公寓/酒店/中介房源推广合作请联系ad@gter.net</view>
 
-            <!-- 加入 QRCodeState 判断原因 需要加入点击弹出二维码，但是底部使用 cover-view 组件图层最高，会出现在 二维码层，解决办法是隐藏底部 -->
-            <view class="detailFooter" wx:if="{{ !QRCodeState }}">
-                <!-- 发布者本人 -->
-                <cover-view class='fixfooter' wx:if="{{ isself }}">
-                    <cover-view class='item'>
-                        <!-- <cover-view bindtap='toindex' class='cells'>
-            <cover-image class='index' src="../../img/indexblack.png"></cover-image>
-          </cover-view> -->
-                        <cover-view class='cells' bindtap="add_to_fav">
-                            <cover-image class='star-bottom' src="../../img/star-yellow.png" wx:if="{{ isfav }}"></cover-image>
-                            <cover-image class='star-bottom' src="../../img/staro.png" wx:if="{{ !isfav }}"></cover-image>
-                        </cover-view>
-                        <cover-view class='cells' bindtap="share_pic">
-                            <cover-image class='share' src="../../img/share.png"></cover-image>
-                        </cover-view>
-                        <navigator class='cells' url="../edit/edit?uniqid={{ uniqid }}&token={{ token }}&types=edit">
-                            <cover-image class='pen' src="../../img/pen.png"></cover-image>
-                        </navigator>
-                    </cover-view>
-                </cover-view>
-
-                <!-- 不是发布者本人 -->
-                <cover-view class='fixfooter' wx:if="{{ !isself }}">
-                    <cover-view class='item'>
-                        <cover-view class='cells' bindtap="add_to_fav">
-                            <cover-image class='star-bottom' src="/img/star-yellow.png" wx:if="{{ isfav }}"></cover-image>
-                            <cover-image class='star-bottom' src="/img/staro.png" wx:if="{{ !isfav }}"></cover-image>
-                        </cover-view>
-                        <cover-view class='cells' bindtap="share_pic">
-                            <cover-image class='share' src="/img/share.png"></cover-image>
-                        </cover-view>
-
-                    </cover-view>
-                    <!--来源为小程序  -->
-                    <cover-view class='item phone' wx:if="{{ info.wechat || info.tel || info.whatsapp || info.wechatdata.aid }}" bindtap="to_message">联系方式</cover-view>
-                </cover-view>
-
-                <!--保存海报图层  -->
-                <cover-view class='share-box' wx:if="{{ show_share_box }}">
-                    <cover-view class='whitebox' bindtap="close_share"></cover-view>
-                    <cover-view class='box'>
-                        <cover-view class='title'>海报已保存到系统相册</cover-view>
-                        <cover-view class='tips'>快去分享给小伙伴们吧</cover-view>
-                        <cover-view class='btn' bindtap="close_share">知道了</cover-view>
-                    </cover-view>
-                </cover-view>
+            <!-- 求租描述 -->
+            <view class="HResource-item" wx:if="{{ info.introduction }}">
+                <view class="HResource-item-head flexacenter">
+                    <image class="HResource-item-head-icon" src="/img/description-rent.png" mode="widthFix"></image>{{ info.intermediary == 6 ? '求租描述' : '更多介绍' }}
+                </view>
+                <view class="HResource-item-list rent-seeking-description">
+                    <template is="wxParse" data="{{ wxParseData:info.introduction.nodes }}" />
+                </view>
             </view>
-            <cover-view class="around-school-alert" data-show="0" hidden="{{ !showSchool }}">
-                <cover-view class="inner">
-                    <cover-view class="title">
-                        <cover-view class="text">房源距离学校</cover-view>
-                        <cover-image src="/img/right-close.png" class="close" bindtap="showSchoolAlert" data-show="0"></cover-image>
-                    </cover-view>
-                    <cover-view class="list">
-                        <cover-view class="item" wx:for="{{ info.pointData }}" wx:key="index">
-                            <cover-view class="school">
-                                <cover-image class="icon" src="/img/school.png"></cover-image>
-                                <cover-view class="name">{{ item.name }}</cover-view>
-                            </cover-view>
-                            <cover-view class="distance-list" wx:for="{{ item.point }}" wx:for-item="s" wx:for-index="i" wx:key="i">
-                                <cover-view class="gate">{{ s.title }}</cover-view>
-                                <cover-view class="distance">{{ s.distance }}公里</cover-view>
-                            </cover-view>
-                        </cover-view>
-                    </cover-view>
-                </cover-view>
-            </cover-view>
+
+            <!-- 房源数据 -->
+            <view class="HResource-item">
+                <template is="HResourceState" data="{{ info }}"></template>
+            </view>
+
+            <!-- 免责声明 -->
+            <template is="disclaimer" data="{{ info,wechat }}"></template>
+            <!-- 底部 -->
+            <template is="footer1" data="{{ info,isfav,bottomLift,bottomUnitState }}"></template>
+
+            <!-- 联系方式弹窗 -->
+            <view class="root-portal" style="display: flex;align-items: flex-end;" bindtap="negation" data-key="contactInformationState" wx:if="{{ contactInformationState }}" catchtouchmove="locationmove">
+                <!-- <template is="root-portal" data="{{ info }}"></template> -->
+                <template is="new-contact-information" data="{{ info,contactValue }}"></template>
+
+            </view>
+        </view>
+    </view>
+
+    <view class="housing-contact" wx:if="{{ contacts }}">
+        <view class="housing-contact-title">房源联系人</view>
+        <view class="housing-contact-box flexflex">
+            <image class="housing-contact-avatar" mode="widthFix" src="{{ contacts.avatar }}"></image>
+            <view class="housing-contact-content flexflex">
+                <view class="housing-contact-name flexacenter">{{ contacts.nickname }}
+                    <image class="housing-contact-icon" mode="widthFix" src="/img/certifying-agent.png"></image>
+                </view>
+                <view class="housing-contact-detail">
+                    <view wx:if="{{ contacts.businesscard }}" class="contact-business-card flexcenter" bindtap="showBusinessCard">
+                        <image class="contact-business-card-icon" mode="widthFix" src="/img/business-card-icon.png"></image>
+                        名片
+                    </view>
+                    <view wx:if="{{ contacts.proxynumber }}" class="housing-contact-item">代理人牌照号：{{ contacts.proxynumber }}</view>
+                    <view wx:if="{{ contacts.companyname }}" class="housing-contact-item">所属公司：{{ contacts.companyname }}</view>
+                    <view wx:if="{{ contacts.companyaddress }}" class="housing-contact-item">公司地址：{{ contacts.companyaddress }}</view>
+                    <view wx:if="{{ contacts.companylicensenumber }}" class="housing-contact-item">公司牌照号：{{ contacts.companylicensenumber }}</view>
+                </view>
+            </view>
+        </view>
+    </view>
+
+    <!-- 其他认证房源 -->
+    <view class="other-information else-box" wx:if="{{ attestationElseResource.length != 0 }}">
+        <view class="other-information-name flexacenter">发布者的其他{{ info['intermediary'] == 1 ? '' : '认证' }}房源<view class="else-quantity">({{ attestationElseResource.length }})</view>
+        </view>
+        <block wx:for="{{ attestationElseResource }}">
+            <common-list item="{{ item }}"></common-list>
         </block>
-    </block>
+    </view>
+
+    <!-- 附近房源 -->
+    <view class="other-information nearby-listings" wx:if="{{ listDataLeft.length != 0 }}">
+        <!-- 列表 -->
+        <view class="other-information-name flexacenter">附近房源</view>
+        <view class="pinterest-list flexflex">
+            <view id="pinterest-list-left" class="pinterest-list-left flex1">
+                <block wx:for="{{ listDataLeft }}" wx:key="index">
+                    <template wx:if="{{item.type == 'adv'}}" is="adv" data="{{ item }}"></template>
+                    <!-- <template wx:elif="{{item.type == 'apartment'}}" is="apartment" data="{{ item,bgColorObj }}"></template> -->
+                    <template wx:elif="{{item.type == 'apartment'}}" is="apartmentApartment" data="{{ item,bgColorObj }}"></template>
+                    <template wx:else is="general" data="{{ item,bgColorObj }}"></template>
+                </block>
+            </view>
+            <view id="pinterest-list-right" class="pinterest-list-right flex1" style="display:flex;flex-direction:column;align-items: flex-end;">
+                <block wx:for="{{ listDataRight }}" wx:key="index">
+                    <template wx:if="{{item.type == 'adv'}}" is="adv" data="{{ item }}"></template>
+                    <!-- <template wx:elif="{{item.type == 'apartment'}}" is="apartment" data="{{ item,bgColorObj }}"></template> -->
+                    <template wx:elif="{{item.type == 'apartment'}}" is="apartmentApartment" data="{{ item,bgColorObj }}"></template>
+                    <template wx:else is="general" data="{{ item,bgColorObj }}"></template>
+                </block>
+            </view>
+        </view>
+    </view>
+
+    <view style="width: 100vw;height: 50rpx;background: rgba(238, 239, 242, 1);"></view>
+
 
 </view>
 
@@ -1113,7 +503,6 @@
 <!-- 底部操作栏 -->
 <template name="footer1">
     <view class="footer1" style="padding-bottom: {{ bottomLift }}rpx;">
-        <!-- <view class="rent-budget flexflex" wx:if="{{ info.intermediary == 6 && bottomUnitState }}"> -->
         <view class="rent-budget flexflex" wx:if="{{ bottomUnitState }}">
             <view class="rent-budget-money">{{ info.rent }}</view>
             <view class="" wx:if="{{ info.intermediary == 6 }}">租金预算</view>
diff --git a/pages/show/show.wxss b/pages/show/show.wxss
index 401a75e..9d7a339 100644
--- a/pages/show/show.wxss
+++ b/pages/show/show.wxss
@@ -1879,14 +1879,6 @@ map .clickmap {
 
 }
 
-.popularize {
-    display: block;
-    width: calc(100vw - 60rpx);
-    margin: 60rpx auto 0;
-    padding-bottom: 60rpx;
-    border-radius: 10rpx;
-}
-
 .housing-contact {
     padding: 0 30rpx;
     background-color: rgba(238, 239, 242, 1);
diff --git a/pages/user/user.js b/pages/user/user.js
index 875c67a..36ae9a8 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -134,7 +134,6 @@ Page({
         failPopState: false, // 提交失败的弹窗状态
 
 
-        isNewVersions: true,
 
 
     },
@@ -218,8 +217,7 @@ Page({
                 wechat: app.globalData.wechat,
                 bottomLift: app.globalData.screen_data.bottomLift
             })
-            if (this.data.isNewVersions) this.getUserInit()
-            else this.initData()
+            this.getUserInit()
 
             // this['get_' + this.data.tab]()
         } else {
@@ -331,15 +329,14 @@ Page({
             token: token,
             uniqid: uniqid
         }).then(data => {
-            if (this.data.isNewVersions) {
-                that.data.fav.data.splice(index, 1);
-                if (that.data.fav.data.length == 0) this.getFavData()
+            that.data.fav.data.splice(index, 1);
+            if (that.data.fav.data.length == 0) this.getFavData()
+
+            that.data.fav.count = that.data.fav.count - 1
+            that.setData({
+                fav: this.data.fav
+            })
 
-                that.data.fav.count = that.data.fav.count - 1
-                that.setData({
-                    fav: this.data.fav
-                })
-            }
             that.data.fav_list.splice(index, 1);
             that.setData({
                 fav_count: data.data.user_count,
@@ -374,28 +371,20 @@ Page({
                         wx.hideLoading()
                         if (data.extraparam.mode == 'right') {
                             // 成功
-                            if (that.data.isNewVersions) {
-                                let status = that.data.publish.data[index].status
-                                let stat = that.data.stat
+                            let status = that.data.publish.data[index].status
+                            let stat = that.data.stat
 
-                                if (status == 0) stat['draft']--
-                                else if (status == 1) stat['listing']--
-                                else stat['offshelf']--
+                            if (status == 0) stat['draft']--
+                            else if (status == 1) stat['listing']--
+                            else stat['offshelf']--
+
+                            that.data.publish.data.splice(index, 1);
+                            that.data.publish.count--;
+                            that.setData({
+                                publish: that.data.publish,
+                                stat
+                            })
 
-                                that.data.publish.data.splice(index, 1);
-                                that.data.publish.count--;
-                                that.setData({
-                                    publish: that.data.publish,
-                                    stat
-                                })
-                            } else {
-                                that.data.publish_list.splice(index, 1);
-                                that.data.publish_count--;
-                                that.setData({
-                                    publish_list: that.data.publish_list,
-                                    publish_count: that.data.publish_count
-                                })
-                            }
 
                             wx.showToast({
                                 title: data.message,
@@ -538,17 +527,11 @@ Page({
     change_item_status: function (e) {
         let uniqid, token, index, status
 
-        if (this.data.isNewVersions) {
-            uniqid = e.detail.uniqid;
-            token = e.detail.token;
-            index = e.detail.index;
-            status = e.detail.status;
-        } else {
-            uniqid = e.currentTarget.dataset.uniqid
-            token = e.currentTarget.dataset.token
-            index = e.currentTarget.dataset.index
-            status = e.currentTarget.dataset.status
-        }
+        uniqid = e.detail.uniqid;
+        token = e.detail.token;
+        index = e.detail.index;
+        status = e.detail.status;
+
         this.setData({
             chage_status_obj: {
                 show: true,
@@ -574,32 +557,25 @@ Page({
             if (data.code == 200) {
                 // 成功
                 that.data.chage_status_obj.show = false;
-                if (this.data.isNewVersions) {
-                    let status = that.data.chage_status_obj.status
-                    let stat = this.data.stat
+                let status = that.data.chage_status_obj.status
+                let stat = this.data.stat
 
-                    if (status == 1) stat['listing']--
-                    else if (status == 0) stat['draft']--
-                    else stat['offshelf']--
+                if (status == 1) stat['listing']--
+                else if (status == 0) stat['draft']--
+                else stat['offshelf']--
 
-                    let newStatus = data.data.status
-                    if (newStatus == 1) stat['listing']++
-                    else if (newStatus == 0) stat['draft']++
-                    else stat['offshelf']++
+                let newStatus = data.data.status
+                if (newStatus == 1) stat['listing']++
+                else if (newStatus == 0) stat['draft']++
+                else stat['offshelf']++
+
+                this.data.publish.data[that.data.chage_status_obj.index].status = newStatus
+                this.setData({
+                    stat,
+                    publish: this.data.publish,
+                    chage_status_obj: this.data.chage_status_obj
+                })
 
-                    this.data.publish.data[that.data.chage_status_obj.index].status = newStatus
-                    this.setData({
-                        stat,
-                        publish: this.data.publish,
-                        chage_status_obj: this.data.chage_status_obj
-                    })
-                } else {
-                    that.data.publish_list[that.data.chage_status_obj.index].status = data.data.status;
-                    that.setData({
-                        publish_list: that.data.publish_list,
-                        chage_status_obj: that.data.chage_status_obj
-                    })
-                }
                 wx.showToast({
                     title: data.message,
                 })
@@ -639,15 +615,10 @@ Page({
     bindtopUp(e) {
         let token, index, isding
 
-        if (this.data.isNewVersions) {
-            token = e.detail.token
-            index = e.detail.index
-            isding = e.detail.isding
-        } else {
-            token = e.currentTarget.dataset.token
-            index = e.currentTarget.dataset.index
-            isding = e.currentTarget.dataset.isding
-        }
+        token = e.detail.token
+        index = e.detail.index
+        isding = e.detail.isding
+
 
         if (isding == 1) {
             this.setData({
@@ -672,14 +643,9 @@ Page({
         }).then(res => {
             if (res.code == 200) {
 
-                let isNewVersions = this.data.isNewVersions
-                if (isNewVersions) {
-                    if (isding == 0) this.data.publish.data[index].isding = 1
-                    else this.data.publish.data[index].isding = 0
-                } else {
-                    if (isding == 0) this.data.publish_list[index].isding = 1
-                    else this.data.publish_list[index].isding = 0
-                }
+                if (isding == 0) this.data.publish.data[index].isding = 1
+                else this.data.publish.data[index].isding = 0
+
 
                 this.setData({
                     raisePopupMessage: res.message,
@@ -1049,16 +1015,30 @@ Page({
             let identityList = data.data
             let isintermediary = data.isintermediary
             if (data['ispopup'] == 0) { // 确认身份 直接跳转
+
+                let user = app.globalData['user']
                 let miniProgram = app.globalData.miniProgram
-                let url = `/pages/edit/edit?intermediary=${isintermediary}`
-                if (miniProgram == 'xg') {
-                    wx.navigateTo({
-                        url,
-                    })
+                if (user['uid']) {
+                    let url = `/pages/edit/edit?intermediary=${isintermediary}`
+                    if (!user['nickname'] || !user['avatar']) {
+                        wx.navigateTo({
+                            url: '/pagesLoginRequired/pages/setAvatarNickname/setAvatarNickname',
+                        })
+                        return
+                    }
+                    if (miniProgram == 'xg') {
+                        wx.navigateTo({
+                            url,
+                        })
+                    } else {
+                        wx.navigateToMiniProgram({
+                            appId: "wx9c68fbf7886ea9c4",
+                            path: url
+                        })
+                    }
                 } else {
-                    wx.navigateToMiniProgram({
-                        appId: "wx9c68fbf7886ea9c4",
-                        path: url
+                    this.setData({
+                        isAuthorization: 1
                     })
                 }
                 return
@@ -1119,6 +1099,7 @@ Page({
         var date = new Date(timestamp * 1000);
         // 使用Date对象的get方法获取年、月、日
         var year = date.getFullYear();
+
         var month = date.getMonth() + 1;
         var day = date.getDate();
 
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index a82edc2..827f915 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -1,7 +1,7 @@
 <import src="../common/common.wxml" />
 <import src="../../wxParse/wxParse.wxml" />
 <view class="container containerNew" wx:if="{{ !loding }}">
-    <header-nav inner-text="Some text" isIndexPage="index" isMessageCount="{{ !isNewVersions }}" unreadMessages="{{ unreadMessages }}" bindunreadMessagesalter="unreadMessagesalter" bgcolor="transparent" position="{{ 'absolute' }}">
+    <header-nav inner-text="Some text" isIndexPage="index" unreadMessages="{{ unreadMessages }}" bindunreadMessagesalter="unreadMessagesalter" bgcolor="transparent" position="{{ 'absolute' }}">
         <view>{{ topTitle }}</view>
     </header-nav>
     <template wx:if="{{ validityidentityState }}" is="public-hint" data="{{ hint: '认证有效期：' + validityidentity }}"></template>
@@ -9,313 +9,95 @@
     <to-top wx:if="{{ showTOTOP }}"></to-top>
     <go-login wx:if="{{ isAuthorization==1 }}" bindislogin="islogin" bindauthorizationSuccess="authorizationSuccess"></go-login>
 
-    <block wx:if="{{ isNewVersions }}">
-        <view class="header-new" style="margin-top: -{{ screen_data.totalTopHeight }}px;">
-            <view class="header-message flexacenter">
-                <view class="header-user-message flexacenter">
-                    <view class="header-user-avatar" bindtap="goSetAvatarNickname">
-                        <image class="header-user-avatar-icon" src="{{ user.avatar }}"></image>
-                        <view class="info-camera flexcenter">
-                            <image class="info-camera-icon" mode="widthFix" src="/img/camera.png"></image>
-                        </view>
-                    </view>
-                    <view class="header-user-info flexflex">
-                        <view bindtap="goSetAvatarNickname" class="header-user-name flexacenter">{{ user.nickname || '微信用户' }} <image wx:if="{{ user.intermediary == 1 }}" class="header-user-agent" mode="heightFix" catchtap="showValidityidentity" src="/img/certifying-agent.png"></image>
-                        </view>
-                        <view class="header-user-uid flexacenter">UID：{{ user.uid }}</view>
+    <view class="header-new" style="margin-top: -{{ screen_data.totalTopHeight }}px;">
+        <view class="header-message flexacenter">
+            <view class="header-user-message flexacenter">
+                <view class="header-user-avatar" bindtap="goSetAvatarNickname">
+                    <image class="header-user-avatar-icon" src="{{ user.avatar }}"></image>
+                    <view class="info-camera flexcenter">
+                        <image class="info-camera-icon" mode="widthFix" src="/img/camera.png"></image>
                     </view>
                 </view>
-                <!-- <button open-type="contact" class='contact' bindcontact="bindcontact">
+                <view class="header-user-info flexflex">
+                    <view bindtap="goSetAvatarNickname" class="header-user-name flexacenter">{{ user.nickname || '微信用户' }} <image wx:if="{{ user.intermediary == 1 }}" class="header-user-agent" mode="heightFix" catchtap="showValidityidentity" src="/img/certifying-agent.png"></image>
+                    </view>
+                    <view class="header-user-uid flexacenter">UID：{{ user.uid }}</view>
+                </view>
+            </view>
+            <!-- <button open-type="contact" class='contact' bindcontact="bindcontact">
                     <image class="contact-icon" src="/img/u1872.png" mode="widthFix"></image>
                     反馈
                 </button> -->
-            </view>
-            <view class="header-btn flexacenter">
-                <view class="header-btn-item flex1 flexcenter" bindtap="publicSkip" data-url="/pages/messageCenter/messageCenter">
-                    <view class="header-btn-box message-reminding flexcenter">
-                        <image class="header-btn-icon" mode="widthFix" src="/img/message-reminding.svg"></image>
-                        <view class="header-btn-num flexcenter" wx:if="{{ newmessagenum != 0 }}">{{ newmessagenum }}</view>
-                    </view>
-                    <view class="header-btn-text">消息提醒</view>
+        </view>
+        <view class="header-btn flexacenter">
+            <view class="header-btn-item flex1 flexcenter" bindtap="publicSkip" data-url="/pages/messageCenter/messageCenter">
+                <view class="header-btn-box message-reminding flexcenter">
+                    <image class="header-btn-icon" mode="widthFix" src="/img/message-reminding.svg"></image>
+                    <view class="header-btn-num flexcenter" wx:if="{{ newmessagenum != 0 }}">{{ newmessagenum }}</view>
                 </view>
-                <view class="header-btn-item flex1 flexcenter" bindtap="handleRightBtn">
-                    <view class="header-btn-box issue-housing flexcenter" style="--bgcolor: {{ identityObj[user.identity || 0].bgcolor }}">
-                        <image wx:if="{{ user.identity == 0 }}" class="header-btn-icon" mode="widthFix" src="/img/plus-3.png"></image>
-                        <image wx:else class="header-btn-icon" style="width: 33rpx;height: 33rpx;" mode="widthFix" src="/img/identification.png"></image>
-                    </view>
-                    <view class="header-btn-text">{{ identityObj[user.identity || 0].text }}</view>
+                <view class="header-btn-text">消息提醒</view>
+            </view>
+            <view class="header-btn-item flex1 flexcenter" bindtap="handleRightBtn">
+                <view class="header-btn-box issue-housing flexcenter" style="--bgcolor: {{ identityObj[user.identity || 0].bgcolor }}">
+                    <image wx:if="{{ user.identity == 0 }}" class="header-btn-icon" mode="widthFix" src="/img/plus-3.png"></image>
+                    <image wx:else class="header-btn-icon" style="width: 33rpx;height: 33rpx;" mode="widthFix" src="/img/identification.png"></image>
+                </view>
+                <view class="header-btn-text">{{ identityObj[user.identity || 0].text }}</view>
+            </view>
+        </view>
+    </view>
+
+    <image class="round1" src="/img/show-head-left.svg"></image>
+    <image class="round2" src="/img/show-head-right.svg"></image>
+
+    <view class="list-new">
+        <view class="list-new-top flexflex">
+            <view class="list-new-top-bg"></view>
+            <view class="list-new-top-item flexflex {{ tab == 'fav' ? 'selected' : '' }}" bindtap="cutTab" data-type="fav">
+                <view class="flexacenter">
+                    <image wx:if="{{ tab == 'fav' }}" class="list-new-top-icon list-new-top-icon-selected" mode="widthFix" src="/img/user-collect-selected.png"></image>
+                    <image wx:else class="list-new-top-icon" mode="widthFix" src="/img/user-collect-unselected.svg"></image>收藏
+                </view>
+            </view>
+            <view class="list-new-top-item flexflex  {{ tab == 'publish' ? 'selected selectedpublish' : '' }}" bindtap="cutTab" data-type="publish">
+                <view class="flexacenter">
+                    <image wx:if="{{ tab == 'publish' }}" class="list-new-top-icon list-new-top-icon-selected" mode="widthFix" src="/img/user-issue-selected.png"></image>
+                    <image wx:else class="list-new-top-icon" mode="widthFix" src="/img/user-issue-unselected.svg"></image>发布
                 </view>
             </view>
         </view>
 
-        <image class="round1" src="/img/show-head-left.svg"></image>
-        <image class="round2" src="/img/show-head-right.svg"></image>
-
-        <view class="list-new">
-            <view class="list-new-top flexflex">
-                <view class="list-new-top-bg"></view>
-                <view class="list-new-top-item flexflex {{ tab == 'fav' ? 'selected' : '' }}" bindtap="cutTab" data-type="fav">
-                    <view class="flexacenter">
-                        <image wx:if="{{ tab == 'fav' }}" class="list-new-top-icon list-new-top-icon-selected" mode="widthFix" src="/img/user-collect-selected.png"></image>
-                        <image wx:else class="list-new-top-icon" mode="widthFix" src="/img/user-collect-unselected.svg"></image>收藏
+        <view wx:if="{{ tab == 'fav' }}" class="list-new-content list-new-content-collect">
+            <block wx:if="{{ fav.count != 0 }}">
+                <view class="list-new-content-total flexacenter">共收藏 <view class="list-new-content-total-num">{{ fav.count }}</view> 个房源</view>
+                <view class="list-new-content-list">
+                    <view class="list-new-content-item" wx:for="{{ fav.data }}" wx:key="index">
+                        <common-list bindcollectOperation="add_to_fav" item="{{ item }}" index="{{ index }}" iscollect="{{ true }}"></common-list>
                     </view>
                 </view>
-                <view class="list-new-top-item flexflex  {{ tab == 'publish' ? 'selected selectedpublish' : '' }}" bindtap="cutTab" data-type="publish">
-                    <view class="flexacenter">
-                        <image wx:if="{{ tab == 'publish' }}" class="list-new-top-icon list-new-top-icon-selected" mode="widthFix" src="/img/user-issue-selected.png"></image>
-                        <image wx:else class="list-new-top-icon" mode="widthFix" src="/img/user-issue-unselected.svg"></image>发布
-                    </view>
-                </view>
-            </view>
-
-            <view wx:if="{{ tab == 'fav' }}" class="list-new-content list-new-content-collect">
-                <block wx:if="{{ fav.count != 0 }}">
-                    <view class="list-new-content-total flexacenter">共收藏 <view class="list-new-content-total-num">{{ fav.count }}</view> 个房源</view>
-                    <view class="list-new-content-list">
-                        <view class="list-new-content-item" wx:for="{{ fav.data }}" wx:key="index">
-                            <common-list bindcollectOperation="add_to_fav" item="{{ item }}" index="{{ index }}" iscollect="{{ true }}"></common-list>
-                        </view>
-                    </view>
-                </block>
-                <template wx:else is="empty-icon" data="{{ hint: '暂无内容' }}"></template>
-                <image class="service flexflex" mode="widthFix" wx:if="{{ wechat['service'] }}" show-menu-by-longpress src="{{ wechat['service'] }}"></image>
-            </view>
-
-            <view wx:else style="border-radius: 15rpx 0 0 0;" class="list-new-content list-new-content-issue">
-                <block wx:if="{{ publish.count != 0 }}">
-                    <view class="list-new-content-total flexacenter">共 <view class="list-new-content-total-num">{{ publish.count }}</view> 条房源（上架 {{ stat.listing }} <view class="list-new-content-vertical"></view> 草稿 {{ stat.draft }} <view class="list-new-content-vertical"></view> 下架 {{ stat.offshelf }} ）</view>
-                    <view class="list-new-content-list">
-                        <view class="list-new-content-item" wx:for="{{ publish.data }}" wx:key="index">
-                            <common-list binduserOperation="userOperation" stateData="{{ stateObj[item.status] }}" item="{{ item }}" index="{{ index }}" ispublish="{{ true }}"></common-list>
-                        </view>
-                    </view>
-                </block>
-                <template wx:else is="empty-icon" data="{{ hint: '暂无内容' }}"></template>
-                <!-- 疑问 -->
-                <view class="query-box flexcenter" wx:if="{{ data.length != 0 }}">
-                    <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>
-        </view>
-    </block>
-    <block wx:else>
-        <!-- tab -->
-        <view class='tab-box'>
-            <view class='{{tab=="fav" ?"tab active" :"tab"}}' bindtap='change_tab' data-tab='fav'>
-                <block>
-                    <image src='/img/collect.jpg' class='star' wx:if="{{ tab=='fav' }}"></image>
-                    <image src='/img/collectc.jpg' class='star' wx:if="{{ tab!='fav' }}"></image>
-                </block>
-                收藏
-            </view>
-            <view class='{{tab=="publish" ?"tab active" :"tab"}}' bindtap='change_tab' data-tab='publish'>
-                <block>
-                    <image src='/img/publishblue.jpg' class='publish' wx:if="{{ tab=='publish' }}"></image>
-                    <image src='/img/publishc.jpg' class='publish' wx:if="{{ tab!='publish' }}"></image>
-                </block>
-                发布
-            </view>
+            </block>
+            <template wx:else is="empty-icon" data="{{ hint: '暂无内容' }}"></template>
+            <image class="service flexflex" mode="widthFix" wx:if="{{ wechat['service'] }}" show-menu-by-longpress src="{{ wechat['service'] }}"></image>
         </view>
 
-        <!--list  -->
-        <view class='list' wx:if="{{ tab=='fav' }}">
-            <view class='item' wx:for="{{ fav_list }}" wx:key="index">
-                <template is="list" wx:if="{{ item.status !=2 }}" data="{{ item:item }}" />
-                <view class='info-list' wx:if="{{ item.status==2 }}" bindtap='have_rent_info'>
-                    <form bindsubmit="send_form_id" report-submit='true' data-types="confirm" class='submit-form'>
-
-                        <view class='title'>
-                            <image class='authentication' wx:if="{{ item.verified == 1 }}" mode="heightFix" src="/img/authentication.jpg" />
-
-                            <image class='newbtn' wx:if="{{ item.isnew }}" src="../../img/newbtn.png" />
-                            <image class='hotbtn' wx:if="{{ item.ishot }}" src="../../img/hotbtn.png" /> {{
-                            item.subject
-                            }}
-                            <image src="../../img/pics.jpg" wx:if="{{ item.ispic }}" class='imgbtn'></image>
-                        </view>
-                        <view class='tips'>
-                            <view class='i' wx:if="{{ item.location }}">{{ item.location }}</view>
-                            <view class='i' wx:if="{{ item.type }}">{{ item.type }}</view>
-                            <view class='i' wx:if="{{ item.acreage }}">{{ item.acreage }}平方{{ item.cityid == 1 ? '呎' :'米'}}</view>
-                            <view class='i' wx:if="{{ item.gender }}">{{ item.gender }}</view>
-                            <view class='i' wx:if="{{ item.leaseterm }}">{{ item.leaseterm ==1 ?'长租':(item.leaseterm ==2 ?'短租' :'')}}</view>
-                        </view>
-                        <view class='footer'>
-                            <view>{{ item.currency }}
-                                <view class='num'>{{ item.rent }}</view>/{{ item.rentalperiod || '月' }}
-                            </view>
-                            <view>
-                                <view class='agent' wx:if="{{ item.intermediary != 2 && item.intermediary != 5 }}">{{ item.intermediary
-                                    ==1?'中介' :(item.publisheridentity ==3 ?"房东" : '有房招室友') }}</view>
-                            </view>
-                            <view class='footer-right'>
-                                <view class='see' wx:if="{{item.count_view >0 }}">
-                                    <image src="../../img/eye.png" />{{ item.count_view }}
-                                </view>
-                                <view class='stars' wx:if="{{item.count_fav >0 }}">
-                                    <image src="../../img/star.png" />{{ item.count_fav }}
-                                </view>
-                            </view>
-                        </view>
-                        <view class='publish_tips' wx:if="{{ item.status==0 }}">
-                            <view class="caution">
-                                <view class="caution-baitiao"></view>
-                            </view> 该信息尚未发布
-                        </view>
-                        <button form-type="submit" hover-class="none" type="default" size="mini"></button>
-                    </form>
-                </view>
-                <view class='is_rent_btn' wx:if="{{ item.status==2 }}">已出租</view>
-                <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" />取消收藏
+        <view wx:else style="border-radius: 15rpx 0 0 0;" class="list-new-content list-new-content-issue">
+            <block wx:if="{{ publish.count != 0 }}">
+                <view class="list-new-content-total flexacenter">共 <view class="list-new-content-total-num">{{ publish.count }}</view> 条房源（上架 {{ stat.listing }} <view class="list-new-content-vertical"></view> 草稿 {{ stat.draft }} <view class="list-new-content-vertical"></view> 下架 {{ stat.offshelf }} ）</view>
+                <view class="list-new-content-list">
+                    <view class="list-new-content-item" wx:for="{{ publish.data }}" wx:key="index">
+                        <common-list binduserOperation="userOperation" stateData="{{ stateObj[item.status] }}" item="{{ item }}" index="{{ index }}" ispublish="{{ true }}"></common-list>
                     </view>
                 </view>
-            </view>
-
-            <view class="whether" wx:if="{{ fav_list.length != 0 && fav_page.next_page == 0}}">到底了</view>
-            <view wx:if="{{ fav_list.length==0 && !loading }}" class='nocontent'>
-                <image src="../../img/file.png" class='file'></image>
-                暂无收藏
+            </block>
+            <template wx:else is="empty-icon" data="{{ hint: '暂无内容' }}"></template>
+            <!-- 疑问 -->
+            <view class="query-box flexcenter" wx:if="{{ data.length != 0 }}">
+                <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>
-        <!-- 发布的状态码不要删除 -->
-        <!-- // 1正常,0未发布,2关闭,-3被投诉下架,-1用户删除,-2论坛删帖,-4待审,-5到期自动下架 -->
-        <view class='list' wx:if="{{ tab=='publish' }}">
-            <view class='item' wx:for="{{ publish_list }}" wx:key="index">
-                <view wx:if="{{ item.status==-4 }}" class='info-list'>
-                    <form bindsubmit="send_form_id" report-submit='true' data-types="confirm" class='submit-form'>
-                        <view class='title'>
-                            <image class='authentication' wx:if="{{ item.verified == 1 }}" mode="heightFix" src="/img/authentication.jpg" />
-                            <image class='newbtn' wx:if="{{ item.isnew }}" src="../../img/newbtn.png" />
-                            <image class='hotbtn' wx:if="{{ item.ishot }}" src="../../img/hotbtn.png" />
-                            {{ item.subject }}
-                            <image src="../../img/pics.jpg" wx:if="{{ item.ispic }}" class='imgbtn'></image>
-                        </view>
-                        <view class='publish_tips'>
-                            <image src="../../img/u1385.png"></image>该信息正在审核中
-                        </view>
-                        <button form-type="submit" hover-class="none" type="default" size="mini"></button>
-                    </form>
-                </view>
-                <view wx:if="{{ item.status==-3 }}" class='info-list'>
-                    <form bindsubmit="send_form_id" report-submit='true' data-types="confirm" class='submit-form'>
-                        <view class='title'>
-                            <image class='authentication' wx:if="{{ item.verified == 1 }}" mode="heightFix" src="/img/authentication.jpg" />
+    </view>
 
-                            <image class='newbtn' wx:if="{{ item.isnew }}" src="../../img/newbtn.png" />
-                            <image class='hotbtn' wx:if="{{ item.ishot }}" src="../../img/hotbtn.png" /> {{ item.subject }}
-                            <image src="../../img/pics.jpg" wx:if="{{ item.ispic }}" class='imgbtn'></image>
-                        </view>
-
-                        <view class='publish_tips'>
-                            <image src="../../img/tips.png"></image>多人投诉，已下架
-                        </view>
-
-                        <button form-type="submit" hover-class="none" type="default" size="mini"></button>
-                    </form>
-                </view>
-                <view wx:if="{{ item.status==0 }}" class='info-list' url="../show/show?tid={{ item.tid }}&uniqid={{ item.uniqid }}">
-                    <form bindsubmit="send_form_id" report-submit='true' data-types="confirm" class='submit-form'>
-                        <view class='title'>
-                            <image class='authentication' wx:if="{{ item.verified == 1 }}" mode="heightFix" src="/img/authentication.jpg" />
-
-                            <image class='newbtn' wx:if="{{ item.isnew }}" src="../../img/newbtn.png" />
-                            <image class='hotbtn' wx:if="{{ item.ishot }}" src="../../img/hotbtn.png" />
-                            <block wx:if="{{ item.subject }}">{{ item.subject }}</block>
-                            <text wx:else style="color: #999; margin-right: 10rpx;">未填写标题</text>
-                            <image src="../../img/pics.jpg" wx:if="{{ item.ispic }}" class='imgbtn'></image>
-                        </view>
-
-                        <view class='publish_tips'>
-                            <view class="caution">
-                                <view class="caution-baitiao"></view>
-                            </view> 该信息尚未发布
-                        </view>
-
-                        <button form-type="submit" hover-class="none" type="default" size="mini"></button>
-                    </form>
-                </view>
-                <view wx:if="{{ item.status == -5 }}" class='info-list' url="../show/show?tid={{ item.tid }}&uniqid={{ item.uniqid }}">
-                    <form bindsubmit="send_form_id" report-submit='true' data-types="confirm" class='submit-form'>
-                        <view class='title'>
-                            <image class='authentication' wx:if="{{ item.verified == 1 }}" mode="heightFix" src="/img/authentication.jpg" />
-
-                            <image class='newbtn' wx:if="{{ item.isnew }}" src="../../img/newbtn.png" />
-                            <image class='hotbtn' wx:if="{{ item.ishot }}" src="../../img/hotbtn.png" />
-                            <block wx:if="{{ item.subject }}">{{ item.subject }}</block>
-                            <text wx:else style="color: #999; margin-right: 10rpx;">未填写标题</text>
-                            <image src="../../img/pics.jpg" wx:if="{{ item.ispic }}" class='imgbtn'></image>
-                        </view>
-
-                        <view class='publish_tips'>
-                            <view class="caution">
-                                <view class="caution-baitiao"></view>
-                            </view> 超出发布期限，已自动下架
-                        </view>
-
-                        <button form-type="submit" hover-class="none" type="default" size="mini"></button>
-                    </form>
-                </view>
-                <template is="list" wx:if="{{ item.status==1 }}" data="{{ item:item }}" />
-                <view class='info-list' wx:if="{{ item.status==2 }}" bindtap='have_rent_info'>
-                    <form bindsubmit="send_form_id" report-submit='true' data-types="confirm" class='submit-form'>
-                        <view class='title'>
-                            <image class='authentication' wx:if="{{ item.verified == 1 }}" mode="heightFix" src="/img/authentication.jpg" />
-                            <view class="close-btn" wx:if="{{ item.status==2}}">已下架</view>
-                            <image class='newbtn' wx:if="{{ item.isnew }}" src="../../img/newbtn.png" />
-                            <image class='hotbtn' wx:if="{{ item.ishot }}" src="../../img/hotbtn.png" /> {{ item.subject }}
-                            <image src="../../img/pics.jpg" wx:if="{{ item.ispic }}" class='imgbtn'></image>
-                        </view>
-                        <view class='tips'>
-                            <view class='i' wx:if="{{ item.location }}">{{ item.location }}</view>
-                            <view class='i' wx:if="{{ item.type }}">{{ item.type }}</view>
-                            <view class='i' wx:if="{{ item.acreage }}">{{ item.acreage }}平方{{ item.cityid == 1 ? '呎' :'米'}}</view>
-                            <view class='i' wx:if="{{ item.gender }}">{{ item.gender }}</view>
-                            <view class='i' wx:if="{{ item.leaseterm }}">{{ item.leaseterm ==1 ?'长租':(item.leaseterm ==2 ?'短租' :'')}}</view>
-                        </view>
-                        <view class='footer'>
-                            <view>{{ item.currency }}
-                                <view class='num'>{{ item.rent }}</view>/{{ item.rentalperiod || '月' }}
-                            </view>
-                            <view class='agent' wx:if="{{ item.intermediary_text }}">{{ item.intermediary_text }}</view>
-                        </view>
-                        <view class='publish_tips' wx:if="{{ item.status==0 }}">
-                            <view class="caution">
-                                <view class="caution-baitiao"></view>
-                            </view> 该信息尚未发布
-                        </view>
-                        <button form-type="submit" hover-class="none" type="default" size="mini"></button>
-                    </form>
-                </view>
-                <view class="house-id">房源ID：{{ item.id }}</view>
-                <view class="operation" wx:if="{{ item.status !=-3 }}">
-                    <block wx:if="{{ item.status != -4 }}">
-                        <view class="operation-item" wx:if="{{ item.status != 4}}" bindtap='del_item' data-index="{{ index }}" data-uniqid="{{item.uniqid}}" data-token="{{ item.token }}">删除</view>
-                        <view wx:if="{{ item.intermediary == 6 }}" bindtap="judgeEditSkip" class="operation-item" data-url="/pages/askHousing/askHousing?uniqid={{ item.uniqid }}&token={{ item.token }}&types={{ item.status==0 ?'edit1' :'edit' }}">
-                            编辑</view>
-                        <view wx:else class="operation-item" bindtap="judgeEditSkip" data-url="/pages/edit/edit?uniqid={{ item.uniqid }}&token={{ item.token }}&types={{ item.status==0 ?'edit1' :'edit' }}">
-                            编辑</view>
-                        <view class="operation-item" wx:if="{{ item.status==1}}" bindtap='change_item_status' data-status="{{ item.status }}" data-index="{{ index }}" data-uniqid="{{item.uniqid}}" data-token="{{ item.token }}">下架</view>
-                        <view class="operation-item" wx:if="{{ item.status==2}}" bindtap='change_item_status' data-status="{{ item.status }}" data-index="{{ index }}" data-uniqid="{{item.uniqid}}" data-token="{{ item.token }}">上架</view>
-                        <view class="operation-item blue" wx:if="{{ item.status == 1 && item.isding == 0 }}" bindtap="bindtopUp" data-isding="{{ item.isding }}" data-index="{{ index }}" data-token="{{ item.token }}">顶上去</view>
-                        <view class="operation-item thinblue" bindtap="bindtopUp" data-isding="{{ item.isding }}" data-index="{{ index }}" data-token="{{ item.token }}" wx:if="{{ item.status == 1 && item.isding == 1 }}">已顶</view>
-                    </block>
-                    <block wx:else>
-                        <view class="operation-item" bindtap="cancelAudit" data-index="{{index}}" data-token="{{ item.appeal.token }}">撤销审核</view>
-                    </block>
-                </view>
-            </view>
-            <view class="whether" wx:if="{{ publish_list.length != 0 && publish_page.next_page == 0 }}">到底了
-            </view>
-            <view wx:if="{{ publish_list.length==0 && !loading }}" class='nocontent'>
-                <image src="../../img/file.png" class='file'></image>
-                暂无发布
-            </view>
-        </view>
-
-    </block>
 
     <view class="loading" wx:if="{{ loading }}">
         <view></view>
@@ -348,7 +130,6 @@
     </view>
 </view>
 
-
 <!-- 触发规则1时 重复发布 -->
 <!-- <template wx:if="{{ triggerRules == 1 }}" is="repeatedRelease" data="{{ pages:'user' }}"></template> -->
 <!-- 触发规则2时 提交失败 -->
@@ -358,6 +139,6 @@
 
 <template wx:if="{{ failPopState }}" is="fail-pop" data="{{ state: 'user' }}"></template>
 
-<fix-footer isNewVersions="{{ isNewVersions }}" user="1" unreadMessages="{{ unreadMessages }}" bottomLift="{{ bottomLift }}"></fix-footer>
+<fix-footer user="1" unreadMessages="{{ unreadMessages }}" bottomLift="{{ bottomLift }}"></fix-footer>
 
 <choice-type-release bindsetValue="setValue" choiceTypeState="{{ choiceTypeState }}" housingnum="{{ housingnum }}" identityList="{{ identityList }}"></choice-type-release>
\ No newline at end of file
diff --git a/pages/user/user.wxss b/pages/user/user.wxss
index 896a5ec..caf967c 100644
--- a/pages/user/user.wxss
+++ b/pages/user/user.wxss
@@ -84,7 +84,6 @@
 .info-list .submit-form {
     padding: 50rpx 40rpx 40rpx;
     display: block;
-
 }
 
 .house-id {
diff --git a/pagesLoginRequired/pages/setAvatarNickname/setAvatarNickname.js b/pagesLoginRequired/pages/setAvatarNickname/setAvatarNickname.js
index 0fd1b85..dbf20a6 100644
--- a/pagesLoginRequired/pages/setAvatarNickname/setAvatarNickname.js
+++ b/pagesLoginRequired/pages/setAvatarNickname/setAvatarNickname.js
@@ -1,9 +1,6 @@
-// var miucms = require('../../utils/miucms.js');
-// var miucms = require('/utils/miucms');
 var miucms = require('../../../utils/miucms');
 const app = getApp()
 Page({
-
     /**
      * 页面的初始数据
      */
@@ -63,7 +60,6 @@ Page({
                     }
                 })
 
-
             } else {
                 wx.showToast({
                     icon: "none",
diff --git a/template/fixFooter/fixFooter.js b/template/fixFooter/fixFooter.js
index 865ed86..841d5b1 100644
--- a/template/fixFooter/fixFooter.js
+++ b/template/fixFooter/fixFooter.js
@@ -15,7 +15,6 @@ Component({
         bottomLift: {
             type: Number
         },
-        isNewVersions: Boolean,
     },
 
     /**
@@ -54,18 +53,33 @@ Component({
                 let identityList = data.data
                 let isintermediary = data.isintermediary
                 if (data['ispopup'] == 0) {
+                    let user = app.globalData['user']
                     let miniProgram = app.globalData.miniProgram
-                    let url = `/pages/edit/edit?intermediary=${isintermediary}`
-                    if (miniProgram == 'xg') {
-                        wx.navigateTo({
-                            url,
-                        })
+                    if (user['uid']) {
+                        if (!user['nickname']) {
+                            wx.navigateTo({
+                                url: '/pagesLoginRequired/pages/setAvatarNickname/setAvatarNickname',
+                            })
+                            return
+                        }
+
+                        let url = `/pages/edit/edit?intermediary=${isintermediary}`
+                        if (miniProgram == 'xg') {
+                            wx.navigateTo({
+                                url,
+                            })
+                        } else {
+                            wx.navigateToMiniProgram({
+                                appId: "wx9c68fbf7886ea9c4",
+                                path: url
+                            })
+                        }
                     } else {
-                        wx.navigateToMiniProgram({
-                            appId: "wx9c68fbf7886ea9c4",
-                            path: url
+                        this.setData({
+                            isAuthorization: 1
                         })
                     }
+
                     // 确认身份 直接跳转
                     return
                 }
@@ -81,16 +95,14 @@ Component({
 
         // 处理发布房源
         handleIssue() {
-            if (this.data.isNewVersions) {
-                this.judgeIssue()
-                return
-            }
+            this.judgeIssue()
+            return
 
             let user = app.globalData['user']
             let miniProgram = app.globalData['miniProgram']
 
             if (user['uid']) {
-                if (!user['nickname']) {
+                if (!user['nickname'] || !user['avatar']) {
                     wx.navigateTo({
                         url: '/pagesLoginRequired/pages/setAvatarNickname/setAvatarNickname',
                     })
diff --git a/template/headSwiper/headSwiper.js b/template/headSwiper/headSwiper.js
index ffc3c69..cc5b11c 100644
--- a/template/headSwiper/headSwiper.js
+++ b/template/headSwiper/headSwiper.js
@@ -8,7 +8,6 @@ Component({
         attachment: Array,
         isInner: Number,
         pages: String,
-        isNewVersions: Boolean,
     },
     observers: {
         attachment(e) {