diff --git a/app.json b/app.json
index 5aaade3..dc622cc 100644
--- a/app.json
+++ b/app.json
@@ -8,7 +8,6 @@
         "pages/quarantineLists/quarantineLists",
         "pages/report/report",
         "pages/irentPark/irentPark",
-        "pages/chooseLocation/chooseLocation",
         "pages/user/user",
         "pages/search/search",
         "pages/edit/edit",
diff --git a/img/approve.png b/img/approve.png
deleted file mode 100644
index cd880af..0000000
Binary files a/img/approve.png and /dev/null differ
diff --git a/img/wechart.png b/img/wechart.png
index 51de208..3371708 100644
Binary files a/img/wechart.png and b/img/wechart.png differ
diff --git a/pages/askHousing/askHousing.js b/pages/askHousing/askHousing.js
index 5788002..1c803a7 100644
--- a/pages/askHousing/askHousing.js
+++ b/pages/askHousing/askHousing.js
@@ -305,13 +305,13 @@ Page({
                 for: 491
             },
             acreage: {
-                min: 100,
+                min: 10,
                 max: 3000,
                 rate: 29,
-                defaultMin: 5,
-                defaultMax: 40,
+                defaultMin: 0,
+                defaultMax: 299,
                 step: 10,
-                for: 291
+                for: 300
             }
         }
     },
