Skip to content

A
applet
提交 bba16d1b authored 作者: 宋雄's avatar 宋雄
浏览文件
操作

‘完善流程’

上级 6f651d91
隐藏空白字符变更
内嵌 并排
正在显示 包含 644 行增加 和 496 行删除
App.vue
浏览文件 @ bba16d1b
<script>
export default {
globalData: {
currentHouseVerify: false, // 当前小区是否认证
registerInfo: {
propertyName: '',
propertyCode: '',
......
config/api.js
浏览文件 @ bba16d1b
......@@ -146,6 +146,17 @@ export const postcommunityOwnerAddApi = (params = {}, config = {})=> {
})
}
// 编辑房屋认证
export const postcommunityOwnerEditApi = (params = {}, config = {})=> {
return new Promise((resolve, reject)=> {
http.post('/property-community/wechat/communityOwner/edit',
{ ...params },
{ ...config })
.then(res=> { resolve(res) })
.catch(err=> { reject(err) })
})
}
// 获取用户信息
export const queryCommunityRoomByUnitIdApi = (params = {}, config = {})=> {
return new Promise((resolve, reject)=> {
......@@ -487,22 +498,6 @@ export const getHouseDetailApi = (params = {}, config = {})=> {
})
}
// 获取业主房屋列表
// export const getCommunityOwnerApi = (params = {}, config = {})=> {
// return new Promise((resolve, reject)=> {
// http.get('/property-community/wechat/communityOwner/list',
// {
// data: {
// ...params,
// residentPhone: uni.getStorageSync('user_phone')
// },
// ...config
// })
// .then(res=> { resolve(res) })
// .catch(err=> { reject(err) })
// })
// }
// 获取维修员房屋列表
export const getCompanyEmployeeApi = (params = {}, config = {})=> {
return new Promise((resolve, reject)=> {
......@@ -553,6 +548,22 @@ export const queryNoticePageApi = (params = {}, config = {})=> {
})
}
// 获取生活缴费列表
export const communityPaymentApi = (params = {}, config = {})=> {
return new Promise((resolve, reject)=> {
http.get('/property-community/wechat/communityPayment/list',
{
data: {
...params,
residentPhone: uni.getStorageSync('user_phone')
},
...config
})
.then(res=> { resolve(res) })
.catch(err=> { reject(err) })
})
}
// 上传
export const uploadFile = (params = {}, config = {})=> {
return new Promise((resolve, reject)=> {
......
config/index.js
浏览文件 @ bba16d1b
......@@ -43,7 +43,7 @@ http.interceptors.response.use((response) => {
} else {
setTimeout(()=> {
uni.showToast({
title: response.data.content,
title: response.data.message,
icon: 'none',
duration: 2000
})
......
config/server_config.js
浏览文件 @ bba16d1b
......@@ -3,8 +3,8 @@
*/
const serverConfig = {
baseURL: "https://life.cloud.hjxbc.cn",
// baseURL: "http://192.168.0.105:9999",
// baseURL: "http://192.168.0.118:9999",
// baseURL: "http://192.168.0.100:9999",
// baseURL: "http://192.168.0.119:9999",
// baseURL: "http://220.203.25.212:9999", /* 根域名 */
// baseURL: "http://114.67.111.37:8001" /* 根域名 */
}
......
pages.json
浏览文件 @ bba16d1b
......@@ -73,6 +73,7 @@
"path": "pages/housingAudit/index",
"style": {
"navigationBarTitleText": "物业审核",
"navigationStyle": "custom",
"navigationBarBackgroundColor": "#ffffff"
}
},
......
pages/announcement/index.vue
浏览文件 @ bba16d1b
......@@ -6,7 +6,7 @@
<view class="item" :class="{'active': activeStatus === 'not'}" @click="onLoadMessage('not')">未读<image src="../../static/images/icon_press02.png" class="icon"></image></view>
<view class="item" :class="{'active': activeStatus === 'yes'}" @click="onLoadMessage('yes')">已读<image src="../../static/images/icon_press02.png" class="icon"></image></view>
</view>
<view class="list">
<view class="list" v-if="activeList.length">
<view class="item" :class="{'noRead' : item.readStatus === '2'}" v-for="item in activeList" :key="item.id" @click="toDetails(item.id)">
<image mode="aspectFill" :src="item.noticeImage" class="icon"></image>
<view class="con">
......@@ -16,6 +16,7 @@
</view>
</view>
</view>
<no-data :show="activeList.length === 0" text="暂无数据"></no-data>
</view>
</view>
</template>
......@@ -23,7 +24,9 @@
<script>
import {queryNoticePageApi} from '@/config/api.js'
import serverConfig from '@/config/server_config.js';
import noData from '@/components/no-data/no-data'
export default {
components: {noData},
data() {
return {
activeStatus: '',
......@@ -95,7 +98,10 @@
if(this.activeStatus === 'yes' && this.yseList.length === 0) this.getList()
}
},
onLoad() {
onShow() {
this.allList = []
this.yseList = []
this.notList = []
this.getList()
}
}
......@@ -186,6 +192,12 @@
.name {
font-size: 30rpx;
color: #373737;
overflow : hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
word-break: break-all; /* 追加这一行代码 */
.tag {
font-size: 22rpx;
......
pages/announcementDetails/index.vue
浏览文件 @ bba16d1b
......@@ -56,8 +56,8 @@
.title {
font-size: 36rpx;
color: #373737;
margin-top: 20rpx;
font-weight: bold;
word-break: break-all;
.tag {
font-size: 22rpx;
......
pages/community/index.vue
浏览文件 @ bba16d1b
......@@ -4,9 +4,8 @@
<view class="search">
<uni-search-bar placeholder="请输入您的小区名" bgColor="#EEEEEE" @confirm="search" @cancel="cancel" />
<view class="list">
<view class="item" :class="{'active': item.platformCode === currentHouseCode}" @click="onChangeHouse(item)" v-for="item in houseList" :key="item.platformCode">
{{item.platformName}}
{{item.auditStatus}}
<view class="item" :class="{'active': item.communityCode === currentHouseCode}" @click="onChangeHouse(item)" v-for="item in houseList" :key="item.communityCode">
{{item.communityName}}
</view>
</view>
</view>
......@@ -15,6 +14,7 @@
</template>
<script>
import { getCompanyListApi } from '@/config/api.js'
let houseAllList = []
export default {
data() {
......@@ -24,9 +24,16 @@
}
},
methods: {
async getList() {
let {result} = await getCompanyListApi()
houseAllList = result
this.houseList = [...result]
},
onChangeHouse(item) {
if(item.platformCode === this.currentHouseCode) return
uni.setStorageSync('platform_code', item.platformCode)
getApp().globalData.registerInfo = {}
if(item.communityCode === this.currentHouseCode) return
uni.setStorageSync('platform_code', item.communityCode)
uni.setStorageSync('platform_name', item.communityName)
uni.reLaunch({
url: '/pages/home/index'
})
......@@ -42,9 +49,14 @@
},
onLoad() {
this.currentHouseCode = uni.getStorageSync('platform_code')
let data = uni.getStorageSync('user_house_list')
houseAllList = JSON.parse(data)
this.houseList = [...houseAllList]
let type = uni.getStorageSync('user_type')
if(type === '1') {
this.getList()
} else {
let data = uni.getStorageSync('user_house_list')
houseAllList = JSON.parse(data)
this.houseList = [...houseAllList]
}
}
}
</script>
......
pages/home/index.vue
浏览文件 @ bba16d1b
......@@ -4,10 +4,10 @@
<view class="nav-top-box" @click="toCommunity()">
<view class="nav-top" v-if="houseInfo.platformName">
<view class="title">{{houseInfo.platformName}}</view>
<image v-if="canChange" mode="aspectFill" src="../../static/images/icon_up.png" class="icon"></image>
<image mode="aspectFill" src="../../static/images/icon_up.png" class="icon"></image>
</view>
<view class="nav-top" v-else>
<view class="title" @click="quickEntry">请认证</view>
<view class="title" @click="quickEntry">{{waitList.length ? '认证中…' : '请认证'}}</view>
</view>
</view>
<view class="banner">
......@@ -61,6 +61,10 @@
<image src="../../static/images/quick07.png" class="icon"></image>
<text>缴纳物业费</text>
</view>
<view class="item" @click="quickEntry(8)">
<image src="../../static/images/quick08.png" class="icon"></image>
<text>个人收据</text>
</view>
</view>
<template v-if="userType === '1'">
<view v-if="communityInfo.adminPhone" class="housekeeper">
......@@ -111,12 +115,13 @@
</view>
<no-data :show="maintenanceList.length === 0" :isFull="false" text="暂无维修信息"></no-data>
</view>
<view v-if="noticeList.length" class="news">
<view class="news">
<view class="title">
<text>社区活动公告</text>
<image src="../../static/images/icon_more.png" class="icon"></image>
</view>
<view class="list">
<view class="list" v-if="noticeList.length">
<view class="item" v-for="item in noticeList" :key="item.id" @click="onJump(`/pages/announcementDetails/index?id=${item.id}`)">
<image :src="item.coverImg" class="icon"></image>
<view class="con">
......@@ -125,6 +130,7 @@
</view>
</view>
</view>
<no-data :show="noticeList.length === 0" :isFull="false" text="暂无活动公告"></no-data>
</view>
<authorization-modal ref="authorization" @loginEnd="onLoginEnd" @refuse="onRefuse" />
......@@ -142,7 +148,6 @@
getAdvertisementApi,
getommunityRepairApi,
editCommunityComplaintApi,
// getCommunityOwnerApi,
getCompanyEmployeeApi
} from '@/config/api.js'
import {Moment} from '@/utils/moment.js'
......@@ -159,11 +164,11 @@
statusBarHeight: 24,
userType: '0', // 1：业主，2：维修员
houseList: [], // 审核通过的小区列表
houseInfo: {}, // 当前小区信息
waitList: [], // 待审核或已驳回列表
houseKey: 0,
neverRegister: false,
// neverRegister: false,
bannerList: [],
......@@ -186,14 +191,8 @@
}
},
computed: {
houseInfo() {
return this.houseList[this.houseKey] || {}
},
isRefuse() {
return this.waitList.some(item=>item.auditStatus === 'refuse')
},
canChange() {
return this.houseList.length > 1
}
},
methods: {
......@@ -202,113 +201,132 @@
pageNo: 1,
pageSize: 10
})
this.bannerList = result.records.map(item=> {
let bannerList = result.records.map(item=> {
return {
...item,
imageUrl: serverConfig.baseURL + '/sys/common/static/' + item.advImageUrl
}
})
if(bannerList.length === 0) {
this.bannerList.push({
id: '123423423',
imageUrl: 'http://220.203.25.212:9999/sys/common/static/scott/pic/default-banner_1687744953805.jpg'
})
} else {
this.bannerList = bannerList
}
},
toCommunity() {
if(this.houseList.length <= 1) return
uni.navigateTo({
url: '/pages/community/index',
});
if(this.houseInfo.platformCode) {
uni.navigateTo({
url: `/pages/community/index?code=${this.houseInfo.platformCode}`
});
}
},
quickEntry(type) {
let isLogin = uni.getStorageSync('openid')
if (!!isLogin) {
if(this.neverRegister) { // 登录了但是还未认证
if(type == 2) {
let currentHouseVerify = getApp().globalData.currentHouseVerify
if(currentHouseVerify) {
if (type == 1) {
uni.navigateTo({
url: '/pages/housing/index',
url: '/pages/message/index?id=' + this.houseInfo.id
});
} else {
uni.showToast({
icon: "none",
title: '暂未查到业主信息，请认证！'
})
if(timer) clearTimeout(timer)
timer = null
timer = setTimeout(()=> {
} else if (type == 2) {
if(this.waitList.length) {
uni.navigateTo({
url: '/pages/housing/index',
url: `/pages/housingAudit/index?id=${this.waitList[0].id}`
});
}, 1500)
} else {
if(flag === '1') {
uni.showToast({
icon: "none",
title: "您的房屋认证正在审核中，请稍等!"
})
// uni.redirectTo({
// url: '/pages/housingResidents/index',
// })
} else {
uni.navigateTo({
url: '/pages/housing/index'
});
}
}
} else if (type == 3) {
uni.navigateTo({
url: '/pages/payCost/index',
});
} else if (type == 4) {
uni.navigateTo({
url: '/pages/maintenance/index'
});
} else if (type == 5) {
uni.navigateTo({
url: '/pages/complaints/index'
});
} else if (type == 6) {
uni.navigateTo({
url: '/pages/announcement/index'
});
} else if (type == 7) {
uni.navigateTo({
url: '/pages/payCostProperty/index'
});
} else if (type == 8) {
uni.navigateTo({
url: '/pages/myReceipt/index'
});
}
} else {
if(this.houseList.length) {
if (type == 1) {
let id = this.houseList[this.houseKey].id
if(this.waitList.length) {
if(type == 2) {
uni.navigateTo({
url: '/pages/message/index?id=' + id
url: `/pages/housingAudit/index?id=${this.waitList[0].id}`
});
} else if (type == 2) {
if(this.waitList.length) {
uni.navigateTo({
url: `/pages/housingAudit/index?id=${this.waitList[0].id}`
});
} else {
if(this.isRefuse) {
uni.showToast({
icon: "none",
title: "您的房屋认证已被驳回，请确认!"
})
if(timer) clearTimeout(timer)
timer = null
timer = setTimeout(()=> {
uni.navigateTo({
url: `/pages/housingAudit/index?id=${this.waitList[0].id}`
});
}, 1500)
} else {
let flag = uni.getStorageSync('current_house_verify')
if(flag === '1') {
uni.showToast({
icon: "none",
title: "您的房屋认证正在审核中，请稍等!"
})
// uni.redirectTo({
// url: '/pages/housingResidents/index',
// })
} else {
uni.showToast({
icon: "none",
title: "您的房屋认证正在审核中，请稍等!"
})
if(timer) clearTimeout(timer)
timer = null
timer = setTimeout(()=> {
uni.navigateTo({
url: '/pages/housing/index'
url: `/pages/housingAudit/index?id=${this.waitList[0].id}`
});
}
}, 1500)
}
} else if (type == 3) {
uni.navigateTo({
url: '/pages/payCost/index',
});
} else if (type == 4) {
uni.navigateTo({
url: '/pages/maintenance/index'
});
} else if (type == 5) {
uni.navigateTo({
url: '/pages/complaints/index'
});
} else if (type == 6) {
uni.navigateTo({
url: '/pages/announcement/index'
});
} else if (type == 7) {
uni.navigateTo({
url: '/pages/payCostProperty/index'
});
}
} else {
if(this.isRefuse) { // 已驳回
if(type == 2) {
uni.navigateTo({
url: '/pages/housing/index',
});
} else {
uni.showToast({
icon: "none",
title: "您的房屋认证已被驳回，请确认!"
title: '暂未查到业主信息，请认证！'
})
if(timer) clearTimeout(timer)
timer = null
timer = setTimeout(()=> {
uni.navigateTo({
url: `/pages/housingAudit/index?id=${this.waitList[0].id}`
url: '/pages/housing/index',
});
}, 1500)
} else {
if(type == 2) {
uni.navigateTo({
url: `/pages/housingAudit/index?id=${this.waitList[0].id}`
});
} else {
uni.showToast({
icon: "none",
title: "您的房屋认证正在审核中，请稍等!"
})
}
}
}
}
......@@ -335,50 +353,59 @@
if(type) {
let platformCode = uni.getStorageSync('platform_code')
if(type === '1') { // 进入小区
let houseData = result.communityOwners
if(houseData.length) { // 用户有小区
this.userType = '1'
uni.setStorageSync('user_type', '1')
let houseList = houseData.filter(item=>item.auditStatus === 'auditPass')
if(houseList.length) {
let mapHoust = houseList.filter((item, index)=> {
return (houseList.findIndex(row=>row.platformCode === item.platformCode) === index)
})
let houseKey = mapHoust.findIndex(item=>item.platformCode === platformCode)
this.houseKey = houseKey === -1 ? 0 : houseKey
uni.setStorageSync('user_name', mapHoust[this.houseKey].residentName)
uni.setStorageSync('user_avatar', mapHoust[this.houseKey].avatar || '')
this.houseList = mapHoust.map(item=> {
return {
id: item.id,
platformCode: item.platformCode,
platformName: item.platformName
}
})
uni.setStorageSync('user_house_list', JSON.stringify(this.houseList))
uni.setStorageSync('platform_code', this.houseList[this.houseKey].platformCode)
let houseData = result.communityOwners.filter(item=>item.platformCode === platformCode)
this.waitList = houseData.filter(item=>item.auditStatus !== 'auditPass')
if(houseData.length) { // 用户当前小区有房屋认证
let passHouse = houseData.filter(item=> item.auditStatus === 'auditPass')
if(passHouse.length) { // 登录时拿到已经验证的
this.userType = '1'
getApp().globalData.currentHouseVerify = true
uni.setStorageSync('user_name', passHouse[0].residentName)
uni.setStorageSync('user_avatar', passHouse[0].avatar || '')
this.houseInfo = {
id: passHouse[0].id,
platformCode: passHouse[0].platformCode,
platformName: passHouse[0].platformName
}
uni.setStorageSync('platform_name', passHouse[0].platformName)
this.getCommunityInfo()
this.getAdvertisement()
}
this.waitList = houseData.filter(item=>item.auditStatus !== 'auditPass')
if(result.employeeVos) { // 是否有维修员
uni.setStorageSync('employee_code', result.employeeVos.comList[0].comCode)
} else {
getApp().globalData.currentHouseVerify = false
this.userType = '0'
let platformName = uni.getStorageSync('platform_name')
this.houseInfo = {
platformCode: platformCode,
platformName: platformName
}
uni.removeStorageSync('user_name')
uni.removeStorageSync('user_avatar')
}
} else { // 用户没有小区
this.userType = '0'
uni.removeStorageSync('user_type')
uni.removeStorageSync('current_house_verify')
// this.neverRegister = true
getApp().globalData.currentHouseVerify = false
this.userType = '0'
let platformName = uni.getStorageSync('platform_name')
this.houseInfo = {
platformCode: platformCode,
platformName: platformName
}
uni.removeStorageSync('user_name')
uni.removeStorageSync('user_avatar')
uni.showToast({
icon: "none",
title: '暂未查到业主信息，请认证！'
})
if(timer) clearTimeout(timer)
timer = null
timer = setTimeout(()=> {
uni.navigateTo({
url: '/pages/housing/index',
});
}, 1500)
// if(timer) clearTimeout(timer)
// timer = null
// timer = setTimeout(()=> {
// uni.navigateTo({
// url: '/pages/housing/index',
// });
// }, 1500)
}
if(result.employeeVos) { // 是否有维修员
uni.setStorageSync('employee_code', result.employeeVos.comList[0].comCode)
}
}
if(type === '2') { // 进入设备管理员
......@@ -389,15 +416,19 @@
uni.setStorageSync('user_avatar', result.employeeVos.employeeAvatar)
let employeeData = result.employeeVos.comList
let houseKey = employeeData.findIndex(item=>item.comCode === platformCode)
this.houseKey = houseKey === -1 ? 0 : houseKey
this.houseList = employeeData.map(item=> {
houseKey = houseKey === -1 ? 0 : houseKey
this.houseInfo = {
platformCode: employeeData[houseKey].comCode,
platformName: employeeData[houseKey].comName
}
let houseList = employeeData.map(item=> {
return {
platformCode: item.comCode,
platformName: item.comName
communityCode: item.comCode,
communityName: item.comName
}
})
uni.setStorageSync('user_house_list', JSON.stringify(this.houseList))
uni.setStorageSync('platform_code', this.houseList[this.houseKey].platformCode)
uni.setStorageSync('platform_code', employeeData[houseKey].comCode)
uni.setStorageSync('user_house_list', JSON.stringify(houseList))
this.getAdvertisement()
this.getMaintenanceList() // 获取待结单列表
} else {
......@@ -417,36 +448,37 @@
} else { // 登录后首次进入
let houseData = result.communityOwners
if(houseData.length) {
this.userType = '1'
uni.setStorageSync('user_type', '1')
let houseList = houseData.filter(item=>item.auditStatus === 'auditPass')
if(houseList.length) {
let mapHoust = houseList.filter((item, index)=> {
return (houseList.findIndex(row=>row.platformCode === item.platformCode) === index)
})
uni.setStorageSync('user_name', mapHoust[0].residentName)
uni.setStorageSync('user_avatar', mapHoust[0].avatar || '')
this.houseKey = 0
this.houseList = mapHoust.map(item=> {
return {
id: item.id,
platformCode: item.platformCode,
platformName: item.platformName
}
})
uni.setStorageSync('user_house_list', JSON.stringify(this.houseList))
uni.setStorageSync('platform_code', this.houseList[0].platformCode)
let passHouse = houseData.filter(item=> item.auditStatus === 'auditPass')
if(passHouse.length) { // 第一次登录时有已验证的
getApp().globalData.currentHouseVerify = true
this.userType = '1'
uni.setStorageSync('user_name', passHouse[0].residentName)
uni.setStorageSync('user_avatar', passHouse[0].avatar || '')
this.houseInfo = {
id: passHouse[0].id,
platformCode: passHouse[0].platformCode,
platformName: passHouse[0].platformName
}
uni.setStorageSync('platform_code', passHouse[0].platformCode)
uni.setStorageSync('platform_name', passHouse[0].platformName)
this.waitList = houseData.filter(item=>(item.auditStatus !== 'auditPass' && item.platformCode === passHouse[0].platformCode))
this.getCommunityInfo()
this.getAdvertisement()
} else {
getApp().globalData.currentHouseVerify = false
this.houseInfo = {
id: houseData[0].id,
platformCode: houseData[0].platformCode,
platformName: houseData[0].platformName
}
uni.setStorageSync('platform_code', houseData[0].platformCode)
uni.setStorageSync('platform_name', houseData[0].platformName)
this.waitList = houseData.filter(item=>(item.auditStatus !== 'auditPass' && item.platformCode === houseData[0].platformCode))
}
this.waitList = houseData.filter(item=>item.auditStatus !== 'auditPass')
}
if(result.employeeVos) {
if(houseData.length === 0) {
// let userType = uni.getStorageSync('user_type')
// if(userType) { // 设备管理员没有小区时候切换到小区
// this.neverRegister = true
// } else {}
this.userType = '2'
uni.setStorageSync('user_type', '2')
uni.setStorageSync('user_name', result.employeeVos.employeeName)
......@@ -459,7 +491,6 @@
}
})
this.houseKey = 0
uni.setStorageSync('user_house_list', JSON.stringify(this.houseList))
uni.setStorageSync('platform_code', this.houseList[0].platformCode)
this.getAdvertisement()
this.getMaintenanceList() // 获取待结单列表
......@@ -467,15 +498,14 @@
uni.setStorageSync('employee_code', result.employeeVos.comList[0].comCode)
}
}
if(houseData.length === 0 && !result.employeeVos) {
this.neverRegister = true
}
// if(houseData.length === 0 && !result.employeeVos) {
// this.neverRegister = true
// }
}
}
},
async getCommunityInfo() {
let id = this.houseList[this.houseKey].id
let {result} = await getCommunityInfoApi({userId: id})
let {result} = await getCommunityInfoApi({userId: this.houseInfo.id})
let communityInfo = {
notPay: result.notPay,
noticeNotRead: result.noticeNotRead,
......@@ -485,77 +515,8 @@
}
this.communityInfo = {...communityInfo}
},
async getUserHouse() {
let {result} = await getCommunityOwnerApi()
let platformCode = uni.getStorageSync('platform_code')
let type = uni.getStorageSync('user_type')
let houseData = result.records
if(type === '1') {
if(houseData.length) {
this.userType = '1'
let houstLists = houseData.filter(item=>item.auditStatus === 'auditPass')
if(houstLists.length) {
let mapHoust = houstLists.filter((item, index)=> {
return (houstLists.findIndex(row=>row.platformCode === item.platformCode) === index)
})
let houseKey = mapHoust.findIndex(item=>item.platformCode === platformCode)
this.houseKey = houseKey === -1 ? 0 : houseKey
uni.setStorageSync('user_name', mapHoust[this.houseKey].residentName)
uni.setStorageSync('user_avatar', mapHoust[this.houseKey].avatar || '')
this.houseList = mapHoust.map(item=> {
return {
id: item.id,
platformCode: item.platformCode,
platformName: item.platformName
}
})
uni.setStorageSync('user_house_list', JSON.stringify(this.houseList))
uni.setStorageSync('platform_code', this.houseList[this.houseKey].platformCode)
this.getCommunityInfo()
this.getAdvertisement()
}
this.waitList = houseData.filter(item=>item.auditStatus !== 'auditPass')
} else {
this.neverRegister = true
}
}
if(type === '2') {
if(houseData.length) {
this.userType = '2'
let houseKey = houseData.findIndex(item=>item.platformCode === platformCode)
this.houseKey = houseKey === -1 ? 0 : houseKey
uni.setStorageSync('user_name', mapHoust[this.houseKey].residentName)
uni.setStorageSync('user_avatar', mapHoust[this.houseKey].avatar || '')
this.houseList = mapHoust.map(item=> {
return {
platformCode: item.platformCode,
platformName: item.platformName
}
})
uni.setStorageSync('user_house_list', JSON.stringify(this.houseList))
uni.setStorageSync('platform_code', this.houseList[this.houseKey].platformCode)
this.getMaintenanceList()
this.getAdvertisement()
} else {
let _this = this
uni.showModal({
title: '警告',
content: '您的维修员身份已被禁用，请联系管理员',
showCancel: false,
success: function (res) {
if (res.confirm) {
uni.setStorageSync('user_type', '1')
_this.getUserHouse()
}
}
});
}
}
this.getAdvertisement()
},
async getAdvertisement() {
let platformCode = this.houseList[this.houseKey].platformCode
let {result} = await getAdvertisementApi({communityCode: platformCode})
let {result} = await getAdvertisementApi({communityCode: this.houseInfo.platformCode})
this.messageList = result.degreeNotice
this.noticeList = result.companyNotice.map(item=> {
return {
......@@ -859,6 +820,10 @@
border-radius: 16rpx;
margin-top: 30rpx;
/deep/ .nodate-box {
padding: 100rpx 0;
}
.title {
// height: 32rpx;
// line-height: 32rpx;
......@@ -903,6 +868,12 @@
.name {
font-size: 30rpx;
color: #373737;
overflow : hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
word-break: break-all; /* 追加这一行代码 */
}
.time {
......@@ -982,11 +953,11 @@
}
.list {
margin-top: 30rpx;
background: #FFFFFF;
box-shadow: 0rpx 0rpx 25rpx 0rpx rgba(81,89,234,0.06);
border-radius: 16rpx;
padding: 0 30rpx;
margin-top: 30rpx;
background: #FFFFFF;
box-shadow: 0rpx 0rpx 25rpx 0rpx rgba(81,89,234,0.06);
border-radius: 16rpx;
padding: 0 30rpx;
.content {
// margin-top: 30rpx;
// background: #FFFFFF;
......
pages/housing/index.vue
浏览文件 @ bba16d1b
......@@ -32,7 +32,7 @@
<view class="form-item">
<view class="form-item-fl"><view class="asterisk">*</view>物业公司</view>
<view class="form-item-fr">
<picker @change="e=>bindPickerChange(e, 'property')" range-key="propertyName" :value="settledKey" :range="settledList" class="form-item-tit">
<picker style="width:100%;text-align:right;" @change="e=>bindPickerChange(e, 'property')" range-key="propertyName" :value="settledKey" :range="settledList" class="form-item-tit">
<view class="uni-input">{{settledList[settledKey].propertyName || '请选择'}}</view>
</picker>
<uni-icons type="forward" color="#E4E4EA"></uni-icons>
......@@ -41,7 +41,7 @@
<view class="form-item">
<view class="form-item-fl"><view class="asterisk">*</view>小区</view>
<view class="form-item-fr">
<picker @change="e=>bindPickerChange(e, 'company')" range-key="communityName" :value="companyKey" :range="companyList" class="form-item-tit">
<picker style="width:100%;text-align:right;" @change="e=>bindPickerChange(e, 'company')" :disabled="companyList.length === 0" range-key="communityName" :value="companyKey" :range="companyList" class="form-item-tit">
<view class="uni-input">{{companyList[companyKey].communityName || '请选择'}}</view>
</picker>
<uni-icons type="forward" color="#E4E4EA"></uni-icons>
......@@ -50,7 +50,7 @@
<view class="form-item">
<view class="form-item-fl"><view class="asterisk">*</view>房屋</view>
<view class="form-item-fr">
<picker mode="multiSelector" :range="houseList" range-key="name" :value="houseRoomKey" @change="houseKeyChange" @columnchange="colChange" class="form-item-tit">
<picker style="width:100%;text-align:right;" mode="multiSelector" :range="houseList" :disabled="houseList[0].length === 0" range-key="name" :value="houseRoomKey" @change="houseKeyChange" @columnchange="colChange" class="form-item-tit">
<view class="uni-input">{{houseRoomName || '请选择'}}</view>
</picker>
<uni-icons type="forward" color="#E4E4EA"></uni-icons>
......@@ -59,7 +59,7 @@
<view class="form-item">
<view class="form-item-fl">房屋状态</view>
<view class="form-item-fr">
<picker @change="e=>bindPickerChange(e, 'status')" range-key="label" :value="statusKey" :range="statusList" class="form-item-tit">
<picker style="width:100%;text-align:right;" @change="e=>bindPickerChange(e, 'status')" range-key="label" :value="statusKey" :range="statusList" class="form-item-tit">
<view class="uni-input">{{statusList[statusKey].label || '请选择'}}</view>
</picker>
<uni-icons type="forward" color="#E4E4EA"></uni-icons>
......@@ -68,7 +68,7 @@
<view class="form-item">
<view class="form-item-fl">房屋用途</view>
<view class="form-item-fr">
<picker @change="e=>bindPickerChange(e, 'type')" range-key="label" :value="typeKey" :range="typeList" class="form-item-tit">
<picker style="width:100%;text-align:right;" @change="e=>bindPickerChange(e, 'type')" range-key="label" :value="typeKey" :range="typeList" class="form-item-tit">
<view class="uni-input">{{typeList[typeKey].label || '请选择'}}</view>
</picker>
<uni-icons type="forward" color="#E4E4EA"></uni-icons>
......@@ -109,6 +109,7 @@ const house = {
unitName: '',
roomId: '',
roomName: '',
floorSpace: '',
buildingStatus: '',
buildingType: '',
isDefault: 0
......@@ -142,6 +143,7 @@ export default {
house.unitName = this.houseList[1][newV[1]] ? this.houseList[1][newV[1]].name : ''
house.roomId = this.houseList[2][newV[2]] ? this.houseList[2][newV[2]].id : ''
house.roomName = this.houseList[2][newV[2]] ? this.houseList[2][newV[2]].name : ''
house.floorSpace = this.houseList[2][newV[2]] ? this.houseList[2][newV[2]].floorSpace : ''
this.houseRoomName = `${this.houseList[0][newV[0]].name} ${this.houseList[1][newV[1]] ? this.houseList[1][newV[1]].name : ''} ${this.houseList[2][newV[2]] ? this.houseList[2][newV[2]].name : ''}`
},
deep: true
......@@ -178,20 +180,24 @@ export default {
let {result} = await getSettledListApi({}, {custom: {load: false}})
this.settledList = result
if(result.length === 0) {
uni.showToast({
icon: "none",
title: '当前物业公司暂无小区'
})
setTimeout(()=> {
uni.showToast({
icon: "none",
title: '当前物业公司下暂无小区'
})
}, 30)
}
},
async ongetCompanyList(platformCode) {
let {result} = await getCompanyListApi({platformCode}, {custom: {load: false}})
this.companyList = result
if(result.length === 0) {
uni.showToast({
icon: "none",
title: '当前小区下暂无楼栋'
})
setTimeout(()=> {
uni.showToast({
icon: "none",
title: '当前小区下暂无楼栋'
})
}, 30)
}
},
async ongetBuildingList(platformCode) {
......@@ -287,37 +293,92 @@ export default {
}
house.isDefault = this.isDefault ? 1 : 0
let registerInfo = getApp().globalData.registerInfo
house.relationShip = this.statusList[this.statusKey].value
house.certificateType = this.typeList[this.typeKey].value
getApp().globalData.registerInfo = {...registerInfo, ...house}
uni.redirectTo({
uni.navigateTo({
url: '/pages/housingResidents/index',
});
}
},
async onLoad() {
this.ongetSettledList()
this.statusList = await this.ongetDictItems('house_status')
this.typeList = await this.ongetDictItems('house_purpose')
let registerInfo = getApp().globalData.registerInfo
console.log(registerInfo)
if(registerInfo.id) {
house.propertyName = registerInfo.propertyName
house.propertyCode = registerInfo.propertyCode
house.platformName = registerInfo.platformName
house.platformCode = registerInfo.platformCode
house.buildingName = registerInfo.buildingName
house.buildingId = registerInfo.buildingId
house.unitId = registerInfo.unitId
house.unitName = registerInfo.unitName
let propertyList = await getSettledListApi({}, {custom: {load: true}})
this.settledList = propertyList.result
if(registerInfo.propertyCode) this.settledKey = this.settledList.findIndex(item=>item.propertyCode === registerInfo.propertyCode)
house.propertyName = this.settledList[this.settledKey].propertyName
house.propertyCode = this.settledList[this.settledKey].propertyCode
let platformList = await getCompanyListApi({platformCode: registerInfo.propertyCode}, {custom: {load: true}})
this.companyList = platformList.result
if(registerInfo.platformCode) this.companyKey = this.companyList.findIndex(item=>item.communityCode === registerInfo.platformCode)
house.platformName = this.companyList[this.companyKey].communityName
house.platformCode = this.companyList[this.companyKey].communityCode
this.settledKey = 0
let buildingList = await getBuildingListApi({platformCode: registerInfo.platformCode}, {custom: {load: false}})
let buildingLists = buildingList.result.map(item=> {
return {
...item,
name: item.buildingName
}
})
this.houseList[0] = new Array().concat([...buildingLists])
if(buildingLists.length) {
let houseRoomKey = buildingLists.findIndex(item=>item.id === registerInfo.buildingId)
let houseRoomplatformCode = buildingLists[houseRoomKey].platformCode
let houseRoomid = buildingLists[houseRoomKey].id
let communityList = await getCommunityUnitListApi({platformCode: houseRoomplatformCode, id: houseRoomid}, {custom: {load: false}})
let communityLists = communityList.result.map(item=> {
return {
...item,
name: item.unitName
}
})
this.houseList[1] = new Array().concat([...communityLists])
if(communityLists.length) {
let RoomKey = communityLists.findIndex(item=>item.id === registerInfo.unitId)
let platformCode = communityLists[RoomKey].platformCode
let id = communityLists[RoomKey].id
let roomList = await getCommunityRoomListApi({platformCode, id}, {custom: {load: false}})
let houseList = roomList.result.map(item=> {
return {
...item,
name: item.roomNum
}
})
this.houseList[2] = new Array().concat([...houseList])
if(houseList.length) {
let key = houseList.findIndex(item=>item.id === registerInfo.roomId)
this.houseRoomKey = [houseRoomKey, RoomKey, key]
}
}
}
// this.ongetSettledList()
// house.propertyName = registerInfo.propertyName
// house.propertyCode = registerInfo.propertyCode
// house.platformName = registerInfo.platformName
// house.platformCode = registerInfo.platformCode
// house.buildingName = registerInfo.buildingName
// house.buildingId = registerInfo.buildingId
// house.unitId = registerInfo.unitId
// house.unitName = registerInfo.unitName
// house.roomId = registerInfo.roomId
// house.roomName = registerInfo.roomName
// house.buildingStatus = registerInfo.buildingStatus
// house.buildingType = registerInfo.buildingType
this.isDefault = registerInfo.isDefault === 1
this.statusKey = this.statusList.findIndex(item=>item.value === registerInfo.buildingStatus)
house.buildingStatus = this.statusList[this.statusKey].value
this.typeKey = this.typeList.findIndex(item=>item.value === registerInfo.buildingType)
house.buildingType = this.typeList[this.typeKey].value
} else {
this.ongetSettledList()
house.buildingStatus = this.statusList[this.statusKey].value
house.buildingType = this.typeList[this.typeKey].value
}
},
onShow() {
}
}
</script>
......
pages/housingAudit/index.vue
浏览文件 @ bba16d1b
<template>
<view class="container">
<uni-nav-bar :fixed="true" style="width: 100%" :statusBar="true" :border="false" title="物业审核" left-icon="left" @clickLeft="onReturnHome"></uni-nav-bar>
<view class="page">
<view class="housing">
<view class="audit">
......@@ -106,16 +107,18 @@ import {
queryByOpenIddApi,
deleteByOpenIdApi
} from '@/config/api.js'
let isHome = false
export default {
data() {
return {
statusList: [],
typeList: [],
relationShipList: [
{label: '本人', value: '1'},
{label: '租户', value: '2'},
{label: '亲人', value: '3'},
{label: '朋友', value: '4'}
{label: '本人', value: 'self'},
{label: '租户', value: 'tenant'},
{label: '亲人', value: 'relative'},
{label: '朋友', value: 'friend'},
{label: '其他', value: 'other'}
],
certificateList: [
{label: '身份证', value: '1'},
......@@ -168,12 +171,28 @@ export default {
async getHouseInfo(id) {
let {result} = await queryByOpenIddApi({id})
this.userHouse = {...result}
},
onReturnHome() {
if(isHome) {
uni.navigateBack();
} else {
// let registerInfo = getApp().globalData.registerInfo
// if(registerInfo.id) {
// } else {
uni.reLaunch({
url: '/pages/home/index'
});
// }
}
}
},
async onLoad(options) {
if(options.id) {
isHome = true
this.getHouseInfo(options.id)
} else {
isHome = false
let data = getApp().globalData.registerInfo
this.userHouse = {...data}
}
......
pages/housingResidents/index.vue
浏览文件 @ bba16d1b
......@@ -34,7 +34,7 @@
<view class="asterisk">*</view>与业主关系
</view>
<view class="form-item-fr">
<picker mode="selector" @change="e=>bindPickerChange(e, 'relationShip')" range-key="label" :value="relationShipIndex" :range="relationShipList" class="form-item-tit">
<picker style="width:100%;text-align:right;" mode="selector" @change="e=>bindPickerChange(e, 'relationShip')" range-key="label" :value="relationShipIndex" :range="relationShipList" class="form-item-tit">
<view class="uni-input">{{relationShipList[relationShipIndex].label}}</view>
</picker>
<uni-icons type="forward" color="#E4E4EA"></uni-icons>
......@@ -62,7 +62,7 @@
<view class="asterisk"></view>证件类型
</view>
<view class="form-item-fr">
<picker @change="e=>bindPickerChange(e, 'certificate')" range-key="label" :value="certificateIndex" :range="certificateList" class="form-item-tit">
<picker style="width:100%;text-align:right;" @change="e=>bindPickerChange(e, 'certificate')" range-key="label" :value="certificateIndex" :range="certificateList" class="form-item-tit">
<view class="uni-input">{{certificateList[certificateIndex].label}}</view>
</picker>
<uni-icons type="forward" color="#E4E4EA"></uni-icons>
......@@ -113,7 +113,8 @@
<script>
import {
postcommunityOwnerAddApi
postcommunityOwnerAddApi,
postcommunityOwnerEditApi
} from '@/config/api.js'
import {isMoble} from '@/utils/util'
export default {
......@@ -134,10 +135,11 @@ export default {
{ text: '女', value: 2 }
],
relationShipList: [
{label: '本人', value: '1'},
{label: '租户', value: '2'},
{label: '亲人', value: '3'},
{label: '朋友', value: '4'}
{label: '本人', value: 'self'},
{label: '租户', value: 'tenant'},
{label: '亲人', value: 'relative'},
{label: '朋友', value: 'friend'},
{label: '其他', value: 'other'}
],
relationShipIndex: 0,
certificateList: [
......@@ -200,23 +202,58 @@ export default {
this.formData.certificateType = this.certificateList[this.certificateIndex].value
this.formData['auditStatus'] = 'waitAudit'
let data = getApp().globalData.registerInfo
postcommunityOwnerAddApi({ ...data, ...this.formData}).then(res=> {
getApp().globalData.registerInfo = { ...data, ...this.formData}
uni.setStorageSync('current_house_verify', '1') // 当前小区有待审核数据
uni.showToast({
icon: "none",
title: res.message
if(data.id) {
postcommunityOwnerEditApi({ ...data, ...this.formData}).then(res=> {
if(res.code === 200) {
getApp().globalData.registerInfo = { ...data, ...this.formData}
setTimeout(()=> {
uni.showToast({
icon: "none",
title: res.message
})
setTimeout(()=> {
uni.navigateTo({
url: '/pages/housingAudit/index',
});
}, 1500)
}, 30)
}
})
} else {
postcommunityOwnerAddApi({ ...data, ...this.formData}).then(res=> {
if(res.code === 200) {
getApp().globalData.registerInfo = { ...data, ...this.formData}
uni.setStorageSync('user_type', '1')
setTimeout(()=> {
uni.showToast({
icon: "none",
title: res.message
})
setTimeout(()=> {
uni.navigateTo({
url: '/pages/housingAudit/index',
});
}, 1500)
}, 30)
}
})
setTimeout(()=> {
uni.redirectTo({
url: '/pages/housingAudit/index',
});
}, 1500)
})
}
}
},
onLoad() {
this.formData.ownerPhone = this.formData.residentPhone = uni.getStorageSync('user_phone')
let registerInfo = getApp().globalData.registerInfo
if(registerInfo.id) {
this.formData.ownerName = registerInfo.ownerName
this.formData.ownerPhone = registerInfo.ownerPhone
this.formData.residentName = registerInfo.residentName
this.formData.residentPhone = registerInfo.residentPhone
this.formData.sex = registerInfo.sex
this.relationShipIndex = this.relationShipList.findIndex(item=>item.value === registerInfo.relationShip)
this.certificateIndex = this.certificateList.findIndex(item=>item.value === registerInfo.certificateType)
} else {
this.formData.ownerPhone = this.formData.residentPhone = uni.getStorageSync('user_phone')
}
}
}
</script>
......
pages/maintenanceAaudit/index.vue
浏览文件 @ bba16d1b
......@@ -47,7 +47,7 @@
<image v-for="(url, index) in imageList" :key="index" :src="url" class="icon"></image>
</view>
</view>
<view class="item text">
<view class="item text" v-if="formModel.evaluateCount">
<view class="name">评价</view>
<view class="detail">
<view>
......
pages/maintenanceAdd/index.vue
浏览文件 @ bba16d1b
......@@ -28,14 +28,14 @@
<input class="form-item-tit" v-model="formData.repairArticle" placeholder="请输入报修物品" />
</view>
</view>
<!-- <view class="form-item">
<view class="form-item">
<view class="form-item-fl">
<view class="asterisk"></view>证件号码
<view class="asterisk"></view>上报人员
</view>
<view class="form-item-fr">
<input class="form-item-tit" v-model="formData.name1" placeholder="请输入证件号码" />
<input class="form-item-tit" v-model="formData.ownerName" placeholder="请输入证件号码" />
</view>
</view> -->
</view>
<view class="form-item">
<view class="form-item-fl">
<view class="asterisk">*</view>手机号码
......@@ -92,6 +92,7 @@
repairAddress: '',
repairArticle: '',
reservationTime: '',
ownerName: '',
ownerPhone: '',
repairDesc: '',
repairPhoto: []
......@@ -121,6 +122,13 @@
})
return
}
if(!this.formData.ownerName) {
uni.showToast({
title: '请输入上报人员',
icon: 'none'
})
return
}
if(!this.formData.ownerPhone) {
uni.showToast({
title: '请输入手机号码',
......@@ -228,6 +236,8 @@
this.isPageEdit = true
this.formData = getApp().globalData.maintenanceInfo
} else {
this.formData.ownerName = uni.getStorageSync('user_name')
this.formData.ownerPhone = uni.getStorageSync('user_phone')
this.formData.reservationTime = Date.now() + 24*60*60*1000
}
}
......
pages/message/index.vue
浏览文件 @ bba16d1b
......@@ -12,46 +12,6 @@
</view>
<view class="con">{{item.noticeContent}}</view>
</view>
<!-- <view class="item" @click="toDetail()">
<view class="top">
<view class="title">
<view class="point"></view>
<image src="../../static/images/img01.png" class="icon"></image>
<view class="name">维修申请状态更新通知</view>
</view>
<image src="../../static/images/icon_more.png" class="arrow"></image>
</view>
<view class="con">
您提交的【门把手脱落】 维修申请已通过申请，即将有工作人员上门维修，请注意接听来电!
</view>
</view>
<view class="item" @click="toDetail()">
<view class="top">
<view class="title">
<view class="point"></view>
<image src="../../static/images/img01.png" class="icon"></image>
<view class="name">2022年4月物业费账单通知</view>
</view>
<image src="../../static/images/icon_more.png" class="arrow"></image>
</view>
<view class="con">
您2022年4月物业费账单已经生成，请及时缴费，谢谢配合!
</view>
</view>
<view class="item">
<view class="top">
<view class="title">
<view class="point"></view>
<image src="../../static/images/img01.png" class="icon"></image>
<view class="name">2022年3月物业费账单通知</view>
</view>
<image src="../../static/images/icon_more.png" class="arrow"></image>
</view>
<view class="con">
您2022年3月物业费账单已经生成，请及时缴费，谢谢配合!
</view>
</view> -->
</view>
<no-data :show="noticeList.length === 0" text="暂无消息"></no-data>
</view>
......
pages/mine/index.vue
浏览文件 @ bba16d1b
......@@ -80,6 +80,7 @@
},
data() {
return {
currentHouseVerify: false,
userType: '0',
userName: '',
userAvatar: '',
......@@ -94,73 +95,86 @@
quickEntry(type) {
let isLogin = uni.getStorageSync('openid')
if (!!isLogin) {
let code = uni.getStorageSync('platform_code')
if(code) {
if (type == 1) {
uni.navigateTo({
url: '/pages/myInformation/index',
});
} else if (type == 2) {
uni.navigateTo({
url: '/pages/myHouse/index',
});
} else if (type == 3) {
uni.navigateTo({
url: '/pages/maintenance/index',
});
} else if (type == 4) {
uni.navigateTo({
url: '/pages/complaints/index',
});
} else if (type == 5) {
uni.navigateTo({
url: '/pages/myPaycost/index',
});
} else if (type == 6) {
uni.navigateTo({
url: '/pages/myReceipt/index',
});
} else if (type == 7) {
const that = this
uni.showModal({
title: '提示',
content: '确认切换到业主吗？',
success: function (res) {
if (res.confirm) {
that.onChangeEmployee('1')
} else if (res.cancel) {
console.log('用户点击取消');
}
if (type == 7) {
const that = this
uni.showModal({
title: '提示',
content: '确认切换到业主吗？',
success: function (res) {
if (res.confirm) {
that.onChangeEmployee('1')
} else if (res.cancel) {
console.log('用户点击取消');
}
});
} else if (type == 8) {
const that = this
uni.showModal({
title: '提示',
content: '确认切换到维修员吗？',
success: function (res) {
if (res.confirm) {
that.onChangeEmployee('2')
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
} else if(type == 8) {
const that = this
uni.showModal({
title: '提示',
content: '确认切换到维修员吗？',
success: function (res) {
if (res.confirm) {
that.onChangeEmployee('2')
} else if (res.cancel) {
console.log('用户点击取消');
}
});
}
});
} else {
let currentHouseVerify = getApp().globalData.currentHouseVerify
if (type == 2) {
let code = uni.getStorageSync('platform_code')
if(code) {
uni.navigateTo({
url: '/pages/myHouse/index',
});
} else {
uni.showToast({
icon: "none",
title: '暂未查到业主信息！'
})
}
return
}
if(!currentHouseVerify) {
uni.showToast({
icon: "none",
title: '暂未查到业主信息！'
})
// if(timer) clearTimeout(timer)
// timer = null
// timer = setTimeout(()=> {
// uni.navigateTo({
// url: '/pages/housing/index',
// });
// }, 1500)
// return
} else {
return false
if (type == 1) {
uni.navigateTo({
url: '/pages/myInformation/index',
});
} else if (type == 3) {
uni.navigateTo({
url: '/pages/maintenance/index',
});
} else if (type == 4) {
uni.navigateTo({
url: '/pages/complaints/index',
});
} else if (type == 5) {
uni.navigateTo({
url: '/pages/myPaycost/index',
});
} else if (type == 6) {
uni.navigateTo({
url: '/pages/myReceipt/index',
});
} else {
return false
}
}
} else {
uni.showToast({
icon: "none",
title: '暂未查到业主信息，请认证！'
})
if(timer) clearTimeout(timer)
timer = null
timer = setTimeout(()=> {
uni.navigateTo({
url: '/pages/housing/index',
});
}, 1500)
}
} else {
uni.hideTabBar()
......@@ -246,8 +260,8 @@
margin: 30rpx 0;
.item {
height: 84rpx;
line-height: 84rpx;
height: 108rpx;
line-height: 108rpx;
display: flex;
justify-content: space-between;
align-items: center;
......@@ -257,13 +271,13 @@
display: flex;
align-items: center;
.icon {
width: 32rpx;
height: 32rpx;
margin-right: 20rpx;
width: 36rpx;
height: 36rpx;
margin-right: 36rpx;
}
.title {
font-size: 28rpx;
font-size: 32rpx;
color: #191A23;
}
}
......
pages/myHouse/index.vue
浏览文件 @ bba16d1b
<template>
<view class="container">
<view class="page">
<view class="page" v-if="houseList.length">
<view class="house">
<view class="information" @click="toDetails(item.id)" v-for="item in houseList" :key="item.id">
<view class="title" :class="item.color">{{item.platformName}}<view class="tag">{{item.statusName}}</view>
......@@ -26,7 +26,8 @@
</view>
</view>
</view>
<view class="form-submit-fixed">
<no-data :show="houseList.length === 0" text="暂无房屋数据"></no-data>
<view class="form-submit-fixed" v-if="!hideAdd">
<view class="form-submit" @click="toEditor()">添加房屋</view>
</view>
</view>
......@@ -36,12 +37,14 @@
import {
getHouseListApi
} from '@/config/api.js'
import noData from '@/components/no-data/no-data'
let statusList = {
waitAudit: { name: '认证中', color: 'yellow' },
refuse: { name: '认证失败', color: 'red' },
auditPass: { name: '认证成功', color: 'green' }
}
export default {
components: {noData},
data() {
return {
pageNumber: 1,
......@@ -49,6 +52,11 @@
isFinish: false
}
},
computed: {
hideAdd() {
return this.houseList.some(item=>item.auditStatus !== 'auditPass')
}
},
methods: {
async getList(flag) {
let {result} = await getHouseListApi({
......
pages/myHouseDetails/index.vue
浏览文件 @ bba16d1b
......@@ -29,7 +29,7 @@
</view>
<view class="item">
<view class="name">房屋用途</view>
<view class="detail">{{formModel.useTo}}</view>
<view class="detail">{{formModel.buildingTypeName}}</view>
</view>
<view class="item">
<view class="name">户型</view>
......@@ -59,7 +59,8 @@
<script>
import {
getHouseDetailApi,
deleteByOpenIdApi
deleteByOpenIdApi,
getDictItemsApi
} from '@/config/api.js'
let statusList = {
waitAudit: { name: '认证中', color: 'yellow' },
......@@ -69,14 +70,19 @@
export default {
data() {
return {
formModel: {}
formModel: {},
typeList: []
}
},
methods: {
ongetDictItems(name) {
return getDictItemsApi(name)
},
async getDetail(id) {
let {result} = await getHouseDetailApi({id})
result['statusName'] = statusList[result.auditStatus].name
result['color'] = statusList[result.auditStatus].color
result['buildingTypeName'] = this.typeList.find(item=>item.value === result.buildingType).label
this.formModel = {...result}
},
deleteDialog() {
......@@ -138,7 +144,8 @@
}
},
},
onLoad(option) {
async onLoad(option) {
this.typeList = await this.ongetDictItems('house_purpose')
this.getDetail(option.id)
},
onShow() {
......@@ -163,16 +170,6 @@
border-radius: 16rpx;
margin-bottom: 30rpx;
.yellow {
border-left: 2px solid #F1BE51;
.tag {
color: #F1BE51;
border: 1px solid #F1BE51;
background-color: #FFFCF6;
}
}
.item {
display: flex;
height: 84rpx;
......
pages/myPaycost/index.vue
浏览文件 @ bba16d1b
......@@ -31,7 +31,7 @@
</view>
</view>
<view class="item" @click="toDetail()">
<!-- <view class="item" @click="toDetail()">
<view class="title">
<view class="name">水费</view>
<view class="cost">¥100.00</view>
......@@ -78,7 +78,7 @@
<view class="detail">十堰市张湾区汉江之星小区1栋1302</view>
</view>
</view>
</view>
</view> -->
</view>
</view>
</view>
......@@ -86,6 +86,9 @@
</template>
<script>
import {
communityPaymentApi
} from '@/config/api.js'
export default {
data() {
return {
......@@ -93,6 +96,9 @@
}
},
methods: {
async getList() {
let data = await communityPaymentApi()
},
toDetail() {
uni.navigateTo({
url: '/pages/myPaycostDetails/index',
......@@ -100,10 +106,7 @@
}
},
onLoad() {
},
onShow() {
// this.getList()
}
}
</script>
......
pages/payCost/index.vue
浏览文件 @ bba16d1b
<template>
<view class="container">
<view class="page">
<view class="paycost">
<view class="item" @click="onPayFree">
<view class="information">
<view class="image">
<image src="../../static/images/paycost01.png" class="icon"></image>
</view>
<view class="title">
<view class="name">水费<view class="tag">待缴费</view>
<view>
<view class="container" v-if="payList.length">
<view class="page">
<view class="paycost">
<view class="item" @click="onPayFree" v-for="item in payList" :key="item.id">
<view class="information">
<view class="image">
<image src="../../static/images/paycost01.png" class="icon"></image>
</view>
<view class="title">
<view class="name">水费<view class="tag">待缴费</view>
</view>
<view class="add">汉江之星小区3栋1401，张一</view>
</view>
<view class="add">汉江之星小区3栋1401，张一</view>
</view>
<uni-icons type="forward" color="#E4E4EA"></uni-icons>
</view>
<uni-icons type="forward" color="#E4E4EA"></uni-icons>
</view>
<view class="item" @click="onPayFree">
<view class="information">
<view class="image">
<image src="../../static/images/paycost02.png" class="icon"></image>
</view>
<view class="title">
<view class="name">电费<view class="tag">待缴费</view>
<!-- <view class="item" @click="onPayFree">
<view class="information">
<view class="image">
<image src="../../static/images/paycost01.png" class="icon"></image>
</view>
<view class="title">
<view class="name">水费<view class="tag">待缴费</view>
</view>
<view class="add">汉江之星小区3栋1401，张一</view>
</view>
<view class="add">汉江之星小区3栋1401，张一</view>
</view>
<uni-icons type="forward" color="#E4E4EA"></uni-icons>
</view>
<uni-icons type="forward" color="#E4E4EA"></uni-icons>
</view>
<view class="item" @click="onPayFree">
<view class="information">
<view class="image">
<image src="../../static/images/paycost03.png" class="icon"></image>
</view>
<view class="title">
<view class="name">物业费<view class="tag">待缴费</view>
<view class="item" @click="onPayFree">
<view class="information">
<view class="image">
<image src="../../static/images/paycost02.png" class="icon"></image>
</view>
<view class="title">
<view class="name">电费<view class="tag">待缴费</view>
</view>
<view class="add">汉江之星小区3栋1401，张一</view>
</view>
<view class="add">汉江之星小区3栋1401，张一</view>
</view>
<uni-icons type="forward" color="#E4E4EA"></uni-icons>
</view>
<uni-icons type="forward" color="#E4E4EA"></uni-icons>
<view class="item" @click="onPayFree">
<view class="information">
<view class="image">
<image src="../../static/images/paycost03.png" class="icon"></image>
</view>
<view class="title">
<view class="name">物业费<view class="tag">待缴费</view>
</view>
<view class="add">汉江之星小区3栋1401，张一</view>
</view>
</view>
<uni-icons type="forward" color="#E4E4EA"></uni-icons>
</view> -->
</view>
</view>
</view>
<no-data :show="payList.length === 0" text="暂无缴费信息"></no-data>
</view>
</template>
<script>
import {
communityPaymentApi
} from '@/config/api.js'
import noData from '@/components/no-data/no-data'
export default {
components: {noData},
data() {
return {
payList: []
}
},
methods: {
async getList() {
let {result} = await communityPaymentApi()
this.payList = result.records
},
onPayFree() {
uni.navigateTo({
url: '/pages/payCostProperty/index',
......@@ -61,10 +86,7 @@
}
},
onLoad() {
},
onShow() {
this.getList()
}
}
</script>
......
pages/payCostProperty/index.vue
浏览文件 @ bba16d1b
<template>
<view class="container">
<view class="page">
<view class="page" v-if="payList.length">
<view class="property">
<view class="top">
<view class="user">
......@@ -13,7 +13,7 @@
</view>
</view>
<view class="list">
<view class="item">
<!-- <view class="item">
<view class="title">
<view class="name">物业费：<view class="cost">¥3000.00</view>
</view>
......@@ -54,19 +54,31 @@
<view class="detail">汉江之星物业公司</view>
</view>
</view>
</view>
</view> -->
</view>
</view>
</view>
<no-data :show="payList.length === 0" text="暂无缴费信息"></no-data>
</view>
</template>
<script>
import {
communityPaymentApi
} from '@/config/api.js'
import noData from '@/components/no-data/no-data'
export default {
components: {noData},
data() {
return {}
return {
payList: []
}
},
methods: {
async getList() {
let {result} = await communityPaymentApi()
this.payList = result.records
},
toDetail(type) {
if(type == 1){
uni.navigateTo({
......@@ -80,10 +92,7 @@
}
},
onLoad() {
},
onShow() {
this.getList()
}
}
</script>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论