Merge branch 'lisu_V4.3.1' of http://120.46.222.128:10021/elink-star/epmet-work-mp into lisu_V4.3.1

pages/resiAndHouse/resiAndHouse.js

@@ -80,7 +80,14 @@ Page({
             { name: '未出售', num: 0, value: '3' },
         ],
         tempList:[],
-        angencyJmList:[]
+        angencyJmList:[],
+        houseListSearchFlag:false
+    },
+    handelClickedit(e){
+        console.log(e);
+         wx.navigateTo({
+                url: `/subpages/house/pages/housePortrait/housePortrait?resiId=${e.currentTarget.dataset.item.id}`,
+        })
     },
     /**
      * 生命周期函数--监听页面加载
@@ -409,6 +416,16 @@ Page({
             this.getTableData()
             this.getAllOrgCategoryCount()
         }else{
+            if(this.data.keyWord){
+               this.setData({
+                   houseListSearchFlag:true,
+                   'params1.searchOrgIdPath':App.globalData.user.agencyId
+               })
+            }else{
+                this.setData({
+                   houseListSearchFlag:false
+                })   
+            }
             this.setData({
                 pageNo: 1,
                 tableFwData: []

pages/resiAndHouse/resiAndHouse.wxml

@@ -94,7 +94,7 @@
 
 <view class="group_2" wx:if="{{selectVale === 'house'}}">
     <view class="section_2">
-        <view class="box_16">
+        <view class="box_16" wx:if="{{!houseListSearchFlag}}">
             <text lines="1" class="text_4" bind:tap="handelClickShowTreeFw">{{cascaderNameFw}}</text>
             <view class="image-text_9">
                 <view class="image-text_qh">
@@ -103,7 +103,7 @@
                 </view>
             </view>
         </view>
-        <view class="box_17">
+        <view class="box_17" wx:if="{{!houseListSearchFlag}}">
             <view class="tabs">
                 <view class="tab_item_fw {{activeFwType === index ? 'border_bto' : ''}}" wx:for="{{fwTypes}}" bind:tap="handelClickTabFw" data-index="{{index}}" data-category="{{item.value}}">
                     <view class="num">{{item.num}}</view>
@@ -111,7 +111,7 @@
                 </view>
             </view>
         </view>
-        <view style="margin-left: 24rpx;margin-top: 47rpx;">
+        <view style="margin-left: 24rpx;margin-top: 47rpx;" wx:if="{{!houseListSearchFlag}}">
             <text class="text_51">注：</text>
             <image src="../../images/house/zzMin.png" class="image_81"></image>
             <text lines="1" class="text_51" bind:tap="handelClickShowTreeFw">自住</text>
@@ -122,8 +122,8 @@
             <image src="../../images/house/wcsMin.png" class="image_81 image_82"></image>
             <text lines="1" class="text_51" bind:tap="handelClickShowTreeFw">未出售</text>
         </view>
-        <scroll-view class="scroll_fw form_item_fw" scroll-y="{{true}}" lower-threshold="{{ lowerThreshold }}" bindscrolltolower="onScrollFwToLower">
-            <view class="form_item_fw">
+        <scroll-view class="{{houseListSearchFlag?'scroll_fw_search':'scroll_fw'}} form_item_fw" scroll-y="{{true}}" lower-threshold="{{ lowerThreshold }}" bindscrolltolower="onScrollFwToLower">
+            <view class="form_item_fw" wx:if="{{!houseListSearchFlag}}">
                 <view wx:for="{{tableFwData}}" :wx:key="{{index}}" bind:tap="onClickJump" data-resiId="{{item.id}}" class="form_item_fw_item">
                     <view class="item_fw">
                         <view class="item_imgs_fw">
@@ -141,7 +141,17 @@
                     </view>
                 </view>
             </view>
-            <load-more loadVisible="{{loadFwMoreVisible}}" loadType="{{loadFwMoreType}}"></load-more>
+            <view class="card" wx:else>
+            <view class="list_card" wx:for="{{tableFwData}}" wx:key="index" data-item="{{item}}" bind:tap="handelClickedit">
+                <view class="left">
+                    <view>{{item.quartersName+item.buildingName+item.buildingUnitName + item.houseName}}</view>
+                </view>
+                <view class="right">
+                    <image src="../../images/right.png" mode=""/>
+                </view>
+            </view>
+        </view>
+            <load-more loadVisible="{{loadFwMoreVisible}}" loadType="{{loadFwMoreType}}" wx:if="{{!nodatafw}}"></load-more>
             <no-data isShow="{{nodatafw}}" wx:if="{{nodatafw}}"></no-data>
         </scroll-view>
     </view>

pages/resiAndHouse/resiAndHouse.wxss

@@ -1395,6 +1395,9 @@ page {
 .scroll_fw {
     height: calc(100vh - 750rpx);
 }
+.scroll_fw_search{
+    height: calc(100vh - 460rpx);
+}
 .loadVisible{
     color: #c1c1c1;
     font-size: 24rpx;
@@ -1554,3 +1557,47 @@ page {
     color: #fcac00;
     background-color: #fff3db;
 }
+.card{
+    background-color: #fff;
+    border-radius: 0 0 20rpx 20rpx;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+}
+.card .list_card{
+    display: flex;
+    justify-content: space-around;
+    padding: 30rpx 0;
+    align-items: center;
+    color: #333333;
+    border-top: 1px solid #EAEAEA;
+}
+.card .list_card .left{
+    flex: 1;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    font-size: 32rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+.card .list_card .left :nth-child(1),
+.card .list_card .left :nth-child(2){
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;     
+}
+.card .list_card .left .address{
+    font-size: 28rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #999999;
+    margin-top: 20rpx;
+}
+.list_card .right image{
+    width: 20rpx;
+    height: 20rpx;
+}

project.private.config.json

@@ -9,6 +9,13 @@
     "condition": {
         "miniprogram": {
             "list": [
+                {
+                    "name": "房屋搜索",
+                    "pathName": "subpages/searchResult/pages/searchResult/searchResult",
+                    "query": "type=house&keyword=101",
+                    "launchMode": "default",
+                    "scene": null
+                },
                 {
                     "name": "巡查上报",
                     "pathName": "subpages/InspectionReport/pages/InspectionReport/InspectionReport",
@@ -272,18 +279,6 @@
                     "pathName": "subpages/gatherInformation/pages/gatherInformation/gatherInformation",
                     "query": "",
                     "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "subpages/searchResult/pages/ceshi/ceshi",
-                    "query": "resiId=1704759138283409410",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "subpages/searchResult/pages/cheshi/cheshi",
-                    "query": "resiId=1704759138283409410",
-                    "scene": null
                 }
             ]
         }