diff --git a/img/ask-for.png b/img/ask-for.png
new file mode 100644
index 0000000..9f58377
Binary files /dev/null and b/img/ask-for.png differ
diff --git a/img/pen-edit.png b/img/pen-edit.png
new file mode 100644
index 0000000..f4bd17c
Binary files /dev/null and b/img/pen-edit.png differ
diff --git a/pages/edit/edit.js b/pages/edit/edit.js
index 6dba2c0..f9397a6 100644
--- a/pages/edit/edit.js
+++ b/pages/edit/edit.js
@@ -34,7 +34,6 @@ Page({
                 data: [],
                 title: "intermediary",
                 need: true
-
             },
             'type': {
                 name: '出租方式',
@@ -65,7 +64,6 @@ Page({
                 name: '房屋类型',
                 data: [],
                 list: {},
-
                 need: true
             },
             rentalduration: {
@@ -103,7 +101,6 @@ Page({
                 placeholder: '请填写数字',
                 unit: '',
                 numberType: true
-
             },
 
             subject: {
@@ -1761,9 +1758,7 @@ Page({
         }
 
         if (field == 'address') {
-            if (this.data.fieldinfoNew.address.type == 'map') {
-                popUpIs = "AddressHongKong"
-            }
+            if (this.data.fieldinfoNew.address.type == 'map') popUpIs = "AddressHongKong"
         }
 
         if (popUpIs == 'unilineInput' || popUpIs == 'multilineInput' || popUpIs == 'multilineInput1') {
diff --git a/pages/edit/edit.wxml b/pages/edit/edit.wxml
index c6ce614..ece7ab3 100644
--- a/pages/edit/edit.wxml
+++ b/pages/edit/edit.wxml
@@ -29,6 +29,7 @@
 
     <!-- 发布成功 -->
     <!-- <template is="succeed-pop"></template> -->
+
     <!-- 发布失败 -->
     <!-- <template is="fail-pop"></template> -->
 
@@ -36,10 +37,10 @@
     <!-- <template is="rent-budget" data="{{ min,max,change,slider2W,slider1Max,slider2Min,slider1Value,slider2Value,rate,scale,slider1W,slider2W,leftSliderPriceWidthX,rightSliderPriceWidthX }}"></template> -->
 
     <!-- 目标区域 -->
-    <!-- <template is="target-area"></template> -->
+    <!-- <template is="pop-target-area"></template> -->
 
     <!-- 新的服务类型 -->
-    <template is="new-marquee-box"></template>
+    <!-- <template is="new-marquee-box"></template> -->
 
     <header-nav inner-text="Some text" bgcolor="rgba(246, 246, 246, 1)">{{ isInput? isInput :( types=='edit' ?'编辑房源信息' :'发布房源信息' ) }}</header-nav>
 
@@ -84,6 +85,7 @@
         </view>
 
         <view class="edit-option">
+
             <!-- 发布者身份 -->
             <view class="edit-option-item">
                 <template is="clickInput" data="{{ item:fieldinfo.status[0], index:0,it:'status',newinfo }}"></template>
@@ -98,6 +100,11 @@
                 </block>
             </view>
 
+            <!-- 目标区域 -->
+            <view class="edit-option-item">
+                <template is="target-area"></template>
+            </view>
+
             <!-- 所在区域 -->
             <view class="edit-option-item">
                 <block wx:for="{{ fieldinfo.address }}" wx:key="index">
@@ -860,30 +867,49 @@
 
 </template>
 
-<!-- 目标区域 -->
+<!-- 当前页面-目标区域 -->
 <template name="target-area">
-    <view class="target-area pop-up">
+    <view class="target-area clickInput-box">
+        <view class="clickInput-title">目标区域<text style="color:#C54235;margin-left: 10rpx;">*</text></view>
+        <view class="target-area-list">
+            <view class="target-area-item flexacenter" wx:for="{{ 3 }}" wx:key="index">
+                <view class="target-area-index flexcenter">{{ index }}</view>
+                <view class="target-area-content">九龙 > 尖沙咀/佐敦</view>
+                <image class="target-area-cross" src="/img/close-c.png"></image>
+            </view>
+        </view>
+
+        <view class="target-area-edit flexcenter">
+            <image class="target-area-edit-icon" src="/img/pen-edit.png" mode="widthFix"></image> 修改
+        </view>
+
+    </view>
+</template>
+
+<!-- 弹窗-目标区域 -->
+<template name="pop-target-area">
+    <view class="pop-target-area pop-up">
         <view class="pop-up-box">
             <view class="pop-up-top" bindtap="closePopUp">
                 <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个目标区域</text>
-            <view class="area-list">
-                <view class="area-item" wx:for="{{ 5 }}">
-                    <view class="area-name">港岛</view>
-                    <view class="area-content flexflex">
-                        <view class="area-content-item flexcenter {{ index == 0 ? 'pitch' : '' }}" wx:for="{{ 10 }}" wx:key="index">不限</view>
+            <text class="pop-last-step-text">最多可选择6个目标区域</text>
+            <view class="pop-area-list">
+                <view class="pop-area-item" wx:for="{{ 5 }}">
+                    <view class="pop-area-name">港岛</view>
+                    <view class="pop-area-content flexflex">
+                        <view class="pop-area-content-item flexcenter {{ index == 0 ? 'pitch' : '' }}" wx:for="{{ 10 }}" wx:key="index">不限</view>
                     </view>
                 </view>
 
             </view>
 
-            <view class="area-pitch-list flexacenter">
-                <view class="area-pitch-item flexacenter" wx:for="{{ 2 }}" wx:key="index">
-                    <view class="area-pitch-index flexcenter">{{ index + 1}}</view>
-                    <view class="area-pitch-content flexacenter">上环上环上环上环/中环</view>
-                    <image class="area-pitch-cross" src="/img/close-c.png"></image>
+            <view class="pop-area-pitch-list flexacenter">
+                <view class="pop-area-pitch-item flexacenter" wx:for="{{ 2 }}" wx:key="index">
+                    <view class="pop-area-pitch-index flexcenter">{{ index + 1}}</view>
+                    <view class="pop-area-pitch-content flexacenter">上环上环上环上环/中环</view>
+                    <image class="pop-area-pitch-cross" src="/img/close-c.png"></image>
                 </view>
             </view>
 
@@ -907,12 +933,13 @@
                 <view class="new-marquee-unlimited-icom new-marquee-unlimited-unselected-icom"></view>
                 不限
             </view>
+            <view class="new-marquee-line"></view>
             <view class="new-marquee-list flexflex">
                 <view class="new-marquee-item flexacenter" wx:for="{{ 7 }}" wx:key="index">
                     <view class="new-marquee-case"></view>唐楼
                 </view>
             </view>
-
+            <template is="pop-up-footer" data="{{ popUpStepState:2 }}"></template>
         </view>
 
     </view>
diff --git a/pages/edit/edit.wxss b/pages/edit/edit.wxss
index 3e20bfd..85f7b89 100644
--- a/pages/edit/edit.wxss
+++ b/pages/edit/edit.wxss
@@ -1482,9 +1482,9 @@ wx-slider .wx-slider-handle-wrapper {
     white-space: nowrap;
 }
 
-.target-area {}
+.pop-target-area {}
 
-.target-area .area-list {
+.pop-target-area .pop-area-list {
     width: 100%;
     border-top: 1rpx solid #ebebeb;
     padding-top: 39rpx;
@@ -1495,11 +1495,11 @@ wx-slider .wx-slider-handle-wrapper {
     overflow: auto;
 }
 
-.target-area .area-item {
+.pop-target-area .pop-area-item {
     margin-bottom: 45rpx;
 }
 
-.target-area .area-name {
+.pop-target-area .pop-area-name {
     color: #000;
     font-size: 30rpx;
     font-weight: 650;
@@ -1507,7 +1507,7 @@ wx-slider .wx-slider-handle-wrapper {
     margin-bottom: 30rpx;
 }
 
-.target-area .area-name::after {
+.pop-target-area .pop-area-name::after {
     content: "";
     position: absolute;
     top: 50%;
@@ -1519,11 +1519,11 @@ wx-slider .wx-slider-handle-wrapper {
     border-radius: 8rpx;
 }
 
-.target-area .area-content {
+.pop-target-area .pop-area-content {
     flex-wrap: wrap;
 }
 
-.target-area .area-content-item {
+.pop-target-area .pop-area-content-item {
     border: 1rpx solid rgba(235, 235, 235, 1);
     border-radius: 15rpx;
     height: 72rpx;
@@ -1534,12 +1534,12 @@ wx-slider .wx-slider-handle-wrapper {
     margin-bottom: 15rpx;
 }
 
-.target-area .area-content-item.pitch {
+.pop-target-area .pop-area-content-item.pitch {
     color: #50E3C2;
     border-color: #50E3C2;
 }
 
-.target-area .area-pitch-list {
+.pop-target-area .pop-area-pitch-list {
     border-top: 1rpx solid #ebebeb;
     width: 750rpx;
     background-color: rgba(246, 246, 246, 1);
@@ -1549,11 +1549,11 @@ wx-slider .wx-slider-handle-wrapper {
 
 }
 
-.target-area .area-pitch-item {
+.pop-target-area .pop-area-pitch-item {
     margin-bottom: 24rpx;
 }
 
-.target-area .area-pitch-index {
+.pop-target-area .pop-area-pitch-index {
     color: #fff;
     width: 30rpx;
     height: 30rpx;
@@ -1563,7 +1563,7 @@ wx-slider .wx-slider-handle-wrapper {
     font-size: 20rpx;
 }
 
-.target-area .area-pitch-content {
+.pop-target-area .pop-area-pitch-content {
     color: #000000;
     font-size: 24rpx;
     width: 220rpx;
@@ -1573,35 +1573,111 @@ wx-slider .wx-slider-handle-wrapper {
     display: inline-block;
 }
 
-.target-area .area-pitch-cross {
+.pop-target-area .pop-area-pitch-cross {
     width: 18rpx;
     height: 18rpx;
     margin-left: 24rpx;
 }
 
-.new-marquee-box {
+.pop-new-marquee-box {
     height: 500rpxx;
 }
 
-.new-marquee-box .new-marquee-unlimited {
+.pop-new-marquee-box .pop-new-marquee-unlimited {
     font-size: 24rpx;
     color: #000;
     align-self: flex-start;
     margin-left: 48rpx;
+    margin-bottom: 48rpx;
+    margin-top: 91.5rpx;
 }
 
-.new-marquee-box .new-marquee-unlimited .new-marquee-unlimited-icom {
+.pop-new-marquee-box .pop-new-marquee-unlimited .pop-new-marquee-unlimited-icom {
     width: 30rpx;
     height: 30rpx;
     margin-right: 12rpx;
 }
 
-.new-marquee-box .new-marquee-unlimited .new-marquee-unlimited-unselected-icom {
+.pop-new-marquee-box .pop-new-marquee-unlimited .pop-new-marquee-unlimited-unselected-icom {
     border: 6rpx solid #d7d7d7;
     border-radius: 50%;
 }
 
-.new-marquee-box .new-marquee-list  {
-    padding: 0 48rpx;
-    border-top: 1rpx solid #ebebeb;
+.pop-new-marquee-box .pop-new-marquee-line {
+    width: 654rpx;
+    height: 1rpx;
+    background-color: #ebebeb;
+}
+
+.pop-new-marquee-box .pop-new-marquee-list {
+    flex-wrap: wrap;
+    justify-content: space-between;
+    padding: 27.75rpx 0 27.75rpx 48rpx;
+    margin-bottom: 64.5rpx;
+}
+
+.pop-new-marquee-box .pop-new-marquee-list .pop-new-marquee-item {
+    width: 33.33%;
+    padding: 27.75rpx 0;
+    font-size: 27rpx;
+    color: #555555;
+}
+
+.pop-new-marquee-box .pop-new-marquee-list .pop-new-marquee-case {
+    width: 30rpx;
+    height: 30rpx;
+    border-radius: 8rpx;
+    border: 4rpx solid #aaaaaa;
+    margin-right: 15rpx;
+}
+
+.target-area {}
+
+.target-area .target-area-list {
+    flex-direction: column;
+    padding-top: 28rpx;
+}
+
+.target-area .target-area-list .target-area-item {
+    margin-bottom: 3rpx;
+}
+
+.target-area .target-area-list .target-area-index {
+    width: 30rpx;
+    height: 30rpx;
+    border-radius: 50%;
+    background-color: #000;
+    color: #fff;
+    font-size: 20rpx;
+    margin-right: 15rpx;
+}
+
+.target-area .target-area-list .target-area-content {
+    width: 650rpx;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    display: inline-block;
+}
+
+.target-area .target-area-list .target-area-cross {
+    width: 18rpx;
+    height: 18rpx;
+    padding: 24rpx;
+}
+
+.target-area .target-area-edit {
+    width: 192rpx;
+    height: 60rpx;
+    font-size: 30rpx;
+    color: #555555;
+    background-color: rgba(242, 242, 242, 0.96078431372549);
+    border-radius: 300rpx;
+    margin: 34rpx auto 0;
+}
+
+.target-area .target-area-edit .target-area-edit-icon {
+    width: 30rpx;
+    height: 30rpx;
+    margin-right: 9rpx;
 }
\ No newline at end of file
diff --git a/pages/show/show.wxml b/pages/show/show.wxml
index 4673c95..30ce4ea 100644
--- a/pages/show/show.wxml
+++ b/pages/show/show.wxml
@@ -25,6 +25,76 @@
   <template is="irenCouponReceive" data="{{ irentCouponBig:irentCouponBig,hideCoupon:hideCoupon,irenCouponReceive:irenCouponReceive }}"></template>
   <canvas style="width:288px; height: {{ canvas1 }}px;" canvas-id="mycanvas1"></canvas>
   <canvas style="width: 100vw; height: {{ canvas11 }}px;" canvas-id="mycanvas11"></canvas>
+
+  <view class="certification resource-beg">
+    <view class="header" wx:if="{{ groupid == 19 }}">
+      <view class="header-left">
+        <image class="landlord-avatar" src="{{ info.avatar }}"></image>
+        <view class="landlord-info" bindtap="goScrollToEles">
+          <view class="landlord-name">{{ info.author }}</view>
+          <view class="" style="display: flex;align-items: center;">共 <text class="bold">{{ listingcount }}</text> 个房源 <image wx:if="{{ listingcount > 1}}" class="arr-bottom" src="/img/u1764.svg"></image>
+          </view>
+        </view>
+      </view>
+      <image class="authentication-icon" bindtap="goApprove" mode="widthFix" src="/img/u30.png"></image>
+    </view>
+
+    <view class="HResource-box {{ groupid != 19 ? 'HResource-box1' : ''}}">
+      <view class='title' wx:if="{{ groupid != 19 }}">
+        {{ info.subject }}
+      </view>
+
+      <view class='user-info' wx:if="{{ groupid != 19 }}">
+        <image src="{{ info.avatar }}"></image> {{ info.author }}
+        <image wx:if="{{ groupid == 19 }}" class="authentication-icon" mode="widthFix" src="/img/u30.png"></image>
+        <view wx:else class='agent'>{{ info.intermediary_text }}</view>
+        <view class='is_rent_btn' wx:if="{{ info.status==2}}">已出租</view>
+      </view>
+
+      <view class="HResource-title" wx:if="{{ groupid == 19 }}">{{ info.subject }}</view>
+      <!-- 房源月租和id -->
+      <view class="HResource-rentAndId">
+        <view class="rent">
+          <view class="rent-label flexcenter">预算</view>
+
+          <view class="unit">{{ info.currency || "HK$"}}</view>
+          <view class="money">{{ info.rent }}</view>
+          <view class="month">
+            /{{ info.rentalperiod }}
+          </view>
+        </view>
+      </view>
+
+      <!-- 房源详细信息 -->
+      <view class="HResource-detail">
+        <view class="HResource-header">
+          <!-- 租房类型、合租整租  房间 -->
+          <template is="HResource-header-item" data="{{ name: info.gptype,value: info.type }}"></template>
+          <!-- 租期 -->
+          <template is="HResource-header-item" data="{{ name: '租期', value: info.rentalduration != 0 ? info.rentalduration: '不限' }}"></template>
+          <!-- 起租日期 -->
+          <template is="HResource-header-item" data="{{ name: '起租日期',value: info.leasetime || '随时' }}"></template>
+        </view>
+      </view>
+
+      <!-- 基本要求 -->
+      <view class="basic-ask-for">
+        <view class="HResource-item-head flexacenter">
+          <image class="HResource-item-head-icon" src="/img/ask-for.png" mode="widthFix"></image>
+          基本要求
+        </view>
+
+
+      </view>
+
+
+
+    </view>
+
+  </view>
+
+
+
   <!-- 认证房东的页面 -->
   <block wx:if="{{ info.cityid == 1 }}">
     <view class="certification">
@@ -264,35 +334,35 @@
           <image class="pop-close" bindtap="negation" data-key="academyState" src="/img/u1849.svg"></image>
           <view class="academy-headline">房源距离院校</view>
           <view class="academy-box">
-          <scroll-view scroll-y style="height: 100%;">
-            <view class="academy-item">
-              <view class="academy-title">
-                <view class="academy-icon-box">
-                  <image class="academy-icon" src="/img/u1827.png"></image>
+            <scroll-view scroll-y style="height: 100%;">
+              <view class="academy-item">
+                <view class="academy-title">
+                  <view class="academy-icon-box">
+                    <image class="academy-icon" src="/img/u1827.png"></image>
+                  </view>
+                  <view class="academy-place">
+                    {{ info.address }}
+                  </view>
                 </view>
-                <view class="academy-place">
-                  {{ info.address }}
+                <view class="school-list"></view>
+              </view>
+              <view class="academy-item" wx:for="{{ info.pointData }}" wx:key="index">
+                <view class="academy-title">
+                  <view class="academy-icon-box">
+                    <image class="academy-icon" src="/img/u1834.png"></image>
+                  </view>
+                  <view class="academy-place">
+                    {{ item.name }}
+                  </view>
+                </view>
+                <view class="school-list">
+                  <view class="school-item" wx:for="{{ item.point }}" wx:for-item="it" wx:for-index="i" wx:key="index">
+                    <view class="school-name">{{ it.title }}</view>
+                    <view class="school-distance">{{ it.distance }} km</view>
+                  </view>
                 </view>
               </view>
-              <view class="school-list"></view>
-            </view>
-            <view class="academy-item" wx:for="{{ info.pointData }}" wx:key="index">
-              <view class="academy-title">
-                <view class="academy-icon-box">
-                  <image class="academy-icon" src="/img/u1834.png"></image>
-                </view>
-                <view class="academy-place">
-                  {{ item.name }}
-                </view>
-              </view>
-              <view class="school-list">
-                <view class="school-item" wx:for="{{ item.point }}" wx:for-item="it" wx:for-index="i" wx:key="index">
-                  <view class="school-name">{{ it.title }}</view>
-                  <view class="school-distance">{{ it.distance }} km</view>
-                </view>
-              </view>
-            </view>
-          </scroll-view>
+            </scroll-view>
           </view>
         </view>
       </view>
diff --git a/pages/show/show.wxss b/pages/show/show.wxss
index 4cce3e4..726db56 100644
--- a/pages/show/show.wxss
+++ b/pages/show/show.wxss
@@ -1633,4 +1633,78 @@ map .clickmap {
   background-color: #fff;
   border: rgba(215, 215, 215, 1) 2rpx solid;
   color: #555;
+}
+
+
+
+/* 特殊处理求房源 */
+.resource-beg {}
+
+.resource-beg .user-info {
+  border-bottom: none;
+}
+
+.resource-beg .rent-label {
+  width: 63rpx;
+  height: 36rpx;
+  border-radius: 9rpx;
+  background-color: rgba(80, 227, 194, 1);
+  color: #ffffff;
+  font-size: 21rpx;
+  margin-right: 18rpx;
+}
+
+.certification.resource-beg .HResource-rentAndId .rent {
+  align-items: center;
+}
+
+.certification.resource-beg .HResource-rentAndId .rent .unit {
+  font-size: 36rpx;
+  font-weight: 900;
+  line-height: normal;
+}
+
+
+.certification.resource-beg .HResource-box .HResource-header-bottom-text {
+  font-weight: 650;
+}
+
+.certification.resource-beg .HResource-box .HResource-rentAndId .rent .month {
+  font-weight: 400;
+  color: #555555;
+  font-size: 36rpx;
+  margin-left: 8rpx;
+}
+
+.certification.resource-beg .HResource-box .HResource-detail {
+  border: none;
+}
+
+.certification.resource-beg .HResource-box .HResource-detail .HResource-arrows {
+  margin-left: 0;
+}
+
+.certification.resource-beg .HResource-box .HResource-detail .HResource-header {
+  padding: 0;
+}
+
+.certification.resource-beg .HResource-box .HResource-detail .HResource-header-item {
+  padding: 39rpx 0;
+}
+
+.certification.resource-beg .HResource-box .HResource-detail .HResource-header-item:not(:last-child) {
+  border-right: 2rpx solid #d7d7d7;
+}
+
+.certification.resource-beg .HResource-item-head {
+  margin: 0 30rpx;
+  font-size: 30rpx;
+  font-weight: 650;
+  color: #000000;
+}
+
+.certification.resource-beg .HResource-item-head-icon {
+  width: 30rpx;
+  height: 33rpx;
+  margin-right: 15rpx;
 }
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index bc3da31..192b2e2 100644
--- a/project.config.json
+++ b/project.config.json
@@ -41,7 +41,7 @@
         "ignoreUploadUnusedFiles": true
     },
     "compileType": "miniprogram",
-    "libVersion": "2.28.1",
+    "libVersion": "2.29.2",
     "appid": "wx9c68fbf7886ea9c4",
     "projectname": "%E5%AF%84%E6%89%98%E7%A7%9F%E6%88%BF",
     "simulatorType": "wechat",
diff --git a/project.private.config.json b/project.private.config.json
index d0d96da..e06df53 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,15 @@
     "projectname": "%E5%AF%84%E6%89%98%E7%A7%9F%E6%88%BF",
     "libVersion": "2.23.4",
     "condition": {
+        "plugin": {
+            "list": []
+        },
+        "game": {
+            "list": []
+        },
+        "gamePlugin": {
+            "list": []
+        },
         "miniprogram": {
             "list": [
                 {
@@ -426,7 +435,12 @@
                     "name": "",
                     "pathName": "pages/irentDetail/irentDetail",
                     "query": "uniqid=fKjybGmrzWuf",
-                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/show/show",
+                    "query": "tid=2555068&uniqid=8e41OXuT5GTD",
                     "scene": null
                 }
             ]