From cc97ca45abc985d9b708bed8a2837a61a525c190 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 10 Apr 2024 20:30:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E6=A0=B7=E5=BC=8F=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/resiAndHouse/resiAndHouse.js | 3 +-
pages/resiAndHouse/resiAndHouse.wxml | 26 ++++++----
pages/resiAndHouse/resiAndHouse.wxss | 51 +++++++++++++++++--
.../searchResult/pages/resiInfo/resiInfo.wxml | 14 ++---
4 files changed, 72 insertions(+), 22 deletions(-)
diff --git a/pages/resiAndHouse/resiAndHouse.js b/pages/resiAndHouse/resiAndHouse.js
index 46fe908..bccfc20 100644
--- a/pages/resiAndHouse/resiAndHouse.js
+++ b/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({
diff --git a/pages/resiAndHouse/resiAndHouse.wxml b/pages/resiAndHouse/resiAndHouse.wxml
index a59a3e4..335c4fa 100644
--- a/pages/resiAndHouse/resiAndHouse.wxml
+++ b/pages/resiAndHouse/resiAndHouse.wxml
@@ -15,10 +15,10 @@
-
+
-
+
搜索
@@ -47,15 +47,21 @@
- {{item.name}}
-
-
- {{itemC}}
-
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+ {{itemC}}
-
- 信息完整度：{{item.synthesizeScore}}
+
@@ -96,7 +102,7 @@
-
+
注：
自住
diff --git a/pages/resiAndHouse/resiAndHouse.wxss b/pages/resiAndHouse/resiAndHouse.wxss
index e28701b..d40bcbb 100644
--- a/pages/resiAndHouse/resiAndHouse.wxss
+++ b/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;
- max-width: 302rpx;
+ /* justify-content: start; */
+ /* 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;
@@ -1486,4 +1493,40 @@ 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;
}
\ No newline at end of file
diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.wxml b/subpages/searchResult/pages/resiInfo/resiInfo.wxml
index e1d8de0..06bb702 100644
--- a/subpages/searchResult/pages/resiInfo/resiInfo.wxml
+++ b/subpages/searchResult/pages/resiInfo/resiInfo.wxml
@@ -47,34 +47,34 @@
*
证件类型：
- {{idTypeList[form.baseInfoDto.idType].label}}
+ {{idTypeList[form.baseInfoDto.idType].label||'--'}}
*
证件号：
- {{form.baseInfoDto.idNum}}
+ {{form.baseInfoDto.idNum||'--'}}
*
联系电话：
- {{form.baseInfoDto.mobile}}
+ {{form.baseInfoDto.mobile||'--'}}
文化程度：
- {{form.eduInfoDto.cultureLevelName}}
+ {{form.eduInfoDto.cultureLevelName||'--'}}
性别：
- {{form.baseInfoDto.genderName}}
+ {{form.baseInfoDto.genderName||'--'}}
出生日期：
- {{form.baseInfoDto.birthday}}
+ {{form.baseInfoDto.birthday||'--'}}
民族：
- {{form.baseInfoDto.nationName}}
+ {{form.baseInfoDto.nationName||'--'}}
婚姻状况：