@@ -1261,6 +1261,12 @@ Page({
             return
         }
 
+        if (this.data.fieldinfo[this.data.popUpit][this.data.step].field == "gender" && this.data.newinfo['type'].indexOf("合租") == -1) {
+            this.setData({
+                step: this.data.step + 1
+            })
+        }
+
         let field = this.data.fieldinfo[this.data.popUpit][this.data.step].field
         let popUpdate = {
             ...this.data.fieldinfoNew[field]
@@ -1281,6 +1287,8 @@ Page({
             return
         }
 
+        console.log("field", field);
+
         this.optionScroll(this.data.fieldinfoNew[popUpdate.field].field)
         if (popUpdate.popUpIs == 'unilineInput' || popUpdate.popUpIs == 'multilineInput' || popUpdate.popUpIs == 'multilineInput1') {
             this.data.focustitle = popUpdate.field
@@ -1288,9 +1296,6 @@ Page({
 
 
         if ((field == "acreage" || field == 'rent') && this.data.newinfo[field].length < 2) {
-            // let estimatedValue = this.data.estimatedValue[field]
-            // this.data.newinfo[field] = [estimatedValue.defaultMin, estimatedValue.defaultMax]
-            // popUpdate['value'] = [estimatedValue.defaultMin, estimatedValue.defaultMax]
             this.setData({
                 [`newinfo.${field}`]: popUpdate['value']
             })
@@ -1714,11 +1719,36 @@ Page({
     bindChangeRent(e) {
         let value = e.detail.value
         let popUpdate = this.data.popUpdate
+
+        console.log(value, "value");
         this.setData({
             [`newinfo.${popUpdate.field}`]: value,
             [`popUpdate.value`]: value
         })
     },
 
+    popUpIsQRCodeState: false,
+    handleWechatQRCodeState() {
+        this.setData({
+            getWechatQRCodeState: !this.data.getWechatQRCodeState
+        })
+
+        if (this.data.popUpIs) {
+            this.popUpIsQRCodeState = true
+            this.setData({
+                popUpIs: ""
+            })
+        }
+        if (!this.data.getWechatQRCodeState && this.popUpIsQRCodeState) {
+            this.popUpIsQRCodeState = false
+            this.setData({
+                popUpIs: "contactInformation"
+            })
+        }
+
+
+
+    },
+
 
 })
\ No newline at end of file
diff --git a/pages/askHousing/askHousing.wxml b/pages/askHousing/askHousing.wxml
index 37f10ad..bb29570 100644
--- a/pages/askHousing/askHousing.wxml
+++ b/pages/askHousing/askHousing.wxml
@@ -37,6 +37,9 @@
                 num = 0
             }
             return num.toFixed(1)
+        },
+        indexof: function (str, targetStr) {
+            return str.indexOf(targetStr) >= 0 ? true : false
         }
     }
 
@@ -51,6 +54,8 @@
 
     <header-nav inner-text="Some text" bgcolor="rgba(246, 246, 246, 1)">{{ types=='edit' ? '编辑' : '发布' }}求房源</header-nav>
 
+    <template wx:if="{{ getWechatQRCodeState }}" is="getWechatQRCode"></template>
+
     <view class="header-tips" wx:if="{{ false }}">
         <view class="name-tips">
             <view class="box">
@@ -122,7 +127,8 @@
             <!-- 租客性别要求 -->
             <view class="edit-option-item">
                 <block wx:for="{{ fieldinfo.identity }}" wx:key="index">
-                    <template is="clickInput" data="{{ item,index,it:'identity',newinfo }}"></template>
+                    <template wx:if="{{ item.field == 'gender' && m1.indexof(newinfo['type'],'合租') }}" is="clickInput" data="{{ item,index,it:'identity',newinfo }}"></template>
+                    <template wx:elif="{{ item.field != 'gender' }}" is="clickInput" data="{{ item,index,it:'identity',newinfo }}"></template>
                 </block>
             </view>
 
@@ -139,7 +145,12 @@
 
                 <block wx:for="{{ fieldinfo.contact }}" wx:key="index">
                     <view wx:if="{{ item.field == 'wechat' }}" class="contact-way contact-way-WeChat">
-                        <view class="contact-way-title" style="padding-bottom: 28rpx;">微信</view>
+                        <!-- <view class="contact-way-title" style="padding-bottom: 28rpx;">微信</view> -->
+                        <view class="contact-way-title WeChat flexacenter" style="padding-bottom: 28rpx;">
+                            <view class="">微信</view>
+                            <view class="how" bindtap="handleWechatQRCodeState">如何获取二维码？</view>
+                        </view>
+
                         <view class="contactInformation-wechat" wx:if="{{ contactInformationState == 0 }}">
                             <view class="contactInformation-wechat-item" hover-class="option-hover" bindtap="UploadQRCode" data-state="2">
                                 <image src="/img/u789.svg"></image>
@@ -267,7 +278,7 @@
         <view class="clpageInputickInput-title">{{ item.title }}<text wx:if="{{ item.required == 1}}" style="color:#C54235;margin-left: 10rpx;">*</text></view>
         <view class="pageInput" bindtap="clickOption" data-field="{{ item.field }}" data-step="{{ index }}" data-it="{{ it }}">
             <input wx:if="{{ !newinfo[item.field][0] && newinfo[item.field][0] != 0 }}" type="{{item.type}}" placeholder="{{ item.placeholder }}" value="" disabled="{{fieldinfo[it][index].popupwindow == 1 ? true : false}}" />
-            <input wx:else type="{{item.type}}" placeholder="{{ item.placeholder }}" value="{{ (newinfo[item.field][0] * 10 + 100) + '~' + (newinfo[item.field][1] * 10 + 100) }}" disabled="{{fieldinfo[it][index].popupwindow == 1 ? true : false}}" />
+            <input wx:else type="{{item.type}}" placeholder="{{ item.placeholder }}" value="{{ (newinfo[item.field][0] * 10 + 10) + '~' + (newinfo[item.field][1] * 10 + 10) }}" disabled="{{fieldinfo[it][index].popupwindow == 1 ? true : false}}" />
             <!-- <input wx:else type="{{item.type}}" placeholder="{{ item.placeholder }}" value="{{ newinfo[item.field][0] + '~' + newinfo[item.field][1] }}" disabled="{{fieldinfo[it][index].popupwindow == 1 ? true : false}}" /> -->
             <text>{{ item.unit }}</text>
         </view>
@@ -445,8 +456,14 @@
             <view class="contactInformation-box">
                 <block wx:for="{{ fieldinfo.contact }}" wx:key="index">
                     <view wx:if="{{ item.field == 'wechat' }}" class="contactInformation-item">
-                        <view class="title">
+                        <!-- <view class="title">
                             <view class="yellowDot"></view><text>微信</text>
+                        </view> -->
+                        <view class="title flexacenter">
+                            <view class="flexacenter">
+                                <view class="yellowDot"></view><text>微信</text>
+                            </view>
+                            <view class="how" bindtap="handleWechatQRCodeState">如何获取二维码？</view>
                         </view>
                         <view class="contactInformation-wechat" wx:if="{{ contactInformationState == 0 }}">
                             <view class="contactInformation-wechat-item" hover-class="option-hover" bindtap="UploadQRCode" data-state="2">
@@ -478,7 +495,10 @@
 
                     <view wx:if="{{ item.field != 'wechat' }}" class="contactInformation-item">
                         <view class="title">
-                            <view class="yellowDot"></view><text>{{ item.title }}</text>
+                            <view class="flexacenter">
+                                <view class="yellowDot"></view><text>{{ item.title }}</text>
+                            </view>
+                            <!-- <view class="yellowDot"></view><text>{{ item.title }}</text> -->
                         </view>
                         <input class="contactInformation-input" placeholder="{{ item.placeholder }}" value="{{newinfo[item.field]}}" type="{{ item.type }}" bindinput="popUpInput" data-field="{{ item.field }}" />
                     </view>
@@ -592,7 +612,6 @@
             <view wx:else class="rent-budget-unit flexcenter">{{ item.unit }}</view>
 
             <picker-view indicator-class="rent-budget-picker" indicator-style="height: 50px;" style="width: 100%; height: 670rpx;margin: 100rpx 0;" immediate-change="{{ true }}" value="{{ [item['value'][0], item['value'][1]] }}" bindchange="bindChangeRent">
-                <!-- <picker-view indicator-class="rent-budget-picker" indicator-style="height: 50px;" style="width: 100%; height: 670rpx;margin: 100rpx 0;" immediate-change="{{ true }}" value="{{ [3,'0'] }}" bindchange="bindChangeRent"> -->
                 <picker-view-column class="picker-view-column">
                     <view wx:for="{{ item.for }}" wx:for-item="it" wx:key="key" class="{{ index == item['value'][0] ? 'pickerpitch' : ''}}">{{ item.min + (it * item.step) }}</view>
                 </picker-view-column>
diff --git a/pages/askHousing/askHousing.wxss b/pages/askHousing/askHousing.wxss
index ef6a8c8..9572a90 100644
--- a/pages/askHousing/askHousing.wxss
+++ b/pages/askHousing/askHousing.wxss
@@ -736,6 +736,7 @@
     display: flex;
     align-items: center;
     margin-bottom: 36rpx;
+    justify-content: space-between;
 }
 
 .contactInformation .contactInformation-box {
@@ -1613,4 +1614,13 @@ wx-slider .wx-slider-handle-wrapper {
 
 .housing-message .housing-message-item:not(:last-of-type) {
     margin-right: 31rpx;
+}
+
+.contact-way .contact-way-title.WeChat {
+    justify-content: space-between;
+}
+
+.how {
+    color: #50E3C2;
+    line-height: 45rpx;
 }
\ No newline at end of file
diff --git a/pages/chooseLocation/addCity/addCity.js b/pages/chooseLocation/addCity/addCity.js
deleted file mode 100644
index eb46583..0000000
--- a/pages/chooseLocation/addCity/addCity.js
+++ /dev/null
@@ -1,160 +0,0 @@
-// pages/chooseLocation/addLocation/addLocation.js
-var app = getApp()
-var config = {};
-var miucms = require('../../../utils/miucms.js');
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    show: false,
-    countryList: [],
-    countryID: '',
-    countryName: '',
-    countryAlias: "",
-    currencyList: [],
-    currencyID: '',
-    currencyName: '',
-    currencyAlias: "",
-
-    showAlert: false,
-    name: '',
-    alias: '',
-    token: "",
-    message:'',
-    isSubmit:false
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-   
-    // 隐藏组件
-    back() {
-      this.setData({
-        show: false
-      })
-    },
-    // 父组件触发显示
-    showPage() {
-      this.setData({
-        show: true
-      })
-      if (this.data.countryList.length == 0 ) {
-        this.getList()
-      }
-    },
-    // 获取国家列表
-    getList() {
-      let url = app.globalData.config.post.regionPlus || 'https://app.gter.net/tenement/post/regionPlus';
-      miucms.request(url, {}).then(data => {
-        if(data.code!=200){return false}
-        data.data.countryList.forEach(item => {
-          item['value'] = item.cid
-        })
-        let currencyList = []
-        for (let i in data.data.currencycodes) {
-          currencyList.push({
-            name: data.data.currencycodes[i],
-            value: i,
-            alias: i
-          })
-        }
-        currencyList.sort((a, b) => a.value.localeCompare(b.value));
-        data.data.countryList.sort((a, b) => a.alias.localeCompare(b.alias));
-        this.setData({
-          countryList: data.data.countryList,
-          currencyList,
-          token: data.data.token
-        })
-      }).then(res => {
-        console.log(res)
-      })
-    },
-    // 国家选好了
-    submitCountry(e) {
-      this.setData({
-        countryID: e.detail.value,
-        countryName: e.detail.name,
-        countryAlias: e.detail.alias
-      })
-    },
-    // 货币选好了
-    submitCurrency(e) {
-      this.setData({
-        currencyID: e.detail.value,
-        currencyName: e.detail.name,
-        currencyAlias: e.detail.alias
-      })
-    },
-
-    // 輸入
-    input(e) {
-      let name = e.currentTarget.dataset.name;
-      let value = e.detail.value;
-      this.data[name] = value;
-      if (name == 'name') {
-        this.setData({
-          name: value
-        })
-      } else {
-        this.setData({
-          alias: value
-        })
-      }
-    },
-    // 提交
-    submit() {
-      if (this.data.isSubmit){return false}
-      this.setData({
-        isSubmit:true
-      })
-      let url = app.globalData.config.post.regionPlus || 'https://app.gter.net/tenement/post/regionPlus';
-      miucms.request(url, {
-        token: this.data.token,
-        info: {
-          cid: this.data.countryID,
-          name: this.data.name,
-          alias: this.data.alias,
-          currencycode: this.data.currencyAlias,
-
-        }
-      }).then(data => {
-        this.setData({
-          isSubmit:false
-        })
-        if(data.code==200){
-          wx.navigateTo({
-            url: `/pages/edit/edit?uniqid=${data.data.uniqid}`,
-          })
-        }
-        if(data.code==201){
-          this.setData({
-            showAlert:true,
-            message:data.message
-          })
-        }
-
-      }).then(res => {
-        this.setData({
-          isSubmit: false
-        })
-      })
-    },
-    // 隐藏弹窗
-    hideAlert(){
-      this.setData({
-        showAlert:false
-      })
-    }
-  },
-
-})
\ No newline at end of file
diff --git a/pages/chooseLocation/addCity/addCity.json b/pages/chooseLocation/addCity/addCity.json
deleted file mode 100644
index 773f5f3..0000000
--- a/pages/chooseLocation/addCity/addCity.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "header-nav": "../../../template/headerNav/index",
-
-    "select-single": "../../../template/selectSingle/selectSingle"
-  }
-}
\ No newline at end of file
diff --git a/pages/chooseLocation/addCity/addCity.wxml b/pages/chooseLocation/addCity/addCity.wxml
deleted file mode 100644
index 6f77107..0000000
--- a/pages/chooseLocation/addCity/addCity.wxml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-<view hidden="{{ !show}}">
-  <view class="inputSelect">
-    <header-nav customBack="true" bindback="back">添加城市</header-nav>
-   
-    <view class="title">
-      添加城市
-    </view>
-    <view class="tips">感谢你的贡献！如果寄托已有这个城市则会无法提交。 </view>
-    <form class="form" report-submit="true" bindsubmit="submit">
-      <view class="item">
-        <view class="name">国家</view>
-        <select-single title="请选择" slots="true" list="{{ countryList }}" value="{{ countryID }}" bindsubmit="submitCountry">
-          <view class="input">
-            <view class="{{ countryName ? 'text' :'text color-c'}}">{{countryName ? (countryName + ' ' + countryAlias ):'请选择'}}</view>
-            <image src="/img/toright.png"></image>
-          </view>
-        </select-single>
-      </view>
-
-      <view class="item">
-        <view class="name">城市中文名称</view>
-        <view class="input">
-          <input bindinput="input" placeholder="请填写" placeholder-class="placeholder" data-name="name" value="{{ name }}"></input>
-        </view>
-      </view>
-
-      <view class="item">
-        <view class="name">城市英文名称</view>
-        <view class="input">
-          <input bindinput="input" placeholder="请填写" placeholder-class="placeholder" data-name="alias" value="{{ alias }}"></input>
-        </view>
-      </view>
-
-      <view class="item">
-        <view class="name">货币</view>
-        <select-single title="请选择" slots="true" list="{{ currencyList }}" value="{{ currencyID }}" bindsubmit="submitCurrency">
-          <view class="input">
-            <view class="{{ currencyName ? 'text' :'text color-c'}}">{{currencyName ? (currencyName + ' ' + currencyAlias ):'请选择'}}</view>
-            <image src="/img/toright.png"></image>
-          </view>
-        </select-single>
-      </view>
-      <view class="btn-box"><button class="btn" form-type="submit">{{isSubmit ? '正在提交...' : '提交'}}</button></view>
-    </form>
-  </view>
-  <view class="alert-box" wx:if="{{ showAlert }}">
-    <view class="inner">
-      <view class="tip-name">{{ message }}</view>
-      <view class="btn" bindtap="hideAlert">返回</view>
-    </view>
-  </view>
-</view>
\ No newline at end of file
diff --git a/pages/chooseLocation/addCity/addCity.wxss b/pages/chooseLocation/addCity/addCity.wxss
deleted file mode 100644
index af2c6e4..0000000
--- a/pages/chooseLocation/addCity/addCity.wxss
+++ /dev/null
@@ -1,114 +0,0 @@
-.inputSelect{
-  position: fixed;
-  left: 0;
-  top: 0;
-  width: 100vw;
-  height: 100vh;
-  z-index: 1006;
-  background: #fff;
-}
-.title{
-  font-size: 42rpx;
-  font-weight: bold;
-  color: #333;
-  line-height: 100rpx;
-  padding-left: 30rpx;
-}
-.tips{
-  color: #ffc05f;
-  font-size: 24rpx;
-  background-color: #fff6dc;
-  padding-left: 30rpx;
-  line-height: 84rpx;
-
-}
-.form{
-  display: block;
-  padding: 30rpx;
-}
-.item{
-  padding: 46rpx 18rpx 0 0;
-  border-bottom: 1px solid #e8e8e8;
-}
-.name{
-  font-size: 24rpx;
-  color: #666;
-}
-.input{
-  padding: 18rpx 0;
-  color: #333;
-  font-size: 26rpx;
-  position: relative
-}
-.input image{
-  position: absolute;
-  right: 0;
-  top: 50%;
-  transform: translateY(-50%);
-  width: 16rpx;
-  height: 24rpx;
-}
-.btn-box{
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  width: 100vw;
-  height: 170rpx;
-  display: flex;
-  border-top: 1px solid #e8e8e8;
-  justify-content: center;
-  align-items: center;
-}
-.btn-box .btn{
-  display: inline-flex;
-  border-radius: 10rpx;
-  background-color: rgb(98, 177, 255);  
-  width: calc(100vw - 60rpx);
-  height: 88rpx;
-  z-index: 15;
-  color: #fff;
-  font-size: 28rpx;
-  justify-content: center;
-  align-items: center;
-  border:none
-}
-.placeholder{
-  color: #ccc;
-}
-.color-c{
-  color: #ccc;
-}
-.alert-box{
-  position: fixed;
-  left: 0;
-  top: 0;
-  width: 100vw;
-  height: 100vh;
-  z-index: 1007;
-  background: rgba(0, 0, 0, 0.5);
-}
-.alert-box .inner{
-  position: fixed;
-  left: 50%;
-  top: 50%;
-  width: 520rpx;
-  height: 275rpx;
-  border-radius: 20rpx;
-  transform: translate(-50%,-50%);
-  background: #fff;
-  z-index: 1008
-}
-
-.tip-name{
-  font-size: 30rpx;
-  color: #000;
-  text-align: center;
-  line-height: 186rpx;
-  border-bottom: 1px solid #e8e8e8;
-}
-.alert-box .btn{
-  text-align: center;
-  line-height:88rpx;
-  color:  #bc302e;
-  font-size: 28rpx;
-}
\ No newline at end of file
diff --git a/pages/chooseLocation/chooseLocation.js b/pages/chooseLocation/chooseLocation.js
deleted file mode 100644
index d01af32..0000000
--- a/pages/chooseLocation/chooseLocation.js
+++ /dev/null
@@ -1,438 +0,0 @@
-// pages/chooseLocation/chooseLocation.js
-
-var app = getApp()
-var config = {};
-var timer = null;
-var miucms = require('../../utils/miucms.js');
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        isloding: true,
-        alias: 0,
-        hotcity: [],
-        countryList: {},
-        cityListLength: 0,
-        cityList: [],
-        letterID: '',
-        countryID: 'hot',
-        letter: 'A',
-        scrollTop: 0,
-        searchBoxHeight: 20, //搜索框高度
-        screen_data: {},
-        value: '',
-        selectCityalias: '',
-        searchList: [],
-        isShowSearch: false,
-        focus: false,
-        searchSuggestList: [],
-        isSearch: false,
-        frompage: 1, //是否从世界各地房源列表点击进来
-        isAuthorization: 0, //是否需要登录
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: function (options) {
-        wx.showLoading()
-        var that = this;
-        this.setData({
-            'frompage': options.frompage || ''
-        })
-        wx.getStorage({
-            key: 'chooseLocationSearch',
-            success: function (res) {
-                that.setData({
-                    searchList: res.data || []
-                })
-            },
-        })
-        if (!this.data.frompage) {
-            setTimeout(function () {
-                that.get_config()
-            }, 200)
-        } else {
-            this.setData({
-                screen_data: app.globalData.screen_data,
-                hotcity: [{
-                    name: '',
-                    id: '0',
-                    alias: 0
-                }],
-                isloding: false
-            })
-            wx.getStorage({
-                key: 'countryList',
-                success: function (res) {
-                    that.dataList = res.data;
-                    let countryList = []
-                    res.data.forEach(item => {
-                        countryList.push({
-                            name: item.name,
-                            alias: item.alias,
-                            weight: item.weight
-                        })
-                    })
-                    wx.getStorage({
-                        key: 'selectcityData',
-                        complete(_complete) {
-                            let index = null;
-                            let selectCityalias = '';
-                            if (_complete.data) {
-                                selectCityalias = _complete.data.uniqid || '';
-                                for (let i = 0; i < res.data.length; i++) {
-                                    if (res.data[i].alias == _complete.data.alias) {
-                                        index = i;
-                                        break;
-                                    }
-                                }
-                            }
-
-                            that.setData({
-                                countryList,
-
-                            }, function () {
-                                wx.hideLoading()
-                                that.calculateLetter()
-                                if (index !== null) {
-                                    that.setData({
-                                        alias: res.data[index].alias,
-                                        selectCityalias,
-                                        cityList: Object.assign({}, that.dataList[index].letter),
-                                        cityListLength: res.data[index].cityListLength,
-                                    })
-                                } else {
-                                    that.setData({
-                                        selectCityalias: 0
-                                    })
-                                }
-                            })
-
-                        }
-                    })
-
-                    wx.hideLoading()
-                },
-            })
-
-        }
-    },
-    get_config() {
-        var that = this;
-        if (app.globalData.config.lists) {
-            this.setData({
-                screen_data: app.globalData.screen_data,
-            })
-            this.getList();
-        } else {
-            setTimeout(function () {
-                that.get_config()
-            }, 200)
-        }
-    },
-    // 如果用户已经同意授权。则开始获取数据
-    islogin() {
-        wx.showLoading({
-            title: '加载中',
-        })
-        this.get_config();
-    },
-
-
-    obvies() {
-        var that = this;
-        for (let i in this.data.cityList) {
-            let item = this.data.cityList[i].letter;
-            wx.createIntersectionObserver().relativeToViewport({
-                bottom: -150
-            }).observe(`#${item}`, res => {
-
-                if (res.intersectionRatio > 0) {
-                    that.setData({
-                        letter: `${item}`
-                    })
-                }
-            })
-        }
-
-    },
-    toLetter(e) {
-        let {
-            letter
-        } = e.currentTarget.dataset;
-        this.setData({
-            letter,
-            letterID: letter
-        })
-
-    },
-    goback() {
-        wx.navigateBack({
-
-        })
-    },
-    dataList: [],
-    // 获取地域列表
-    getList() {
-        let that = this;
-
-        miucms.request(app.globalData.config.post.regions, {}).then(data => {
-            if (data.code == 401) {
-                wx.hideLoading()
-                that.setData({
-                    isAuthorization: 1,
-                    isloding: false
-                })
-                return false
-            }
-            that.dataList = data.data.list;
-            let countryList = []
-            data.data.list.forEach(item => {
-                countryList.push({
-                    name: item.name,
-                    alias: item.alias,
-                    weight: item.weight
-                })
-            })
-            that.setData({
-                hotcity: data.data.hotcity,
-                countryList,
-                isloding: false
-            }, function () {
-                wx.hideLoading()
-                // that.calculateScrollHeight()
-                this.calculateLetter()
-
-            })
-            wx.hideLoading()
-        }).catch(res => {})
-    },
-    calculateScrollHeight() {
-        // 获取城市列表高度
-        var that = this;
-        const query = wx.createSelectorQuery()
-        query.select('.search-box').boundingClientRect()
-        query.exec(function (res) {
-            that.setData({
-                searchBoxHeight: res[0].height,
-                screen_data: app.globalData.screen_data
-            })
-        })
-
-    },
-    // 处理城市列表的letter
-    calculateLetter() {
-        this.dataList.forEach(item => {
-            item.letter = []
-            item.cityListLength = 0;
-            let letter = {}
-            item.city.forEach(s => {
-                if (letter[s.letter]) {
-                    letter[s.letter].push(Object.assign({}, s))
-                } else {
-                    letter[s.letter] = [Object.assign({}, s)]
-                    item.cityListLength += 1;
-                }
-            })
-            for (let i in letter) {
-                item.letter.push({
-                    letter: i,
-                    data: letter[i]
-                })
-            }
-
-            item.letter.sort(function (a, b) {
-                return a.letter.localeCompare(b.letter)
-            })
-
-            return item;
-        })
-        if (this.data.hotcity.length == 0 && this.data.alias == 0 && !this.data.frompage) {
-            this.changeCountry(this.dataList[0].alias)
-        }
-    },
-    // 点击切换国家
-    changeCountry(e) {
-        var alias = null,
-            that = this;
-        if (typeof e === "string") {
-            alias = e;
-        } else {
-            alias = e.currentTarget.dataset.alias;
-        }
-
-        if (alias == this.data.alias) {
-            return false
-        } //避免重复点击
-        this.setData({
-            alias
-        })
-        if (alias != 0) {
-            // 选择的是其他的国家、地区
-            for (let i = 0; i < this.dataList.length; i++) {
-                if (this.dataList[i].alias == alias) {
-
-                    this.setData({
-                        cityList: [...this.dataList[i].letter],
-                        cityListLength: this.dataList[i].cityListLength,
-                        // selectCityalias:'',
-                        // letter:'top',
-                        // scrollTop:0
-                    }, function () {
-                        that.obvies()
-                    })
-                    break;
-                }
-            }
-        }
-    },
-    input(e) {
-        this.setData({
-            value: e.detail.value.trim(),
-            // selectCityalias:'',
-            isSearch: false
-        })
-        if (e.detail.value.trim().length >= 1) {
-            this.timer = setTimeout(function () {
-                this.submit()
-            }.bind(this), 800)
-        }
-
-    },
-    timer: null,
-    // 搜索
-    submit() {
-        clearTimeout(this.timer)
-        this.data.searchSuggestList = []
-        let value = this.data.value;
-        var that = this;
-        this.dataList.forEach(item => {
-            item.city.forEach(s => {
-                if (s.name.indexOf(value) > -1 || s.alias.indexOf(value) > -1) {
-                    s['countryName'] = item.name;
-                    that.data.searchSuggestList.push(s)
-                }
-            })
-        })
-        this.setData({
-            searchSuggestList: this.data.searchSuggestList,
-            isSearch: true
-        })
-    },
-    // 找到搜索记录关键词
-    findKeyWord(obj, alias) {
-        this.changeCountry(alias)
-        this.data.searchList.push(Object.assign({}, obj))
-        if (this.data.searchList.length > 3) {
-            this.data.searchList.length = 3
-        } //最多保留3个搜索记录
-        this.setData({
-            countryID: alias,
-            searchList: this.data.searchList,
-            letterID: obj.letter,
-            // selectCityalias: obj.alias
-        }, function () {
-            this.calculateScrollHeight()
-        })
-        wx.setStorage({
-            key: 'chooseLocationSearch',
-            data: this.data.searchList,
-        })
-
-    },
-    // 选择城市
-    selectCity(e) {
-        let {
-            name,
-            alias,
-            search,
-            uniqid
-        } = e.currentTarget.dataset;
-        let that = this;
-        if (search) {
-            let isinsearchList = false;
-            this.data.searchList.every(item => {
-                if (item.name === name) {
-                    isinsearchList = true;
-                    return false
-                }
-                return true;
-            })
-            if (!isinsearchList) {
-                // 如果是用户自己输入的点击，则需记录到历史数据
-                this.data.searchList.push({
-                    name,
-                    alias,
-                    uniqid
-                })
-                if (this.data.searchList.length > 3) {
-                    this.data.searchList.length = 3
-                } //最多保留3个搜索记录
-                this.setData({
-                    searchList: this.data.searchList
-                })
-                wx.setStorage({
-                    key: 'chooseLocationSearch',
-                    data: this.data.searchList,
-                })
-            }
-        }
-        if (this.data.frompage == 1) {
-
-            wx.setStorage({
-                key: 'selectcityData',
-                data: {
-                    uniqid,
-                    name,
-                    alias: that.data.alias
-                },
-            })
-            wx.navigateBack()
-        } else {
-            wx.navigateTo({
-                url: `/pages/edit/edit?cityName=${name}&alias=${alias}&uniqid=${uniqid}`,
-            })
-        }
-
-    },
-    // 清除关键词
-    clearKW() {
-        this.setData({
-            value: '',
-            focus: true
-        })
-    },
-    // 清空搜索记录
-    clearHistory() {
-        this.setData({
-            searchList: []
-        })
-        wx.setStorage({
-            key: 'chooseLocationSearch',
-            data: [],
-        })
-    },
-    // input获取焦点
-    toSearch() {
-        this.data.isShowSearch = !this.data.isShowSearch;
-        this.setData({
-            isShowSearch: this.data.isShowSearch,
-            focus: this.data.isShowSearch,
-            searchSuggestList: [],
-            value: ''
-        })
-    },
-    // 点击添加城市按钮
-    addCity() {
-        let myComponent = this.selectComponent('#addCityComponent');
-        myComponent.showPage();
-    },
-    back() {
-        this.setData({
-            isShowSearch: false
-        })
-    }
-})
\ No newline at end of file
diff --git a/pages/chooseLocation/chooseLocation.json b/pages/chooseLocation/chooseLocation.json
deleted file mode 100644
index 703ec74..0000000
--- a/pages/chooseLocation/chooseLocation.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "navigationBarTitleText": "寄托租房",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "header-nav": "../../template/headerNav/index",
-    "go-login": "../../template/goLogin/goLogin",
-    "add-city":"./addCity/addCity"
-  }
-}
\ No newline at end of file
diff --git a/pages/chooseLocation/chooseLocation.wxml b/pages/chooseLocation/chooseLocation.wxml
deleted file mode 100644
index bc41a9c..0000000
--- a/pages/chooseLocation/chooseLocation.wxml
+++ /dev/null
@@ -1,98 +0,0 @@
-<view class="container" wx:if="{{ !isloding }}">
-    <header-nav customBack="{{ isShowSearch }}" bindback="back">{{ isShowSearch ? '搜索' : '选择房源所在地' }}</header-nav>
-
-    <go-login wx:if="{{ !frompage && isAuthorization==1 }}" bindislogin="islogin"></go-login>
-    <view hidden="{{ isShowSearch }}">
-        <view class="search-box">
-            <view class="form">
-                <image class="search" src="/img/search-6.png"></image>
-                <view class="input" bindtap="toSearch">搜索城市</view>
-            </view>
-
-        </view>
-
-        <view class="scroll-box" style="height:{{ screen_data.windowHeight -  screen_data.totalTopHeight - 150}}px">
-            <view class="country">
-                <scroll-view class="scroll" scroll-y="true" scroll-into-view="{{ countryID }}" scroll-with-animation="true" style="height:{{  screen_data.windowHeight -  screen_data.totalTopHeight - 151}}px">
-                    <view class="{{ alias==0 ? 'item active' :'item'}}" wx:if="{{ frompage || hotcity.length>0 }}" id="hot" data-alias="0" bindtap="changeCountry">{{ frompage ?'不限' :'热门'}}</view>
-                    <view class="{{ alias==item.alias ? 'item active' :'item'}}" id="{{ item.alias }}" data-alias="{{ item.alias }}" bindtap="changeCountry" wx:for="{{ countryList }}" wx:key="index">{{ item.name }}</view>
-                </scroll-view>
-
-            </view>
-            <view class="city">
-                <scroll-view class="scroll" scroll-into-view="{{ letterID }}" scroll-with-animation="true" scroll-top="{{ scrollTop }}" scroll-y="true" style="height:{{  screen_data.windowHeight -  screen_data.totalTopHeight - 151 }}px">
-                    <view id="top"></view>
-                    <view class="city-list">
-                        <view class="item">
-
-                            <view class="letter-list" wx:if="{{ alias==0 }}">
-                                <view class="{{ selectCityalias==item.id ? ' text active' :'text' }}" wx:for="{{ hotcity }}" wx:key="index" bindtap="selectCity" data-uniqid="{{ item.uniqid || item.id }}" data-name="{{ item.name }}" data-alias="{{ item.alias }}">{{ item.name || '不限' }}</view>
-                            </view>
-                        </view>
-                        <block wx:if="{{ alias !=0 }}">
-                            <view class="item" wx:for="{{ cityList }}" wx:key="index">
-                                <view class="letter-title" id="{{ item.letter }}">{{ item.letter }}</view>
-                                <view class="letter-list">
-                                    <view class="{{ selectCityalias==s.id ? ' text active' :'text' }}" bindtap="selectCity" data-uniqid="{{ s.uniqid  || s.id}}" data-name="{{ s.name }}" data-alias="{{ s.alias }}" wx:for="{{ item.data }}" wx:for-item="s" wx:for-index="i" wx:key="i">{{ s.name }} {{s.alias }}</view>
-                                </view>
-                            </view>
-                        </block>
-                    </view>
-                </scroll-view>
-            </view>
-            <view class="letter-box" wx:if="{{ alias !=0 && cityListLength>1  }}">
-                <view class="{{letter== item.letter ? 'item active' : 'item'}}" wx:for="{{ cityList }}" wx:key="index" bindtap="toLetter" data-letter="{{ item.letter }}">{{ item.letter }}</view>
-            </view>
-        </view>
-
-
-        <view class="footer-btn">
-            <view class="{{frompage? 'btn back':'btn'}}" bindtap="goback">返回</view>
-            <view class="add-btn btn" wx:if="{{ !frompage }}" bindtap="addCity">
-                <view class="plus"></view>添加城市
-            </view>
-        </view>
-    </view>
-    <add-city id="addCityComponent"></add-city>
-
-    <view hidden="{{ !isShowSearch }}" class="search-type">
-        <view class="search-box">
-            <view class="top">
-                <view class="form">
-                    <image class="search" src="/img/search-icon.svg"></image>
-                    <input placeholder="搜索城市" focus="{{ focus }}" bindinput="input" value="{{ value }}" bindconfirm="submit" placeholder-class="placeholder"></input>
-                    <view class="clear" wx:if="{{ value.length>0 }}" bindtap="clearKW">
-                        <view class="close">
-                            <image src="/img/close-f.png"></image>
-                        </view>
-                    </view>
-
-                </view>
-                <view class="btn" bindtap="toSearch">取消</view>
-            </view>
-
-            <view class="history" wx:if="{{ searchList.length>0 && searchSuggestList.length==0 }}">
-                <view class="name">搜索记录
-                    <view class="del-btn" bindtap="clearHistory">
-                        <image src="/img/del-6.png"></image>
-                    </view>
-                </view>
-                <view class="i" wx:for="{{ searchList}}" bindtap="selectCity" data-uniqid="{{ item.uniqid || item.id }}" data-alias="{{ item.alias }}" data-name="{{ item.name }}" wx:key="index">{{ item.name }}</view>
-            </view>
-            <view wx:if="{{ searchSuggestList.length>0 && value.length>0 }}" class="searchSuggestList">
-                <view class="item" wx:for="{{ searchSuggestList }}" bindtap="selectCity" data-uniqid="{{ item.uniqid || item.id }}" data-search="true" data-name="{{ item.name }}" data-alias="{{ item.alias }}" wx:key="index">{{ item.countryName + ' - ' + item.name + ' ' + item.alias }}</view>
-            </view>
-            <view wx:if="{{ searchSuggestList.length==0 && value.length>0 && isSearch }}" class="nocity">
-                <image src="/img/nocity.png"></image>
-                <view class="titles">没有找到该城市</view>
-                <view class="tips" wx:if="{{ !frompage }}">点击添加城市即可发布房源</view>
-                <view class="add-btn" bindtap="addCity" wx:if="{{ !frompage }}">
-                    <view class="plus"></view>添加城市
-                </view>
-            </view>
-
-        </view>
-
-    </view>
-
-</view>
\ No newline at end of file
diff --git a/pages/chooseLocation/chooseLocation.wxss b/pages/chooseLocation/chooseLocation.wxss
deleted file mode 100644
index cf393ca..0000000
--- a/pages/chooseLocation/chooseLocation.wxss
+++ /dev/null
@@ -1,348 +0,0 @@
-.hot-city{
-  padding: 40rpx 30rpx 36rpx;
-  background: #f1f1f1;
-}
-.hot-city .title{
-  margin-bottom: 10rpx;
-  font-size: 26rpx;
-  color: #999999;
-  display: flex;
-  align-items: center;
-}
-.hot-city .title::before{
-  display: inline-flex;
-  margin-right: 8rpx;
-  content: "";
-  background-color: rgb(255, 192, 95);
-  width: 8rpx;
-  height: 26rpx;
-  border-radius: 8rpx;
-}
-.hot-city .list{
-  display: flex;
-  justify-content: flex-start;
-  flex-wrap: wrap;
-  font-size: 24rpx;
-  color: #333333;
-}
-.hot-city .list .item{
-  margin: 20rpx 0 0;
-  display: inline-flex;
-  width: 220rpx;
-  height: 72rpx;
-  align-items: center;
-  justify-content: center;
-  background: #fff;
-  border-radius: 10rpx;
-}
-.hot-city .list .item:nth-child(3n+2){
-  margin: 20rpx 15rpx 0
-}
-.search-box{
- padding: 20rpx 30rpx 30rpx;
-}
-
-.search-box .form{
-  display: flex;
-  border:1px solid #f1f1f1;
-  border-radius: 8rpx;
-  height: 40px;
-  padding: 0 0 0 28rpx;
-  align-items: center;
-  background: #f1f1f1;
-  position: relative;
-  box-sizing: border-box;
-}
-.search-box .form .search{
-  display: inline-flex;
-  flex: 0 0 30rpx;
-  width: 30rpx;
-  height: 30rpx;
-}
-.search-box .form .input{
-  display: inline-flex;
-  padding: 0rpx 0 0rpx 14rpx;
-  width: calc(100vw - 210rpx);
-  color: #ccc;
-}
-.search-type .search-box .top{
-  display: flex;
-  align-items: center;
-  padding-left: 30rpx;
-}
-.search-type .search-box .top .form{
-  display: inline-flex;
-  flex: 1;
-}
-.search-type .search-box{
-  padding-right: 0;
- 
-  padding-left: 0
-}
-.search-type .search-box .form input{
-
-  padding: 0rpx 0 0rpx 14rpx;
-  width: calc(100vw - 300rpx);
-}
-.search-type .search-box .top .btn{
-  display: inline-flex;
-  width: 112rpx;
-  font-size: 26rpx;
-  color: #666;
-  justify-content: center;
-  height: 80rpx;
-  align-items: center;
-}
-/* .search-box .form .close{
-  display: inline-flex;
-  flex: 0 0 70rpx;
-  width: 70rpx;
-  height: 80rpx;
-  align-items: center;
-  justify-content: center;
-  position: absolute;
-  right: 0;
-  top: 0;
-  background: transparent;
-}
-.search-box .form .close image{
-  width: 22rpx;
-  height: 22rpx;
-} */
-.search-box .form .clear{
-  position: absolute;
-  right: 0;
-  top: 50%;
-  padding: 30rpx;
-  transform: translateY(-50%);
-
-}
-.search-box .form .clear .close{
-  width: 28rpx;
-  height: 28rpx;
-  border-radius: 50%;
-  background: #c2c2c2;
-  padding: 7rpx;
-  text-align: center;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-}
-.search-box .form .clear .close image{
-  width: 12rpx;
-  height: 12rpx;
-}
-.search-box .history{
-  padding: 20rpx 0 20rpx 30rpx;
-  border-top: 1px solid #e8e8e8;
-  margin-top: 30rpx;
-
-}
-.search-box .history .i{
-  display: inline-flex;
-  margin-right: 40rpx;
-  font-size: 24rpx;
-  color: #333333;
-
-}
-.search-box .history .i:last-child{
-  margin-right: 0
-}
-.search-box .history .name{
-  color: #999;
-  margin-bottom: 10rpx;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-.search-box .history .del-btn{
-  display:inline-flex;
-  padding: 20rpx 30rpx; 
-}
-.search-box .history .del-btn image{
-  width: 26rpx;
-  height: 26rpx;
-}
-.city-list{
-  padding-bottom: 40rpx;
-  padding-left: 60rpx;
-}
-
-.city-list .letter-title{
-  font-size: 28rpx;
-  color: #ffc05f;
-  line-height: 30rpx;
-  padding-top: 30rpx;
-
-}
-.city-list .text{
-  font-size: 24rpx;
-  color: #666;
-  padding: 30rpx 30rpx 30rpx 0rpx;
-  border-bottom: 1px solid #e8e8e8;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.letter-box{
-  padding: 30rpx 0 30rpx 20rpx;
-  width: 70rpx;
-  box-sizing: border-box;
-  position: absolute;
-  right: 0;
-  top: 50%;
-  transform: translateY(-50%);
-  z-index: 10;
-  font-size: 20rpx;
-  color: #333;
-  background: transparent;
-}
-.letter-box .item{
-  line-height: 28rpx;
-  text-align: center;
-}
-.letter-box .item.active{
-  color: #ffc05f;
-}
-.footer-btn{
-  padding: 20px 30rpx;
-  border-top: 1px solid #e8e8e8;
-  display: flex;
-  justify-content: space-between;
-}
-.footer-btn .btn{  
-  display: inline-flex;
-  width: 416rpx;
-  bottom: 38rpx;
-  height: 44px;
-  border-radius: 10rpx;
-  font-size: 28rpx;
-  color: #333;
-  line-height: 44px;
-  text-align: center;
-  z-index: 10;
-  border:1px solid rgb(230, 230, 230);
-  justify-content: center;
-}
-.footer-btn .back{
-  width: 100%;
-  background: #f2f2f2;
-}
-.footer-btn .add-btn{  
-  display: inline-flex;
-  border-color: rgb(98, 177, 255);
-  color: #62b1ff;
-  flex: 1;
-  margin-left: 30rpx;
-  align-items: center;
-}
-.plus{
-  margin-right: 20rpx;
-  display: inline-flex;
-  position: relative;
-  width: 26rpx;
-  height: 26rpx;
-  justify-content: center;
-  align-items: center;
-}
-.plus::before,.plus::after{
-  display: block;
-  content: "";
-  width: 4rpx;
-  height: 26rpx;
-  background: #62b1ff;
-  border-radius: 4rpx;
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  transform: translate(-50%,-50%)
-}
-.plus::after{
-  transform:translate(-50%,-50%) rotateZ(90deg);
-  transform-origin: center;
-}
-
-
-.scroll-box{
-  display: flex;
-  font-size: 0;
-  border-top: 1px solid #e8e8e8;
-  position: relative;
-  vertical-align: top
-}
-.scroll-box .country{
-  display: inline-block;
-  width: 220rpx;
-  background: #f2f2f2;
-}
-.country .item{
-  font-size: 24rpx;
-  color: #333;
-  text-align: center;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  padding: 0 10rpx;
-  line-height: 108rpx;
-  
-}
-.country .item.active{
-  background: #fff;
-  color: #bc302e;
-}
-.text.active{
-  color: #bc302e;
-}
-.scroll-box .city{
-  display: inline-block;
-  width: calc(100% - 220rpx);
-}
-.scroll{
-  height: 80vh;
-}
-.searchSuggestList{
-  border-top: 1px solid #e8e8e8;
-  padding: 0 30rpx;
-  margin-top: 30rpx;
-}
-.searchSuggestList .item{
-  border-bottom: 1px solid #e8e8e8;
-  padding: 34rpx 20rpx;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  color: #333;
-  font-size: 26rpx;
-}
-.nocity{
-  margin-top: 30rpx;
-  border-top: 1px solid #e8e8e8;
-  padding: 190rpx 30rpx 0; 
-  text-align: center;
-  font-size: 24rpx;
-  color: #999;
-}
-.nocity image{
-  width: 158rpx;
-  height: 110rpx;
-}
-.nocity .titles{
-  margin: 18rpx 0 20rpx;
-  font-size: 30rpx;
-  color: #666;
-}
-.nocity .add-btn{
-  margin-top: 300rpx;
-  display: block;
-  height: 88rpx;
-  line-height: 88rpx;
-  background:  #62b1ff;
-  color: #fff;
-  font-size: 28rpx;
-  border-radius: 10rpx;
-
-}
-.nocity .plus::after,.nocity .plus::before{
-  background: #fff;
-}
\ No newline at end of file
diff --git a/pages/common/common.wxml b/pages/common/common.wxml
index c968ab3..8ee11fc 100644
--- a/pages/common/common.wxml
+++ b/pages/common/common.wxml
@@ -596,7 +596,6 @@
                             <view class="area-vertical"></view>
                             <view class="area-distance">{{ item.distance }}km</view>
                         </block>
-
                     </view>
                 </view>
                 <view class="apartment-price">
@@ -612,4 +611,22 @@
             </view>
         </view>
     </view>
+</template>
+
+<!-- 获取微信二维码 -->
+<template name="getWechatQRCode">
+    <view class="getWechatQRCode">
+        <view class="getWechatQRCode-box flexflex">
+            <view class="getWechatQRCode-title">如何获取微信二维码？</view>
+            <image class="getWechatQRCode-image" src="https://offer.gter.net/image/gter/img/zufang-QRcode.svg" mode="widthFix"></image>
+            <view class="getWechatQRCode-close flexcenter">
+                <view class="getWechatQRCode-close-btn flexcenter" bindtap="handleWechatQRCodeState">关闭</view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<!-- 公共的提示 -->
+<template name="public-hint">
+    <view class="public-hint flexcenter">{{ hint }}</view>
 </template>
\ No newline at end of file
diff --git a/pages/common/common.wxss b/pages/common/common.wxss
index 29012d4..f348162 100644
--- a/pages/common/common.wxss
+++ b/pages/common/common.wxss
@@ -2,6 +2,7 @@
 .submitFailure,
 .wrong-micro-signal,
 .succeed-pop,
+.getWechatQRCode,
 .fail-pop {
     position: fixed;
     top: 0;
@@ -1139,4 +1140,57 @@
 .apartment-list.apartment-item .apartment-bottom .apartment-price-unit {
     color: #555555;
     font-size: 21rpx;
+}
+
+.getWechatQRCode {}
+
+.getWechatQRCode .getWechatQRCode-box {
+    width: 100vw;
+    background-color: rgba(246, 246, 246, 1);
+    flex-direction: column;
+    border-radius: 60rpx 60rpx 0 0;
+    font-size: 42rpx;
+    align-items: center;
+    padding-top: 70.5rpx;
+}
+
+.getWechatQRCode .getWechatQRCode-title {
+    padding-bottom: 67.5rpx;
+    color: #000000;
+    font-weight: 650;
+}
+
+.getWechatQRCode .getWechatQRCode-image {
+    width: 675rpx;
+}
+
+.getWechatQRCode .getWechatQRCode-close {
+    width: 100vw;
+    height: 186rpx;
+    background-color: #fff;
+    margin-top: 75rpx;
+}
+
+.getWechatQRCode .getWechatQRCode-close-btn {
+    font-size: 36rpx;
+    width: 360rpx;
+    height: 96rpx;
+    border-radius: 82.5rpx;
+    border: 1rpx solid rgba(215, 215, 215, 1);
+}
+
+.public-hint {
+    height: 60rpx;
+    line-height: 60rpx;
+    border-radius: 6rpx;
+    position: fixed;
+    top: 50%;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: fit-content;
+    background-color: rgba(85, 85, 85, 0.9);
+    color: #fff;
+    padding: 30rpx;
+    z-index: 1000;
 }
\ No newline at end of file
diff --git a/pages/edit/edit.js b/pages/edit/edit.js
index 127affd..75531cf 100644
--- a/pages/edit/edit.js
+++ b/pages/edit/edit.js
@@ -389,8 +389,9 @@ Page({
         intermediaryVlaue: 3, // 作者的身份
 
         aboutRulesList: {}, // 关于发布的数据
+        getWechatQRCodeState: false,
 
-        isNewVersions: true
+        isNewVersions: true,
     },
 
     /**
@@ -2169,5 +2170,28 @@ Page({
         })
     },
 
+    popUpIsQRCodeState: false,
+    handleWechatQRCodeState() {
+        this.setData({
+            getWechatQRCodeState: !this.data.getWechatQRCodeState
+        })
+
+        if (this.data.popUpIs) {
+            this.popUpIsQRCodeState = true
+            this.setData({
+                popUpIs: ""
+            })
+        }
+        if (!this.data.getWechatQRCodeState && this.popUpIsQRCodeState) {
+            this.popUpIsQRCodeState = false
+            this.setData({
+                popUpIs: "contactInformation"
+            })
+        }
+
+
+
+    },
+
 
 })
\ No newline at end of file
diff --git a/pages/edit/edit.wxml b/pages/edit/edit.wxml
index c71b3ae..6756771 100644
--- a/pages/edit/edit.wxml
+++ b/pages/edit/edit.wxml
@@ -38,6 +38,9 @@
 
     <!-- 发布失败 -->
     <!-- <template is="fail-pop"></template> -->
+    <block wx:if="{{ getWechatQRCodeState }}">
+        <template is="getWechatQRCode"></template>
+    </block>
 
     <header-nav inner-text="Some text" bgcolor="rgba(246, 246, 246, 1)">{{ isInput? isInput :( types=='edit' ?'编辑' :'发布' ) }}{{ intermediaryVlaue == 1 ? '中介' : '个人' }}房源</header-nav>
 
@@ -111,7 +114,7 @@
                     <template wx:else is="clickInput" data="{{ item,index,it:'basic',newinfo,fieldinfoNew,leaseTimeValue }}"></template>
                 </block>
             </view>
-            
+
             <!-- 所在区域 -->
             <view class="edit-option-item">
                 <block wx:for="{{ fieldinfo.address }}" wx:key="index">
@@ -148,7 +151,10 @@
 
                 <block wx:for="{{ fieldinfo.contact }}" wx:key="index">
                     <view wx:if="{{ item.field == 'wechat' }}" class="contact-way contact-way-WeChat">
-                        <view class="contact-way-title" style="padding-bottom: 28rpx;">微信</view>
+                        <view class="contact-way-title WeChat flexacenter" style="padding-bottom: 28rpx;">
+                            <view class="">微信</view>
+                            <view class="how" bindtap="handleWechatQRCodeState">如何获取二维码？</view>
+                        </view>
                         <view class="contactInformation-wechat" wx:if="{{ contactInformationState == 0 }}">
                             <view wx:if="{{ !isNewVersions }}" class="contactInformation-wechat-item" hover-class="option-hover" hover-stay-time="50" bindtap="contactInformationwechatcut" data-state="1">
                                 <image mode="widthFix" src="/img/pengreydark.png"></image><text>填写微信号</text>
@@ -494,7 +500,7 @@
                 <image class="pop-up-arrow" mode="widthFix" src="/img/back.png"></image>
             </view>
             <view class="pop-up-title">房屋照片</view>
-            <text class="last-step-text">最多可上传6张，不大于5M</text>
+            <text class="last-step-text">最多可上传9张，不大于5M</text>
             <!-- 上传图片 -->
             <view class="pop-up-homePhoto-image-box">
                 <view class="pop-up-homePhoto-image" wx:for="{{ imgs }}" wx:key="index">
@@ -615,8 +621,11 @@
             <view class="contactInformation-box">
                 <block wx:for="{{ fieldinfo.contact }}" wx:key="index">
                     <view wx:if="{{ item.field == 'wechat' }}" class="contactInformation-item">
-                        <view class="title">
-                            <view class="yellowDot"></view><text>微信</text>
+                        <view class="title flexacenter">
+                            <view class="flexacenter">
+                                <view class="yellowDot"></view><text>微信</text>
+                            </view>
+                            <view class="how" bindtap="handleWechatQRCodeState">如何获取二维码？</view>
                         </view>
                         <view class="contactInformation-wechat" wx:if="{{ contactInformationState == 0 }}">
                             <view wx:if="{{ !isNewVersions }}" class="contactInformation-wechat-item" hover-class="option-hover" hover-stay-time="50" bindtap="contactInformationwechatcut" data-state="1">
@@ -662,7 +671,9 @@
 
                     <view wx:if="{{ item.field != 'wechat' }}" class="contactInformation-item">
                         <view class="title">
-                            <view class="yellowDot"></view><text>{{ item.title }}</text>
+                            <view class="flexacenter">
+                                <view class="yellowDot"></view><text>{{ item.title }}</text>
+                            </view>
                         </view>
                         <input class="contactInformation-input" placeholder="{{ item.placeholder }}" value="{{newinfo[item.field]}}" type="{{ item.type }}" bindinput="popUpInput" data-field="{{ item.field }}" />
                     </view>
diff --git a/pages/edit/edit.wxss b/pages/edit/edit.wxss
index 12a0b0f..b21aff6 100644
--- a/pages/edit/edit.wxss
+++ b/pages/edit/edit.wxss
@@ -854,6 +854,8 @@
     display: flex;
     align-items: center;
     margin-bottom: 36rpx;
+    justify-content: space-between;
+
 }
 
 .contactInformation .contactInformation-box {
@@ -867,6 +869,8 @@
     margin-bottom: 64rpx;
 }
 
+
+
 .contactInformation .contactInformation-wechat {
     display: flex;
     align-items: center;
@@ -1140,6 +1144,15 @@
     line-height: 28rpx;
 }
 
+.contact-way .contact-way-title.WeChat {
+    justify-content: space-between;
+}
+
+.how {
+    color: #50E3C2;
+    line-height: 45rpx;
+}
+
 .contact-way .contact-way-input {
     display: flex;
     align-items: center;
diff --git a/pages/index/index.js b/pages/index/index.js
index ea94009..b3363a1 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -650,8 +650,6 @@ Page({
             })
         }
 
-        console.log("operationsTop", this.data.operationsTop);
-
         if (e.scrollTop > 1000 && !this.data.showTOTOP) {
             this.setData({
                 showTOTOP: true
@@ -662,11 +660,6 @@ Page({
             })
         }
     },
-    aaa() {
-        wx.navigateTo({
-            url: '/pages/webViewwebweb/index?url=https://app.gter.net/special/propertyAuth',
-        })
-    },
 
 
 })
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 49fbc86..0a8c2ec 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -9,12 +9,7 @@
         <view class="general-name1 flexacenter" id="general">{{ targetData['title'] }}</view>
     </view>
 
-    <view></view>
-
     <header-nav inner-text="Some text" isIndexPage="index" headerSrc="{{ miniProgram == 'gx' ? 'top-image1.png' : 'top-image.png' }}" bgcolor="{{ operationsTop ? 'rgba(246, 246, 246, 1)' : 'linear-gradient(0deg, rgba(246, 246, 246, 1) 2%, rgba(98, 177, 255, 1) 333%)'}}" topImage="{{ !operationsTop }}"></header-nav>
-    <!-- <block wx:else>
-        <header-nav inner-text="Some text" isIndexPage="index">{{ topTitle }}</header-nav>
-    </block> -->
 
     <!-- 新的 首页轮播图 -->
     <!-- 搜索框 -->
@@ -30,52 +25,14 @@
 
     <!-- 分类  -->
     <view class="types-tab">
-        <navigator wx:for="{{ tabs }}" wx:key="index" class="item" url="{{ item.url}}" hover-class="hover">
+        <navigator wx:for="{{ tabs }}" wx:key="index" class="item" url="{{ item.url }}" hover-class="hover">
             <view class="img-box">
                 <image mode="widthFix" src="{{ item.icon }}"></image>
             </view>
             <view>{{ item.name }}</view>
         </navigator>
-        <block wx:if="{{ false }}">
-            <navigator class="item" url="/pages/personList/personList" hover-class="hover">
-                <view class="img-box">
-                    <image src="/img/hkperson.jpg"></image>
-                </view>
-                <!-- <view>香港个人房源</view> -->
-                <view>个人房源</view>
-            </navigator>
-            <navigator class="item" url="/pages/irentList/irentList" hover-class="hover">
-                <view class="img-box">
-                    <image src="/img/hkbrands.jpg"></image>
-                </view>
-                <view>品牌公寓</view>
-            </navigator>
-            <!-- <navigator class="item" url="/pages/UK/UK" hover-class="hover">
-      <view class="img-box">
-        <image src="/img/uk-apartment.png"></image>
-      </view>
-      <view>英国学生公寓</view>
-    </navigator> -->
-            <navigator class="item" url="/pages/restOfWorld/restOfWorld" hover-class="hover">
-                <view class="img-box">
-                    <image src="/img/uk-apartment.png"></image>
-                </view>
-                <view>求房源</view>
-            </navigator>
-            <navigator class="item" url="/pages/edit/edit?cityName=香港&alias=Hongkong&uniqid=kbu4a9v7CjzvjJ__vUlA_jYDaTVRHWsf93n0bXfpkc4Q5XuCsk2ubBTz-qLRaUT_87YAS_ET7pf5tt0itORxLtPJJ7C76Q5_qXBATZgDTr_uyuBsaOnC0YA0Gm239lTdshoOpmqksJ85qQMXI_-jSNt7O4wZA5bropLHPIPdq6sX51OVn1WobolXqAcUbe-4mXPFIFpawZNCwmPlLf8e2ZZdkxkmfq_fCw7Pd8jj5rFiJh2_Im7unspYmE8nOO4iePI0wmW9F50tai27VeWj2s2mmGO6kiqhIb3B_Irub_WT3ys-0-1Yvf9oHop6dz0TAXgc6-ReM_tIZDE0NQ~~" hover-class="hover">
-                <view class="img-box addhousingresource-icon">
-                    <view class="addhousingresource-yellow">
-                        <view class="across"></view>
-                        <view class="vertical"></view>
-                    </view>
-                </view>
-                <view style="color: #ffc05f;">发布房源</view>
-            </navigator>
-        </block>
-
     </view>
 
-    <!-- <view class="flexcenter" style="width: 100rpx;height: 100rpx;background: red;" bindtap="aaa">入口</view> -->
     <!-- 区域选择 新 -->
     <view class="area-selection">
         <view class="head flexacenter shadow">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 5ec92e7..9d09b9c 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -9,31 +9,6 @@
     width: 100vw;
 }
 
-.search-btn {
-    display: flex;
-    align-items: center;
-    height: 90rpx;
-    line-height: 90rpx;
-    width: calc(100vw - 60rpx);
-    margin: 0 auto 35rpx;
-    border-radius: 10rpx;
-    color: #999;
-    font-size: 26rpx;
-    padding: 0 30rpx;
-    box-shadow: 0px 1px 21px 0px rgba(153, 153, 153, 0.27);
-    position: relative;
-    top: -25rpx;
-    z-index: 10;
-    box-sizing: border-box;
-    background: rgba(255, 255, 255, 0.96)
-}
-
-.search-btn image {
-    width: 32rpx;
-    height: 32rpx;
-    margin-right: 16rpx;
-}
-
 .types-tab {
     display: flex;
     justify-content: space-between;
@@ -68,88 +43,8 @@
     height: 45rpx;
 }
 
-.addhousingresource-icon {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.addhousingresource-icon .addhousingresource-yellow {
-    width: 60rpx;
-    height: 60rpx;
-    background-color: #fddb50;
-    border-radius: 50%;
-    position: relative;
-}
-
-.across {
-    width: 32rpx;
-    height: 4rpx;
-    border-radius: 50rpx;
-    background-color: #000222;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-
-}
-
-.vertical {
-    width: 4rpx;
-    height: 32rpx;
-    border-radius: 50rpx;
-    background-color: #000;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-}
-
 .scroll {
     width: 100vw;
-
-}
-
-.scroll .last-child {
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    background: rgba(5, 5, 5, 0.7);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.scroll .last-child .btn {
-    color: #fff;
-    width: 210rpx;
-    height: 120rpx;
-    border: 1px solid #fff;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 26rpx;
-}
-
-.scroll .last-child .btn image {
-    width: 20rpx;
-    height: 20rpx;
-    margin-left: 10rpx;
-}
-
-.house-brands .title .more {
-    color: #66b3ff;
-}
-
-.world-block .title .more {
-    color: #74cdc1
-}
-
-.inner-scroll .card {
-    display: block;
-    width: 100%;
 }
 
 .popularize {
@@ -179,8 +74,6 @@
 }
 
 .video-box video {
-    /* margin: calc(50vh - 120px) auto;
-  display: block; */
     width: 100vw;
     height: 100vh;
 }
@@ -204,7 +97,6 @@
     -moz-box-shadow: 0 -6rpx 12rpx rgba(0, 0, 0, 0.0784313725490196);
     -webkit-box-shadow: 0 -6rpx 12rpx rgba(0, 0, 0, 0.0784313725490196);
     box-shadow: 0 -6rpx 12rpx rgba(0, 0, 0, 0.0784313725490196);
-    /* box-shadow: 0 0 12rpx red; */
 }
 
 .area-selection {
@@ -223,7 +115,6 @@
     background-color: rgb(98, 177, 255);
     margin-top: 12rpx;
     border-radius: 24rpx 24rpx 0 0;
-    /* overflow: hidden; */
     margin-top: 30rpx;
 
 }
@@ -251,11 +142,6 @@
     height: 114rpx;
     border-radius: 24rpx 24rpx 0 0;
     margin-bottom: 12rpx;
-
-    /* -moz-box-shadow: 0 -12rpx 12rpx rgba(0, 0, 0, 0.0784313725490196);
-    -webkit-box-shadow: 0 -12rpx 12rpx rgba(0, 0, 0, 0.0784313725490196);
-    box-shadow: 0 -12rpx 12rpx rgba(0, 0, 0, 0.0784313725490196) */
-    /* box-shadow: 0 -8rpx 12rpx rgba(0, 0, 0, 0.0784313725490196); */
     padding-top: 20rpx;
 }
 
