代码提交

pages/resiAndHouse/resiAndHouse.js

@@ -1,7 +1,10 @@
-// pages/resiAndHouse/resiAndHouse.js
 import api, {
     getAllOrgCategoryCount,
     getResidentBaseInfo,
+    getTopTree,
+    getNextTree,
+    houseSearch,
+    allOrgHouseInfo,
     getCommunityHouse
 } from "../../utils/api"
 const App = getApp()
@@ -14,6 +17,7 @@ Page({
         activeType: 0,
         tabList: [],
         tableData: [],
+        tableFwData: [],
         resiList: [{
             name: '',
             resiTags: [''],
@@ -31,21 +35,52 @@ Page({
         pageSize: 10,
         lowerThreshold: '10',
         loadMoreVisible: false,
+        loadFwMoreVisible: false,
         loadMoreType: "none",
+        loadFwMoreType: "none",
         nodata: false,
         selectVale: 'resi',
-    keyWord: '',
+        keyWord: '1',
         angencyId: null,
         category: null,
         searchOrgIdPath: '',
+        cascaderFwValue: '',
         angencyList: [], //组织树
+        angencyFwList: [], //房屋组织树
         showAngenCascader: false,
         agencyName: '',
         fieldName: {
             text: 'agencyName',
             value: 'agencyId',
             children: 'subAgencyList'
-    }
+        },
+        fieldNameFw: {
+            text: 'label',
+            value: 'id',
+            children: 'children'
+        },
+        cascaderNameFw: null,
+        showFw: false,
+        params: {
+            agencyId: '',
+            orgId: '',
+            level: 'district',
+            orgInfo:''
+        },
+        params1: {
+            "searchKey": "",
+            "pageSize": 50,
+            "pageNo": 1,
+            "searchOrgIdPath": "7b6f9a9f9f38d5f9fa7ce94a93d6eb28",
+        },
+        activeFwType: 0,
+        fwTypes: [
+            { name: '房屋', num: 0, value: '' },
+            { name: '自住', num: 0, value: '0' },
+            { name: '出租', num: 0, value: '1' },
+            { name: '闲置', num: 0, value: '2' },
+            { name: '未出售', num: 0, value: '3' },
+        ]
     },
     /**
      * 生命周期函数--监听页面加载
@@ -54,11 +89,23 @@ Page({
         this.setData({
             searchOrgIdPath: App.globalData.user.agencyId,
             cascaderName: App.globalData.user.agencyName,
-      agencyName: App.globalData.user.agencyName
+            cascaderNameFw: App.globalData.user.agencyName,
+            agencyName: App.globalData.user.agencyName,
+            params: {
+                ...this.data.params,
+                agencyId:App.globalData.user.agencyId,
+                orgId:App.globalData.user.agencyId
+            },
+            params1: {
+                ...this.data.params1,
+                searchOrgIdPath:App.globalData.user.agencyId,
+            }
         })
+        this.getTableFwData()
         this.getAgencygridtree()
         this.getAllOrgCategoryCount()
         this.getTableData()
+        this.getTopTreeData()
     },
     // 
     /**
@@ -121,11 +168,115 @@ Page({
         })
         this.getTableData()
     },
+    handelClickTabFw(e) {
+        this.setData({
+            activeFwType: e.currentTarget.dataset.index,
+            // category: e.currentTarget.dataset.category,
+            tableFwData: [],
+            params1: {
+                ...this.data.params1,
+                pageNo: 1,
+                "category": e.currentTarget.dataset.category,
+            },
+        })
+        this.getTableFwData()
+    },
     handelBlurKeyWord(e) {
         this.setData({
             keyWord: e.detail.value
         })
     },
+    getTopTreeData() {
+        getTopTree().then(res => {
+            const arr = res.data.children.map(item => {
+                return {
+                    ...item,
+                    children: []
+                }
+            })
+            this.setData({
+                angencyFwList: [{ ...res.data, children: arr }],
+            })
+        })
+    },
+    getTreeFun(id, arr, data) {
+        return arr.map(item => {
+            if (id == item.id) {
+                return {
+                    ...item,
+                    children: data,
+                }
+            }
+            if (item.children && item.children.length > 0) {
+                return {
+                    ...item,
+                    children: this.getTreeFun(id, item.children, data),
+                }
+            }
+            return item
+        })
+    },
+    onChangeFw(e) {
+        const { value, tabIndex, selectedOptions } = e.detail;
+        if (tabIndex > 0 && selectedOptions[selectedOptions.length - 1].level != 'building') {
+            const level = selectedOptions[selectedOptions.length - 1].level
+            getNextTree({ level, id: value }).then(res => {
+                if (res.data.length > 0) {
+                    const data = res.data.map(item => {
+                        if (item.level != 'building') {
+                            return {
+                                ...item,
+                                children: []
+                            }
+                        }
+                        return {
+                            ...item,
+                            children: null
+                        }
+                    });
+                    const arr = this.getTreeFun(value, this.data.angencyFwList, data);
+                    this.setData({
+                        angencyFwList: arr,
+                    })
+                } else {
+                    const arr = this.getTreeFun(value, this.data.angencyFwList, null);
+                    this.setData({
+                        angencyFwList: arr,
+                    })
+                }
+            })
+        }
+    },
+    onCloseFw() {
+        this.setData({
+            showFw: false,
+        });
+    },
+
+    onFinishFw(e) {
+        const { selectedOptions, value } = e.detail;
+        // const fieldNameFw = selectedOptions
+        //     .map((option) => option.text || option.name)
+        //     .join('/');
+        const level = selectedOptions[selectedOptions.length - 1].level
+        this.setData({
+            cascaderNameFw: e.detail.selectedOptions.map(item => item.label).join(' '),
+            showFw: false,
+            cascaderFwValue: value,
+            params: {
+                ...this.data.params,
+                orgId: value,
+                level,
+            },
+            params1: {
+                ...this.data.params1,
+                searchOrgIdPath: value,
+                orgId: value,
+                level,
+            },
+        });
+        this.getTableFwData()
+    },
     handelClickSearchType(e) {
         this.setData({
             selectVale: e.currentTarget.dataset.type
@@ -136,6 +287,11 @@ Page({
             showAngenCascader: true
         })
     },
+    handelClickShowTreeFw() {
+        this.setData({
+            showFw: true
+        })
+    },
     // 组织树
     getAgencygridtree() {
 
@@ -148,12 +304,19 @@ Page({
         })
     },
     async handelClickSearch() {
+        if (this.data.selectVale === 'resi') {
             this.setData({
                 pageNo: 1,
                 tableData: []
             })
-    this.getAllOrgCategoryCount()
             this.getTableData()
+        }else{
+            this.setData({
+                pageNo: 1,
+                tableFwData: []
+            })
+            this.getTableFwData()
+        }
     },
     handelClickToOcr() {
         wx.navigateTo({
@@ -193,7 +356,14 @@ Page({
         // '1765976717767618562'
         console.log(e);
         wx.navigateTo({
-      url: `/subpages/searchResult/pages/resiInfo/resiInfo?resiId=${e.currentTarget.dataset.resiid}`,
+            url: `/subpages/searchResult/pages/punchCard/punchCard?resiId=${e.currentTarget.dataset.resiid}`,
+        })
+    },
+    onClickJump(e) {
+        console.log('e::', e)
+        // '1765976717767618562'?resiId=${e.currentTarget.dataset.resiid}
+        wx.navigateTo({
+            url: `/subpages/house/pages/housePortrait/housePortrait?resiId=${e.currentTarget.dataset.resiid}`,
         })
     },
     onFinish(e) {
@@ -203,7 +373,6 @@ Page({
             cascaderName: e.detail.selectedOptions.map(item => item.agencyName).join(','),
             tableData: []
         })
-    this.getAllOrgCategoryCount()
         this.getTableData()
     },
     onClose() {
@@ -222,6 +391,16 @@ Page({
             this.getTableData()
         }
     },
+    onScrollFwToLower(e) {
+        console.log('this.data.loadFwMoreType::','zoule', this.data.loadFwMoreType)
+        if (this.data.loadFwMoreType === 'more') {
+            this.setData({
+                loadFwMoreVisible: true,
+            })
+            this.data.params1.pageNo += 1
+            this.getTableFwData()
+        }
+    },
     getTableData: async function () {
         try {
             this.setData({
@@ -268,5 +447,47 @@ Page({
             })
         }
     },
-
+    getTableFwData: async function () {
+        this.setData({
+            loadMoreVisible: true,
+            nodata: false,
+            loadMoreType: "more",
+        })
+        await allOrgHouseInfo({ ...this.data.params }).then(res => {
+            const data = [];
+            let num = 0;
+            res.data.forEach((item, index) => {
+                if (index < 4) {
+                    let value = item.name == '自住' ? '0' : item.name == '出租' ? '1' : item.name == '闲置' ? '2' : item.name == '未出售' ? '3' : '';
+                    data.push({ ...item, value });
+                    num = num + parseInt(item.num);
+                }
+            })
+            const arr = [{ name: '房屋', num, value: '' }, ...data];
+            this.setData({
+                fwTypes: arr
+            })
+        })
+        await houseSearch({ ...this.data.params1, searchKey: this.data.keyWord }).then(res => {
+            const { code, data } = res;
+            if (code == 0) {
+                this.setData({
+                    loadFwMoreType: data.list.length === this.data.params1.pageSize ? 'more' : 'none',
+                    tableFwData: this.data.tableFwData.concat(data.list),
+                })
+                if (this.data.tableData.length == 0) {
+                    this.setData({
+                        loadMoreVisible: false,
+                        nodata: true
+                    })
+                }
+            } else {
+                this.setData({
+                    loadMoreVisible: false,
+                    nodata: true,
+                    loadMoreType: 'none'
+                })
+            }
+        })
+    }
 })

pages/resiAndHouse/resiAndHouse.wxml

@@ -56,8 +56,6 @@
                     </view>
 
                     <view class="text-wrapper_9">
-                        <!-- <text lines="1" class="text_19">信息完整度：</text>
-                        <text lines="1" class="text_20">40%</text> -->
                     </view>
                 </view>
                 <view class="box_19">
@@ -93,7 +91,64 @@
         </scroll-view>
     </view>
 </view>
+<view class="group_2" wx:if="{{selectVale === 'house'}}">
+    <view class="section_2">
+        <view class="box_16">
+            <text lines="1" class="text_4" bind:tap="handelClickShowTreeFw">{{cascaderNameFw}}</text>
+            <view class="image-text_9">
+                <view class="image-text_qh">
+                    <text lines="1" class="text_5" bind:tap="handelClickShowTreeFw">切换</text>
+                    <image src="../../images/swapHorizontal.png" class="image_8"></image>
+                </view>
+            </view>
+        </view>
+        <view class="box_17">
+            <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>
+                    <view class="name" style="color:{{activeFwType === index?'#3974f6':'#666666'}}">{{item.name}}</view>
+                </view>
+            </view>
+        </view>
+        <view style="margin-left: 24rpx;">
+            <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>
+            <image src="../../images/house/czMin.png" class="image_81 image_82"></image>
+            <text style="margin-left:1" lines="1" class="text_51" bind:tap="handelClickShowTreeFw">出租</text>
+            <image src="../../images/house/xzMin.png" class="image_81 image_82"></image>
+            <text lines="1" class="text_51" bind:tap="handelClickShowTreeFw">闲置</text>
+            <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">
+                <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">
+                            <image class="item_img_fw_img" wx:if="{{item.rentFlagName=='自住'}}" src="../../images/house/zzMax.png"></image>
+                            <image class="item_img_fw_img" wx:if="{{item.rentFlagName=='出租'}}" src="../../images/house/czMax.png"></image>
+                            <image class="item_img_fw_img" wx:if="{{item.rentFlagName=='闲置'}}" src="../../images/house/xzMax.png"></image>
+                            <image class="item_img_fw_img" wx:if="{{item.rentFlagName=='未出售'}}" src="../../images/house/wcsMax.png"></image>
+                        </view>
+                        <view class="item_texts_fw">
+                            <view class="item_text_hh">{{item.houseName}}</view>
+                            <view class="item_text_rs">
+                                {{item.resiTotal}}人
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <load-more loadVisible="{{loadFwMoreVisible}}" loadType="{{loadFwMoreType}}"></load-more>
+            <no-data isShow="{{nodata}}" wx:if="{{tableFwData.length==0}}"></no-data>
+        </scroll-view>
+    </view>
+</view>
 <custom-tab-bar></custom-tab-bar>
 <van-popup show="{{ showAngenCascader }}" round position="bottom">
     <van-cascader field-names="{{fieldName}}" wx:if="{{showAngenCascader}}" value="{{ searchOrgIdPath }}" title="请选择" options="{{ angencyList }}" bind:close="onClose" bind:finish="onFinish" />
 </van-popup>
+<van-popup show="{{ showFw }}" round position="bottom">
+    <van-cascader wx:if="{{ showFw }}" field-names="{{ fieldNameFw }}" value="{{ cascaderFwValue }}" title="请选择所在地区" options="{{ angencyFwList }}" bind:close="onCloseFw" bind:change="onChangeFw" bind:finish="onFinishFw" />
+</van-popup>

pages/resiAndHouse/resiAndHouse.wxss

@@ -5,6 +5,7 @@ page{
     overflow: hidden;
     background-color: #f7f7f7;
 }
+
 /* .page {
     position: relative;
     width: 750rpx;
@@ -20,6 +21,7 @@ page{
     display: flex;
     flex-direction: column;
 }
+
 .group_2 {
     background-color: rgba(245, 246, 246, 1.000000);
     border-radius: 20rpx;
@@ -40,6 +42,7 @@ page{
     display: flex;
     flex-direction: column;
 }
+
 .box_15 {
     width: 709rpx;
     height: 56rpx;
@@ -47,11 +50,13 @@ page{
     display: flex;
     margin: 70rpx 0 0 21rpx;
 }
+
 .label_1 {
     width: 34rpx;
     height: 31rpx;
     margin-top: 11rpx;
 }
+
 .text_1 {
     width: 157rpx;
     height: 30rpx;
@@ -65,11 +70,13 @@ page{
     line-height: 42rpx;
     margin: 13rpx 0 0 18rpx;
 }
+
 .image_2 {
     width: 158rpx;
     height: 56rpx;
     margin-left: 342rpx;
 }
+
 .text-wrapper_30 {
     width: 100%;
     flex-direction: row;
@@ -78,6 +85,7 @@ page{
     margin-top: 39rpx;
     position: relative;
 }
+
 .text-wrapper_30>view {
     display: flex;
     width: 50%;
@@ -87,6 +95,7 @@ page{
     position: relative;
 
 }
+
 .text-wrapper_30>view image {
     width: 140rpx;
     height: 14rpx;
@@ -95,8 +104,8 @@ page{
     left: 50%;
     transform: translateX(-50%);
 }
-  .text-wrapper_30 
+
-  .text_2 {
+.text-wrapper_30 .text_2 {
     width: 134rpx;
     height: 33rpx;
     overflow-wrap: break-word;
@@ -108,6 +117,7 @@ page{
     white-space: nowrap;
     line-height: 42rpx;
 }
+
 .text_3 {
     width: 132rpx;
     height: 33rpx;
@@ -120,6 +130,7 @@ page{
     white-space: nowrap;
     line-height: 42rpx;
 }
+
 .image_3 {
     width: 140rpx;
     height: 14rpx;
@@ -143,6 +154,7 @@ page{
     flex-direction: column;
     margin: 21rpx 0 0 20rpx;
 }
+
 .box_16 {
     width: 100%;
     height: 100rpx;
@@ -151,6 +163,16 @@ page{
     align-items: center;
     margin-top: 20rpx;
 }
+
+.box_161 {
+    width: 100%;
+    height: 100rpx;
+    justify-content: center;
+    align-items: center;
+    text-align: center;
+    margin-top: 20rpx;
+}
+
 .text_4 {
     overflow-wrap: break-word;
     color: rgba(51, 51, 51, 1);
@@ -164,12 +186,44 @@ page{
 
     margin-right: 20rpx;
 }
+
 .image-text_9 {
     width: 89rpx;
     flex-direction: row;
     display: flex;
     justify-content: space-between;
 }
+
+.image-text_91 {
+    flex-direction: row;
+    display: flex;
+    text-align: center;
+    justify-content: space-between;
+}
+
+.image-text_qh {
+    /* margin: 0 auto; */
+}
+
+.text_51{
+    font-size: 26rpx;
+    color: #ACACAC;
+}
+
+.text_52 {
+    margin-right: 36rpx;
+}
+
+.image_81{
+    width: 26rpx;
+    height: 26rpx;
+    position: relative;
+    top: 5rpx;
+}
+.image_82{
+    margin-left: 36rpx;
+}
+
 .text_5 {
     width: 55rpx;
     height: 26rpx;
@@ -182,21 +236,25 @@ page{
     white-space: nowrap;
     line-height: 28rpx;
 }
+
 .image_8 {
     width: 28rpx;
     height: 18rpx;
     margin-top: 5rpx;
 }
+
 .box_17 {
     width: 649rpx;
     margin: 20rpx 0 0 30rpx;
 }
+
 .list_2 {
     width: 486rpx;
     height: 75rpx;
     flex-direction: row;
     display: flex;
 }
+
 .text-wrapper_31-0 {
     width: 99rpx;
     height: 75rpx;
@@ -204,6 +262,7 @@ page{
     display: flex;
     flex-direction: column;
 }
+
 .text_6-0 {
     width: 99rpx;
     height: 31rpx;
@@ -216,6 +275,7 @@ page{
     line-height: 42rpx;
     color: rgba(57, 116, 246, 1);
 }
+
 .text_7-0 {
     width: 102rpx;
     height: 24rpx;
@@ -229,6 +289,7 @@ page{
     margin: 20rpx 0 0 24rpx;
     color: rgba(57, 116, 246, 1);
 }
+
 .text-wrapper_31-1 {
     width: 99rpx;
     height: 75rpx;
@@ -236,6 +297,7 @@ page{
     display: flex;
     flex-direction: column;
 }
+
 .text_6-1 {
     width: 99rpx;
     height: 31rpx;
@@ -248,6 +310,7 @@ page{
     line-height: 42rpx;
     color: rgba(51, 51, 51, 1);
 }
+
 .text_9-1 {
     width: 49rpx;
     height: 25rpx;
@@ -261,6 +324,7 @@ page{
     line-height: 38rpx;
     margin: 19rpx 0 0 13rpx;
 }
+
 .text-wrapper_31-2 {
     width: 99rpx;
     height: 75rpx;
@@ -268,6 +332,7 @@ page{
     display: flex;
     flex-direction: column;
 }
+
 .text_6-2 {
     width: 99rpx;
     height: 31rpx;
@@ -280,6 +345,7 @@ page{
     line-height: 42rpx;
     color: rgba(51, 51, 51, 1);
 }
+
 .text_7-2 {
     width: 102rpx;
     height: 24rpx;
@@ -293,6 +359,7 @@ page{
     margin: 20rpx 0 0 24rpx;
     color: rgba(102, 102, 102, 1);
 }
+
 .text-wrapper_31-3 {
     width: 99rpx;
     height: 75rpx;
@@ -300,6 +367,7 @@ page{
     display: flex;
     flex-direction: column;
 }
+
 .text_6-3 {
     width: 99rpx;
     height: 31rpx;
@@ -312,6 +380,7 @@ page{
     line-height: 42rpx;
     color: rgba(51, 51, 51, 1);
 }
+
 .text_7-3 {
     width: 102rpx;
     height: 24rpx;
@@ -339,6 +408,7 @@ page{
     line-height: 42rpx;
     margin-left: 24rpx;
 }
+
 .text_50 {
     width: 128rpx;
     height: 25rpx;
@@ -362,6 +432,7 @@ page{
     display: flex;
     margin: 20rpx 0 0 0;
 }
+
 .text_16 {
     width: fit-content;
     overflow-wrap: break-word;
@@ -388,6 +459,7 @@ page{
     font-size: 24rpx;
     color: #999999;
 }
+
 .text_18 {
     width: 94rpx;
     height: 23rpx;
@@ -401,6 +473,7 @@ page{
     line-height: 42rpx;
     margin: 7rpx 0 0 8rpx;
 }
+
 .text-wrapper_9 {
     width: 243rpx;
     overflow-wrap: break-word;
@@ -412,6 +485,7 @@ page{
     line-height: 40rpx;
     margin: 4rpx 0 0 0;
 }
+
 .text_19 {
     width: 243rpx;
     height: 28rpx;
@@ -424,6 +498,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_20 {
     width: 243rpx;
     height: 28rpx;
@@ -436,6 +511,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .box_19 {
     width: 533rpx;
     height: 29rpx;
@@ -444,6 +520,7 @@ page{
     justify-content: space-between;
     margin: 27rpx 0 0 0;
 }
+
 .text-wrapper_10 {
     width: 146rpx;
     height: 29rpx;
@@ -455,6 +532,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_21 {
     width: 146rpx;
     height: 29rpx;
@@ -467,6 +545,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_22 {
     width: 146rpx;
     height: 29rpx;
@@ -479,6 +558,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text-wrapper_11 {
     width: 145rpx;
     height: 28rpx;
@@ -490,6 +570,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_23 {
     width: 145rpx;
     height: 28rpx;
@@ -502,6 +583,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_24 {
     width: 145rpx;
     height: 28rpx;
@@ -514,6 +596,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text-wrapper_12 {
     width: 263rpx;
     height: 28rpx;
@@ -526,6 +609,7 @@ page{
     line-height: 40rpx;
     margin: 19rpx 0 0 0;
 }
+
 .text_25 {
     width: 263rpx;
     height: 28rpx;
@@ -538,6 +622,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_26 {
     width: 263rpx;
     height: 28rpx;
@@ -550,6 +635,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text-wrapper_13 {
     width: 415rpx;
     height: 28rpx;
@@ -562,6 +648,7 @@ page{
     line-height: 40rpx;
     margin: 20rpx 0 0 0;
 }
+
 .text_27 {
     width: 415rpx;
     height: 28rpx;
@@ -574,6 +661,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_28 {
     width: 415rpx;
     height: 28rpx;
@@ -586,6 +674,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_29 {
     width: 415rpx;
     height: 28rpx;
@@ -598,6 +687,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text-wrapper_14 {
     width: 639rpx;
     height: 28rpx;
@@ -610,6 +700,7 @@ page{
     line-height: 40rpx;
     margin: 20rpx 0 0 0;
 }
+
 .text_30 {
     width: 639rpx;
     height: 28rpx;
@@ -622,6 +713,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_31 {
     width: 639rpx;
     height: 28rpx;
@@ -634,6 +726,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text-wrapper_15 {
     width: 537rpx;
     height: 28rpx;
@@ -646,6 +739,7 @@ page{
     line-height: 40rpx;
     margin: 20rpx 0 0 0;
 }
+
 .text_32 {
     width: 537rpx;
     height: 28rpx;
@@ -658,6 +752,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_33 {
     width: 537rpx;
     height: 28rpx;
@@ -670,11 +765,13 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .image_6 {
     width: 650rpx;
     height: 1rpx;
     margin: 30rpx 0 0 31rpx;
 }
+
 .box_20 {
     width: 648rpx;
     height: 36rpx;
@@ -682,6 +779,7 @@ page{
     display: flex;
     margin: 28rpx 0 0 31rpx;
 }
+
 .text_34 {
     width: 83rpx;
     height: 32rpx;
@@ -695,6 +793,7 @@ page{
     line-height: 41rpx;
     margin-top: 2rpx;
 }
+
 .text-wrapper_23 {
     background-color: rgba(236, 236, 236, 0.500000);
     border-radius: 4rpx;
@@ -704,6 +803,7 @@ page{
     flex-direction: column;
     width: 60rpx;
 }
+
 .text_51 {
     width: 45rpx;
     height: 23rpx;
@@ -717,6 +817,7 @@ page{
     line-height: 42rpx;
     margin: 7rpx 0 0 8rpx;
 }
+
 .text-wrapper_24 {
     background-color: rgba(236, 236, 236, 0.500000);
     border-radius: 4rpx;
@@ -726,6 +827,7 @@ page{
     flex-direction: column;
     width: 110rpx;
 }
+
 .text_52 {
     width: 94rpx;
     height: 23rpx;
@@ -739,6 +841,7 @@ page{
     line-height: 42rpx;
     margin: 7rpx 0 0 8rpx;
 }
+
 .text-wrapper_16 {
     width: 243rpx;
     height: 28rpx;
@@ -751,6 +854,7 @@ page{
     line-height: 40rpx;
     margin: 5rpx 0 0 130rpx;
 }
+
 .text_35 {
     width: 243rpx;
     height: 28rpx;
@@ -763,6 +867,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_36 {
     width: 243rpx;
     height: 28rpx;
@@ -775,6 +880,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text-wrapper_17 {
     width: 263rpx;
     height: 28rpx;
@@ -787,6 +893,7 @@ page{
     line-height: 40rpx;
     margin: 22rpx 0 0 30rpx;
 }
+
 .text_37 {
     width: 263rpx;
     height: 28rpx;
@@ -799,6 +906,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_38 {
     width: 263rpx;
     height: 28rpx;
@@ -811,6 +919,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text-wrapper_18 {
     width: 415rpx;
     height: 28rpx;
@@ -823,6 +932,7 @@ page{
     line-height: 40rpx;
     margin: 20rpx 0 0 31rpx;
 }
+
 .text_39 {
     width: 415rpx;
     height: 28rpx;
@@ -835,6 +945,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_40 {
     width: 415rpx;
     height: 28rpx;
@@ -847,6 +958,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_41 {
     width: 415rpx;
     height: 28rpx;
@@ -859,6 +971,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text-wrapper_19 {
     width: 639rpx;
     height: 28rpx;
@@ -871,6 +984,7 @@ page{
     line-height: 40rpx;
     margin: 20rpx 0 0 31rpx;
 }
+
 .text_42 {
     width: 639rpx;
     height: 28rpx;
@@ -883,6 +997,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_43 {
     width: 639rpx;
     height: 28rpx;
@@ -895,6 +1010,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text-wrapper_20 {
     width: 537rpx;
     height: 28rpx;
@@ -907,6 +1023,7 @@ page{
     line-height: 40rpx;
     margin: 20rpx 0 0 30rpx;
 }
+
 .text_44 {
     width: 537rpx;
     height: 28rpx;
@@ -919,6 +1036,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_45 {
     width: 537rpx;
     height: 28rpx;
@@ -931,11 +1049,13 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .image_9 {
     width: 650rpx;
     height: 1rpx;
     margin: 31rpx 0 0 30rpx;
 }
+
 .box_21 {
     width: 648rpx;
     height: 32rpx;
@@ -944,6 +1064,7 @@ page{
     justify-content: space-between;
     margin: 36rpx 0 0 31rpx;
 }
+
 .text_53 {
     width: 83rpx;
     height: 32rpx;
@@ -956,6 +1077,7 @@ page{
     white-space: nowrap;
     line-height: 41rpx;
 }
+
 .text-wrapper_25 {
     width: 243rpx;
     height: 28rpx;
@@ -968,6 +1090,7 @@ page{
     line-height: 40rpx;
     margin-top: 3rpx;
 }
+
 .text_54 {
     width: 243rpx;
     height: 28rpx;
@@ -980,6 +1103,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_55 {
     width: 243rpx;
     height: 28rpx;
@@ -992,6 +1116,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text-wrapper_26 {
     width: 263rpx;
     height: 28rpx;
@@ -1004,6 +1129,7 @@ page{
     line-height: 40rpx;
     margin: 24rpx 0 0 30rpx;
 }
+
 .text_56 {
     width: 263rpx;
     height: 28rpx;
@@ -1016,6 +1142,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_57 {
     width: 263rpx;
     height: 28rpx;
@@ -1028,6 +1155,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text-wrapper_27 {
     width: 416rpx;
     height: 28rpx;
@@ -1040,6 +1168,7 @@ page{
     line-height: 40rpx;
     margin: 20rpx 0 0 31rpx;
 }
+
 .text_58 {
     width: 416rpx;
     height: 28rpx;
@@ -1052,6 +1181,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_59 {
     width: 416rpx;
     height: 28rpx;
@@ -1064,6 +1194,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_60 {
     width: 416rpx;
     height: 28rpx;
@@ -1076,6 +1207,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text-wrapper_28 {
     width: 639rpx;
     height: 28rpx;
@@ -1092,6 +1224,7 @@ page{
 .scroll {
     height: calc(100vh - 750rpx);
 }
+
 .text_61 {
     width: 639rpx;
     height: 28rpx;
@@ -1104,6 +1237,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_62 {
     width: 639rpx;
     height: 28rpx;
@@ -1116,6 +1250,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text-wrapper_29 {
     width: 537rpx;
     height: 28rpx;
@@ -1128,6 +1263,7 @@ page{
     line-height: 40rpx;
     margin: 20rpx 0 27rpx 30rpx;
 }
+
 .text_63 {
     width: 537rpx;
     height: 28rpx;
@@ -1140,6 +1276,7 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .text_64 {
     width: 537rpx;
     height: 28rpx;
@@ -1152,11 +1289,13 @@ page{
     white-space: nowrap;
     line-height: 40rpx;
 }
+
 .box_17 .tabs {
     display: flex;
     justify-content: start;
 
 }
+
 .box_17 .tabs .tab_item {
     display: flex;
     flex-direction: column;
@@ -1164,11 +1303,33 @@ page{
     align-items: center;
     margin-right: 20rpx;
 }
+
+.box_17 .tabs .tab_item_fw {
+    display: flex;
+    flex-direction: column;
+    width: 120rpx;
+    justify-content: space-between;
+    align-items: center;
+    margin-right: 20rpx;
+}
+
 .box_17 .tabs .tab_item .num {
     font-weight: 400;
     font-size: 36rpx;
 }
 
+.box_17 .tabs .tab_item_fw .num {
+    font-weight: 400;
+    font-size: 36rpx;
+}
+
+.box_17 .tabs .tab_item_fw .name {
+    font-size: 26rpx;
+    padding-bottom: 6rpx;
+    box-sizing: border-box;
+    color: #666666;
+}
+
 .box_17 .tabs .tab_item .name {
     font-size: 26rpx;
     padding-bottom: 6rpx;
@@ -1180,6 +1341,7 @@ page{
     color: #3974f6 !important;
     border-bottom: solid 6rpx #3974f6;
 }
+
 .resi_tag {
     display: flex;
     flex-grow: 0;
@@ -1189,18 +1351,80 @@ page{
     padding: 10rpx 0;
     box-sizing: border-box;
 }
+
 .form_item {
     margin-top: 10rpx;
     padding: 0 30rpx 30rpx;
     box-sizing: border-box;
     border-bottom: 1rpx #EAEAEA solid;
 }
+
+.scroll_fw {
+    height: calc(100vh - 750rpx);
+}
+
+.form_item_fw {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    /* 可选：添加以下任一属性以调整子元素在主轴上的对齐方式 */
+    justify-content: center;
+    /* justify-content: space-between;  // 子元素间均匀间隔，首尾元素贴边 */
+    /* justify-content: space-around; */
+}
+
+.form_item_fw_item{
+    /* flex-basis: 200px; */
+    /* 或设置固定宽度，如  */
+    width: calc(33% - 24rpx);
+    /* 其他样式... */
+    margin: 10rpx;
+    height: 124rpx;
+    background: rgba(225, 238, 254, 0.4);
+    /* 为了弥补可能出现的1px间隙，可以添加适当的左右外边距 */
+}
+.form_item_fw_item_bg0{
+    background: rgba(225, 238, 254, 0.4);
+}
+.form_item_fw_item_bg1{
+    background: rgba(227, 248, 247, 0.4);
+}
+.form_item_fw_item_bg2{
+    background: rgba(225, 238, 254, 0.4);
+}
+.form_item_fw_item_bg3{
+    background: rgba(217, 223, 233, 0.4);
+}
+.item_fw{
+    display: flex;
+    padding: 24rpx;
+}
+.item_img_fw_img{
+    width: 32rpx;
+    height: 32rpx;
+}
+.item_text_hh{
+    font-weight: bold;
+    font-size: 34rpx;
+    color: #333333;
+}
+.item_texts_fw{
+    padding-left: 12rpx;
+    padding-top: 4rpx;
+}
+.item_text_rs{
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #999999;
+}
+
 .inout_box {
     position: relative;
     margin: 20rpx 0 20rpx;
     padding: 0 20rpx;
     box-sizing: border-box;
 }
+
 .inout_box input {
     width: auto;
     background: #F5F5FA;
@@ -1212,6 +1436,7 @@ page{
     text-overflow: ellipsis;
     white-space: nowrap;
 }
+
 .inout_box .search_img {
     position: absolute;
     left: 37rpx;
@@ -1219,6 +1444,7 @@ page{
     width: 30rpx;
     height: 30rpx;
 }
+
 .inout_box .btn_box {
     width: 110rpx;
     height: 50rpx;
@@ -1228,6 +1454,7 @@ page{
     display: flex;
     align-items: center;
 }
+
 .inout_box .btn_box text {
     width: 80rpx;
     height: 30rpx;
@@ -1238,6 +1465,7 @@ page{
     padding-left: 15rpx;
     border-left: 2rpx #3A80E7 solid;
 }
+
 .OCR_img {
     width: 44rpx;
     height: 44rpx;
@@ -1245,8 +1473,7 @@ page{
     left: -60rpx;
     z-index: 10;
 }
+
 .font_bold {
     font-weight: 600;
 }
-      
-  

project.config.json

@@ -45,7 +45,8 @@
         "disableUseStrict": false,
         "minifyWXML": true,
         "showES6CompileOption": false,
-        "useCompilerPlugins": false
+        "useCompilerPlugins": false,
+        "condition": false
     },
     "compileType": "miniprogram",
     "libVersion": "2.19.4",

utils/api.js

@@ -66,6 +66,11 @@ module.exports = {
   getAllOrgCategoryCount,
   getResiInfo,
   userXiangQ,
+  getTopTree,
+  getNextTree,
+  houseSearch,
+  allOrgHouseInfo,
+  getLogList,
   updatetResi
 }
 
@@ -348,5 +353,26 @@ function updatetResi(parm) {
   return fly.post(`actual/base/residentBaseInfo/update`,parm)
 }
 
+// 社区查询-房屋查询
+function houseSearch(parm) {
+    console.log('parmparm:', parm)
+  return fly.post(`actual/base/communityHouse/houseSearch`,parm)
+}
+// 社区查询-房屋概览查询
+function allOrgHouseInfo(parm) {
+  return fly.get(`actual/base/streetOverview/allOrgHouseInfo`,parm)
+}
+// 懒加载树状一级
+function getTopTree(parm) {
+  return fly.get(`actual/base/communityBuilding/tree/initTree`,parm)
+}
+// 懒加载树状多层下级
+function getNextTree(parm) {
+  return fly.get(`actual/base/communityBuilding/tree/nextTreeNode`,parm)
+}
+// 获取打卡记录
+function getLogList(parm) {
+  return fly.get(`actual/base/clockRecords/logList`,parm)
+}
 
 

utils/config.js

@@ -6,8 +6,8 @@ module.exports = {
   
   function BASEURL() {
     // return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境
-    // return 'http://192.168.1.144/api/' //测试环境
+    return 'http://192.168.1.144/api/' //测试环境
-    return 'http://219.146.91.110:30801/api/'
+    // return 'http://219.146.91.110:30801/api/'
     //return http://219.146.91.110:30801/api //外网
   }