‘完善流程’

App.vue

 <script>
 	export default {
 		globalData: {
+			currentHouseVerify: false,		// 当前小区是否认证
 			registerInfo: {
 				propertyName: '',
 				propertyCode: '',

config/api.js

@@ -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

@@ -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

@@ -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

@@ -73,6 +73,7 @@
 			"path": "pages/housingAudit/index",
 			"style": {
 				"navigationBarTitleText": "物业审核",
+				"navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		},

pages/announcement/index.vue

@@ -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

@@ -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

@@ -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/housing/index.vue

@@ -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

 <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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

 <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

@@ -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

@@ -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

 <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

 <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>