@@ -266,11 +152,6 @@
     bottom: 18rpx;
     background-color: #fff;
     display: none;
-    /* border: 1rpx solid; */
-    /* border-top-color: rgb(98, 177, 255); */
-    /* border-right-color: rgb(98, 177, 255); */
-    /* border-bottom-color: #fff; */
-    /* border-left-color: #fff; */
 }
 
 .area-selection .pitch .head-item-pitch {
@@ -278,26 +159,12 @@
     width: 25rpx;
     height: 25rpx;
     position: absolute;
-    /* bottom: 0; */
-    /* left: 0; */
     background-color: rgb(98, 177, 255);
     border: none;
 }
 
-/* .area-selection .head .head-item-pitch::after {
-    content: "";
-    width: 24rpx;
-    height: 24rpx;
-    background-color: rgb(98, 177, 255);
-    position: absolute;
-    padding: 0;
-    margin: 0;
-} */
-
 .area-selection .head .head-item-pitch-left {
-    /* left: -24rpx; */
     left: -25rpx;
-
 }
 
 .area-selection .head .head-item-pitch-right {
diff --git a/pages/irentDetail/irentDetail.js b/pages/irentDetail/irentDetail.js
index 7609d6a..2de290a 100644
--- a/pages/irentDetail/irentDetail.js
+++ b/pages/irentDetail/irentDetail.js
@@ -2,7 +2,6 @@
 var app = getApp()
 var miucms = require('../../utils/miucms.js');
 var config = {};
-var WxParse = require('../../wxParse/wxParse.js');
 var screenWidth = 288;
 var center_position = 144;
 var avatar_height = 40;
@@ -183,7 +182,6 @@ Page({
         var sendData = Object.assign({}, this.data.options, {
             session: wx.getStorageSync('session'),
             uniqid: that.data.uniqid,
-            // uniqid: "qzfLnHH5Sr5e",
         })
         let url = `${app.globalData.baseURL}/tenement/v2/api/apartment/details`
         // url = app.globalData.config.studentapartment.details
diff --git a/pages/irentDetail/irentDetail.wxml b/pages/irentDetail/irentDetail.wxml
index ba24047..29a2a14 100644
--- a/pages/irentDetail/irentDetail.wxml
+++ b/pages/irentDetail/irentDetail.wxml
@@ -115,7 +115,7 @@
                 <view class="apartment-tips-text">公寓/酒店/中介房源推广合作请联系：ad@gter.net</view>
             </view>
 
-            <view class="apartment-block" id="dual-brand">
+            <view class="apartment-block" id="dual-brand" wx:key="{{ withSameBrand.length }}">
                 <template is="apartment-head" data="{{ title:'同品牌推荐', imgUrl:'/img/same-brand-recommendation.png' }}"></template>
                 <view class="apartment-list flexcenter">
                     <template is="apartment-item" wx:for="{{ withSameBrand }}" wx:key="index" data="{{ item }}"></template>
diff --git a/pages/irentDetail/irentDetail.wxss b/pages/irentDetail/irentDetail.wxss
index f5a3e07..b4ffa82 100644
--- a/pages/irentDetail/irentDetail.wxss
+++ b/pages/irentDetail/irentDetail.wxss
@@ -851,6 +851,7 @@ map .clickmap {
     color: #000000;
     margin-bottom: 24rpx;
     padding: 0 30rpx;
+    word-break: break-word;
 }
 
 .apartment-introduce {
@@ -859,6 +860,7 @@ map .clickmap {
     font-size: 25.5rpx;
     padding: 0 30rpx;
     margin-bottom: 37.5rpx;
+    word-break: break-word;
 }
 
 .all-apartments {
@@ -929,6 +931,7 @@ map .clickmap {
     color: #000000;
     font-weight: 650;
     margin-bottom: 16.5rpx;
+    word-break: break-word;
 }
 
 .room-type-box .room-type-tab {
@@ -964,9 +967,7 @@ map .clickmap {
 .room-type-box .room-type-media-item {
     width: 114rpx;
     height: 120rpx;
-    border-radius: 20rpx;
     margin-right: 15rpx;
-    /* background-color: #62b1fe; */
     position: relative;
     overflow: hidden;
 }
@@ -974,6 +975,7 @@ map .clickmap {
 .room-type-box .room-type-media-image {
     width: 100%;
     height: 100%;
+    border-radius: 10rpx;
 }
 
 .room-type-box .room-type-videoplay {
@@ -1100,7 +1102,7 @@ map .clickmap {
 .apartment-facility {
     width: 690rpx;
     margin: 0 30rpx;
-    padding: 30rpx;
+    padding: 30rpx 30rpx 0;
     border-radius: 30rpx;
     background-color: #fff;
     box-shadow: 0 0 12rpx rgba(0, 0, 0, 0.0823529411764706);
@@ -1119,10 +1121,6 @@ map .clickmap {
     border: none;
 }
 
-.apartment-facility .apartment-facility-item:last-of-type .apartment-facility-box .apartment-facility-box-item {
-    margin: 0;
-}
-
 .apartment-facility .apartment-facility-title {
     background-color: rgba(246, 246, 246, 1);
     height: 39rpx;
diff --git a/pages/irentList/irentList.js b/pages/irentList/irentList.js
index 26f77eb..d69f17b 100644
--- a/pages/irentList/irentList.js
+++ b/pages/irentList/irentList.js
@@ -2,7 +2,6 @@
 var app = getApp()
 var miucms = require('../../utils/miucms.js');
 var config = {};
-var WxParse = require('../../wxParse/wxParse.js');
 var screenWidth = 288;
 var center_position = 144;
 var avatar_height = 40;
@@ -71,7 +70,6 @@ Page({
     headerSearchTopHeight: 10,
     operationsHeight: 297,
     onPageScroll(e) {
-        
         if (e.scrollTop > this.headerSearchTopHeight && !this.data.headerSearchTop) {
             this.setData({
                 headerSearchTop: true
@@ -228,9 +226,7 @@ Page({
     onReachBottom() {
         // 加载下一页
         if (!this.data.page.next_page) return false
-
         if (this.data.listPage == 0) return false
-
         this.getList()
     },
 
@@ -251,9 +247,6 @@ Page({
             success: function (res) {
                 miucms.share(app, types)
             },
-            fail: function (res) {
-                // 转发失败
-            }
         }
 
     },
@@ -350,7 +343,6 @@ Page({
         // url = app.globalData.config.studentapartment.lists
 
         miucms.wxget(url, {
-            // page: this.data.page.next_page,
             page: listPage,
             school: this.data.school,
             brand: this.data.brands.value,
@@ -359,7 +351,6 @@ Page({
             rent_min: this.data.money.rent_min,
             rent_max: this.data.money.rent_max
         }).then(data => {
-            // console.log(data, "data");
             if (data.code != 200) {
                 wx.showModal({
                     title: '提示',
diff --git a/pages/irentList/irentList.wxml b/pages/irentList/irentList.wxml
index 3bb7bfc..a52b546 100644
--- a/pages/irentList/irentList.wxml
+++ b/pages/irentList/irentList.wxml
@@ -11,85 +11,30 @@
     <view class='irent-list-box'>
 
         <view class="header-bj" wx:if="{{ isNewVersions }}"></view>
-        
+
         <view id="list-header-search">
             <template is="list-header-search" data="{{ isNeedMap: true }}"></template>
         </view>
 
-        <xin-head-swiper wx:if="{{ isNewVersions }}" bindrecordSwiperHeight="recordSwiperHeight" data="{{ imgUrls }}"></xin-head-swiper>
-        <head-swiper wx:else attachment="{{ imgUrls }}"></head-swiper>
-        <view wx:if="{{ isNewVersions }}" style="height: 48rpx; width: 100vw;"></view>
+        <xin-head-swiper bindrecordSwiperHeight="recordSwiperHeight" data="{{ imgUrls }}"></xin-head-swiper>
+        <view style="height: 48rpx; width: 100vw;"></view>
 
         <view class="tab-box">
             <tab isNewVersions="{{ isNewVersions }}" StudentapartmentNew="{{ StudentapartmentNew }}" page="irentList" listTab="{{ listTab }}"></tab>
         </view>
 
+        <view id="annex-school" class="annex-school flexacenter">
+            <view class="annex-school-name flexacenter">学校附近</view>
+            <scroll-view scroll-x="{{ true }}" style=" width: 60%; white-space: nowrap;" class="flex1">
+                <view class="annex-school-item flexcenter {{ school == '' ? 'pitch' : '' }}" bindtap="chooseSchool" data-id="">不限</view>
+                <view class="annex-school-item flexcenter {{ school == item.id ? 'pitch' : '' }}" bindtap="chooseSchool" wx:for="{{ schoolList }}" wx:key="index" data-id="{{ item.id }}">{{ item.name }}</view>
+            </scroll-view>
+        </view>
 
-        <block wx:if="{{ isNewVersions }}">
-            <view id="annex-school" class="annex-school flexacenter">
-                <view class="annex-school-name flexacenter">学校附近</view>
-                <scroll-view scroll-x="{{ true }}" style=" width: 60%; white-space: nowrap;" class="flex1">
-                    <view class="annex-school-item flexcenter {{ school == '' ? 'pitch' : '' }}" bindtap="chooseSchool" data-id="">不限</view>
-                    <view class="annex-school-item flexcenter {{ school == item.id ? 'pitch' : '' }}" bindtap="chooseSchool" wx:for="{{ schoolList }}" wx:key="index" data-id="{{ item.id }}">{{ item.name }}</view>
-                </scroll-view>
-            </view>
-        </block>
-        <block wx:else>
-            <!-- 附近学校 -->
-            <view class="nearby-school">
-                <view class="name">附近学校：</view>
-                <view class="school-list">
-                    <scroll-view class="inner" scroll-x="true">
-                        <view class="item {{school=='' ? 'active' :''}}" data-id="" bindtap="chooseSchool">不限</view>
-                        <view class="item {{school==item.id ? 'active' :''}}" data-id="{{ item.id }}" bindtap="chooseSchool" wx:for="{{ schoolList }}" wx:key="index">{{ item.name }}</view>
-                    </scroll-view>
-                </view>
-            </view>
-        </block>
 
-        <block wx:if="{{ isNewVersions }}">
             <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>
             </view>
-        </block>
-
-        <!-- 条件框 -->
-        <view wx:else class="condition-box" style="top:{{screen_data.totalTopHeight}}px">
-            <view class="tab">
-                <select-single title="请选择品牌" slots="true" list="{{ brands.list }}" value="{{ brands.value }}" bindsubmit="submitBrands">
-                    <view class="{{ brands.value ? 'bold' :''}}">
-                        {{ brands.value ? brands.obj[brands.value] : '品牌' }}
-                        <image src="/img/tobottom-c.png" class="tobottom"></image>
-                    </view>
-                </select-single>
-            </view>
-
-            <view class="tab">
-                <range-box title="租金区间（港元）" img="tobottom" bindsubmit="submitMoney" value1="{{ money.rent_min }}" value2="{{ money.rent_max }}">
-                    <view wx:if="{{ money.rent_min || money.rent_max }}" class="bold">
-                        {{ (money.rent_min || '') + '~' + (money.rent_max || '') }}
-                    </view>
-                    <block wx:if="{{ !money.rent_min && !money.rent_max}}">租金</block>
-                    <image src="/img/tobottom-c.png" class="tobottom"></image>
-                </range-box>
-            </view>
-            <view class="tab">
-                <select-single title="请选择房型" slots="true" list="{{ roomtype.list }}" value="{{ roomtype.value }}" bindsubmit="submitRoomtype">
-                    <view class="{{ roomtype.value ? 'bold' :''}}">
-                        {{ roomtype.value ? roomtype.obj[roomtype.value] : '房型' }}
-                        <image src="/img/tobottom-c.png" class="tobottom"></image>
-                    </view>
-                </select-single>
-            </view>
-            <view class="tab">
-                <select-single title="请选择楼型" slots="true" list="{{ roomlistings.list }}" value="{{ roomlistings.value }}" bindsubmit="submitRoomlistings">
-                    <view class="{{ roomlistings.value ? 'bold' :''}}">
-                        {{ roomlistings.value ? roomlistings.obj[roomlistings.value] : '楼型' }}
-                        <image src="/img/tobottom-c.png" class="tobottom"></image>
-                    </view>
-                </select-single>
-            </view>
-        </view>
 
         <block wx:if="{{ isNewVersions }}">
             <view class='house-list apartment-list'>
diff --git a/pages/irentList/irentList.wxss b/pages/irentList/irentList.wxss
index fbf3bcd..d5476b0 100644
--- a/pages/irentList/irentList.wxss
+++ b/pages/irentList/irentList.wxss
@@ -3,9 +3,7 @@
 
 .irent-list-box {
     min-height: 100vh;
-    /* padding-bottom: 80rpx; */
     box-sizing: border-box;
-    /* background: rgba(246, 246, 246, 1); */
 }
 
 
@@ -14,18 +12,6 @@
     color: #333;
 }
 
-/* .house-list .point view:nth-child(3n+1){
-  background: #e0ebf6;
-  color: #649cd4;
-}
-.house-list .point view:nth-child(3n+2){
-  background: #fbe5e4;
-  color: #eb7b78;
-}
-.house-list .point view:nth-child(3n+3){
-  background: #e4f2e9;
-  color: #7abe8f;
-} */
 .hover {
     background: transparent
 }
@@ -81,136 +67,6 @@
 
 }
 
-
-.nearby-school {
-    height: 112rpx;
-    width: 100vw;
-    display: flex;
-    font-size: 26rpx;
-    border-bottom: 1px solid #e8e8e8;
-}
-
-.nearby-school .name {
-    height: 112rpx;
-    display: inline-flex;
-    padding-left: 30rpx;
-    font-size: 28rpx;
-    color: #333;
-    font-weight: bold;
-    width: 190rpx;
-    box-sizing: border-box;
-    align-items: center;
-
-}
-
-.nearby-school .school-list {
-    height: 112rpx;
-    display: inline-flex;
-    flex: 1;
-    width: calc(100% - 190rpx);
-    align-items: center;
-}
-
-.nearby-school .school-list .inner {
-    display: block;
-    white-space: nowrap;
-    width: 100%;
-    overflow-x: scroll;
-    box-sizing: border-box;
-    padding-right: 22rpx;
-    height: 112rpx;
-}
-
-.nearby-school .school-list .inner .item {
-    display: inline-block;
-    margin: 30rpx 8rpx;
-    padding: 0 20rpx;
-    height: 52rpx;
-    line-height: 52rpx;
-    border-radius: 26rpx;
-    color: #666;
-
-
-}
-
-.nearby-school .school-list .inner .item.active {
-    background: #f2f2f2;
-    color: rgb(255, 192, 95);
-}
-
-
-.condition-box {
-    display: flex;
-    padding: 50rpx 30rpx 40rpx;
-    justify-content: space-between;
-    align-items: center;
-    border-bottom: 10rpx solid #f5f5f5;
-
-    height: 84rpx;
-    position: sticky;
-    top: 0;
-    z-index: 1002;
-    background: #fff;
-}
-
-.condition-box .condition-tab {
-    display: flex;
-    flex: 1;
-    height: 80rpx;
-    border: 1px solid #e8e8e8;
-    border-radius: 10rpx;
-    justify-content: space-evenly;
-    align-items: center;
-    overflow: hidden;
-    box-sizing: border-box;
-}
-
-.condition-box .condition-tab .divide {
-    display: inline-flex;
-    flex: 0 0 2rpx;
-    height: 26rpx;
-    background: rgb(225, 225, 225)
-}
-
-.condition-box .tab .tobottom {
-    width: 12rpx;
-    height: 7rpx;
-    margin-left: 8rpx;
-    /* transform: rotateZ(180deg) */
-}
-
-.condition-box .tab .filtrate {
-    width: 16rpx;
-    height: 18rpx;
-    margin-left: 8rpx;
-}
-
-.condition-box .tab .order {
-    width: 18rpx;
-    height: 20rpx;
-    margin-left: 8rpx;
-}
-
-.condition-box .tab.active .tobottom {
-    transform: rotateZ(0)
-}
-
-.condition-box .tab {
-    display: inline-flex;
-    position: relative;
-    justify-content: center;
-    align-items: center;
-    color: #666;
-    font-size: 24rpx;
-    box-sizing: border-box;
-}
-
-.condition-box .tab.active {
-    font-weight: bold;
-    color: #333;
-    font-size: 22rpx;
-}
-
 .triangle {
     display: inline-flex;
     width: 40rpx;
@@ -221,30 +77,6 @@
     transform: rotateZ(180deg)
 }
 
-.condition-box .more {
-    display: inline-flex;
-    flex: 0 0 138rpx;
-    height: 80rpx;
-    align-items: center;
-    justify-content: center;
-    /* background: #f2f2f2; */
-    border-radius: 80rpx;
-    font-size: 30rpx;
-    box-sizing: border-box;
-    border: 1px solid #e8e8e8;
-}
-
-.condition-box .more image {
-    display: inline-flex;
-    width: 26rpx;
-    height: 26rpx;
-    margin-left: 4rpx;
-}
-
-.condition-box .more.hascondition {
-    font-weight: bold;
-}
-
 .bold {
     font-weight: bold;
 }
diff --git a/pages/personList/personList.js b/pages/personList/personList.js
index 5d5df69..dba45fb 100644
--- a/pages/personList/personList.js
+++ b/pages/personList/personList.js
@@ -227,7 +227,7 @@ Page({
 
             app.globalData['langs'] ? '' : this.getDtailsLangs()
 
-            if (!this.data.isNewVersions) this.getgroupSearch();
+            // if (!this.data.isNewVersions) this.getgroupSearch();
 
             let screen_data = this.data.screen_data
             let windowWidth = screen_data['windowWidth']; //获取设备屏幕宽度
@@ -327,9 +327,8 @@ Page({
      * 页面上拉触底事件的处理函数
      */
     onReachBottom: function () {
-        if (!app.globalData.config || !app.globalData.config.lists) {
-            return false
-        }
+        if (!app.globalData.config || !app.globalData.config.lists) return false
+        
         this.get_list()
     },
 
@@ -488,7 +487,7 @@ Page({
 
         var that = this;
         let isNewVersions = this.data.isNewVersions
-        let url = isNewVersions ? `/tenement/v2/api/lists` : `/tenement/housingresources/lists`
+        let url = `/tenement/v2/api/lists`
 
         miucms.request(`${app.globalData.baseURL}${url}`, sendData).then(data => {
             if (data.code != 200) {
@@ -498,14 +497,15 @@ Page({
                 return
             }
             data = data.data
-            if (isNewVersions) this.handleDetailData(data.data)
 
-            if (!isNewVersions) {
-                that.data.lists = that.data.lists.concat(data.data)
-                this.setData({
-                    lists: that.data.lists,
-                })
-            }
+            this.handleDetailData(data.data)
+
+            // if (!isNewVersions) {
+            //     that.data.lists = that.data.lists.concat(data.data)
+            //     this.setData({
+            //         lists: that.data.lists,
+            //     })
+            // }
 
             that.setData({
                 // lists: that.data.lists,
@@ -518,8 +518,10 @@ Page({
             this.handleDetailData()
 
         }).catch(res => {
-            // console.log("lists", this.data.lists);
-
+            wx.hideLoading()
+            this.setData({
+                loading: false,
+            })
         })
     },
 
diff --git a/pages/personList/personList.wxml b/pages/personList/personList.wxml
index 299b8e4..f268545 100644
--- a/pages/personList/personList.wxml
+++ b/pages/personList/personList.wxml
@@ -3,81 +3,36 @@
 
 <view class="container" wx:if="{{ !isloding }}">
     <to-top wx:if="{{ showTOTOP }}"></to-top>
-    <block wx:if="{{ isNewVersions }}">
-        <view class="header-bj" wx:if="{{ isNewVersions }}"></view>
-        <header-nav bgcolor="{{ headerSearchTop ? '#fff' : 'transparent' }}">香港租房</header-nav>
-        <view id="list-header-search">
-            <template is="list-header-search" data="{{ kw:'',disabled: true,isNeedMap: true }}"></template>
-        </view>
-        <xin-head-swiper bindrecordSwiperHeight="recordSwiperHeight" data="{{ attachment }}"></xin-head-swiper>
-    </block>
-    <block wx:else>
-        <header-nav haveSearch="true">{{ topTitle }}</header-nav>
-        <head-swiper attachment="{{ attachment }}"></head-swiper>
-    </block>
+    <view class="header-bj"></view>
+    <header-nav bgcolor="{{ headerSearchTop ? '#fff' : 'transparent' }}">香港租房</header-nav>
+    <view id="list-header-search">
+        <template is="list-header-search" data="{{ kw:'',disabled: true,isNeedMap: true }}"></template>
+    </view>
+    <xin-head-swiper bindrecordSwiperHeight="recordSwiperHeight" data="{{ attachment }}"></xin-head-swiper>
+
     <!-- 临时隔断用的  -->
-    <view wx:if="{{ isNewVersions }}" style="height: 48rpx; width: 100vw;"></view>
+    <view style="height: 48rpx; width: 100vw;"></view>
 
     <tab isNewVersions="{{ isNewVersions }}" StudentapartmentNew="{{ StudentapartmentNew }}" page="{{ intermediary == 0 ? 'personList' : 'quarantineLists' }}" listTab="{{ listTab }}"></tab>
-    <!-- 热词 -->
-    <view class="hot-text-box" wx:if="{{ !isNewVersions }}">
-        <view class="hot-text" wx:if="{{ groupSearch.length>0 }}">
-            <view class="{{ index===selectGroupIndex ? 'active item' :'item'}}" bindtap="selectGroup" data-index="{{ index }}" wx:for="{{ groupSearch }}" wx:key="index">{{ item['keyword'] }}</view>
-        </view>
-    </view>
 
     <!-- 新的 -->
     <view id="list-operations" class="list-operations {{ operationsTop ? 'list-operations-top' : '' }}" wx:if="{{ isNewVersions }}" style="top: {{ screen_data.totalTopHeight }}px;">
         <list-operations tabTitle="{{ intermediary == 1 ? '中介' : '个人' }}房源" property="{{ property }}" school="{{ school }}" types="{{ types }}" location="{{ location }}" operationstype="personhousing" money="{{ money }}" brands="{{ brands }}" screen_data="{{ screen_data }}" roomtype="{{ roomtype }}" roomlistings="{{ roomlistings }}" bindsubmit="submitOperations"></list-operations>
-    </view>
-    <!-- 条件框 -->
-    <view wx:else class="condition-box" style="top:{{screen_data.totalTopHeight}}px">
-        <view class="tab">
-            <area-select title="区域" verifiedList="{{ verifiedList }}" school="{{ school.list }}" locationValue="{{ location.value }}" schoolValue="{{ school.value}}" img="tobottom" list="{{ location.data }}" bindsubmit="submitarea">
-                <view></view>
-            </area-select>
-        </view>
-        <view class="tab">
-            <select-more title="出租方式" img="tobottom" propertyValue="{{ types.value }}" list="{{ types.data }}" bindsubmit="submittype"></select-more>
-        </view>
-        <view class="tab">
-            <range-box title="租金区间（港元）" img="tobottom" bindsubmit="submitMoney" value1="{{ money.rent_min }}" value2="{{ money.rent_max }}">
-                <view wx:if="{{ money.rent_min || money.rent_max }}" class="bold">
-                    {{ (money.rent_min || '') + '~' + (money.rent_max || '') }}
-                </view>
-                <block wx:if="{{ !money.rent_min && !money.rent_max}}">租金</block>
-                <image src="/img/tobottom-c.png" class="tobottom"></image>
-            </range-box>
-        </view>
-
-        <view class="tab" data-tab="timestamp">
-            <filtrate-box bindselectSubmit="myEventSelectSubmit" property="{{ property }}" value="{{ moreCondition.data }}">
-                <view class="{{ hascondition ? 'bold':''}}">
-                    更多<image src="/img/filtrate.png" class="filtrate"></image>
-                </view>
-            </filtrate-box>
-        </view>
-        <view class="tab">
-            <select-single title="请选择排序方式" list="{{ orderby.list }}" value="{{ orderby.value }}" bindsubmit="submitOrderby"></select-single>
-        </view>
-    </view>
+    </view>  
 
     <!--合租  -->
-    <view class='list {{ isNewVersions ? "new-list" : "" }}'>
+    <view class='list new-list'>
+        <template wx:if="{{ lists.length == 0 && !loading }}" is="empty-icon"></template>
         <block wx:for="{{ lists }}" wx:key="index">
-            <common-list wx:if="{{ isNewVersions }}" item="{{ item }}"></common-list>
-            <block wx:else>
+            <common-list item="{{ item }}"></common-list>
+            <!-- <block wx:else>
                 <template is="personalList" wx:if="{{ !item.isad }}" data="{{ item:item }}" />
                 <ads isList="true" wx:if="{{ item.isad && !item.banner }}" data-index="{{ index }}" bindclickAD="clickAD" bindcloseAD="closeAD" item="{{ item }}"></ads>
                 <banner-ad wx:if="{{ item.isad && item.banner }}" index="{{ index }}" item="{{ item }}"></banner-ad>
-            </block>
-        </block>
-        <block wx:if="{{ lists.length==0 && !loading }}">
-            <view class='nocontent'>
-                <image src="../../img/file.png" class='file'></image>
-                暂无数据
-            </view>
+            </block> -->
         </block>
+
+        <view class="inTheEnd" wx:if="{{ page == 0 && lists.length != 0 }}">到底了</view>
     </view>
 
     <view class="loading" wx:if="{{ loading }}">
diff --git a/pages/personList/personList.wxss b/pages/personList/personList.wxss
index fbb92fb..d30b50a 100644
--- a/pages/personList/personList.wxss
+++ b/pages/personList/personList.wxss
@@ -2,465 +2,330 @@
 @import '/pages/common/common.wxss';
 
 .bold {
-  font-weight: bold
+    font-weight: bold
 }
 
 .container {
-  padding-bottom: 150rpx;
+    /* padding-bottom: 150rpx; */
 }
 
 .header {
-  text-align: center;
-  font-size: 72rpx;
-  color: #eb7b78;
-  padding: 80rpx 0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
+    text-align: center;
+    font-size: 72rpx;
+    color: #eb7b78;
+    padding: 80rpx 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 
 .scrollx-box {
-  /* width: 120vw; */
-  overflow: scroll;
-  -webkit-overflow-scrolling: touch
+    /* width: 120vw; */
+    overflow: scroll;
+    -webkit-overflow-scrolling: touch
 }
 
 .scrollx {
-  padding: 34rpx 24rpx 0;
-  font-size: 0;
-  position: relative;
-  display: flex;
-  justify-content: space-between;
-  width: 116vw;
+    padding: 34rpx 24rpx 0;
+    font-size: 0;
+    position: relative;
+    display: flex;
+    justify-content: space-between;
+    width: 116vw;
 
 }
 
 .scrollx .label {
-  background: #f2f2f2;
-  border-radius: 46rpx;
-  line-height: 92rpx;
-  height: 92rpx;
-  /* width: calc(100% / 3 - 40rpx); */
-  /* margin-right: 10rpx; */
-  display: inline-flex;
-  font-size: 28rpx;
-  padding: 0 30rpx 0 20rpx;
-  position: relative;
-  vertical-align: middle;
-  width: 21vw;
+    background: #f2f2f2;
+    border-radius: 46rpx;
+    line-height: 92rpx;
+    height: 92rpx;
+    /* width: calc(100% / 3 - 40rpx); */
+    /* margin-right: 10rpx; */
+    display: inline-flex;
+    font-size: 28rpx;
+    padding: 0 30rpx 0 20rpx;
+    position: relative;
+    vertical-align: middle;
+    width: 21vw;
 
 }
 
 .scrollx .label .span {
-  width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  text-align: center;
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    text-align: center;
 }
 
 .scrollx .label .tobottom {
-  position: absolute;
-  right: 14rpx;
-  top: 42rpx;
+    position: absolute;
+    right: 14rpx;
+    top: 42rpx;
 }
 
 .scrollx .search {
-  width: 92rpx;
-  padding: 0;
-  text-align: center;
-  position: absolute;
-  right: 24rpx;
-  margin: 0;
+    width: 92rpx;
+    padding: 0;
+    text-align: center;
+    position: absolute;
+    right: 24rpx;
+    margin: 0;
 }
 
 /* .plus{
   overflow: hidden
 } */
 .search-btn {
-  position: fixed;
-  left: 10rpx;
-  top: 50px;
-}
-
-.nocontent {
-  text-align: center;
-  font-size: 28rpx;
-  padding: 200rpx 0 0;
-  color: #999
-}
-
-.nocontent .file {
-  width: 40rpx;
-  height: 46rpx;
-  display: block;
-  margin: 0 auto 20rpx;
-}
-
-
-.condition-box {
-  display: flex;
-  /* padding: 50rpx 30rpx 40rpx; */
-  padding: 0 30rpx;
-  justify-content: space-between;
-  align-items: center;
-  /* border-bottom: 15rpx solid #f5f5f5; */
-  border-bottom: 15rpx solid #eee;
-
-  height: 113rpx;
-  background: #fff;
-  position: sticky;
-  z-index: 1002;
-}
-
-.condition-box .condition-tab {
-  display: flex;
-  flex: 1;
-  height: 80rpx;
-  border: 1px solid #e8e8e8;
-  border-radius: 10rpx;
-  justify-content: space-evenly;
-  align-items: center;
-  overflow: hidden;
-  box-sizing: border-box;
-}
-
-.condition-box .condition-tab .divide {
-  display: inline-flex;
-  flex: 0 0 2rpx;
-  height: 26rpx;
-  background: rgb(225, 225, 225)
-}
-
-.condition-box .tab .tobottom {
-  width: 12rpx;
-  height: 7rpx;
-  margin-left: 8rpx;
-  /* transform: rotateZ(180deg) */
-}
-
-.condition-box .tab .filtrate {
-  width: 16rpx;
-  height: 18rpx;
-  margin-left: 8rpx;
-}
-
-.condition-box .tab .order {
-  width: 18rpx;
-  height: 20rpx;
-  margin-left: 8rpx;
-}
-
-.condition-box .tab.active .tobottom {
-  transform: rotateZ(0)
-}
-
-.condition-box .tab {
-  display: inline-flex;
-  position: relative;
-  justify-content: center;
-  align-items: center;
-  color: #666;
-  font-size: 24rpx;
-  box-sizing: border-box;
-}
-
-.condition-box .tab.active {
-  font-weight: bold;
-  color: #333;
-  font-size: 22rpx;
+    position: fixed;
+    left: 10rpx;
+    top: 50px;
 }
 
 .triangle {
-  display: inline-flex;
-  width: 40rpx;
-  height: 40rpx;
+    display: inline-flex;
+    width: 40rpx;
+    height: 40rpx;
 }
 
 .triangle.descend {
-  transform: rotateZ(180deg)
+    transform: rotateZ(180deg)
 }
 
-.condition-box .more {
-  display: inline-flex;
-  flex: 0 0 138rpx;
-  height: 80rpx;
-  align-items: center;
-  justify-content: center;
-  /* background: #f2f2f2; */
-  border-radius: 80rpx;
-  font-size: 30rpx;
-  box-sizing: border-box;
-  border: 1px solid #e8e8e8;
-}
-
-.condition-box .more image {
-  display: inline-flex;
-  width: 26rpx;
-  height: 26rpx;
-  margin-left: 4rpx;
-}
-
-.condition-box .more.hascondition {
-  font-weight: bold;
-}
-
-.condition-box .search {
-  display: inline-flex;
-  width: 80rpx;
-  flex: 0 0 80rpx;
-  height: 80rpx;
-  border: 1px solid #e8e8e8;
-  border-radius: 50%;
-  align-items: center;
-  justify-content: center;
-  box-sizing: border-box
-}
-
-.condition-box .search image {
-  display: inline-flex;
-  flex: 0 0 24rpx;
-  height: 24rpx;
-}
-
-
 .location {
-  margin-right: 16rpx;
+    margin-right: 16rpx;
 }
 
 .play {
-  position: fixed;
-  right: 16rpx;
-  bottom: 16rpx;
-  display: flex;
-  flex-direction: column;
-  width: 124rpx;
-  height: 124rpx;
-  border-radius: 50%;
-  background: #eb7b78;
-  justify-content: center;
-  align-items: center;
-  box-shadow: 1px 1px 8px 3px #e8e8e8;
-  color: #fff;
-  letter-spacing: 1px;
-  z-index: 1000
+    position: fixed;
+    right: 16rpx;
+    bottom: 16rpx;
+    display: flex;
+    flex-direction: column;
+    width: 124rpx;
+    height: 124rpx;
+    border-radius: 50%;
+    background: #eb7b78;
+    justify-content: center;
+    align-items: center;
+    box-shadow: 1px 1px 8px 3px #e8e8e8;
+    color: #fff;
+    letter-spacing: 1px;
+    z-index: 1000
 }
 
 .play image {
-  display: inline-flex;
-  flex: 0 0 34rpx;
-  height: 34rpx;
-  width: 34rpx;
-  margin-bottom: 4rpx;
-}
-
-.hot-text-box {
-  min-height: 1px;
+    display: inline-flex;
+    flex: 0 0 34rpx;
+    height: 34rpx;
+    width: 34rpx;
+    margin-bottom: 4rpx;
 }
 
 .hot-text {
-  padding: 18rpx 22rpx 38rpx;
-  display: flex;
-  flex-wrap: wrap;
-  /* border-bottom: 1px solid #e8e8e8; */
-  background-color: #f5f5f5;
+    padding: 18rpx 22rpx 38rpx;
+    display: flex;
+    flex-wrap: wrap;
+    /* border-bottom: 1px solid #e8e8e8; */
+    background-color: #f5f5f5;
 }
 
 .hot-text .item {
-  display: inline-flex;
-  padding: 20rpx 26rpx;
-  margin: 20rpx 15rpx 0 0;
-  box-sizing: border-box;
-  border-radius: 15rpx;
-  background: #fff;
-  border: 2rpx solid #e4e4e4;
-  font-size: 22rpx;
-  color: #7a7a7a;
-  align-items: center;
-  justify-content: center;
+    display: inline-flex;
+    padding: 20rpx 26rpx;
+    margin: 20rpx 15rpx 0 0;
+    box-sizing: border-box;
+    border-radius: 15rpx;
+    background: #fff;
+    border: 2rpx solid #e4e4e4;
+    font-size: 22rpx;
+    color: #7a7a7a;
+    align-items: center;
+    justify-content: center;
 
-  height: 65rpx;
+    height: 65rpx;
 }
 
 .hot-text .item.active {
-  color: #ffc05f;
-  border-color: #ffc05f;
-  background: #fff;
+    color: #ffc05f;
+    border-color: #ffc05f;
+    background: #fff;
 }
 
 .conditionFixed {
-  position: fixed;
-  left: 0;
-  background: #fff;
-  width: 100vw;
-  z-index: 12
+    position: fixed;
+    left: 0;
+    background: #fff;
+    width: 100vw;
+    z-index: 12
 }
 
 .authentication-icon {
-  width: 125rpx;
-  height: 34rpx;
+    width: 125rpx;
+    height: 34rpx;
 }
 
 .info-list .footer {
-  align-items: center;
+    align-items: center;
 }
 
 .personalList .region {
-  height: 44rpx;
-  padding: 0 14rpx;
-  border-radius: 18rpx;
-  background-color: #f2f2f2;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 22rpx;
-  color: #555555;
+    height: 44rpx;
+    padding: 0 14rpx;
+    border-radius: 18rpx;
+    background-color: #f2f2f2;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 22rpx;
+    color: #555555;
 }
 
 .personalList .tips {
-  margin-top: 28rpx;
-  color: #555555;
-  font-size: 22rpx;
+    margin-top: 28rpx;
+    color: #555555;
+    font-size: 22rpx;
 }
 
 .personalList .footer {
-  color: #343434;
+    color: #343434;
 }
 
 .personalList .money {
-  margin-top: 32rpx;
-  font-size: 26rpx;
-  line-height: 26rpx;
+    margin-top: 32rpx;
+    font-size: 26rpx;
+    line-height: 26rpx;
 }
 
 .personalList {
-  border-bottom: 15rpx solid #eee;
+    border-bottom: 15rpx solid #eee;
 }
 
 .personalList .footer {
-  height: 90rpx;
-  line-height: 90rpx;
-  border-top: 1rpx dotted #d0d0d0;
-  padding-left: 30rpx;
-  padding-right: 30rpx;
-  margin-top: 40rpx;
+    height: 90rpx;
+    line-height: 90rpx;
+    border-top: 1rpx dotted #d0d0d0;
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    margin-top: 40rpx;
 }
 
 .personalList .submit-form {
-  padding-left: 0;
-  padding-right: 0;
-  padding-bottom: 0;
-  padding-top: 38rpx;
+    padding-left: 0;
+    padding-right: 0;
+    padding-bottom: 0;
+    padding-top: 38rpx;
 }
 
 .personalList .personalList-top {
-  padding: 0 30rpx;
+    padding: 0 30rpx;
 }
 
 .personalList .personalList-avatar {
-  width: 34rpx;
-  height: 34rpx;
-  border-radius: 50rpx;
+    width: 34rpx;
+    height: 34rpx;
+    border-radius: 50rpx;
 }
 
 .personalList .l {
-  display: flex;
-  align-items: center;
-  height: 90rpx;
-  line-height: 90rpx;
+    display: flex;
+    align-items: center;
+    height: 90rpx;
+    line-height: 90rpx;
 }
 
 .personalList .personalList-name {
-  font-size: 24rpx;
-  padding: 0 24rpx 0 20rpx;
+    font-size: 24rpx;
+    padding: 0 24rpx 0 20rpx;
 }
 
 .personalList .agent {
-  color: #343434;
-  background-color: #fff;
-  border: 2rpx solid #d3d3d3;
-  display: flex;
-  font-size: 20rpx;
-  align-items: center;
-  line-height: 30rpx;
-  height: 30rpx;
-  padding: 0 10rpx;
+    color: #343434;
+    background-color: #fff;
+    border: 2rpx solid #d3d3d3;
+    display: flex;
+    font-size: 20rpx;
+    align-items: center;
+    line-height: 30rpx;
+    height: 30rpx;
+    padding: 0 10rpx;
 }
 
 .personalList .footer-right {
-  height: 36rpx;
-  line-height: 36rpx;
-  display: flex;
-  align-items: center;
-  padding: 0 18rpx;
-  border-radius: 8rpx;
-  background-color: #e8f4ff;
-  color: #5eb1ff;
+    height: 36rpx;
+    line-height: 36rpx;
+    display: flex;
+    align-items: center;
+    padding: 0 18rpx;
+    border-radius: 8rpx;
+    background-color: #e8f4ff;
+    color: #5eb1ff;
 }
 
 .personalList .housingInfo {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
 }
 
 .personalList .housingSite {
-  flex: 1;
+    flex: 1;
 }
 
 .personalList .housingMedia {
-  width: 200rpx;
-  height: 150rpx;
-  margin-left: 10rpx;
-  position: relative;
+    width: 200rpx;
+    height: 150rpx;
+    margin-left: 10rpx;
+    position: relative;
 }
 
 .personalList .housingMedia image {
-  width: 200rpx;
-  height: 150rpx;
-  border-radius: 15rpx;
+    width: 200rpx;
+    height: 150rpx;
+    border-radius: 15rpx;
 }
 
 .personalList .orientation {
-  width: 30rpx;
-  height: 30rpx;
-  margin-right: 10rpx;
+    width: 30rpx;
+    height: 30rpx;
+    margin-right: 10rpx;
 }
 
 .personalList .tips .i:not(:last-child):after {
-  background-color: #555555;
+    background-color: #555555;
 }
 
 .personalList .title {
-  font-weight: bold;
-  line-height: 38rpx;
+    font-weight: bold;
+    line-height: 38rpx;
 }
 
 .personalList .housingVideo {
-  width: 200rpx;
-  height: 150rpx;
-  margin-left: 10rpx;
-  border-radius: 15rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  overflow: hidden;
+    width: 200rpx;
+    height: 150rpx;
+    margin-left: 10rpx;
+    border-radius: 15rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    overflow: hidden;
 }
 
 .personalList .housingVideo .playBtn-bj {
-  position: absolute;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 200rpx;
-  height: 150rpx;
-  background: rgba(0,0,0,0.5);
+    position: absolute;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 200rpx;
+    height: 150rpx;
+    background: rgba(0, 0, 0, 0.5);
 }
 
 .personalList .housingVideo .playBtn {
-  width: 46rpx;
-  height: 46rpx;
-  border-radius: 50rpx;
+    width: 46rpx;
+    height: 46rpx;
+    border-radius: 50rpx;
 }
 
 .list {
@@ -469,6 +334,7 @@
 
 .new-list {
     padding-top: 36rpx;
+    padding-bottom: 24rpx;
     background-color: rgba(246, 246, 246, 1);
     box-shadow: 0 0 12rpx rgba(0, 0, 0, 0.156862745098039);
     /* border-radius: 60rpx 60rpx 0 0; */
@@ -478,11 +344,18 @@
 }
 
 .list-operations {
-    position: sticky; 
+    position: sticky;
     z-index: 1000;
 }
 
-.list-operations.list-operations-top{
+.list-operations.list-operations-top {
     background-color: #fff;
     border-bottom: 1rpx solid #ebebeb;
+}
+
+.inTheEnd {
+    color: #AAAAAA;
+    font-size: 22rpx;
+    text-align: center;
+    margin: 20rpx 0 76rpx;
 }
\ No newline at end of file
diff --git a/pages/personList/tab/tab.wxml b/pages/personList/tab/tab.wxml
index 91bad14..66fa0c6 100644
--- a/pages/personList/tab/tab.wxml
+++ b/pages/personList/tab/tab.wxml
@@ -10,11 +10,6 @@
     <view class="{{ page=='quarantineLists'? 'tab active' :'tab'}}" bindtap="toIntermediaryPage">
         <view class="text">{{ '中介房源' }}</view>
     </view>
-    <!-- <block wx:else>
-    <view class="{{ page=='quarantineLists'? 'tab active' :'tab'}}" wx:if="{{ listTab.quarantineLists }}" data-page="quarantineLists" bindtap="toPage">
-      <view class="text">{{ listTab.quarantineLists }}</view>
-    </view>
-  </block> -->
 
     <view class="{{ page=='irentList'? 'tab active' :'tab'}}" data-page="irentList" bindtap="toPage">
         <view class="text">品牌公寓</view>
diff --git a/pages/personList/tab/tab.wxss b/pages/personList/tab/tab.wxss
index 5146c59..37c0848 100644
--- a/pages/personList/tab/tab.wxss
+++ b/pages/personList/tab/tab.wxss
@@ -43,14 +43,10 @@
 }
 
 .irent-tab-box {
-  /* height: 130rpx; */
   height: 120rpx;
   display: flex;
-  /* align-items: center; */
-  /* border-bottom: 1px solid #e8e8e8; */
   border-bottom: 2rpx solid #d5d5d5;
   background: #fff;
-
 }
 
 .irent-tab-box .tab {
@@ -67,11 +63,6 @@
   top: 0;
   width: 90rpx;
   height: 90rpx;
-  /* color: #C63E3A;
-  font-size: 46rpx;
-  transform: rotateZ(20deg) translate(-30%,-34%);
-  transform-origin: center;
-  font-weight: 700; */
 }
 
 .irent-tab-box .new image {
diff --git a/pages/quarantineLists/quarantineLists.wxss b/pages/quarantineLists/quarantineLists.wxss
index f689af4..03ba5ab 100644
--- a/pages/quarantineLists/quarantineLists.wxss
+++ b/pages/quarantineLists/quarantineLists.wxss
@@ -286,6 +286,7 @@
 .personalList .title {
   font-weight: bold;
   line-height: 38rpx;
+  word-break: break-word;
 }
 
 .personalList .housingVideo {
diff --git a/pages/reply/reply.js b/pages/reply/reply.js
deleted file mode 100644
index 990eb42..0000000
--- a/pages/reply/reply.js
+++ /dev/null
@@ -1,178 +0,0 @@
-// pages/replyQuestions/replyQuestions.js
-var app = getApp()
-var miucms = require('../../utils/miucms.js');
-var config = {};
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    questions: [],
-    can_submit: false,
-    status: '',
-    avatar: '',
-    show_custom: false,
-    show_fast_reply: false,
-    uniqid: 'm1Oeq5PvPnnr',
-    token: '',
-    messageid: '',
-    XiaoappHKid: '',
-    islandlord: false,
-    lastmessageid: 0,
-    page: {},
-    pagemessageid: 0,
-    count: 0,
-    data: [],
-    impression: []
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    var that = this;
-    this.get_config()
-    that.setData({
-      uniqid: options.uniqid
-    })
-    wx.getStorage({
-      key: 'questions_info',
-      success: function(res) {
-        console.log(res)
-        that.setData({
-          XiaoappHKid: res.data.XiaoappHKid,
-          info: res.data.info,
-          questions: res.data.questions,
-          token: res.data.token
-        })
-        // wx.removeStorage({
-        //   key: 'questions_info',
-        // })
-      },
-
-    })
-    
-  },
-  get_config() {
-    var that = this;
-    if (app.globalData.config.lists) {
-      config = app.globalData.config;
-      
-      that.setData({
-        user: app.globalData.user,
-        status: app.globalData.status
-      })
-    } else {
-      setTimeout(function () {
-        that.get_config()
-      }, 200)
-    }
-  },
- 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
- 
- 
-  input: function (e) {
-    let that = this;
-    var i = e.currentTarget.dataset.i;
-    this.data.questions[i].answer = e.detail.value;
-    let can_submit = true;
-    for (let i = 0; i < this.data.questions.length; i++) {
-      if (this.data.questions[i].answer.trim().length == 0) {
-        can_submit = false;
-        break;
-      }
-    }
-    this.setData({
-      questions: that.data.questions,
-      can_submit: can_submit
-    })
-  },
-  submit: function () {
-    var that = this;
-    if (!this.data.can_submit) {
-      return false
-    }
-    // 提交
-    wx.showLoading({
-      title: '提交中',
-    })
-    wx.request({
-      url: app.globalData.config.message.launch,
-      data: {
-        session: wx.getStorageSync('session'),
-        token: that.data.token,
-        uniqid: that.data.uniqid,
-        do_submit: 1,
-        XiaoappHKid: that.data.XiaoappHKid,
-        questions: that.data.questions
-      },
-      method: 'POST', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT
-      header: app.globalData.header,
-      success: function (res) {
-        var data = app.return_data(res);
-        if (data.extraparam && data.extraparam.mode == 'chat') {
-          // 直接聊天
-          wx.redirectTo({
-            url: '/pages/chartroom/chartroom?uniqid=' + data.talk.uniqid,
-          })
-        }
-      },
-      fail: function (res) {
-        wx.showModal({
-          content: res,
-        })
-      },
-      complete: function (res) {
-        wx.hideLoading()
-        that.setData({
-          can_submit: false
-        })
-      }
-    })
-
-  },
-  
-})
\ No newline at end of file
diff --git a/pages/reply/reply.json b/pages/reply/reply.json
deleted file mode 100644
index 6a74b6c..0000000
--- a/pages/reply/reply.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "快速沟通",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "header-nav": "../../template/headerNav/index"
-  }
-}
\ No newline at end of file
diff --git a/pages/reply/reply.wxml b/pages/reply/reply.wxml
deleted file mode 100644
index cc8d4ef..0000000
--- a/pages/reply/reply.wxml
+++ /dev/null
@@ -1,20 +0,0 @@
-<view class="caontainer">
-  <header-nav inner-text="Some text">快速沟通</header-nav>
-  <view class='header'>
-    <view class='title'>{{ info.subject }}</view>
-    <view class='info'>
-      {{ info.gptype }} {{ info.type}}
-      <view class='divide'>|</view>
-      {{ info.rent && info.rent >0 ? info.rent :info.money }} HK$/月
-    </view>
-  </view>
-  <view class='tips'>发布者预设了以下提问，回答后即可与其联系</view>
-  <view class='question-list'>
-    <view class='li' wx:for="{{ questions }}" wx:key="index">
-      <view class='title'>{{ item.questions }}</view>
-      <textarea value='{{ item.answer }}' cursor-spacing="20" bindinput='input' data-i="{{index }}" show-confirm-bar="{{ false }}"></textarea>
-    </view>
-  </view>
-  <view class="{{can_submit?'button' :'button button-grey' }}" bindtap='submit'>提交     </view>
-  
-</view>
\ No newline at end of file
diff --git a/pages/reply/reply.wxss b/pages/reply/reply.wxss
deleted file mode 100644
index 8c62813..0000000
--- a/pages/reply/reply.wxss
+++ /dev/null
@@ -1,84 +0,0 @@
-/* pages/reply/reply.wxss */
-.header{
-  background: #eeeff3;
-  padding: 40rpx 28rpx;
-}
-.header .title{
-  font-size: 36rpx;
-  color: #333;
-  line-height: 54rpx;
-  text-align: justify;
-
-}
-.header .info{
-  font-size: 30rpx;
-  color: #999;
-  vertical-align: middle;
-  line-height: 30rpx;
-  margin-top: 30rpx;
-}
-.header .info .divide{
-  display: inline-block;
-  margin: 0 16rpx;
-  vertical-align: top;
-  color: #ccc;
-  font-size: 24rpx;
-}
-.tips{
-  font-size: 28rpx;
-  color: #62b1fe;
-  text-align: center;
-  padding: 52rpx 0 0;
-}
-.question-list{
-  padding: 0rpx 32rpx 280rpx 60rpx;
-}
-.question-list .li{
-  padding: 80rpx 0 0;
-}
-.question-list .title{
-  position: relative;
-  font-size: 30rpx;
-  color: #666;
-  line-height: 40rpx;
-  text-align: justify;
-  margin-bottom: 46rpx;
-}
-.question-list .title:before{
-  content:'';
-  display: block;
-  width: 8rpx;
-  height: 32rpx;
-  background: #ffd14f;
-  position: absolute;
-  left: -28rpx;
-  top: 4rpx;
-}
-.question-list textarea{
-  display: block;
-  border:1px solid #e8e8e8;
-  border-radius: 5px;
-  padding: 16rpx;
-  height: 200rpx;
-  width: 100%;
-  box-sizing: border-box;
-  font-size:28rpx;
-}
-.button{
-  background: #bc312e;
-  width: calc(100% - 64rpx);
-  text-align: center;
-  color: #fff;
-  font-size: 32rpx;
-  height: 96rpx;
-  line-height: 96rpx;
-  position: fixed;
-  left: 32rpx;
-  bottom: 64rpx;
-  border-radius: 96rpx;
-  z-index: 1000;
-  letter-spacing: 2rpx;
-}
-.button-grey{
-  background: #ccc
-}
\ No newline at end of file
diff --git a/pages/report/report.wxml b/pages/report/report.wxml
index ac82e08..e5361b5 100644
--- a/pages/report/report.wxml
+++ b/pages/report/report.wxml
@@ -8,7 +8,6 @@
         <view class="text">{{item.name}}</view>
         <view class="checkbox"></view>
       </view>
-      
     </view>
     <view class="{{ otherSelect ? 'item active' :'item'}}">
       <view class="content" bindtap="selectOthers">
diff --git a/pages/restOfWorld/restOfWorld.js b/pages/restOfWorld/restOfWorld.js
index 10e6a30..6357c68 100644
--- a/pages/restOfWorld/restOfWorld.js
+++ b/pages/restOfWorld/restOfWorld.js
@@ -548,6 +548,7 @@ Page({
         let requestData = this.requestData
         requestData = Object.assign(requestData, value)
         this.requestData = requestData
+        console.log("requestData", requestData);
         this.data.page = 1
         this.data.list = []
         this.get_list()
diff --git a/pages/restOfWorld/restOfWorld.wxml b/pages/restOfWorld/restOfWorld.wxml
index 089293a..61d4118 100644
--- a/pages/restOfWorld/restOfWorld.wxml
+++ b/pages/restOfWorld/restOfWorld.wxml
@@ -31,29 +31,7 @@
             <view class="{{ index===selectGroupIndex ? 'active item' :'item'}}" bindtap="selectGroup" data-index="{{ index }}" wx:for="{{ groupSearch }}" wx:key="index">{{ item['keyword'] }}</view>
         </view>
     </view>
-
-    <!-- 条件框 -->
-    <!-- <view class="{{conditionFixed ? 'conditionFixed condition-box': 'condition-box'}}" style="top:{{ screen_data.totalTopHeight }}px">
-    <view class="tab" >
-      <navigator hover-class="hover" class="{{city.name ?'bold navigator' : 'navigator' }}" url="/pages/chooseLocation/chooseLocation?frompage=1">{{ city.name || '地区'}}<image src="/img/tobottom-c.png" class="tobottom"></image></navigator>
-   
-    </view> 
-    <view class="tab" >
-      <select-more title="出租方式" img="tobottom" propertyValue="{{ types.value }}" list="{{ types.data }}" bindsubmit="submittype"></select-more>
-    </view> 
-
-    <view class="tab"  data-tab="timestamp">
-      <filtrate-box  bindselectSubmit="myEventSelectSubmit" isrestofWorld="true"  property="{{ property }}" value="{{ moreCondition.data }}">
-        <view class="{{ hascondition ? 'bold':''}}">
-           更多<image src="/img/filtrate.png" class="filtrate"></image>
-        </view>       
-      </filtrate-box>
-    </view> 
-    <view class="tab" >
-      <select-single title="请选择排序方式" list="{{ orderby.list }}" value="{{ orderby.value }}" bindsubmit="submitOrderby"></select-single>
-    </view>   
-  </view> -->
-
+    
     <view wx:if="{{ list.length != 0 }}" class="list {{ isNewVersions ? 'new-list' : '' }}">
         <block wx:if="{{ isNewVersions }}">
             <common-list wx:for="{{ list }}" wx:key="index" item="{{ item }}">{{ index }}</common-list>
diff --git a/pages/restOfWorld/restOfWorld.wxss b/pages/restOfWorld/restOfWorld.wxss
index f19dab6..0dcb3a6 100644
--- a/pages/restOfWorld/restOfWorld.wxss
+++ b/pages/restOfWorld/restOfWorld.wxss
@@ -27,86 +27,10 @@
     background: #fff;
 }
 
-.condition-box .navigator {
-    line-height: 80rpx;
-}
-
-.condition-box .bold {
-    font-weight: bold;
-}
-
 .hot-text-box {
     min-height: 1px;
 }
 
-.condition-box {
-    display: flex;
-    padding: 50rpx 30rpx 40rpx;
-    justify-content: space-between;
-    align-items: center;
-    border-bottom: 20rpx solid #f5f5f5;
-    border-top: 1px solid #e8e8e8;
-    height: 84rpx;
-}
-
-.condition-box .condition-tab {
-    display: flex;
-    flex: 1;
-    height: 80rpx;
-    border: 1px solid #e8e8e8;
-    border-radius: 10rpx;
-    justify-content: space-evenly;
-    align-items: center;
-    overflow: hidden;
-    box-sizing: border-box;
-}
-
-.condition-box .condition-tab .divide {
-    display: inline-flex;
-    flex: 0 0 2rpx;
-    height: 26rpx;
-    background: rgb(225, 225, 225)
-}
-
-.condition-box .tab .tobottom {
-    width: 12rpx;
-    height: 7rpx;
-    margin-left: 8rpx;
-    /* transform: rotateZ(180deg) */
-}
-
-.condition-box .tab .filtrate {
-    width: 16rpx;
-    height: 18rpx;
-    margin-left: 8rpx;
-}
-
-.condition-box .tab .order {
-    width: 18rpx;
-    height: 20rpx;
-    margin-left: 8rpx;
-}
-
-.condition-box .tab.active .tobottom {
-    transform: rotateZ(0)
-}
-
-.condition-box .tab {
-    display: inline-flex;
-    position: relative;
-    justify-content: center;
-    align-items: center;
-    color: #666;
-    font-size: 24rpx;
-    box-sizing: border-box;
-}
-
-.condition-box .tab.active {
-    font-weight: bold;
-    color: #333;
-    font-size: 22rpx;
-}
-
 .triangle {
     display: inline-flex;
     width: 40rpx;
@@ -117,56 +41,6 @@
     transform: rotateZ(180deg)
 }
 
-.condition-box .more {
-    display: inline-flex;
-    flex: 0 0 138rpx;
-    height: 80rpx;
-    align-items: center;
-    justify-content: center;
-    /* background: #f2f2f2; */
-    border-radius: 80rpx;
-    font-size: 30rpx;
-    box-sizing: border-box;
-    border: 1px solid #e8e8e8;
-}
-
-.condition-box .more image {
-    display: inline-flex;
-    width: 26rpx;
-    height: 26rpx;
-    margin-left: 4rpx;
-}
-
-.condition-box .more.hascondition {
-    font-weight: bold;
-}
-
-.condition-box .search {
-    display: inline-flex;
-    width: 80rpx;
-    flex: 0 0 80rpx;
-    height: 80rpx;
-    border: 1px solid #e8e8e8;
-    border-radius: 50%;
-    align-items: center;
-    justify-content: center;
-    box-sizing: border-box
-}
-
-.condition-box .search image {
-    display: inline-flex;
-    flex: 0 0 24rpx;
-    height: 24rpx;
-}
-
-.conditionFixed {
-    position: fixed;
-    left: 0;
-    background: #fff;
-    width: 100vw;
-    z-index: 12
-}
-
 .list {
     padding-bottom: 40rpx;
 }
@@ -191,8 +65,8 @@
     border-radius: 50%;
     background-color: rgba(253, 218, 98, 1);
     position: fixed;
-    right: 20rpx;
-    bottom: 300rpx;
+    right: 10rpx;
+    bottom: 350rpx;
     font-size: 25rpx;
     color: #000000;
     flex-direction: column;
diff --git a/pages/setFastrReply/setFastrReply.js b/pages/setFastrReply/setFastrReply.js
deleted file mode 100644
index a0af922..0000000
--- a/pages/setFastrReply/setFastrReply.js
+++ /dev/null
@@ -1,173 +0,0 @@
-// pages/setFastrReply/setFastrReply.js
-var app = getApp()
-var config = {};
-var miucms = require('../../utils/miucms.js');
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    message:[],
-    loading:false
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    var that = this;
-    wx.getStorage({
-      key:'message',
-      success: function (res) {
-        that.setData({
-          message: res.data
-        })
-        if (res.data.length == 0) {
-          that.setData({
-            message: ['']
-          })
-        }
-
-      },
-    })
-    this.get_config()
-  },
-  get_config() {
-    var that = this;
-    if (app.globalData.config.lists) {
-      config = app.globalData.config;
-     
-    } else {
-      setTimeout(function () {
-        that.get_config()
-      }, 200)
-    }
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-  
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-  
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-  
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  // onShareAppMessage: function () {
-  
-  // },
-  del_item:function(e){
-    var i = e.currentTarget.dataset.i;
-    console.log(i)
-    let that = this;
-    that.data.message.splice(i,1);
-    this.setData({
-      message: that.data.message
-    })
-  },
-  input:function(e){
-    var i = e.currentTarget.dataset.i;
-    let that = this;
-    that.data.message[i] = e.detail.value;
-    this.setData({
-      message: that.data.message
-    })
-  },
-  add_item:function(){
-    let that = this;
-    that.data.message.push('');
-    this.setData({
-      message: that.data.message
-    })
-  },
-  cle: function () {
-    wx.navigateBack({
-      delta: 1, // 回退前 delta(默认为1) 页面
-    })
-  },
-  submit:function(){
-    let that = this;
-    // 避免重复提交
-    if(that.data.loading){
-      return false
-    }
-    that.setData({
-      loading: true
-    })
-    wx.showLoading({
-      title: '提交中',
-    })
-    wx.request({
-      url: config.message.customreply,
-      data: {
-        session: wx.getStorageSync('session'),
-        do_submit:1,
-        message:that.data.message
-      },
-      method: 'POST', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT
-      header: app.globalData.header,
-      success: function (res) {
-        wx.setStorage({
-          key: 'message',
-          data: that.data.message,
-          success: function (res) {
-            wx.navigateBack({
-              delta: 1, 
-            })
-          }
-        })
-      },
-      fail: function (res) {
-        wx.hideLoading()
-        wx.showModal({
-          title: '提示',
-          content: 'res',
-        })
-      },
-      complete: function () {
-        wx.hideLoading()
-        that.setData({
-          loading: false
-        })
-      }
-    })
-    
-  }
-})
\ No newline at end of file
diff --git a/pages/setFastrReply/setFastrReply.json b/pages/setFastrReply/setFastrReply.json
deleted file mode 100644
index 5acdc69..0000000
--- a/pages/setFastrReply/setFastrReply.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "编辑常用回复",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "header-nav": "../../template/headerNav/index"
-  }
-}
\ No newline at end of file
diff --git a/pages/setFastrReply/setFastrReply.wxml b/pages/setFastrReply/setFastrReply.wxml
deleted file mode 100644
index 98dafe3..0000000
--- a/pages/setFastrReply/setFastrReply.wxml
+++ /dev/null
@@ -1,17 +0,0 @@
-<view class="container">
-  <header-nav inner-text="Some text">编辑常用回复</header-nav>
-  <view class='ul'>
-    <view class='li' wx:for="{{ message }}" wx:key="index">
-      <textarea maxlength='-1' auto-height='true'   cursor-spacing="30" placeholder='请输入内容' value='{{ item }}' bindinput='input' data-i="{{ index }}"></textarea>
-      <image src="../../img/del.png" class='del' data-i="{{ index }}" bindtap='del_item'></image>
-    </view>
-
-    <view class='add_btn' bindtap='add_item'>
-      <image src="../../img/plusgrey.png"></image>
-    </view>
-    <view class='button-box'>
-      <view class='cle questions-cle' bindtap="cle">取消</view>
-      <view class='submit' bindtap='submit'>完成</view>
-    </view>
-  </view>
-</view>
\ No newline at end of file
diff --git a/pages/setFastrReply/setFastrReply.wxss b/pages/setFastrReply/setFastrReply.wxss
deleted file mode 100644
index 545ebcd..0000000
--- a/pages/setFastrReply/setFastrReply.wxss
+++ /dev/null
@@ -1,73 +0,0 @@
-/* pages/setFastrReply/setFastrReply.wxss */
-.ul{
-  padding: 76rpx 32rpx;
-}
-.li{
-  margin-bottom: 40rpx;
-  position: relative
-}
-.li .del{
-  display: block;
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  width: 32rpx;
-  height: 34rpx;
-}
-.li textarea{
-  width: calc(100% - 80rpx);
-  border:1px solid #e8e8e8;
-  border-radius: 5px;
-  padding: 28rpx 16rpx;
-  line-height: 40rpx;
-}
-.add_btn{
-  display: block;
-  margin: 24rpx auto;
-  border:1px solid #e8e8e8;
-  border-radius: 50%;
-  width: 68rpx;
-  height: 68rpx;
-  line-height: 68rpx;
-  text-align: center;
-  margin-bottom: 100px;
-}
-.add_btn image{
-  width: 32rpx;
-  height: 32rpx;
-  position: relative;
-  top: 4rpx;
-}
-.button-box{
-  padding: 36rpx 0 ;
-  text-align: center;
-  position: fixed;
-  bottom: 60rpx;
-  width: 100%;
-  padding: 0;
-  left: 0;
-}
-.button-box view{
-  display: inline-block;
-  vertical-align: middle;
-  width: 240rpx;
-  height: 72rpx;
-  text-align: center;
-  line-height: 72rpx;
-  box-sizing: border-box;
-  font-size: 32rpx;
-  border-radius: 10rpx;
-}
-.button-box .cle{
-  color: #333;
-  margin-right: 84rpx;
-  border:1px solid #e8e8e8;
-}
-.questions-box .button-box .cle{
-  background: #fff;
-}
-.button-box .submit{
-  background: #bc312e;
-  color: #fff;
-  border-color: #bc312e
-}
\ No newline at end of file
diff --git a/pages/share/share.js b/pages/share/share.js
index 0dbe5a8..a635f2e 100644
--- a/pages/share/share.js
+++ b/pages/share/share.js
@@ -149,18 +149,6 @@ Page({
         }
       }
     })
-    // wx.getImageInfo({
-    //   src: that.data.imgs[index],
-    //   success: function (res) {
-    //     that.data.poster[index].height = res.height;
-    //     that.setData({
-    //       height: Math.max(that.data.height, res.height),
-    //       width: res.width,
-    //       poster: that.data.poster
-    //     })
-
-    //   }
-    // })
   },
 
   change_page: function (e) {
diff --git a/pages/show/show.js b/pages/show/show.js
index ad413b1..d0fbc99 100644
--- a/pages/show/show.js
+++ b/pages/show/show.js
@@ -262,12 +262,11 @@ Page({
             } else {
                 data = data.data
                 let info = data.info
-                // info['verified'] = 1
                 let arr = ["wechat", "wechatdata", "whatsapp", "tel"]
                 let contactValue = []
                 let contactObj = this.data.contactObj
                 arr.forEach(element => {
-                    if (typeof info[element] == "object" && info[element]['aid'] != 0) {
+                    if (typeof info[element] == "object" && info[element] && info[element]['aid'] != 0) {
                         contactValue.push({
                             key: element,
                             value: info[element],
@@ -383,7 +382,6 @@ Page({
             list.forEach(element => {
                 if (info[element] == 0) info[differentNames[element] ? differentNames[element] : element] = '不限' //  当 值为 [0] 时为不限
                 else info[differentNames[element] ? differentNames[element] : element] = langs[element][info[element]]
-
             })
 
             let location = langs.location // 遍历替换区域的值  所有房源
@@ -613,58 +611,6 @@ Page({
             selector: '#relation',
             offsetTop: -(app.globalData.screen_data.windowHeight * 0.3)
         })
-        return false
-        wx.showLoading({
-            title: '正在发起对话',
-        })
-        wx.request({
-            url: app.globalData.config.message.launch,
-            data: {
-                session: wx.getStorageSync('session'),
-                uniqid: that.data.uniqid
-            },
-            method: 'POST', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT
-            header: app.globalData.header,
-            success: function (res) {
-                var data = app.return_data(res);
-                if (data.extraparam && data.extraparam.mode == 'chat') {
-                    // 直接聊天
-                    wx.navigateTo({
-                        url: '../chartroom/chartroom?uniqid=' + data.talk.uniqid,
-                    })
-
-                } else if (data.extraparam && data.extraparam.mode == 'questions') {
-                    wx.setStorage({
-                        key: 'questions_info',
-                        data: {
-                            info: data.info,
-                            questions: data.questions,
-                            token: data.token,
-                            XiaoappHKid: data.XiaoappHKid
-                        },
-                        success: function (res) {
-                            wx.navigateTo({
-                                url: '../reply/reply?uniqid=' + that.data.uniqid,
-                            })
-                        }
-                    })
-
-                } else if (data.extraparam && data.extraparam.mode == 'alert') {
-                    wx.showModal({
-                        content: data.message,
-                    })
-                }
-            },
-            fail: function (res) {
-                wx.showModal({
-                    content: res,
-                })
-            },
-            complete: function (res) {
-                wx.hideLoading()
-            }
-        })
-
     },
     send_form_id: function (e) {
         wx.request({
diff --git a/pages/user/user.js b/pages/user/user.js
index dbdb02d..24d2978 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -5,7 +5,6 @@ var miucms = require('../../utils/miucms.js');
 // 发布的状态码不要删除
 // status 状态 1正常,0未发布,2关闭,-3被投诉下架,-1用户删除,-2论坛删帖,-4待审,-5到期自动下架
 
-var WxParse = require('../../wxParse/wxParse.js');
 Page({
     /**
      * 页面的初始数据
@@ -200,9 +199,6 @@ Page({
 
     // 如果用户已经同意授权。则开始获取数据
     islogin() {
-        wx.showLoading({
-            title: '加载中',
-        })
         this.setData({
             initState: true
         })
@@ -279,58 +275,28 @@ Page({
      */
     onPullDownRefresh: function () {
         let tab = this.data.tab;
-        let isNewVersions = this.data.isNewVersions
         wx.stopPullDownRefresh();
-
         if (!app.globalData.config.lists) return false
 
-        if (isNewVersions) {
-            if (this.data.tab == 'fav') {
-                this.setData({
-                    fav: {
-                        page: 1,
-                        count: 0,
-                        data: []
-                    }
-                })
-                this.getFavData()
-            } else {
-                this.setData({
-                    publish: {
-                        page: 1,
-                        count: 0,
-                        data: []
-                    }
-                })
-                this.getPublishData()
-            }
+        if (this.data.tab == 'fav') {
+            this.setData({
+                fav: {
+                    page: 1,
+                    count: 0,
+                    data: []
+                }
+            })
+            this.getFavData()
         } else {
-            if (tab == 'fav') {
-                this.setData({
-                    fav_page: {
-                        next_page: 1
-                    },
-                    fav_list: []
-                })
-            } else if (tab == 'message') {
-                this.setData({
-                    message_page: {
-                        next_page: 1
-                    },
-                    message_list: [],
-                })
-            } else if (tab == 'publish') {
-                this.setData({
-                    publish_page: {
-                        next_page: 1
-                    },
-                    publish_list: []
-                })
-            }
-
-            this['get_' + this.data.tab]();
+            this.setData({
+                publish: {
+                    page: 1,
+                    count: 0,
+                    data: []
+                }
+            })
+            this.getPublishData()
         }
-
     },
 
     /**
@@ -338,17 +304,8 @@ Page({
      */
     onReachBottom: function () {
         if (!app.globalData.config.lists) return false
-        let isNewVersions = this.data.isNewVersions
-        if (this.data.tab == 'fav') {
-            isNewVersions ? this.getFavData() : this.get_fav()
-
-        } else if (this.data.tab == 'publish') {
-            isNewVersions ? this.getPublishData() : this.get_publish()
-            // this.get_publish()
-            // this.getPublishData()
-        } else {
-            this.get_message();
-        }
+        if (this.data.tab == 'fav') this.getFavData()
+        else this.getPublishData()
     },
 
     change_tab: function (e) {
@@ -361,110 +318,6 @@ Page({
         }
 
     },
-    // 收藏列表
-    get_fav: function () {
-        var that = this;
-        if (!app.globalData.config.lists || that.data.fav_page.next_page == 0) return false
-        this.setData({
-            loading: true
-        })
-        var sendData = Object.assign({}, this.data.options, {
-            session: wx.getStorageSync('session'),
-            page: that.data.fav_page.next_page,
-            q: that.data.q
-        })
-        // miucms.request(app.globalData.config.collection.init, {
-        miucms.request(`${app.globalData.baseURL}/tenement/my/favList`, {
-            page: that.data.fav_page.next_page,
-        }).then(data => {
-            wx.hideLoading()
-            if (data.code == 401) {
-                that.setData({
-                    loding: false,
-                    isAuthorization: 1,
-                })
-                return false
-            }
-            if (data.code == 200) {
-                data = data.data
-
-                let list = data.data
-                list.forEach(element => {
-                    if (Array.isArray(element.rent)) element.rent = element.rent.join(' ~ ')
-                })
-
-                that.data.fav_list = that.data.fav_list.concat(list)
-                if (that.data.fav_list.length >= data.count) this.data.fav_page.next_page = 0
-                else this.data.fav_page.next_page += 1
-
-                that.setData({
-                    fav_list: that.data.fav_list,
-                    fav_page: this.data.fav_page,
-                    fav_count: data.count,
-                    loading: false,
-                })
-
-            } else {
-                wx.showModal({
-                    title: '提示',
-                    content: data.message,
-                })
-            }
-        }).catch(res => {})
-    },
-
-    // 发布列表
-    get_publish: function () {
-        if (!app.globalData.config.lists || this.data.publish_page.next_page == 0) return false
-        var that = this;
-        this.setData({
-            loading: true
-        })
-        // miucms.request(app.globalData.config.post.init, {
-        miucms.request(`${app.globalData.baseURL}/tenement/my/releaseList`, {
-            page: this.data.publish_page.next_page
-        }).then(data => {
-            wx.hideLoading()
-            if (data.code == 401) {
-                that.setData({
-                    isAuthorization: 1,
-                    loding: false,
-                })
-                return false
-            }
-            if (!data.extraparam) {
-                data = data.data
-                let list = data.data
-                list.forEach(element => {
-                    if (Array.isArray(element.rent)) element.rent = element.rent.join(' ~ ')
-                })
-
-                that.data.publish_list = that.data.publish_list.concat(list);
-                if (that.data.publish_list.length != 0 && that.data.publish_list.length == data.count) {
-                    this.data.publish_page.next_page = 0;
-                } else {
-                    this.data.publish_page.next_page += 1;
-                }
-
-                that.setData({
-                    publish_list: that.data.publish_list,
-                    publish_page: that.data.publish_page,
-                    publish_count: data.count,
-                    loading: false,
-                })
-            } else {
-                wx.showModal({
-                    title: '提示',
-                    content: data.message,
-                })
-            }
-        }).catch(res => {
-            wx.showModal({
-                title: '提示',
-                content: res,
-            })
-        })
-    },
     add_to_fav: function (e) {
         let that = this;
         let uniqid = e.currentTarget.dataset.uniqid || e.detail.uniqid;
@@ -556,7 +409,6 @@ Page({
             }
         })
     },
-
     bindcontact: function (re) {},
     show_select: function (e) {
         this.data.orderby.show = true;
@@ -579,54 +431,10 @@ Page({
         this.setData({
             orderby: this.data.orderby
         })
-        if (change) this.clear_data()
+        // if (change) this.clear_data()
 
     },
-    clear_data: function () {
-        this.setData({
-            message_page: {
-                next_page: 1
-            },
-            message_list: []
-        })
-        this.get_message()
-    },
-    // 留言列表
-    get_message: function () {
-        var that = this;
-        if (!app.globalData.config.lists || that.data.message_page.next_page == 0) return false
 
-        this.setData({
-            loading: true
-        })
-        var sendData = Object.assign({}, this.data.options, {
-            session: wx.getStorageSync('session'),
-            page: that.data.message_page.next_page,
-            order: that.data.orderby.value,
-            q: that.data.q
-        })
-        miucms.request(app.globalData.config.message.lists, sendData, ).then(data => {
-            wx.hideLoading()
-            if (!data.extraparam) {
-                that.data.message_list = that.data.message_list.concat(data.data);
-                // that.data.user.newpm = data.newpm;
-                that.setData({
-                    message_list: that.data.message_list,
-                    message_page: data.page,
-                    impression: data.impression,
-                    user: that.data.user,
-                    loading: false
-                })
-                app.globalData.user.newpm = data.newpm;
-
-            } else {
-                wx.showModal({
-                    title: '提示',
-                    content: data.message,
-                })
-            }
-        }).catch(res => {})
-    },
     show_more_item: function (e) {
         let that = this;
         let index = e.currentTarget.dataset.index;
@@ -636,21 +444,6 @@ Page({
             message_list: that.data.message_list
         })
     },
-    // 设置印象
-    set_impression: function (e) {
-        let that = this;
-        that.data.impression_obj.index = e.currentTarget.dataset.i;
-        that.data.impression_obj.impression = e.currentTarget.dataset.impression;
-        that.data.impression_obj.uniqid = e.currentTarget.dataset.uniqid;
-        that.data.impression_obj.show = true;
-        that.data.del_obj.index = e.currentTarget.dataset.i;
-        that.data.del_obj.uniqid = e.currentTarget.dataset.uniqid;
-        that.data.del_obj.token = e.currentTarget.dataset.token;
-        that.setData({
-            impression_obj: that.data.impression_obj,
-            del_obj: that.data.del_obj
-        })
-    },
     check_item: function (e) {
         var that = this;
         var impression = e.currentTarget.dataset.impression;
@@ -731,11 +524,7 @@ Page({
     },
     send_form_id: function (e) {
         return false;
-        miucms.request(app.globalData.config.FormidInsert, {
-            formid: e.detail.formId
-        }).then(data => {}).catch(res => {})
     },
-
     wxParseTagATap: function (e) {
         var url = e.currentTarget.dataset.src;
         wx.navigateTo({
@@ -784,14 +573,12 @@ Page({
                 if (this.data.isNewVersions) {
                     let status = that.data.chage_status_obj.status
                     let stat = this.data.stat
-                    console.log("newStatus", newStatus);
 
                     if (status == 1) stat['listing']--
                     else if (status == 0) stat['draft']--
                     else stat['offshelf']--
 
                     let newStatus = data.data.status
-                    console.log("newStatus", newStatus);
                     if (newStatus == 1) stat['listing']++
                     else if (newStatus == 0) stat['draft']++
                     else stat['offshelf']++
@@ -1028,7 +815,6 @@ Page({
     // 判断是否 需要 跳转另一个的编辑
     judgeEditSkip(e) {
         let url = e.currentTarget.dataset.url
-        let user = app.globalData['user']
         let miniProgram = app.globalData['miniProgram']
 
         if (miniProgram == 'gx') {
@@ -1080,8 +866,6 @@ Page({
                 initState: true,
                 loding: false
             })
-
-            console.log("validityidentity", this.data.validityidentity);
         })
     },
 
@@ -1198,7 +982,6 @@ Page({
         if (type == "undercarriage") this.change_item_status(e)
         if (type == "del") this.del_item(e)
         if (type == "up") this.bindtopUp(e)
-
     },
 
     handleRightBtn(e) {
@@ -1218,14 +1001,6 @@ Page({
 
     // 发布房源 的 判断
     judgeIssue() {
-        // miucms.request(`${app.globalData.baseURL}/tenement/v2/api/publish/submitidentity`, {
-        //     isintermediary: -1
-        // }).then(res => {
-        //     if (res.code != 200) return
-        //     console.log(res);
-        // })
-        // return
-
         if (this.data.identityList.length != 0) {
             this.setData({
                 choiceTypeState: true
@@ -1276,11 +1051,15 @@ Page({
 
     // 展示有效期
     showValidityidentity() {
-        wx.showToast({
-            icon: "none",
-            title: `认证有效期：${this.data.validityidentity}`,
-            duration: 2000
+        this.setData({
+            validityidentityState: true
         })
+
+        setTimeout(() => {
+            this.setData({
+                validityidentityState: false
+            })
+        }, 2000);
     },
 
 })
\ No newline at end of file
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 0e38378..5eced69 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -1,14 +1,13 @@
 <import src="../common/common.wxml" />
 <import src="../../wxParse/wxParse.wxml" />
-<view class="container {{ isNewVersions ? 'containerNew' : '' }}" wx:if="{{ !loding }}">
+<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' }}">
         <view>{{ topTitle }}</view>
     </header-nav>
+    <template wx:if="{{ validityidentityState }}" is="public-hint" data="{{ hint: '认证有效期：' + validityidentity }}"></template>
 
     <to-top wx:if="{{ showTOTOP }}"></to-top>
-    <block wx:if="{{ isAuthorization==1 }}">
-        <go-login bindislogin="islogin" bindauthorizationSuccess="authorizationSuccess"></go-login>
-    </block>
+    <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;">
@@ -96,34 +95,6 @@
         </view>
     </block>
     <block wx:else>
-        <view class='header'>
-            <view class="user-box">
-                <view class="info">
-                    <view class="" style="position: relative;" bindtap="goSetAvatarNickname">
-                        <image class="info-avatar" 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="user-info">
-                        <view class="nickname" bindtap="goSetAvatarNickname">
-                            {{ user.nickname || '微信用户' }} <image wx:if="{{ user.groupid == 19 }}" class="authentication-icon" mode="widthFix" src="/img/u30.png"></image>
-                        </view>
-                        <view class="user-uid">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>
-
-            <!-- 认证 -->
-            <image wx:if="{{ landlordcertification }}" class="approve" bindtap="goApprove" mode="widthFix" src="/img/approve.png"></image>
-        </view>
-
         <!-- tab -->
         <view class='tab-box'>
             <view class='{{tab=="fav" ?"tab active" :"tab"}}' bindtap='change_tab' data-tab='fav'>
@@ -215,7 +186,6 @@
                     <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 }}
@@ -321,12 +291,6 @@
                 <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>
-
-                        <!-- <navigator wx:if="{{ item.intermediary == 6 }}" class="operation-item" url="../askHousing/askHousing?uniqid={{ item.uniqid }}&token={{ item.token }}&types={{ item.status==0 ?'edit1' :'edit' }}">
-                        编辑</navigator>
-                    <navigator wx:else class="operation-item" url="../edit/edit?uniqid={{ item.uniqid }}&token={{ item.token }}&types={{ item.status==0 ?'edit1' :'edit' }}">
-                        编辑</navigator>
-                    <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 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' }}">
@@ -340,40 +304,13 @@
                         <view class="operation-item" bindtap="cancelAudit" data-index="{{index}}" data-token="{{ item.appeal.token }}">撤销审核</view>
                     </block>
                 </view>
-
-                <!-- <view class='table' wx:if="{{ item.status !=-3 }}">
-        <navigator class='cell'
-          url="../edit/edit?uniqid={{ item.uniqid }}&token={{ item.token }}&types={{ item.status==0 ?'edit1' :'edit' }}">
-          <image src="../../img/pengrey.png" class='pengrey'></image>
-          编辑
-        </navigator>
-        <view class='cell' wx:if="{{ item.status==1 || item.status==2 }}" bindtap='change_item_status'
-          data-status="{{ item.status }}" data-index="{{ index }}" data-uniqid="{{item.uniqid}}"
-          data-token="{{ item.token }}">
-          <block wx:if="{{ item.status==1}}">
-            <image src="../../img/eye-close.png" class='eye-close'></image>
-            关闭
-          </block>
-          <block wx:if="{{ item.status==2}}">
-            <image src="../../img/eye-open.png" class='eye-close'></image>
-            上架
-          </block>
-        </view>
-        <view class='cell' wx:if="{{ item.status !=1}}" bindtap='del_item' data-index="{{ index }}"
-          data-uniqid="{{item.uniqid}}" data-token="{{ item.token }}">
-          <image src="../../img/del.png" class='del'></image>
-          删除
-        </view>
-      </view> -->
             </view>
-            <view class="whether" wx:if="{{ publish_list.length != 0 && publish_page.next_page == 0 }}">
-                到底了
+            <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>
@@ -386,18 +323,16 @@
         <view></view>
     </view>
 
-    <block wx:if="{{ chage_status_obj.show }}">
-        <view class='chage-status-box'>
-            <view class='black' bindtap='close_alert'></view>
-            <view class='box'>
-                <view class='tips'>{{chage_status_obj.status==2 ? '确定要重新发布该房源信息吗？' :'请关闭已出租或已失效的房源信息'}}</view>
-                <view class='btn-box'>
-                    <view bindtap='change_status'>{{chage_status_obj.status==2 ?'确定' :'关闭房源'}}</view>
-                    <view class='cle' bindtap='close_alert'>取消</view>
-                </view>
+    <view wx:if="{{ chage_status_obj.show }}" class='chage-status-box'>
+        <view class='black' bindtap='close_alert'></view>
+        <view class='box'>
+            <view class='tips'>{{chage_status_obj.status==2 ? '确定要重新发布该房源信息吗？' :'请关闭已出租或已失效的房源信息'}}</view>
+            <view class='btn-box'>
+                <view bindtap='change_status'>{{chage_status_obj.status==2 ?'确定' :'关闭房源'}}</view>
+                <view class='cle' bindtap='close_alert'>取消</view>
             </view>
         </view>
-    </block>
+    </view>
 
     <!-- 顶上去升起弹出框 -->
     <view class="raise-popup flexcenter {{ raisePopupState ? 'raisePopup' : ''}} ">
@@ -406,7 +341,6 @@
         </view>
     </view>
 
-
     <view style="position: relative;z-index: 1001;">
         <announcement-popup interface='my' init="{{ initState }}"></announcement-popup>
     </view>
@@ -414,21 +348,13 @@
 
 
 <!-- 触发规则1时 重复发布 -->
-<block wx:if="{{ triggerRules == 1 }}">
-    <template is="repeatedRelease" data="{{ pages:'user' }}"></template>
-</block>
+<template wx:if="{{ triggerRules == 1 }}" is="repeatedRelease" data="{{ pages:'user' }}"></template>
 <!-- 触发规则2时 提交失败 -->
-<block wx:elif="{{ triggerRules == 2 }}">
-    <template is="submitFailuretwo" data="{{ isnodraft:true}}"></template>
-</block>
+<template wx:elif="{{ triggerRules == 2 }}" is="submitFailuretwo" data="{{ isnodraft:true}}"></template>
 <!-- 触发规则3时 提交失败 -->
-<block wx:elif="{{ triggerRules == 3 }}">
-    <template is="submitFailurethree" data="{{ isnodraft:true}}"></template>
-</block>
+<template wx:elif="{{ triggerRules == 3 }}" is="submitFailurethree" data="{{ isnodraft:true}}"></template>
 <!-- 触发规则4时 你的微信号有误 -->
-<block wx:elif="{{ triggerRules == 4 }}">
-    <template is="wrong-micro-signal"></template>
-</block>
+<template wx:elif="{{ triggerRules == 4 }}" is="wrong-micro-signal"></template>
 
 <fix-footer isNewVersions="{{ isNewVersions }}" user="1" unreadMessages="{{ unreadMessages }}" bottomLift="{{ bottomLift }}"></fix-footer>
 
diff --git a/pages/user/user.wxss b/pages/user/user.wxss
index e2a7ae4..daefd42 100644
--- a/pages/user/user.wxss
+++ b/pages/user/user.wxss
@@ -22,14 +22,6 @@
     margin-left: 32rpx;
 }
 
-.header .user-box .info-avatar {
-    width: 90rpx;
-    height: 90rpx;
-    border-radius: 50%;
-    display: block;
-    border: 1rpx solid #fff;
-
-}
 
 .info-camera {
     width: 33rpx;
@@ -47,137 +39,6 @@
     height: 21rpx;
 }
 
-.header .user-info {
-    margin-left: 16rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    align-items: flex-start;
-    height: 65rpx;
-}
-
-.header .user-info .nickname {
-    display: flex;
-    align-items: center;
-    color: #000;
-}
-
-.header .user-box {
-    width: 750rpx;
-    /* height: 177rpx; */
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-end;
-    padding-top: 87rpx;
-    padding-bottom: 63rpx;
-}
-
-.header .user-uid {
-    font-size: 21rpx;
-    color: #7f7f7f;
-    margin-top: 8rpx;
-}
-
-.header .approve {
-    width: 687rpx;
-    height: 75rpx;
-    border-radius: 13.5rpx;
-    margin-bottom: 21rpx;
-}
-
-.tab-box {
-    border-top: 1px solid #d7d7d7;
-    border-bottom: 1px solid #d7d7d7;
-    font-size: 0;
-    text-align: center;
-    color: #999;
-    display: flex;
-    width: 100%;
-    background: #eeeff3;
-}
-
-.tab {
-    display: inline-flex;
-    flex-direction: column;
-    flex: 1;
-    justify-content: space-between;
-    align-items: center;
-    width: 33%;
-    font-size: 22rpx;
-    position: relative;
-    height: 150rpx;
-    padding: 28rpx 0 22rpx;
-    box-sizing: border-box;
-}
-
-.tab .box {
-    overflow: hidden;
-    width: 100%;
-    height: 100%;
-    padding: 28rpx 0 24rpx;
-    display: block;
-    position: relative;
-}
-
-.tab:not(:last-child) {
-    border-right: 1px solid #e8e8e8;
-}
-
-.tab.active {
-    color: #333;
-}
-
-.tab.active:after {
-    content: '';
-    position: absolute;
-    display: block;
-    bottom: -13rpx;
-    border: 1px solid #e8e8e8;
-    background: #fff;
-    width: 20rpx;
-    height: 20rpx;
-    transform: rotateZ(45deg);
-    left: calc(50% - 10rpx);
-    border-right-color: transparent;
-    border-bottom-color: transparent;
-    z-index: 998;
-}
-
-.tab .star {
-    width: 56rpx;
-    height: 50rpx;
-    display: block;
-    margin: 0 auto 11rpx;
-}
-
-.tab .message {
-    width: 54rpx;
-    height: 51rpx;
-    display: block;
-    margin: 0rpx auto 11rpx;
-}
-
-.tab .publish {
-    width: 58rpx;
-    height: 52rpx;
-    display: block;
-    margin: 0 auto 10rpx;
-}
-
-.tab .new {
-    color: #fff;
-    background: #bc312e;
-    transform: rotateZ(45deg);
-    top: 10rpx;
-    right: -30rpx;
-    position: absolute;
-    font-size: 26rpx;
-    line-height: 28rpx;
-    height: 30rpx;
-    width: 110rpx;
-
-}
-
 .item {
     border-bottom: 20rpx solid rgba(238, 239, 243, 1);
 }
@@ -234,20 +95,6 @@
 
 }
 
-.nocontent {
-    text-align: center;
-    font-size: 28rpx;
-    padding: 200rpx 0 0;
-    color: #999
-}
-
-.file {
-    width: 40rpx;
-    height: 46rpx;
-    display: block;
-    margin: 0 auto 20rpx;
-}
-
 .publish_tips {
     color: #999;
     display: flex;
@@ -300,120 +147,6 @@
     margin-right: 8rpx;
 }
 
-/*messages  */
-.select-bar {
-    text-align: center;
-    color: #999;
-    padding: 40rpx 0;
-    border-bottom: 1px solid #e8e8e8;
-}
-
-.select-bar .tobottom {
-    margin-left: 10rpx;
-    display: inline-block;
-    vertical-align: middle;
-}
-
-.messages .item {
-    border-bottom: 1px solid #e8e8e8;
-    font-size: 0;
-}
-
-.messages .item .submit-form {
-    padding: 40rpx 0 70rpx 26rpx;
-}
-
-.messages .item .l {
-    display: inline-block;
-    width: 108rpx;
-    vertical-align: top;
-    position: relative;
-}
-
-.messages .item .l .avatar {
-    width: 80rpx;
-    height: 80rpx;
-    border-radius: 5px;
-}
-
-.messages .item .l .count {
-    position: absolute;
-    left: 62rpx;
-    top: -18rpx;
-    background: #bc312e;
-    color: #fff;
-    font-size: 26rpx;
-    line-height: 36rpx;
-    height: 36rpx;
-    border-radius: 50%;
-    min-width: 36rpx;
-    text-align: center;
-    padding: 0 8rpx;
-
-}
-
-.messages .item .r {
-    display: inline-block;
-    width: calc(100% - 108rpx);
-    vertical-align: top;
-    position: relative
-}
-
-.messages .item .r .name {
-    font-size: 30rpx;
-    color: #333;
-    margin-bottom: 10rpx
-}
-
-.messages .item .r .info {
-    color: #ccc;
-    font-size: 26rpx;
-}
-
-.messages .item .r .right-box {
-    position: absolute;
-    right: 0;
-    top: 0;
-    z-index: 1000;
-}
-
-.messages .item .impression {
-    width: 200rpx;
-    height: 70rpx;
-    position: relative;
-    top: -8rpx;
-    padding-top: 8rpx;
-
-}
-
-.messages .item .impression .grey-inner {
-    background: #fff;
-    color: #999;
-    font-size: 26rpx;
-    width: 174rpx;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: #f2f2f2;
-    border-radius: 5px;
-    padding: 0 20rpx;
-    position: relative;
-}
-
-.messages .item .impression .tobottom {
-    position: absolute;
-    right: 20rpx;
-    top: 22rpx;
-}
-
-.messages .item .play {
-    min-height: 70rpx;
-    min-width: 100rpx;
-    padding-right: 26rpx;
-    padding-top: 26rpx;
-    position: relative;
-    top: -26rpx;
-}
-
 .moreplay {
     width: 32rpx;
     height: 10rpx;
@@ -455,92 +188,6 @@
     transform: rotateZ(180deg)
 }
 
-/*弹窗  */
-.impression-box {
-    position: fixed;
-    left: 0;
-    top: 0;
-    width: 100vw;
-    height: 100vh;
-    z-index: 100000;
-    background: rgba(0, 0, 0, 0.4);
-    padding-bottom: 40rpx;
-}
-
-.impression-box .black {
-    height: 80vh;
-}
-
-.impression-box .box {
-    background: #fff;
-    text-align: center;
-    font-size: 30rpx;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100vw;
-    padding-bottom: 40rpx;
-}
-
-.impression-box .tips {
-    line-height: 160rpx;
-
-}
-
-.impression-box .label {
-    width: 520rpx;
-    height: 92rpx;
-    line-height: 92rpx;
-    border: 1px solid #e8e8e8;
-    border-radius: 5px;
-    position: relative;
-    margin: 0 auto 20rpx;
-}
-
-.impression-box .label.active {
-    background: #62B1FE;
-    color: #fff;
-    border-color: #62B1FE;
-}
-
-.impression-box .label image {
-    width: 36rpx;
-    height: 36rpx;
-    position: absolute;
-    left: 26rpx;
-    top: 28rpx;
-}
-
-.impression-box .bottom {
-    padding: 44rpx 0 80rpx;
-    border-top: 1px solid #e8e8e8;
-    margin-top: 30rpx;
-}
-
-.impression-box .btn {
-    background: #fff;
-    color: #C63E3A;
-    border: 1px solid #e8e8e8;
-    border-radius: 5px;
-    width: 520rpx;
-    height: 92rpx;
-    line-height: 92rpx;
-    margin: 0 auto 40rpx;
-}
-
-.impression-box .btn image {
-    width: 32rpx;
-    height: 34rpx;
-    display: inline-block;
-    margin-right: 6rpx;
-    position: relative;
-    top: 6rpx;
-}
-
-.impression-box .btn-black {
-    color: #333;
-}
-
 .divide {
     color: #e8e8e8;
     display: inline-block;
diff --git a/pages/video_show/video_show.js b/pages/video_show/video_show.js
index 6e920a2..68a138a 100644
--- a/pages/video_show/video_show.js
+++ b/pages/video_show/video_show.js
@@ -104,23 +104,6 @@ Page({
                 liveIndex: this.data.current
             })
         }
-
-        return
-        if (this.data.current >= this.data.videoLength + this.data.liveLength) {
-            this.setData({
-                tab: 'live',
-                liveIndex: this.data.current - this.data.videoLength,
-            })
-        } else if (this.data.current >= this.data.videoLength) {
-            this.setData({
-                tab: 'img',
-                imgIndex: this.data.current - this.data.videoLength,
-            })
-        } else {
-            this.setData({
-                videoIndex: this.data.current
-            })
-        }
     },
     // 切换图片或视频
     changeTab(e) {
@@ -132,7 +115,6 @@ Page({
         else current = this.data.liveLength + this.data.videoLength
 
         this.setData({
-            // current: tab == 'img' ? this.data.videoLength : 0,
             current,
             imgIndex: 0,
             videoIndex: 0,
@@ -141,7 +123,6 @@ Page({
     },
     currentIndex: 0,
     bindchangeSwiper(e) {
-        // console.log(e.detail.current, e.detail.source)
         if (this.data.tab == 'video') {
             let videoID = wx.createVideoContext('video' + this.currentIndex, this)
             videoID.pause()
@@ -162,40 +143,8 @@ Page({
             current,
         })
 
-
-
-        return
-
-        this.currentIndex = current;
-        if (e.detail.current >= this.data.videoLength) {
-            // 显示视频
-            if (this.data.tab == 'video') {
-                this.setData({
-                    tab: 'img',
-                    imgIndex: 0,
-                })
-            } else {
-                this.setData({
-                    imgIndex: current - this.data.videoLength
-                })
-            }
-        } else {
-            // 显示图片
-            if (this.data.tab == 'img') {
-                this.setData({
-                    tab: 'video',
-                    videoIndex: 0,
-
-                })
-            } else {
-                this.setData({
-                    videoIndex: current
-                })
-            }
-        }
     },
     load(e) {
-        // if (this.data.swiperHeight > 0) { return false }
         this.setData({
             swiperHeight: Math.max(this.data.swiperHeight, this.data.windowWidth * e.detail.height / e.detail.width)
         })
diff --git a/pages/video_show/video_show.wxml b/pages/video_show/video_show.wxml
index a362285..4ce5e7f 100644
--- a/pages/video_show/video_show.wxml
+++ b/pages/video_show/video_show.wxml
@@ -3,7 +3,6 @@
   <block wx:if="{{ tab == 'img' }}">{{(current - videoLength - liveLength) + 1 + '/' + imgLength }} </block>
   <block wx:if="{{ tab == 'video' }}">{{ (current - liveLength) + 1 + '/' + videoLength }}</block>
   <block wx:if="{{ tab == 'live' }}">{{ current * 1 + 1 + '/' + liveLength }}</block>
-  <!-- {{ tab=='img' ? (imgIndex*1+1 + '/' + imgLength) : (videoIndex*1+1 + '/' + videoLength }} -->
 </header-nav>
 <view class='video-box' wx:if="{{ !frompage }}">
   <video src="{{ src}}" id="videobox" loop="{{ loop }}" initial-time="{{ currentTime }}" custom-cache="{{false}}" autoplay='{{false}}'>
@@ -27,8 +26,11 @@
       <block wx:for="{{ attachment }}" wx:key="index">
         <swiper-item>
           <view class="img-box">
-            <image wx:if="{{ !(item.video || item.videourl) }}" src="{{ item.image }}" bindload='load' class="slide-image" mode="widthFix" />
-            <video src="{{ item.video || item.videourl }}" id="video{{ index }}" data-index="{{ index }}" wx:if="{{ item.video || item.videourl }}"></video>
+            <video src="{{ item.video || item.videourl }}" id="video{{ index }}" data-index="{{ index }}" wx:if="{{ (item.video || item.videourl) && index == current  }}"></video>
+            <image wx:else src="{{ item.image }}" bindload='load' class="slide-image" mode="widthFix" />
+
+            <!-- <image wx:if="{{ !(item.video || item.videourl) }}" src="{{ item.image }}" bindload='load' class="slide-image" mode="widthFix" />
+            <video src="{{ item.video || item.videourl }}" id="video{{ index }}" data-index="{{ index }}" wx:if="{{ item.video || item.videourl }}"></video> -->
           </view>
         </swiper-item>
       </block>
diff --git a/template/announcementPopup/announcementPopup.js b/template/announcementPopup/announcementPopup.js
index 9799220..030eabf 100644
--- a/template/announcementPopup/announcementPopup.js
+++ b/template/announcementPopup/announcementPopup.js
@@ -127,9 +127,7 @@ Component({
             this.setData({
                 announcementPopupWindow: !this.data.announcementPopupWindow
             })
-            if (this.data.announcementPopupWindow) {
-                this.getHieght(this.data.current)
-            }
+            if (this.data.announcementPopupWindow) this.getHieght(this.data.current)
         },
 
         // 提取目标数据
@@ -161,13 +159,11 @@ Component({
                 targetData
             })
             // 下面是自动弹窗后 需要计算高度 和 统计数据
-            if (this.data.announcementPopupWindow) {
-                this.getHieght(this.data.current)
-            }
+            if (this.data.announcementPopupWindow) this.getHieght(this.data.current)
+
             // 当 目标数据只有一条时 需要发统计数据
-            if (this.data.announcementPopupWindow && targetData.length == 1) {
-                this.statistics()
-            }
+            if (this.data.announcementPopupWindow && targetData.length == 1) this.statistics()
+
         },
 
         // 统计浏览量
diff --git a/template/newFeatures/newFeatures.js b/template/newFeatures/newFeatures.js
deleted file mode 100644
index 9912de0..0000000
--- a/template/newFeatures/newFeatures.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// template/newFeatures/newFeatures.js
-var app = getApp()
-var config = {};
-var miucms = require('../../utils/miucms.js');
-var WxParse = require('../../wxParse/wxParse.js');
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    newFunction: false
-  },
-  lifetimes: {
-    attached: function () {
-      this.attachedIn()
-    },
-  },
-  attached: function () {
-    this.attachedIn()
-  },
-  /**
-   * 组件的方法列表
-   */
-  timer: null,
-  methods: {
-    attachedIn() {
-      this.getContent()
-    },
-    getContent() {
-      var that = this;
-      clearTimeout(that.timer)
-      if (!app.globalData.config.lists) {
-        this.timer = setTimeout(function () {
-          that.getContent()
-        }, 500)
-        return false
-      }
-      // console.log(app.globalData['notice']);
-
-      // app.globalData['notice'] = {
-      //   title: '标题',
-      //   message: '111'
-      // }
-
-      this.setData({
-        newFunction: app.globalData.notice
-      })
-      if (app.globalData.notice && app.globalData.notice !== false) {
-        WxParse.wxParse('newFunction.message', 'html', '<div>' + app.globalData.notice.message + '</div>', this, 0);
-      }
-      app.globalData.notice = false;
-    },
-    // 关闭弹窗
-    close_newFunction: function () {
-      this.data.newFunction = false;
-      this.setData({
-        newFunction: this.data.newFunction
-      })
-      app.globalData.notice = false;
-    },
-  }
-})
\ No newline at end of file
diff --git a/template/newFeatures/newFeatures.json b/template/newFeatures/newFeatures.json
deleted file mode 100644
index e8cfaaf..0000000
--- a/template/newFeatures/newFeatures.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}
\ No newline at end of file
diff --git a/template/newFeatures/newFeatures.wxml b/template/newFeatures/newFeatures.wxml
deleted file mode 100644
index 73b6559..0000000
--- a/template/newFeatures/newFeatures.wxml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- 新功能弹窗 -->
-<import src="/wxParse/wxParse.wxml"/>
-<view class='new-function-alert' wx:if="{{ newFunction !== false }}">
-  <view class='box'>
-    <view class='header-box'>
-      <view class='loudspeaker'>
-        <image src="/img/loudspeaker.png"></image>
-      </view>
-    </view>
-    <view class='inner'>
-      <view class='notoverflow'>
-        <view class='tips'>{{ newFunction.title }}</view>
-        <view class='content'>
-            <template is="wxParse" data="{{wxParseData:newFunction.message.nodes }}"/>  
-        </view>
-      </view>
-      
-      <view class='know' bindtap='close_newFunction'>知道了</view>
-    </view>
-  </view>
-</view>
diff --git a/template/newFeatures/newFeatures.wxss b/template/newFeatures/newFeatures.wxss
deleted file mode 100644
index 6d9b6d1..0000000
--- a/template/newFeatures/newFeatures.wxss
+++ /dev/null
@@ -1,90 +0,0 @@
-/* template/newFeatures/newFeatures.wxss */
-.new-function-alert{
-  background: rgba(0,0,0,0.4);
-  width: 100vw;
-  height: 100vh;
-  position: fixed;
-  left: 0;
-  top: 0;
-  z-index: 100000;
-
-}
-.new-function-alert .box{
-  position: fixed;
-  left: 50%;
-  top: 50%;
-  width: calc(100vw - 40rpx);
-  /* max-height: 0; */
-  transform: translate(-50%,-50%);
-  /* animation: to_big 0.5s 0.5s forwards; */
-  /* overflow: hidden; */
-}
-@keyframes to_big{
-  0%{
-    width: 0;
-    max-height: 0;
-  }
-  100%{
-    width: calc(100vw - 40rpx);
-    max-height: 90vh;
-  }
-}
-.new-function-alert .header-box{
-  background: #e8e8e8;
-  border-radius: 5px 5px 0 0;
-
-}
-.new-function-alert .loudspeaker{
-  background: #62B1FE;
-  border:16rpx solid #e8e8e8;
-  border-radius: 50%;
-  width: 120rpx;
-  height: 120rpx;
-  position: relative;
-  left:calc(50% - 60rpx);
-  top: -50rpx;
-}
-.new-function-alert .loudspeaker image{
-  width: 66rpx;
-  height: 53.5rpx;
-  position: absolute;
-  left: 11rpx;
-  top: 17rpx;
-}
-.new-function-alert .inner{
-  border-radius: 0 0 5px 5px;
-  background: #fff;
-  padding: 40rpx;
-  font-size: 30rpx;
-  color: #333;
-  line-height: 40rpx;
-  
-}
-.new-function-alert .inner .notoverflow{
-  max-height: calc(90vh - 376rpx);
-  overflow-y: scroll;
-  -webkit-overflow-scrolling: touch
-}
-.new-function-alert .inner .tips{
-  margin-bottom: 60rpx;
-}
-.new-function-alert .inner view{
-  min-height: 40rpx;
-  word-break: break-word;
-  margin-bottom: 40rpx;
-}
-.new-function-alert .inner .know{
-  border:1px solid #ccc;
-  color: #999;
-  font-size: 28rpx;
-  width: 200rpx;
-  height: 66rpx;
-  line-height: 62rpx;
-  border-radius:60rpx;
-  margin: 80rpx auto 0;
-  text-align: center;
-}
-.new-function-alert .inner navigator{
-  color: #C63E3A;
-  display: inline-block;
-}
diff --git a/template/xinHeadSwiper/xinHeadSwiper.wxml b/template/xinHeadSwiper/xinHeadSwiper.wxml
index 6adace1..6466e85 100644
--- a/template/xinHeadSwiper/xinHeadSwiper.wxml
+++ b/template/xinHeadSwiper/xinHeadSwiper.wxml
@@ -1,5 +1,3 @@
-<!--template/xinHeadSwiper/xinHeadSwiper.wxml-->
-<!-- <text>template/xinHeadSwiper/xinHeadSwiper.wxml</text> -->
 <view class="headSwiper">
     <swiper class='headSwiper-swiper' current="{{ swiperCurrent }}" autoplay="{{ true }}" circular interval="{{ 3000 }}" duration="{{ 500 }}" bindanimationfinish="bindchangeSwiper" style="height: {{ HeadSwiperHeight + 5 }}px;">
         <block wx:for="{{ data }}" wx:key="index">