From b5d2ec149dbca8b8a44b9de0605aecc74cbddc1e Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Tue, 16 Apr 2024 17:35:23 +0800
Subject: [PATCH] 更新
---
pages/home/index.vue | 10 +++--
pages.json | 2
subPackage/house/member/index.vue | 17 +++++---
static/icon/nav-29.png | 0
subPackage/house/family/index.vue | 11 ++++-
subPackage/house/member/householdLabel.vue | 3 -
subPackage/police/people.vue | 34 ----------------
7 files changed, 29 insertions(+), 48 deletions(-)
diff --git a/pages.json b/pages.json
index ce0a4de..05af079 100644
--- a/pages.json
+++ b/pages.json
@@ -309,7 +309,7 @@
}, {
"path": "bail",
"style": {
- "navigationBarTitleText": "取保候审",
+ "navigationBarTitleText": "取保监居",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 148dc59..b7d6074 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -499,7 +499,7 @@
path: '/subPackage/hotLine/index'
},
{
- icon: "/static/icon/nav-26.png",
+ icon: "/static/icon/nav-28.png",
text: "统战上报",
path: "/subPackage/bs/views/addRepair?title=统战上报&type=6"
},
@@ -516,7 +516,7 @@
path: "/subPackage/workbench/views/editExamine"
},
{
- icon: "/static/icon/nav-02.png",
+ icon: "/static/icon/nav-29.png",
text: "企业商户上报",
path: "/subPackage/bs/views/addRepair?title=企业商户上报&type=5"
}
@@ -652,6 +652,7 @@
this.curSelectSite = {
addressType: 1
}
+ this.isBailer = false;
this.init()
})
//选择位置刷新楼盘表
@@ -1077,9 +1078,10 @@
},
setLiveMenu(arr) {
+ console.log("0000", arr);
if (arr.length) {
-
let index3 = arr.findIndex(item => item.name.trim() == "取保监居")
+ console.log("0000", index3)
if (index3 != -1) {
console.log(uni.getStorageSync("activeRole").roleName, 11111);
this.isBailer = true;
@@ -1091,8 +1093,8 @@
// path: '/subPackage/label/bail'
// }]
// })
-
} else {
+ console.log(2222)
this.isBailer = false;
let itemIndex = this.tabs.findIndex(item => item.name.trim() == "警务服务")
if (itemIndex != -1) {
diff --git a/static/icon/nav-29.png b/static/icon/nav-29.png
new file mode 100644
index 0000000..b36ae06
--- /dev/null
+++ b/static/icon/nav-29.png
Binary files differ
diff --git a/subPackage/house/family/index.vue b/subPackage/house/family/index.vue
index 0be1a29..c78e756 100644
--- a/subPackage/house/family/index.vue
+++ b/subPackage/house/family/index.vue
@@ -67,8 +67,9 @@
<view class="flex" style="width:90%;">
<image class="box-icon" src="/static/icon/person.png" mode="aspectFill">
</image>
- <scroll-view class="label-wrap flex flex-wrap"
- v-if="scItem.householdLabelList.length">
+ <!-- <view class="label-wrap"> -->
+ <scroll-view class="label-wrap" v-if="scItem.householdLabelList.length"
+ :scroll-x="true">
<block v-for="i in scItem.householdLabelList">
<view class="label-tag mr-10" @click.stop="showTag(i.labelName)"
v-if="i.labelName"
@@ -77,6 +78,7 @@
</view>
</block>
</scroll-view>
+ <!-- </view> -->
</view>
<view class="r flex">
<!-- <view v-show="scItem.residentialStatus">
@@ -553,6 +555,11 @@
.label-wrap {
margin-left: 5rpx;
width: calc(100% - 32rpx - 5rpx);
+
+ }
+
+ .label-scroll {
+ width: 100%;
white-space: nowrap;
}
diff --git a/subPackage/house/member/householdLabel.vue b/subPackage/house/member/householdLabel.vue
index e2b1649..63eebf8 100644
--- a/subPackage/house/member/householdLabel.vue
+++ b/subPackage/house/member/householdLabel.vue
@@ -203,7 +203,7 @@
// 将细类放到一起
this.labelBtnList.forEach(e => {
e.children.forEach(f => {
- if (e.children.length) {
+ if (f.children.length) {
f.children.forEach(k => {
labelChildAll.push(k)
})
@@ -212,7 +212,6 @@
}
})
})
-
if (this.id || this.householdInfo.householdLabelList) {
let householdLabelList = this.householdInfo.householdLabelList
if (householdLabelList.length > 0) {
diff --git a/subPackage/house/member/index.vue b/subPackage/house/member/index.vue
index 941b1bd..abc23af 100644
--- a/subPackage/house/member/index.vue
+++ b/subPackage/house/member/index.vue
@@ -598,19 +598,24 @@
}
if (option.from) {
-
this.from = option.from;
- if (option.from == 'family') {
- if (data.type == 1) {
- this.houseCode = uni.getStorageSync("siteInfo").houseCode
- }
- } else {
+ if (option.from != 'family') {
+ // if (data.type == 1) {
+ // this.houseCode = uni.getStorageSync("siteInfo").houseCode
+ // }
this.id = option.id;
uni.setNavigationBarTitle({
title: "住户信息"
})
this.getHouseholdInfo()
}
+ // } else {
+ // this.id = option.id;
+ // uni.setNavigationBarTitle({
+ // title: "住户信息"
+ // })
+ // this.getHouseholdInfo()
+ // }
}
diff --git a/subPackage/police/people.vue b/subPackage/police/people.vue
index 47a6059..244b109 100644
--- a/subPackage/police/people.vue
+++ b/subPackage/police/people.vue
@@ -173,43 +173,11 @@
})
},
navTo(id, status) {
-
uni.navigateTo({
- url: `peopleDetail?id=${id}`
+ url: `/subPackage/house/member/index?id=${id}&from=search`
})
-
- // uni.navigateTo({
- // url: `./policeSituationDetail?id=${id}`,
- // complete: (res) => {
- // console.log(res)
- // }
- // })
- // this.navToDetail(reportType, id)
},
- navToEdit(reportType, id, type) {
- if (reportType == 1) {
- this.$u.func.globalNavigator(`/subPackage/label/bail?id=${id}`)
- } else if (reportType == 2) {
- this.$u.func.globalNavigator(`/subPackage/label/check?id=${id}`)
- } else if (reportType == 5) {
- this.$u.func.globalNavigator(`/subPackage/label/form?id=${id}`)
- }
- },
-
- navToDetail(reportType, id, type) {
- if (reportType == 1) {
- this.$u.func.globalNavigator(`bailReportDetail?id=${id}`)
- } else if (reportType == 7) {
- this.$u.func.globalNavigator(`selfCheckDetail?id=${id}`)
- } else if (reportType == 5) {
- this.$u.func.globalNavigator(`labelReportDetail?id=${id}`)
- } else {
- this.$u.func.globalNavigator(`checkReform?id=${id}`)
- }
-
-
- },
showDateModal() {
this.$refs.dateRane.open();
--
Gitblit v1.9.3