Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
aixianling
2021-12-24 14:39:00 +08:00
60 changed files with 245 additions and 95 deletions

View File

@@ -204,7 +204,7 @@ export default {
this.getTopicList()
console.log(option)
if (option.id) {
uni.setNavigationBarTitle({ title: '编辑活动' })
document.title = '编辑活动'
this.params.id = option.id
this.getDetail()
} else {

View File

@@ -94,7 +94,7 @@ export default {
item.createTime = item.createTime.substring(0, 19)
})
}
uni.setNavigationBarTitle({ title: this.info.userId == this.user.id ? '我的帖子' : 'Ta的帖子' })
document.title = this.info.userId == this.user.id ? '我的帖子' : 'Ta的帖子'
this.$nextTick(() => {
this.pageShow = true
})

View File

@@ -148,7 +148,7 @@ export default {
'isFilingCertificateStatus', 'communityBuildingType', 'yesOrNo', 'BulidResidentType').then(() => {
this.getDetail()
})
uni.setNavigationBarTitle({title: '房屋信息'})
document.title = '房屋信息'
},
methods: {

View File

@@ -48,11 +48,11 @@
</div>
<div class="info-flex">
<span class="label">所属网格</span>
<span class="value">蓝天新城基础网格一</span>
<span class="value">{{detailInfo.community.girdName || ''}}</span>
</div>
<div class="info-flex">
<span class="label">网格管理员</span>
<span class="value">{{detailInfo.build.girdMemberNames}}</span>
<span class="value">{{detailInfo.build.girdMemberNames || ''}}</span>
</div>
<div class="info-flex">
<span class="label">楼栋长</span>
@@ -139,7 +139,7 @@ export default {
this.getCenterLatLng().then(points => {
this.getMarkerCluster(points)
})
uni.setNavigationBarTitle({title: '以房找人'})
document.title = '以房找人'
},
created() {
this.$dict.load("communityBuildingType")

View File

@@ -168,7 +168,7 @@ export default {
'isFilingCertificateStatus', 'communityBuildingType', 'yesOrNo', 'BulidResidentType').then(() => {
this.getBuilding()
})
uni.setNavigationBarTitle({title: '以房找人'})
document.title = '以房找人'
},
methods: {
getSelectList(communityId) {

View File

@@ -37,7 +37,7 @@ export default {
this.$dict.load('BuildLocationStatus').then(() => {
this.getList()
})
uni.setNavigationBarTitle({title: '楼栋列表'})
document.title = '楼栋列表'
uni.$on('updateList', () => {
this.current = 1
this.getList()

View File

@@ -65,7 +65,7 @@ export default {
computed: {...mapState(['user'])},
mounted() {
this.initMap()
uni.setNavigationBarTitle({title: '以房找人'})
document.title = '以房找人'
},
methods: {
initMap() { //初始化地图

View File

@@ -60,7 +60,7 @@ export default {
console.log(this.params)
this.getList()
this.getStatistic()
uni.setNavigationBarTitle({title: '乡村相册'})
document.title = '乡村相册'
},
methods: {

View File

@@ -38,7 +38,7 @@ export default {
this.areaId = this.user.areaId
this.areaName = this.user.areaName
this.getList()
uni.setNavigationBarTitle({title: '乡村相册'})
document.title = '乡村相册'
uni.$on('updateList', () => {
this.getList()
})

View File

@@ -4,7 +4,7 @@
<span class="label">网格选择</span>
<div class="value">
<AiTreePicker :ops="treeList" v-model="form.id" @select="handleSelect">
<div class="grid-name" :style="{ color: form.girdName ? '' : '#c0c4cc' }">{{ form.girdName || '请选择社区居委会' }}
<div class="grid-name" :style="{ color: form.girdName ? '' : '#c0c4cc' }">{{ form.girdName || '请选择网格' }}
<u-icon name="arrow-right" color="#cccccc" size="14"></u-icon>
</div>
</AiTreePicker>
@@ -67,7 +67,7 @@ export default {
this.$dict.load('girdType', 'girdLevel')
this.areaId = this.user.areaId
this.getLeafNodes()
uni.setNavigationBarTitle({title: '网格管理'})
document.title = '网格管理'
},
methods: {
getLeafNodes() {

View File

@@ -1,45 +1,164 @@
<template>
<div class="AppMailList">
<component
:is="component"
@change="onChange"
:params="params">
</component>
<div class="list-content">
<u-index-list :scrollTop="scrollTop" :index-list="indexList">
<div v-for="(letter, index) in indexList" :key="index">
<u-index-anchor :index="letter"/>
<div class="item" v-for="(item, index) in list.filter(e=>e.nameInitials==letter)">
<div class="title">{{item.label}}</div>
<div class="phone-list">
<div class="item-info">
<p>{{item.name}}</p>
<div class="phone">
<span>{{item.type}}</span>{{item.phone}}
</div>
</div>
</div>
<img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(item.phone)" class="phone-icon" >
</div>
</div>
</u-index-list>
</div>
<AiEmpty v-if="!list.length"/>
<!-- <div class="id-list">
<div class="item" v-for="(item, index) in list" :key="index">
<u-index-anchor :index="item.label" />
</div>
</div> -->
<div class="footer-btn" @click="toAddList">我添加的</div>
</div>
</template>
<script>
import Add from './add'
import List from './list'
import MyAddList from './myAddList'
import { mapState } from 'vuex'
export default {
name: 'AppMailList',
appName: '便民通讯录',
name: "AppMailList",
appName: "便民通讯录",
inject: {
root: {}
},
data() {
return {
component: 'List',
params: {}
scrollTop: 0,
list: [],
indexList: []
}
},
components: { Add, List , MyAddList},
computed: { ...mapState(['user']) },
mounted() {
this.getList()
document.title = '便民通讯录'
},
methods: {
onChange(e) {
this.params = e.params
this.component = e.type
}
callPhone(phone) {
uni.makePhoneCall({phoneNumber: phone})
},
getList() {
this.$http.post(`/app/appconvenientaddressbook/list`, null, {
params: {
areaId: this.user.areaId,
isPublic: 1,
resource: "portal",
size: 999
}
}).then(res => {
if (res.code == 0) {
this.indexList = [...new Set(res.data.records.map(e=>e.nameInitials))];
this.list = res.data.records;
}
})
},
toAddList() {
// this.$emit('change', {
// type: 'MyAddList',
// })
uni.navigateTo({url: `./myAddList`})
},
},
onPageScroll(e) {
this.scrollTop = e.scrollTop;
}
}
</script>
<style lang="scss" scoped>
uni-page-body{
height: 100%;
}
.AppMailList{
height: 100%;
.AppMailList {
background-color: #F3F6F9;
.list-content{
padding-bottom: 112px;
// .title{
// padding-left: 48px;
// line-height: 64px;
// font-size: 26px;
// font-family: PingFangSC-Semibold, PingFang SC;
// font-weight: 600;
// color: #999;
// }
.item{
position: relative;
}
.phone-list{
background-color: #fff;
width: 100%;
.item-info{
width: 680px;
padding: 32px 48px;
box-sizing: border-box;
box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.02);
p{
font-size: 32px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #333;
line-height: 44px;
word-break: break-all;
margin-bottom: 8px;
width: 100%;
word-break: break-all;
}
.phone{
font-size: 26px;
font-family: PingFangSC-Regular, PingFang SC;
color: #333;
line-height: 36px;
width: 100%;
word-break: break-all;
span{
display: inline-block;
margin-right: 16px;
color: #999;
}
}
}
}
}
.footer-btn{
width: 100%;
text-align: center;
height: 112px;
line-height: 112px;
background: #3975C6;
box-shadow: 0px 1px 0px 0px #EEEEEE;
position: fixed;
bottom: 0;
left: 0;
font-size: 32px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #FFF;
z-index: 999;
}
::v-deep .u-index-anchor {
top: 0!important;
}
.phone-icon{
width: 40px;
height: 40px;
vertical-align: sub;
position: absolute;
top: 60px;
right: 64px;
}
}
</style>

View File

@@ -78,7 +78,7 @@ export default {
this.getDetail()
}
})
uni.setNavigationBarTitle({title: '新增'})
document.title = '新增'
},
methods: {

View File

@@ -43,7 +43,7 @@ export default {
computed: { ...mapState(['user']) },
mounted() {
this.getList()
uni.setNavigationBarTitle({title: '便民通讯录'})
document.title = '便民通讯录'
},
methods: {
@@ -72,6 +72,9 @@ export default {
uni.navigateTo({url: `./myAddList`})
},
},
onPageScroll(e) {
this.scrollTop = e.scrollTop;
}
}
</script>

View File

@@ -34,7 +34,7 @@ export default {
computed: { ...mapState(['user']) },
mounted() {
this.getList()
uni.setNavigationBarTitle({title: '便民通讯录'})
document.title = '便民通讯录'
uni.$on('updateList', () => {
this.getList()
})

View File

@@ -77,7 +77,7 @@ export default {
computed: {},
watch: {},
onLoad() {
uni.setNavigationBarTitle({ title: '婚丧嫁娶' })
document.title = '婚丧嫁娶'
this.$dict.load('marriageType', 'modeType').then(() => {
this.getCount()
this.getList()

View File

@@ -77,7 +77,7 @@ export default {
computed: {},
watch: {},
onLoad() {
uni.setNavigationBarTitle({ title: '婚丧嫁娶' })
document.title = '婚丧嫁娶'
this.$dict.load('marriageType', 'modeType').then(() => {
this.getCount()
this.getList()

View File

@@ -77,7 +77,7 @@ export default {
computed: {},
watch: {},
onLoad() {
uni.setNavigationBarTitle({ title: '婚丧嫁娶' })
document.title = '婚丧嫁娶'
this.$dict.load('marriageType', 'modeType').then(() => {
this.getCount()
this.getList()

View File

@@ -77,7 +77,7 @@ export default {
computed: {},
watch: {},
onLoad() {
uni.setNavigationBarTitle({ title: '婚丧嫁娶' })
document.title = '婚丧嫁娶'
this.$dict.load('marriageType', 'modeType').then(() => {
this.getCount()
this.getList()

View File

@@ -131,7 +131,7 @@ export default {
},
onShow() {
uni.setNavigationBarTitle({title: '会议通知'})
document.title = '会议通知'
this.$dict.load("meetingNoticeBefore", "meetingNoticeAfter");
this.getData();
},

View File

@@ -145,7 +145,7 @@ export default {
},
onShow() {
uni.setNavigationBarTitle({title: '新增会议'})
document.title = '新增会议'
this.$dict.load("meetingNoticeBefore", "meetingNoticeAfter");
},

View File

@@ -67,7 +67,7 @@ export default {
}
},
onShow() {
uni.setNavigationBarTitle({title: '我发起的'})
document.title = '我发起的'
},
created() {
this.injectJWeixin(['sendChatMessage']).then(() => {

View File

@@ -55,9 +55,7 @@ export default {
onLoad(opt) {
this.index = opt.index
uni.setNavigationBarTitle({
title: opt.index == 0 ? "历史会议" : "草稿箱"
});
document.title = opt.index == 0 ? "历史会议" : "草稿箱"
this.getData();
},

View File

@@ -27,7 +27,7 @@ export default {
}
},
created() {
uni.setNavigationBarTitle({title: '基层办公'})
document.title = '基层办公'
},
methods: {

View File

@@ -32,7 +32,7 @@ export default {
}
},
created() {
uni.setNavigationBarTitle({title: '文明乡风'})
document.title = '文明乡风'
},
methods: {

View File

@@ -32,7 +32,7 @@ export default {
}
},
created() {
uni.setNavigationBarTitle({title: '居民互动'})
document.title = '居民互动'
},
mounted() {
document.title = "居民互动"

View File

@@ -40,7 +40,7 @@ export default {
}
},
created() {
uni.setNavigationBarTitle({title: '基层党建'})
document.title = '基层党建'
},
methods: {

View File

@@ -32,7 +32,7 @@ export default {
}
},
created() {
uni.setNavigationBarTitle({title: '居民管理'})
document.title = '居民管理'
},
methods: {

View File

@@ -202,9 +202,7 @@ export default {
onLoad(query) {
if (query.isFrom) {
this.isFrom = true
uni.setNavigationBarTitle({
title: '风险预警详情'
})
document.title = '风险预警详情'
}
uni.showLoading()
this.$dict.load(['fpType', 'riskEliminationMethod', 'fpRiskType', 'fpYesOrNo']).then(() => {

View File

@@ -97,7 +97,7 @@ export default {
},
computed: { ...mapState(['user']) },
onLoad(o) {
uni.setNavigationBarTitle({ title: '发布活动' })
document.title = '发布活动'
this.id = o.id ? o.id : ''
this.$dict.load('realityStatus').then(() => {
this.areaId = this.user.areaId
@@ -105,11 +105,25 @@ export default {
this.user.phone = this.forms.contactPhone
this.user.name = this.forms.contactPerson
this.getDetail()
})
},
mounted() {},
methods: {
getDetail() {
this.$http.post(`/app/appvillageactivityinfo/queryDetailById?id=${this.id}`).then((res) => {
if (res?.data) {
this.forms = res.data
if (res.data) {
if (res.data.url) {
this.forms.url = JSON.parse(res.data.url || '[]')
}
}
}
})
},
submit() {
if (this.flag) return

View File

@@ -39,7 +39,7 @@ export default {
}
},
onLoad(o) {
uni.setNavigationBarTitle({ title: '发布动态' })
document.title = '发布动态'
this.id = o.id || ''
},
methods: {

View File

@@ -75,7 +75,7 @@ export default {
},
watch: {},
onLoad() {
uni.setNavigationBarTitle({ title: '居民活动' })
document.title = '居民活动'
this.$dict.load(['villageActivityStatus']).then(() => {
this.getList()
})

View File

@@ -101,6 +101,8 @@
<AiEmpty v-else />
</div>
</div>
<div class="fixedBtns" v-if="this.current == 0 && detail.status == 0" @click="toAdd">编辑活动</div>
</div>
<AiFixedBtn>
@@ -135,7 +137,7 @@ export default {
}
},
onLoad(option) {
uni.setNavigationBarTitle({ title: '活动报名' })
document.title = '活动报名'
this.id = option.id
this.$dict.load(['villageActivityStatus']).then(() => {
this.getDetail()
@@ -192,6 +194,10 @@ export default {
}
},
toAdd() {
uni.navigateTo({ url: `./Add?id=${this.id}` })
},
AddPosts() {
uni.navigateTo({ url: `./AddPosts?id=${this.id}` })
},
@@ -252,7 +258,7 @@ export default {
background: #e4e4e4;
}
.header-content {
// padding-bottom: 150px;
// padding-bottom: 80px;
.header-top {
width: 100%;
height: 440px;
@@ -317,7 +323,7 @@ export default {
// background: #fff;
.content-details {
padding: 32px 32px 80px 32px;
padding: 32px 32px 130px 32px;
.font {
margin-top: 32px;
font-size: 30px;
@@ -429,6 +435,19 @@ export default {
}
}
}
.fixedBtns {
position: fixed;
bottom: 0;
width: 100%;
height: 112px;
line-height: 112px;
background: #1365dd;
text-align: center;
font-size: 32px;
font-weight: 500;
color: #ffffff;
}
}
.AiFixedBtn {

View File

@@ -66,7 +66,7 @@ export default {
},
watch: {},
onLoad() {
uni.setNavigationBarTitle({ title: '居民列表' })
document.title = '居民列表'
this.areaId = this.user.areaId
this.getList()
},

View File

@@ -65,7 +65,7 @@ export default {
computed: {},
watch: {},
onLoad(o) {
uni.setNavigationBarTitle({ title: '居民档案' })
document.title = '居民档案'
this.id = o.id
this.$dict.load('householdRelation', 'fileStatus').then(() => {
this.getDetail()

View File

@@ -121,7 +121,7 @@ export default {
computed: {},
watch: {},
onLoad(o) {
uni.setNavigationBarTitle({ title: '家庭成员信息' })
document.title = '家庭成员信息'
this.id = o.id
this.$dict.load('householdRelation', 'nation', 'education', 'maritalStatus', 'politicsStatus', 'militaryStatus', 'faithType', 'job').then(() => {
this.getDetail()

View File

@@ -182,7 +182,7 @@ export default {
},
watch: {},
onLoad() {
uni.setNavigationBarTitle({ title: '居民信息管理' })
document.title = '居民信息管理'
this.getEchart1()
this.areaId = this.user.areaId
},

View File

@@ -101,7 +101,7 @@ export default {
}
},
onLoad() {
uni.setNavigationBarTitle({ title: '添加标签' })
document.title = '添加标签'
},
computed: {
tagsList() {

View File

@@ -83,7 +83,7 @@ export default {
}
},
onLoad() {
uni.setNavigationBarTitle({ title: '居民详情' })
document.title = '居民详情'
this.$dict.load('sex', 'nation', 'education', 'job', 'faithType', 'politicsStatus', 'militaryStatus', 'householdRelation', 'householdName')
},
}

View File

@@ -191,7 +191,7 @@ export default {
},
},
onLoad() {
uni.setNavigationBarTitle({ title: '居民详情' })
document.title = '居民详情'
this.$dict.load('wxCustomerAddWay', 'wxCustomerLogType')
this.getCustomLog(this.top.custom)
this.injectJWeixin('openUserProfile')

View File

@@ -30,7 +30,7 @@ export default {
}
},
onLoad() {
uni.setNavigationBarTitle({ title: '居民详情' })
document.title = '居民详情'
},
computed: {
tabs() {

View File

@@ -75,7 +75,7 @@ export default {
this.forms.areaId = this.user.areaId
this.listName = o.listName
this.getType()
uni.setNavigationBarTitle({title: this.listName})
document.title = this.listName
},
mounted() {},
@@ -140,6 +140,7 @@ export default {
moduleId: this.moduleId,
categoryId: categoryId,
categoryName: categoryName,
contentType: 0
})
.then((res) => {
console.log(333)

View File

@@ -96,7 +96,7 @@ export default {
uni.$on('update', () => {
this.getList()
})
uni.setNavigationBarTitle({title: this.listName})
document.title = this.listName
},
methods: {
previewImage(images, img) {

View File

@@ -48,7 +48,7 @@ export default {
this.id = o.id
this.listName = o.listName
this.getType()
uni.setNavigationBarTitle({title: this.listName})
document.title = this.listName
},
mounted() {},
methods: {

View File

@@ -155,7 +155,7 @@ export default {
computed: { ...mapState(['user']) },
created() {
this.getType()
uni.setNavigationBarTitle({title: '新增人员'})
document.title = '新增人员'
},
methods: {

View File

@@ -94,7 +94,7 @@ export default {
this.getStatistic()
this.getStatisticMon()
this.getUserList()
uni.setNavigationBarTitle({title: '特殊人群管理'})
document.title = '特殊人群管理'
uni.$on('specialPeopleList', () => {
this.getStatistic()
this.getStatisticMon()

View File

@@ -47,7 +47,7 @@ export default {
},
computed: { ...mapState(['user']) },
onLoad(o) {
uni.setNavigationBarTitle({ title: '新增通知公告' })
document.title = '新增通知公告'
this.id = o.id
this.getDetail()
},

View File

@@ -78,7 +78,7 @@ export default {
},
watch: {},
onLoad() {
uni.setNavigationBarTitle({ title: '通知公告' })
document.title = '通知公告'
this.getList()
uni.$on('updateList', () => {
this.current = 1

View File

@@ -33,7 +33,7 @@ export default {
computed: {},
watch: {},
onLoad(o) {
uni.setNavigationBarTitle({ title: '公告详情' })
document.title = '公告详情'
this.id = o.id
this.getDetail()
},

View File

@@ -177,7 +177,7 @@ export default {
this.areaId = this.user.areaId
this.areaName = this.user.areaName
this.getList()
uni.setNavigationBarTitle({title: '视频监控'})
document.title = '视频监控'
// this.getMonitors()
},
mounted() {

View File

@@ -22,7 +22,7 @@ export default {
this.$nextTick(() => {
this.detectOrient()
})
uni.setNavigationBarTitle({title: '视频监控'})
document.title = '视频监控'
},
methods: {

View File

@@ -101,7 +101,7 @@ export default {
...mapState(['user']),
},
onLoad() {
uni.setNavigationBarTitle({ title: '走访慰问' })
document.title = '走访慰问'
this.areaId = this.user.areaId
this.$dict.load('realityStatus').then(() => {
this.getList()

View File

@@ -86,7 +86,7 @@ export default {
computed: { ...mapState(['user']) },
onLoad(o) {
this.id = o.id
uni.setNavigationBarTitle({ title: '新建走访' })
document.title = '新建走访'
this.areaIdProps = this.user.areaId
this.forms.areaId = this.user.areaId
this.$dict.load('realityStatus').then(() => {

View File

@@ -50,7 +50,7 @@ export default {
computed: {},
onLoad(o) {
this.id = o.id
uni.setNavigationBarTitle({ title: '走访详情' })
document.title = '走访详情'
this.$dict.load('realityStatus').then(() => {
this.getDetail()
})

View File

@@ -75,7 +75,7 @@ export default {
computed: {},
created() {
console.log(1)
uni.setNavigationBarTitle({ title: '选择走访慰问对象' })
document.title = '选择走访慰问对象'
this.getDiyList()
},
mounted() {},

View File

@@ -89,7 +89,7 @@ export default {
},
watch: {},
onLoad() {
uni.setNavigationBarTitle({ title: '网上办事' })
document.title = '网上办事'
this.$dict.load('listApprovalStatusHb').then(() => {
this.getList()
})

View File

@@ -237,7 +237,7 @@ export default {
},
},
onLoad(options) {
uni.setNavigationBarTitle({ title: '审批详情' })
document.title = '审批详情'
this.objid = options.id
this.listType = options.listType
this.getDetail()

View File

@@ -18,7 +18,7 @@ export default {
}
},
onLoad(val) {
uni.setNavigationBarTitle({ title: '审批详情' })
document.title = '审批详情'
this.flag = val?.flag == 1
},
methods: {

View File

@@ -101,7 +101,7 @@ export default {
}
},
onLoad(options) {
uni.setNavigationBarTitle({ title: '审批详情' })
document.title = '审批详情'
this.objid = options.id
this.type = options.type

View File

@@ -237,7 +237,7 @@ export default {
},
},
onLoad(options) {
uni.setNavigationBarTitle({ title: '审批详情' })
document.title = '审批详情'
this.objid = options.id
this.listType = options.listType
this.getDetail()

View File

@@ -58,9 +58,7 @@ export default {
onLoad(opt) {
this.index = opt.index
uni.setNavigationBarTitle({
title: opt.index == 0 ? "历史会议" : "草稿箱"
});
document.title = opt.index == 0 ? "历史会议" : "草稿箱"
},
onShow() {
this.getData();