diff --git a/pages/index/index.js b/pages/index/index.js
index 1606c45..81f4d70 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -23,11 +23,7 @@ Page({
         unreadMessages: 0, // 底部我的图标 未读系统通知数量
         areaList: ['school', 'district', 'type'],
         areaTab: "school", //  school  district type
-        areaObj: {
-            'school': 0,
-            'district': 1,
-            'type': 2,
-        },
+        areaIndex: 0, //  school  district type
 
         envVersionState: false, // 是否在开发环境
         images: "https://oss.gter.net/Zvt57TuJSUvkyhw-xG7Y2l-W-58oc3nqqsgFptxhXa6SWi2uePJ5Bg8cFLPIvsEG-4BUA27F7lfn5E55tXAL34gR30K6A7FxO7Sa1zx17l80NDI5", // 新公寓列表的图片链接 随时删除
@@ -112,7 +108,6 @@ Page({
 
     // 新初始化数据
     getNewInit() {
-        console.log("screen_data", this.data.screen_data.windowWidth);
         miucms.wxget(`${app.globalData.baseURL}/tenement/v2/api/home`).then(res => {
             let data = res.data
 
@@ -125,8 +120,6 @@ Page({
             this.setData({
                 ...data
             })
-
-            console.log("tabs", this.data.tabs);
         })
 
     },
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index de34370..fc51751 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -75,40 +75,40 @@
     </view>
 
     <!-- 区域选择 新 -->
-    <view class="area-selection" wx:if="{{ envVersionState && false }}">
+    <view class="area-selection" wx:if="{{ envVersionState && true }}">
         <view class="head flexacenter shadow">
-            <view class="head-item flexcenter flex1 {{ item == areaTab  ? 'pitch' : '' }}" wx:for="{{ areaList }}" wx:key="index" bindtap="setValue" data-key="areaTab" data-value="{{ item }}">
-                学校附近
-                <view class="head-underline" wx:if="{{ item == areaTab }}"></view>
+            <view class="head-item flexcenter flex1 {{ index == areaIndex  ? 'pitch' : '' }}" wx:for="{{ combination }}" wx:key="index" bindtap="setValue" data-key="areaIndex" data-value="{{ index }}">
+                {{ item.name }}
+                <view class="head-underline" wx:if="{{ index == areaIndex }}"></view>
             </view>
         </view>
 
         <view class="area-content shadow">
             <view class="area-data flexcenter">
                 <image class="area-icon" mode="widthFix" src="/img/area-icon.png"></image>
-                当前共有 <view class="area-amount">13298</view> 个房源
+                当前共有 <view class="area-amount">{{ combination[areaIndex] && combination[areaIndex].num }}</view> 个房源
             </view>
 
-            <view wx:if="{{ areaTab == 'school' }}" class="area-list area-school flexflex">
-                <view class="area-item flexcenter" wx:for="{{ 10 }}" wx:key="index">港岛</view>
+            <view wx:if="{{ areaIndex == 0 }}" class="area-list area-school flexflex">
+                <view class="area-item flexcenter" wx:for="{{ combination[areaIndex].where }}" wx:key="index" data-id="{{ item.id }}">{{ item.name }}</view>
             </view>
-            <view wx:if="{{ areaTab == 'district' }}" class="area-list area-district flexflex">
-                <view class="area-item flexcenter" wx:for="{{ 3 }}" wx:key="index">港岛</view>
+            <view wx:if="{{ areaIndex == 1 }}" class="area-list area-district flexflex">
+                <view class="area-item flexcenter" wx:for="{{ combination[areaIndex].where }}" wx:key="index" data-id="{{ item.id }}">{{ item.name }}</view>
             </view>
 
-            <block wx:if="{{ areaTab == 'type' }}">
-                <view class="area-list area-type flexflex">
-                    <view class="area-type-name">合租</view>
+            <block wx:if="{{ areaIndex == 2 }}">
+                <view class="area-list area-type flexflex" wx:for="{{ combination[areaIndex].where }}" wx:for-item="ite">
+                    <view class="area-type-name">{{ ite.name }}</view>
                     <view class="area-type-block flex1 flexflex">
-                        <view class="area-item flexcenter" wx:for="{{ 5 }}" wx:key="index">港岛</view>
+                        <view class="area-item flexcenter" wx:for="{{ ite.data }}" wx:for-item="it" wx:key="index">{{ it.name }}</view>
                     </view>
                 </view>
-                <view class="area-list area-type flexflex">
+                <!-- <view class="area-list area-type flexflex">
                     <view class="area-type-name">合租</view>
                     <view class="area-type-block flex1 flexflex">
                         <view class="area-item flexcenter" wx:for="{{ 5 }}">港岛</view>
                     </view>
-                </view>
+                </view> -->
             </block>
 
         </view>
@@ -177,7 +177,7 @@
         <!-- <view class="tab-green" style="left: {{ tabList[tabValue].left }}rpx;"></view> -->
     </view>
 
-    <view class="pinterest-list flexflex" wx:if="{{ envVersionState && true }}">
+    <view class="pinterest-list flexflex" wx:if="{{ envVersionState && false }}">
         <!-- 广告 -->
         <image class="pinterest-list-item" mode="widthFix" src="https://axure-file.lanhuapp.com/md516b251fb-9cfa-46fc-a9b6-2a41a7b4dc37__3e8c7ffd967c39e01538667fc12558ab.svg"></image>
         <!-- 公寓 -->
diff --git a/pages/personList/personList.js b/pages/personList/personList.js
index 31dafa1..84cf624 100644
--- a/pages/personList/personList.js
+++ b/pages/personList/personList.js
@@ -694,6 +694,7 @@ Page({
       school,
       location
     } = e.detail;
+    console.log(school, location, "00");
     this.data.school.value = school;
     this.data.location.value = location;
     this.setData({