From 5fa1870a958994ca5e8161376d26762a7bdafbbf Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Fri, 15 Dec 2023 19:09:36 +0800
Subject: [PATCH] 公共收益、扫码逻辑修改
---
components/noticeList/noticeList.vue | 2
subPackage/article/list.vue | 40 ++++++++-----
pages/user/center.vue | 9 ++-
static/icon/menu-center-04.png | 0
static/icon/menu-center-03.png | 0
pages/home/index.vue | 35 ++++++++---
subPackage/house/houseNumber/index.vue | 12 +++-
subPackage/workbench/views/cscj.vue | 9 ++
subPackage/workbench/views/csjl.vue | 13 +++
subPackage/house/family/index.vue | 2
static/icon/menu-center-02.png | 0
subPackage/article/detail.vue | 2
12 files changed, 86 insertions(+), 38 deletions(-)
diff --git a/components/noticeList/noticeList.vue b/components/noticeList/noticeList.vue
index c61d51b..ac88877 100644
--- a/components/noticeList/noticeList.vue
+++ b/components/noticeList/noticeList.vue
@@ -6,7 +6,7 @@
<text class="notice-title f-28">{{item.title}}</text>
<view class="flex j-c-s-b a-i-c">
<view class="flex a-i-c">
- <tag-cell :text="item.dictValue" />
+ <tag-cell v-if="item.dictValue" :text="item.dictValue" />
<view class="flex a-i-c">
<u-icon name="eye-fill" size="14" color="#CECECE"></u-icon>
<text class="f-24 c-99 ml-5">{{item.viewNumber}}</text>
diff --git a/pages/home/index.vue b/pages/home/index.vue
index f63ec74..a386c99 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -177,6 +177,9 @@
} from "@/common/setting"
import noticeList from "@/components/noticeList/noticeList";
import captionRow from "@/components/caption/caption.vue"
+
+ import { getPublicSecurityDetail } from "@/api/grid/grid.js"
+
export default {
components: {
noticeList,
@@ -316,7 +319,7 @@
{
title: "公共收益",
icon: "/static/icon/nav-15.png",
- path: ""
+ path: "/subPackage/article/list?type=1"
}
]
@@ -720,23 +723,21 @@
console.log(obj)
if (obj.stdId == "3C77B40EFC5F4C899AA74BEE747D9DF1") {
eventType = 1;
- }
- if (obj.stdId == "CDF5528D617342228F3C84EF5C3C8780") {
- eventType = 2;
- }
- if (eventType) {
that.$u.func.globalNavigator(
`/subPackage/house/houseNumber/index?stdId=${obj.stdId}&eventType=${eventType}`,
"navTo")
- } else {
+ }else if (obj.stdId == "CDF5528D617342228F3C84EF5C3C8780"){
+ eventType = 2;
that.$u.func.globalNavigator(
- `/subPackage/house/houseNumber/index?stdId=${obj.stdId}`, "navTo")
+ `/subPackage/house/houseNumber/index?stdId=${obj.stdId}&eventType=${eventType}`,
+ "navTo")
+ }else {
+ that.getHouseType(obj.stdId);
}
-
+
//"3C77B40EFC5F4C899AA74BEE747D9DF1"
// let url = "/subPackage/workbench/views/cscj?stdId=" + obj.stdId
// let url = "/subPackage/workbench/views/cscj?houseCode=" + obj.stdId
-
// let url = `/subPackage/house/houseNumber/index?stdId=${obj.stdId}`
// that.$u.func.globalNavigator(url, "navTo")
}
@@ -757,6 +758,20 @@
}
return obj
},
+
+ getHouseType(code){
+ getPublicSecurityDetail({
+ addressCode:code
+ }).then(res=>{
+ console.log(res)
+ if(res.data.doorplateType == "户室牌"){
+ this.$u.func.globalNavigator(`/subPackage/house/roomDetails/index?id=${code}`,"navTo")
+ }else if (res.data.addressLevel == 4){
+ this.$u.func.globalNavigator(
+ `/subPackage/house/houseNumber/index?stdId=${code}`, "navTo")
+ }
+ })
+ }
}
}
</script>
diff --git a/pages/user/center.vue b/pages/user/center.vue
index 80073c4..029647b 100644
--- a/pages/user/center.vue
+++ b/pages/user/center.vue
@@ -303,13 +303,16 @@
margin: 18rpx;
.icon {
- width: 50rpx;
- height: 50rpx;
+ width: 52rpx;
+ height: 52rpx;
margin-right: 22rpx;
}
}
/deep/ .u-cell__title-text{
- font-size:26rpx !important;
+ font-size:28rpx !important;
+ font-family: PingFang SC;
+ font-weight: 500;
+ color: #585b61;
}
</style>
diff --git a/static/icon/menu-center-02.png b/static/icon/menu-center-02.png
index ceb5acc..7c62437 100644
--- a/static/icon/menu-center-02.png
+++ b/static/icon/menu-center-02.png
Binary files differ
diff --git a/static/icon/menu-center-03.png b/static/icon/menu-center-03.png
index a351922..ea0715b 100644
--- a/static/icon/menu-center-03.png
+++ b/static/icon/menu-center-03.png
Binary files differ
diff --git a/static/icon/menu-center-04.png b/static/icon/menu-center-04.png
index 9959c76..e7061a8 100644
--- a/static/icon/menu-center-04.png
+++ b/static/icon/menu-center-04.png
Binary files differ
diff --git a/subPackage/article/detail.vue b/subPackage/article/detail.vue
index 860aefd..54bbc1c 100644
--- a/subPackage/article/detail.vue
+++ b/subPackage/article/detail.vue
@@ -10,7 +10,7 @@
<text class="f-22 ml-10">120</text>
</view> -->
<view class="flex a-i-c">
- <tag-cell :text="detailInfo.dictValue"></tag-cell>
+ <tag-cell v-if="detailInfo.dictValue" :text="detailInfo.dictValue"></tag-cell>
<view class="flex a-i-c ml-20">
<u-icon name="eye-fill" color="#CECECE"></u-icon>
<text class="f-22 ml-10">{{detailInfo.viewNumber}}</text>
diff --git a/subPackage/article/list.vue b/subPackage/article/list.vue
index 3fb310d..344401b 100644
--- a/subPackage/article/list.vue
+++ b/subPackage/article/list.vue
@@ -1,7 +1,7 @@
<template>
<view class="">
<z-paging ref="paging" v-model="list" :auto="false" @query="queryList" @onRefresh="refreshList" loading-more-no-more-text="没有更多了">
- <view class="tab" slot="top">
+ <view class="tab" slot="top" v-show="tabList.length">
<u-tabs :list="tabList" :current="tabIndex" keyName="dictValue" @change="changeTab"
:inactiveStyle="{color:'#999999'}" :activeStyle="{color:'#017BFC'}"></u-tabs>
</view>
@@ -31,24 +31,32 @@
list: [],
currentPage: 1,
loadingStatus: 'nomore',
- eventType: ""
+ eventType: "",
+ type:""
}
},
onLoad(option) {
+ console.log(option);
if (option.type) {
- this.eventType = option.type;
- if (option.type == 0) {
- this.tabList = [{
- dictKey: "",
- dictValue: "公益报名"
- }]
- } else {
- this.tabList = [{
- dictKey: "",
- dictValue: "选举调查"
- }]
- }
+ // this.eventType = option.type;
+ // if (option.type == 0) {
+ // this.tabList = [{
+ // dictKey: "",
+ // dictValue: "公益报名"
+ // }]
+ // } else {
+ // this.tabList = [{
+ // dictKey: "",
+ // dictValue: "选举调查"
+ // }]
+ // }
// this.getNoticeList()
+ uni.setNavigationBarTitle({
+ title:"公共收益"
+ })
+ this.type = option.type;
+ this.$refs.paging.reload();
+
} else {
this.getCateList()
}
@@ -82,6 +90,7 @@
dictKey: "",
dictValue: "全部"
})
+
this.tabList = data;
// this.tabId = data[0].dictKey;
// this.getNoticeList()
@@ -95,7 +104,8 @@
current: pageNo,
size: pageSize,
articleType: this.tabId,
- eventType: this.eventType
+ eventType: this.eventType,
+ type:this.type
}).then(res => {
this.$refs.paging.complete(res.data.records);
})
diff --git a/subPackage/house/family/index.vue b/subPackage/house/family/index.vue
index 554fd72..f633d96 100644
--- a/subPackage/house/family/index.vue
+++ b/subPackage/house/family/index.vue
@@ -326,7 +326,7 @@
box-sizing: border-box;
// background-color: #FAFBFE;
// background-color: rgb(236, 244, 255);
- background-color: #F4F4F4;
+ background-color: #F8F8F8;
margin: 6rpx;
&>view {
diff --git a/subPackage/house/houseNumber/index.vue b/subPackage/house/houseNumber/index.vue
index 99562c9..279caef 100644
--- a/subPackage/house/houseNumber/index.vue
+++ b/subPackage/house/houseNumber/index.vue
@@ -213,12 +213,15 @@
addressType:2,
placeId:"",
eventType:0 ,//历史事件类型 1邻里纠纷 2噪音扰民
- neiName:"" //社区名称
+ neiName:"" ,//社区名称
+ placeName:"" //场所名称
}
},
onLoad(option) {
this.stdId = option.stdId
- this.addressType = option.addressType
+ if(option.addressType){
+ this.addressType = option.addressType
+ }
if(this.addressType ==4){
this.placeId = this.stdId
}
@@ -253,6 +256,7 @@
return
}
if(data){
+ this.placeName = data.placeName;
const doorplateAddressEntity = data?.doorplateAddressEntity || {}
const placePoiLabelVOList = data?.placePoiLabelVOList || {}
@@ -332,7 +336,9 @@
this.$u.func.globalNavigator(`/subPackage/workbench/views/cscj?houseCode=${this.stdId}&addressType=${this.addressType}`)
},
csjlClick() {
- this.$u.func.globalNavigator('/subPackage/workbench/views/csjl?stdId=' + this.stdId)
+ let url = `/subPackage/workbench/views/csjl?stdId=${this.stdId}&name=${this.placeName}&from=place`
+ // this.$u.func.globalNavigator('/subPackage/workbench/views/csjl?stdId=' + this.stdId)
+ this.$u.func.globalNavigator(url)
},
navToEventDetail(){
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index 4966ddc..9492754 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -200,7 +200,9 @@
imageUrls: "",
placeName: "",
username: '',
- phone: ''
+ phone: '',
+ lat:'',
+ lng:''
},
rules: {
// 'buildingCode': {
@@ -397,7 +399,7 @@
},
onShow() {
this.getLabel()
- this.getLocation()
+ // this.getLocation()
},
methods: {
@@ -511,6 +513,9 @@
}
}
})
+
+
+ this.form.jwd = `${Number(data.lat).toFixed(6)},${Number(data.lng).toFixed(6)}`
this.form.building = arr.join("")
setTimeout(() => {
diff --git a/subPackage/workbench/views/csjl.vue b/subPackage/workbench/views/csjl.vue
index 2993773..8b96655 100644
--- a/subPackage/workbench/views/csjl.vue
+++ b/subPackage/workbench/views/csjl.vue
@@ -1,6 +1,6 @@
<template>
<view class="container">
- <u-sticky>
+ <u-sticky v-if="from == 'home'">
<view class="tabsAndSearch">
<view class="tabs">
<u-tabs :list="tabsList" @click="tabClick" :inactiveStyle="{color:'#999999'}"
@@ -65,9 +65,18 @@
},
tabsType: 0,
status: 'nomore',
- currentRole: {}
+ currentRole: {},
+ from:"home" //页面跳入来源
}
},
+ onLoad(option){
+ if(option.from){
+ this.from = option.from;
+ this.iptContext = option.name;
+ // this.getrRecordList(option.name);
+ }
+ },
+
onShow() {
this.recordsData = []
this.currentRole = uni.getStorageSync('activeRole')
--
Gitblit v1.9.3