人房样式调整

pages/resiAndHouse/resiAndHouse.js

@@ -432,9 +432,10 @@ Page({
                 msg
             } = await getResidentBaseInfo(parm)
             if (code == 0) {
+                
                 this.setData({
                     loadMoreType: data.list.length === this.data.pageSize ? 'more' : 'none',
-                    tableData: this.data.tableData.concat(data.list),
+                    tableData: this.data.tableData.concat(data.list.map(item=>({...item,categoryNameStr:item.categoryNameStr?item.categoryNameStr.split(','):null}))),
                 })
                 if (this.data.tableData.length == 0) {
                     this.setData({

pages/resiAndHouse/resiAndHouse.wxml

@@ -15,7 +15,7 @@
             </view>
         </view>
         <view class="inout_box">
-            <image src="../../images/work/search.png" mode="" class="search_img"/>
+            <image src="../../images/work/search.png" mode="" class="search_img" />
             <input type="text" placeholder="姓名/手机/身份证" bindinput="handelBlurKeyWord" bindblur="handelBlurKeyWord" value="{{keyWord}}" />
             <view class="btn_box" bind:tap="handelClickSearch">
                 <image src="../../images/cardIcon.png" mode="" wx:if="{{selectVale == 'resi'}}" class="OCR_img" bind:tap="handelClickToOcr" />
@@ -47,15 +47,21 @@
         <scroll-view class="scroll" scroll-y="{{true}}" lower-threshold="{{ lowerThreshold }}" bindscrolltolower="onScrollToLower">
             <view class="form_item" wx:for="{{tableData}}" :wx:key="{{index}}" bind:tap="toResiDetail" data-resiId="{{item.resiId}}">
                 <view class="box_18">
-                    <text lines="1" class="text_16">{{item.name}}</text>
+                    <view style="display: flex;">
-                    <view class="resi_tag" wx:if="{{item.categoryInfo.categoryNames}}">
+                        <image style="width: 40rpx;height: 40rpx;margin-right: 16rpx;" wx:if="{{item.gender=='1'&&item.age>18 &&item.age<60}}" src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/1e21790833b04e9abe61e2a8f40446cb.png" mode="" />
-                        <view class="text-wrapper_8" wx:for="{{item.categoryInfo.categoryNames.split(',')}}" wx:for-item="itemC">
+                        <image style="width: 40rpx;height: 40rpx;margin-right: 16rpx;" wx:if="{{item.gender=='1'&& item.age<18 }}" src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/62c2b6a1ce834f8dae081b562b2579b9.png" mode="" />
-                            {{itemC}}
+                        <image style="width: 40rpx;height: 40rpx;margin-right: 16rpx;" wx:if="{{item.gender=='1'&&item.age>=60}}" src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/bd586a4e7d0f4b3aa68c79067dfe1428.png" mode="" />
+                        <image style="width: 40rpx;height: 40rpx;margin-right: 16rpx;" wx:if="{{item.gender=='2'&&item.age>18 &&item.age<60}}" src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/3b44e3495dcd4d96a3c07baad1bd7c5e.png" mode="" />
+                        <image style="width: 40rpx;height: 40rpx;margin-right: 16rpx;" wx:if="{{item.gender=='2'&&item.age<18 }}" src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/0c38251bba644a6b8e4a925aea74c9a7.png" mode="" />
+                        <image style="width: 40rpx;height: 40rpx;margin-right: 16rpx;" wx:if="{{item.gender=='2'&&item.age>=60}}" src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/2465ff7633a94413bf4ed2aa778c2765.png" mode="" />
+                        <image wx:if="{{item.gender == '0'}}" src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/1e21790833b04e9abe61e2a8f40446cb.png" mode="" />
+                        <text lines="1" class="text_16"> {{item.name}}</text>
+                    </view>
+                    <view class="resi_tag " wx:if="{{item.categoryNameStr}}">
+                        <view wx:for="{{item.categoryNameStr}}" wx:for-item="itemC" wx:for-index="indexxxxxxxx" wx:key="indexxxxxxxx" class="{{itemC === '党员'?'hong':itemC==='群众'?'lan':itemC === '共青团员'?'ju':itemC ==='残疾人员'?'qing':itemC =='慢病'?'zi':itemC ==='死亡'?'灰':itemC=='老年人'?'lan':itemC=='低保人员'?'lv':itemC =='退役军人'?'hong':itemC === '保障房人员'?'huang':itemC =='育龄妇女'?'fen':itemC=='特扶人员'?'zi':itemC=='安置帮教'?'zi':itemC=='吸毒人员'?'hong':itemC =='社区矫正'?'qing':itemC=='不良青少年'?'huang':itemC=='肇事肇祸精神病'?'zi':itemC =='邪教人员'?'ju':itemC=='统战人员'?'lv':itemC=='信访人员'?'honsg':itemC=='志愿者'?'hong':itemC == '楼长'?'lan':itemC=='单元长'?'qing':itemC=='公益岗'?'fen':itemC==='大病'?'hong':''}}">{{itemC}}</view>
                     </view>
-                    </view>
-
                     <view class="text-wrapper_9">
-                        <view class="label">信息完整度：</view><view class="value">{{item.synthesizeScore}}</view> 
+                        <!-- <view class="label">信息完整度：</view><view class="value">{{item.synthesizeScore}}</view>  -->
                     </view>
                 </view>
                 <view class="text-wrapper_13">
@@ -96,7 +102,7 @@
                 </view>
             </view>
         </view>
-        <view style="margin-left: 24rpx;">
+        <view style="margin-left: 24rpx;margin-top: 47rpx;">
             <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>

pages/resiAndHouse/resiAndHouse.wxss

@@ -433,7 +433,7 @@ page {
     /* height: 36rpx; */
     flex-direction: row;
     align-items: center;
-    justify-content: space-between;
+    justify-content: start;
     display: flex;
     margin: 20rpx 0 0 0;
 }
@@ -1355,13 +1355,20 @@ page {
 .resi_tag {
     display: flex;
     flex-grow: 0;
-    justify-content: start;
+    /* justify-content: start; */
-    max-width: 302rpx;
+    /* max-width: 302rpx; */
     overflow-x: scroll;
     padding: 10rpx 0;
     box-sizing: border-box;
+    margin-left: 16rpx;
+}
+.resi_tag view{
+    padding: 7rpx 9rpx;
+    box-sizing: border-box;
+    white-space:nowrap;
+    margin-right:5rpx;
+    border-radius: 6rpx;
 }
-
 .form_item {
     margin-top: 10rpx;
     padding: 0 30rpx 30rpx;
@@ -1487,3 +1494,39 @@ page {
 .font_bold {
     font-weight: 600;
 }
+.hong{
+    color:#ff3c3c;
+    background-color:#ffe3e3 ;
+}
+.lan{
+    color:#4f94ff;
+    background-color:#e6f0ff ;
+}
+.ju{
+    color:#fe840d;
+    background-color:#ffeedd ;
+}
+.qing{
+    color: #04b8ad;
+    background-color:#dcf5f3 ;
+}
+.zi{
+    color: #b462e8;
+    background-color:#f4e9fc ;
+}
+.hui{
+    color: #959495;
+    background-color:#f1f1f1 ;
+}
+.lv{
+    color: #52ba74;
+    background-color:#e7f5ec ;
+}
+.fen{
+    color: #ff688f;
+    background-color:#ffeaef ;
+}
+.huang{
+    color: #fcac00;
+    background-color: #fff3db;
+}

subpages/searchResult/pages/resiInfo/resiInfo.wxml

@@ -47,34 +47,34 @@
         <view class="item">
             <text class="must">*</text>
             <view class="label">证件类型：</view>
-            <View class="value">{{idTypeList[form.baseInfoDto.idType].label}}</View>
+            <View class="value">{{idTypeList[form.baseInfoDto.idType].label||'--'}}</View>
         </view>
         <view class="item">
             <text class="must">*</text>
             <view class="label">证件号：</view>
-            <View class="value">{{form.baseInfoDto.idNum}}</View>
+            <View class="value">{{form.baseInfoDto.idNum||'--'}}</View>
         </view>
         <view class="item">
             <text class="must">*</text>
             <view class="label">联系电话：</view>
-            <View class="value">{{form.baseInfoDto.mobile}}</View>
+            <View class="value">{{form.baseInfoDto.mobile||'--'}}</View>
         </view>
         <view class="item">
             <view class="label">文化程度：</view>
-            <View class="value">{{form.eduInfoDto.cultureLevelName}}</View>
+            <View class="value">{{form.eduInfoDto.cultureLevelName||'--'}}</View>
         </view>
 
         <view class="item">
             <view class="label">性别：</view>
-            <View class="value">{{form.baseInfoDto.genderName}}</View>
+            <View class="value">{{form.baseInfoDto.genderName||'--'}}</View>
         </view>
         <view class="item">
             <view class="label">出生日期：</view>
-            <View class="value">{{form.baseInfoDto.birthday}}</View>
+            <View class="value">{{form.baseInfoDto.birthday||'--'}}</View>
         </view>
         <view class="item">
             <view class="label">民族：</view>
-            <View class="value">{{form.baseInfoDto.nationName}}</View>
+            <View class="value">{{form.baseInfoDto.nationName||'--'}}</View>
         </view>
         <view class="item">
             <view class="label">婚姻状况：</view>