From 9736e39ad1437dfea7886803536c576fe5013383 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 10 Apr 2024 13:59:47 +0800
Subject: [PATCH] =?UTF-8?q?tabBar=E9=A1=BA=E5=BA=8F=E4=BF=AE=E6=94=B9,?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/custom-tab-bar/index.js | 21 ++++++++--------
pages/resiAndHouse/resiAndHouse.js | 1 +
pages/work2/work2.wxml | 2 +-
.../pages/housePortrait/housePortrait.wxml | 4 ++--
.../searchResult/pages/resiInfo/resiInfo.js | 4 ++--
.../searchResult/pages/resiInfo/resiInfo.wxml | 24 ++++++++++++-------
.../searchResult/pages/resiInfo/resiInfo.wxss | 9 ++++++-
7 files changed, 41 insertions(+), 24 deletions(-)
diff --git a/components/custom-tab-bar/index.js b/components/custom-tab-bar/index.js
index ac6feb3..5aa7f3c 100644
--- a/components/custom-tab-bar/index.js
+++ b/components/custom-tab-bar/index.js
@@ -23,14 +23,6 @@ Component({
"selectedIconPath": "/images/home/resiAndHouseSelected.png",
show: true
- },
- {
- "pagePath": "/pages/statistics/statistics",
- "text": "数据",
- "iconPath": "/images/home/information.png",
- "selectedIconPath": "/images/home/informationSelected.png",
- show: false
-
},
{
"pagePath": "/pages/work2/work2",
@@ -40,6 +32,15 @@ Component({
show: true
},
+ {
+ "pagePath": "/pages/statistics/statistics",
+ "text": "数据",
+ "iconPath": "/images/home/information.png",
+ "selectedIconPath": "/images/home/informationSelected.png",
+ show: false
+
+ },
+
{
"pagePath": "/pages/mine/mine",
"text": "我的",
@@ -63,13 +64,13 @@ Component({
getOwnedRolesOfStaffId(res.data.id).then(res2 => {
app.globalData.user = res.data
this.setData({
- "list[2].show": res2.data.filter(item => item.roleKey === 'secretary' || item.roleKey === 'admin').length > 0
+ "list[3].show": res2.data.filter(item => item.roleKey === 'secretary' || item.roleKey === 'admin').length > 0
})
})
})
} else {
this.setData({
- "list[2].show": app.globalData.roleList.filter(item => item.roleKey === 'secretary' || item.roleKey === 'admin').length > 0
+ "list[3].show": app.globalData.roleList.filter(item => item.roleKey === 'secretary' || item.roleKey === 'admin').length > 0
})
}
console.log(app.globalData.roleList, 'userss')
diff --git a/pages/resiAndHouse/resiAndHouse.js b/pages/resiAndHouse/resiAndHouse.js
index 2171d75..46fe908 100644
--- a/pages/resiAndHouse/resiAndHouse.js
+++ b/pages/resiAndHouse/resiAndHouse.js
@@ -386,6 +386,7 @@ Page({
tableData: []
})
this.getTableData()
+ this.getAllOrgCategoryCount()
},
onClose() {
this.setData({
diff --git a/pages/work2/work2.wxml b/pages/work2/work2.wxml
index 39c2e3c..53bda47 100644
--- a/pages/work2/work2.wxml
+++ b/pages/work2/work2.wxml
@@ -42,7 +42,7 @@
- 信息服务
+ 为民服务
diff --git a/subpages/house/pages/housePortrait/housePortrait.wxml b/subpages/house/pages/housePortrait/housePortrait.wxml
index 599e898..2fba860 100644
--- a/subpages/house/pages/housePortrait/housePortrait.wxml
+++ b/subpages/house/pages/housePortrait/housePortrait.wxml
@@ -69,10 +69,10 @@
操作人：
{{item.operatorName}}
-
+
diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.js b/subpages/searchResult/pages/resiInfo/resiInfo.js
index 45feb71..12e0776 100644
--- a/subpages/searchResult/pages/resiInfo/resiInfo.js
+++ b/subpages/searchResult/pages/resiInfo/resiInfo.js
@@ -646,7 +646,8 @@ Page({
list.push({
name:'关系图谱',
id:"graph"
- })
+ },
+ )
this.setData({
tabList: list
})
@@ -656,7 +657,6 @@ Page({
item.name == "拓展信息" ||item.name == "居住信息" ||
item.name == "基本信息")
);
-
let arrs = []
arrs = this.data.originalExpandList.filter((itemA) => {
return arr.some((itemB) => itemB.name === itemA.title);
diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.wxml b/subpages/searchResult/pages/resiInfo/resiInfo.wxml
index 5ed9b94..e1d8de0 100644
--- a/subpages/searchResult/pages/resiInfo/resiInfo.wxml
+++ b/subpages/searchResult/pages/resiInfo/resiInfo.wxml
@@ -16,11 +16,11 @@
编辑
-
+
创建时间：
{{form.baseInfoDto.createdTime}}
@@ -30,8 +30,8 @@
{{form.baseInfoDto.updatedTime}}
-
- {{item.name}} （{{ item.filledQty }}/{{ item.totalQty }}）
+
+ {{item.name}} （{{ item.filledQty }}/{{ item.totalQty }}）
@@ -116,13 +116,21 @@
*
- 人房状况：
- {{item.agencyName}}{{item.homeName }}
+ 人户状况：
+
+
+
+ {{selectItem.label}}
+
+
+
+ --
+
+
- *
户籍所在地：
- {{ item.placeOfDomicile || "--" }}
+ {{ item.placeOfDomicile === 'null'?'--':item.placeOfDomicile}}
*
diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.wxss b/subpages/searchResult/pages/resiInfo/resiInfo.wxss
index e5095e0..a2d0023 100644
--- a/subpages/searchResult/pages/resiInfo/resiInfo.wxss
+++ b/subpages/searchResult/pages/resiInfo/resiInfo.wxss
@@ -68,6 +68,11 @@ page {
color: #999999;
}
+
+.info .item .value {
+ flex: 1;
+ overflow-x: hidden;
+}
.must{
font-size: 32rpx;
font-weight: 500;
@@ -113,12 +118,14 @@ page {
}
.btn {
+ display: flex;
+ align-items: center;
+ justify-content: center;
box-sizing: border-box;
text-align: center;
height: 76rpx;
border-radius: 39rpx;
margin: 30rpx 0;
- line-height: 76rpx;
border-radius: 76rpx;
border: 1rpx solid #999999;
width: 226rpx;