diff --git a/common/wskj_function.js b/common/wskj_function.js
index 0b179e457a77a551e983cd617bd2c67c9de78d70..d992f5d590ed3f30b7001103fb4d1c93c6c24777 100644
--- a/common/wskj_function.js
+++ b/common/wskj_function.js
@@ -527,6 +527,23 @@ function toast(text) {
 	uni.$u.toast(text)
 }
 
+function showModal(title, content, showCancel, callback) {
+	uni.showModal({
+		title: title,
+		content: content,
+		showCancel: showCancel,
+		cancelText: '取消',
+		confirmText: '确定',
+		success: function(res) {
+			if (res.confirm) {
+				callback && callback(true);
+			} else if (res.cancel) {
+				callback && callback(false);
+			}
+		}
+	});
+};
+
 function isNull(text) {
 	return text == null || text == '' ? true : false
 }
@@ -667,12 +684,14 @@ const wskj_function = {
 	throttle,
 	debounce,
 	toast,
+	showModal,
 	pay,
 	onSaveImageAlbum,
 	wxBrowserPay,
 	isNullStr,
 	isNull,
 	splitList,
+
 }
 
 
diff --git a/pages/login/wechatlogin.png b/pages/login/wechatlogin.png
deleted file mode 100644
index f78cf1aa43331990ade8c48266eb4ac21841519f..0000000000000000000000000000000000000000
Binary files a/pages/login/wechatlogin.png and /dev/null differ
diff --git a/pages/login/wechatlogin.vue b/pages/login/wechatlogin.vue
index 8c2581dc06362073a1b688fc8baf68732af99d84..aab74d07d8a9d9d5d4c8ae3a5507ad49fecf1106 100644
--- a/pages/login/wechatlogin.vue
+++ b/pages/login/wechatlogin.vue
@@ -1,29 +1,31 @@
 <template>
 	<view class='container'>
-		<view class="center">
-			<image class="w-240 h-240" src="@/static/icon_logo.png"></image>
-		</view>
+		<view class="flex-column" style="width: 100%;">
+			<view class="flex h-center">
+				<image class="w-240 h-240" src="@/static/icon_logo.png"></image>
+			</view>
 
-		<view class="login-btn">
-			<button v-if="agreement" class="lh-90 br-8" style="height: 100%;background-color: #1FCA7C;color: #FFF;"
-				open-type="getPhoneNumber" @getphonenumber="onGetphonenumber">
-				<text>立即登录</text>
-			</button>
-			<view v-else @click="$u.toast('请同意用户协议与隐私政策')" class="lh-90"
-				style="height: 100%;background-color: #ccc;border-radius: 8rpx;">
-				<text class="fs-30">立即登录</text>
+			<view class="mb-100 mlr-50" style="margin-top: 300rpx;">
+				<button v-if="agreement" class="fullscreen-btn" style="border-radius: 100rpx;"
+					open-type="getPhoneNumber" @getphonenumber="onGetphonenumber">
+					<text>立即登录</text>
+				</button>
+				<view v-else @click="$u.toast('请同意用户协议与隐私政策')" class="fullscreen-btn"
+					style="background: #999;border-radius: 100rpx;">
+					立即登录
+				</view>
 			</view>
-			<!-- <view @click="youkeLogin" class="lh-90 br-8 mt-30" style="height: 100%;background-color: #31AD6F;">
-				<text>游客登录</text>
-			</view> -->
-		</view>
 
-		<view class="agreement">
-			<image v-if="!agreement" @click="agreement = !agreement" src="@/static/select.png"></image>
-			<image v-else @click="agreement = !agreement" src="@/static/is-select.png"></image>
-			<text>阅读并同意<text @click="onGetXieyi(1)" style="color: #4083F0;">《用户协议》</text>和<text @click="onGetXieyi(2)"
-					style="color: #4083F0;">《隐私政策》</text></text>
+			<view class="flex vh-center ">
+				<image class="w-40 h-40" v-if="!agreement" @click="agreement = !agreement" src="@/static/select.png">
+				</image>
+				<image class="w-40 h-40" v-else @click="agreement = !agreement" src="@/static/is-select.png"></image>
+				<text class="ml-10">阅读并同意<text @click="onGetXieyi(1)" style="color: #4083F0;">《用户协议》</text>和<text
+						@click="onGetXieyi(2)" style="color: #4083F0;">《隐私政策》</text></text>
+			</view>
 		</view>
+
+
 	</view>
 </template>
 
@@ -115,36 +117,10 @@
 
 <style scoped>
 	.container {
-		height: 100%;
-		padding: 100px 20rpx 0;
-	}
-
-	.login-btn {
-		width: 94%;
-		height: 90rpx;
-		text-align: center;
-		line-height: 90rpx;
-		color: #FFF;
-		position: absolute;
-		bottom: 400rpx;
-		left: 50%;
-		margin-left: -47%;
-	}
-
-
-	.agreement {
-		width: 100%;
 		display: flex;
+		flex-direction: column;
+		height: 100%;
 		align-items: center;
-		font-size: 28rpx;
-		position: fixed;
-		bottom: 100rpx;
-	}
-
-
-	.agreement>image {
-		width: 40rpx;
-		height: 40rpx;
-		margin-right: 20rpx;
+		justify-content: center;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/wy-bmfw.vue b/pages/wy-bmfw.vue
index 8dea1814f823186c43b097b2ea2a6c7c2c1f9216..7ca735a6e0bfa1bb6e1dbf16ed41146982a44bcc 100644
--- a/pages/wy-bmfw.vue
+++ b/pages/wy-bmfw.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="center">
 		<view style="background: linear-gradient( 180deg, #1FCA7C 0%, #F2F2F2 100%);">
-			<u-navbar bgColor="transparent" placeholder="true">
+			<u-navbar bgColor="transparent" placeholder="true" @leftClick="onXz">
 				<view style="display: flex;align-items: center;font-size: 32rpx;color: #fff;" slot="left">
 					<image src="/static/icon_home_dw1.png" style="width: 30rpx;height: 30rpx;margin-right: 10rpx;"
 						mode=""></image>
@@ -33,6 +33,23 @@
 					</view>
 				</view>
 			</scroll-view>
+			<u-popup :show="show" mode="center" @close="close" @open="open" round="20">
+				<view class="flex-column mlr-50 ptb-30 vh-center" style="width:600rpx;">
+					<text class="fs-32 fw-600 mtb-20">选择小区</text>
+					<scroll-view scroll-y class="h-400">
+						<view v-for="(item, index) in listXq" :key="index" @click="onSelect(index)">
+							<view class="fs-24 pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
+								<text
+									:style="selectIndex==index?'color: #1FCA7C;':'color: #000000;'">{{item.communityName}}</text>
+							</view>
+						</view>
+					</scroll-view>
+					<view @click="onSubmit()" class="w-250 h-60 lh-60 br-12 mt-20"
+						style="background:#1FCA7C;color: #fff;">
+						完成
+					</view>
+				</view>
+			</u-popup>
 		</view>
 
 
@@ -45,18 +62,86 @@
 		data() {
 			return {
 				address: '请选择',
+				userInfo: '',
+				show: false,
+				selectIndex: -1,
+				listXq: [],
+				communityId: '', //小区ID
 
 			};
 		},
 		onLoad(options) {
-			//获取小区信息
-			const addressItem = uni.getStorageSync("addressItem")
-			this.address = addressItem.communityName
+			this.getUserInfo()
+			this.getXqList()
 		},
 		methods: {
+			onXz() {
+				console.log(this.userInfo.userPermission)
+				//非业主 弹出选择小区框
+				if (parseInt(this.userInfo.userPermission) > 1) {
+					this.open()
+					return
+				}
+				//业主和家人 选择房屋信息
+				if (parseInt(this.userInfo.userPermission) < 2) {
+					this.$wskj.to("/pagesMine/pages/fwxx?type=1")
+					return
+				}
+			},
+			open() {
+				this.show = true
+			},
+			close() {
+				this.show = false
+			},
+			onSelect(index) {
+				this.selectIndex = index
+			},
+			onSubmit() {
+				if (this.selectIndex == -1) {
+					this.$wskj.toast('请选择')
+					return
+				}
+				this.show = false
+				this.address = this.listXq[this.selectIndex].communityName
+				uni.setStorageSync('addressItem', this.listXq[this.selectIndex])
+			},
 			onClick(inder) {
 				this.$wskj.toast('敬请期待')
 			},
+			getUserInfo() {
+				const params = {
+					url: '/api/login/userInfo',
+					method: 'GET',
+					data: {}
+				}
+				this.$request(params).then(res => {
+					uni.setStorageSync('userInfo', res.data)
+					this.userInfo = res.data
+					//用户类型（0=业主，1= 家庭成员，2=访客，3=保洁，4=保安）
+					if (parseInt(this.userInfo.userPermission) < 2) {
+						const fwInfo = uni.getStorageSync("fwInfo")
+						this.address = fwInfo.communityName
+					} else {
+						//获取小区信息
+						const addressItem = uni.getStorageSync("addressItem")
+						this.address = addressItem.communityName
+					}
+
+				})
+			},
+			//获取小区数据
+			getXqList() {
+				const params = {
+					url: '/api/community/listAll',
+					method: 'GET',
+					data: {}
+				}
+				this.$request(params).then(res => {
+					console.log(res.data)
+					this.listXq = res.data
+				})
+			},
 
 		}
 	};
diff --git a/pages/wy-home.vue b/pages/wy-home.vue
index 591e3585635f52a2615166694f11b6235cb2944d..9dd4f3173aaef7b79a9485cb203203a18697b16b 100644
--- a/pages/wy-home.vue
+++ b/pages/wy-home.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="center">
 		<view>
-			<u-navbar bgColor="#1FCA7C" placeholder="true" @leftClick="open">
+			<u-navbar bgColor="#1FCA7C" placeholder="true" @leftClick="onXz">
 				<view style="display: flex;align-items: center;font-size: 32rpx;color: #fff;" slot="left">
 					<image src="/static/icon_home_dw1.png" style="width: 30rpx;height: 30rpx;margin-right: 10rpx;"
 						mode=""></image>
@@ -13,7 +13,7 @@
 		</view>
 		<view style="background: linear-gradient( 180deg, #1FCA7C 0%, #F2F2F2 100%);height: 800rpx;"></view>
 		<view class="mlr-24" style="margin-top: -800rpx;">
-			<u-swiper :list="list1" radius="6"></u-swiper>
+			<u-swiper :list="bannerList" radius="6"></u-swiper>
 		</view>
 		<view class="mtb-20 mlr-24 br-12" style="background-color: white;">
 			<view class="mar-20 fs-32 fw-600" style="text-align: left;">常用服务</view>
@@ -39,11 +39,11 @@
 					</view>
 				</scroll-view>
 				<view @click="onSubmit()" class="w-250 h-60 lh-60 br-12 mt-20" style="background:#1FCA7C;color: #fff;">
-					下一步
+					完成
 				</view>
 			</view>
 		</u-popup>
-		<u-popup :show="showHh" mode="center" @close="closeHh" @open="openHh" round="20">
+		<!-- <u-popup :show="showHh" mode="center" @close="closeHh" @open="openHh" round="20">
 			<view class="flex-column mlr-50 ptb-30 vh-center" style="width:600rpx;">
 				<text class="fs-32 fw-600 mtb-20">楼栋号/单元号/户号</text>
 				<scroll-view scroll-y class="h-400">
@@ -58,7 +58,7 @@
 					完成
 				</view>
 			</view>
-		</u-popup>
+		</u-popup> -->
 		<!-- <view class="v-top-popup">
 			<u-popup :show="show" @close="close" @open="open" mode="top" :style="{ top: 100 + 'px' }">
 				<view class="flex-column">
@@ -91,6 +91,10 @@
 				selectHhIndex: -1,
 				listHh: [],
 				proprietorId: '', //户号id
+				userInfo: '',
+				selecteIndex: 0, //绑定房屋信息
+				houseList: [],
+				bannerList: [],
 				list1: [
 					"https://nimg.ws.126.net/?url=http%3A%2F%2Fdingyue.ws.126.net%2F2023%2F0826%2F07b46817j00rzyq1h000kd000hs00alp.jpg&thumbnail=660x2147483647&quality=80&type=jpg",
 					"https://nimg.ws.126.net/?url=http%3A%2F%2Fdingyue.ws.126.net%2F2023%2F0826%2F07b46817j00rzyq1h000kd000hs00alp.jpg&thumbnail=660x2147483647&quality=80&type=jpg",
@@ -131,13 +135,25 @@
 			};
 		},
 		onShow() {
-			this.userInfo()
+			this.getUserInfo()
 			this.getXqList()
-			//获取小区信息
-			const addressItem = uni.getStorageSync("addressItem")
-			this.address = addressItem.communityName
+			this.getHouseList()
+			this.getBannerList()
 		},
 		methods: {
+			onXz() {
+				console.log(this.userInfo.userPermission)
+				//非业主 弹出选择小区框
+				if (parseInt(this.userInfo.userPermission) > 1) {
+					this.open()
+					return
+				}
+				//业主和家人 选择房屋信息
+				if (parseInt(this.userInfo.userPermission) < 2) {
+					this.$wskj.to("/pagesMine/pages/fwxx?type=1")
+					return
+				}
+			},
 			open() {
 				this.show = true
 			},
@@ -148,11 +164,13 @@
 				this.selectIndex = index
 			},
 			onSubmit() {
+				if (this.selectIndex == -1) {
+					this.$wskj.toast('请选择')
+					return
+				}
 				this.show = false
 				this.address = this.listXq[this.selectIndex].communityName
-				this.communityId = this.listXq[this.selectIndex].communityId
 				uni.setStorageSync('addressItem', this.listXq[this.selectIndex])
-				this.getHhList()
 			},
 			//获取小区数据
 			getXqList() {
@@ -166,7 +184,20 @@
 					this.listXq = res.data
 				})
 			},
-
+			//轮播图列表
+			getBannerList() {
+				const than = this;
+				const params = {
+					url: '/api/slideshow/list',
+					method: 'GET',
+					data: {}
+				}
+				this.$request(params).then(res => {
+					res.data.forEach(function(item, index) {
+						than.bannerList.push(item.url)
+					});
+				})
+			},
 			openHh() {
 				this.showHh = true
 			},
@@ -206,7 +237,7 @@
 					this.userInfo()
 				})
 			},
-			userInfo() {
+			getUserInfo() {
 				const params = {
 					url: '/api/login/userInfo',
 					method: 'GET',
@@ -214,31 +245,89 @@
 				}
 				this.$request(params).then(res => {
 					uni.setStorageSync('userInfo', res.data)
+					this.userInfo = res.data
+					//用户类型（0=业主，1= 家庭成员，2=访客，3=保洁，4=保安）
+					if (parseInt(this.userInfo.userPermission) < 2) {
+						const fwInfo = uni.getStorageSync("fwInfo")
+						this.address = fwInfo.communityName
+					} else {
+						//获取小区信息
+						const addressItem = uni.getStorageSync("addressItem")
+						this.address = addressItem.communityName
+					}
+				})
+			},
+			getHouseList() {
+				const than = this;
+				const params = {
+					url: '/api/community/myRoomListAll',
+					method: 'GET',
+				}
+				than.$request(params).then(res => {
+					if (than.$wskj.isNull(res.data)) {
+						return
+					}
+					than.houseList = res.data
+					than.houseList.forEach(function(item, index) {
+						if (item.room == than.userInfo.room) {
+							than.selecteIndex = index
+						}
+					});
+					//默认绑定房屋信息
+					than.setHouse()
+				})
+			},
+			setHouse() {
+				const params = {
+					url: '/api/community/cut/' + this.houseList[this.selecteIndex].communityId + "/" + this.houseList[
+						this.selecteIndex].proprietorId,
+				}
+				this.$request(params).then(res => {
+					uni.setStorageSync('fwInfo', res.data)
+					this.address = res.data.communityName
 				})
 			},
-
 
 			onClick(index) {
+				//访客
 				if (index == 0) {
 					this.$wskj.to("/pagesMain/pages/fkdj")
 					return
 				}
+
+				if (parseInt(this.userInfo.userPermission) > 1) {
+					this.$wskj.showModal('提示', '只有业主以及其家人可使用该功能', false, null);
+					return
+				}
+				if (parseInt(this.userInfo.userPermission) < 2 && this.$wskj.isNull(uni.getStorageSync("fwInfo"))) {
+					this.$wskj.showModal('提示', '请先选择房屋信息', true, (confirmed) => {
+						if (confirmed) {
+							this.$wskj.to("/pagesMine/pages/fwxx?type=1")
+						}
+					});
+					return
+				}
+				//报修报事
 				if (index == 1) {
 					this.$wskj.to("/pagesMain/pages/bxbs")
 					return
 				}
+				//生活缴费
 				if (index == 2) {
 					this.$wskj.to("/pagesMain/pages/shjf")
 					return
 				}
+				//常用电话
 				if (index == 3) {
 					this.$wskj.to("/pagesMain/pages/cydh")
 					return
 				}
+				//停车缴费
 				if (index == 4) {
 					this.$wskj.toast("敬请期待")
 					return
 				}
+				//投诉表扬
 				if (index == 5) {
 					this.$wskj.to("/pagesMain/pages/tsby")
 					return
diff --git a/pages/wy-mine.vue b/pages/wy-mine.vue
index 509fce8894a8848993d1b1b264f0aea060775138..2bc226c80001fc534710c568e245ebc785bddc03 100644
--- a/pages/wy-mine.vue
+++ b/pages/wy-mine.vue
@@ -1,28 +1,31 @@
 <template>
 	<view class="center">
 		<view style="background: linear-gradient( 180deg, #1FCA7C 0%, #F2F2F2 100%);">
-			<view class="h-300 flex flex-row-between mt-200">
-				<view class="flex ml-25 mt-70 v-center h-95">
+			<view class="h-300 flex flex-row-between mt-200" style="position: relative;">
+				<image class="w-344 h-266" style="position: absolute;right: 0;
+				top: 20rpx;" src="/static/icon_my_bg.png"></image>
+				<view class="flex ml-25 mt-70 v-center h-95" @click="onClick(3)">
 					<image class="w-95 h-95 br-50" :src="userInfo.avatar"></image>
-					<view class="flex-column ml-10" style="color: #FFFFFF;text-align: left;" @click="onClick(3)">
+					<view class="flex-column ml-10" style="color: #FFFFFF;text-align: left;">
 						<text class="fs-32 fw-700">{{userInfo.nickName}}</text>
 						<text class="fs-24 mt-10">{{userInfo.mobile}}</text>
 					</view>
 				</view>
-				<image class="w-344 h-266" src="/static/icon_my_bg.png"></image>
+
 			</view>
+
 		</view>
-		<view class="mlr-25 br-12" style="background: white;margin-top: -60rpx;">
+		<view class="mlr-25 br-12" style="background: white;margin-top: -60rpx;z-index: 1;">
 			<view class="flex-column mar-25" @click="onClick(4)">
 				<text class="fs-32 fw-700 mb-30" style="text-align: left;">房屋信息</text>
 				<view class="flex-column br-12 pad-25" style="background: #F3FEF9;">
 					<view class="flex">
 						<image class="h-42 w-42" src="/static/icon_my_fw.png"></image>
-						<text class="fs-28">{{userInfo.communityName}}</text>
+						<text class="fs-28">{{$wskj.isNullStr(userInfo.communityName)||'暂无'}}</text>
 					</view>
 					<text class="fs-24 h-54 lh-54 mt-30"
 						style="background: linear-gradient( 90deg, #CAF6E2 0%, #FFFFFF 100%);">
-						{{userInfo.room}}
+						{{$wskj.isNullStr(userInfo.room)||'暂无'}}
 					</text>
 				</view>
 			</view>
@@ -47,7 +50,7 @@
 			</view>
 		</view>
 		<view class="mlr-25 mt-30">
-			<image style="height: 160rpx;width: 100%;" src="/static/icon_my_img.png"></image>
+			<u-swiper :list="bannerList" radius="6"></u-swiper>
 		</view>
 
 
@@ -58,14 +61,29 @@
 	export default {
 		data() {
 			return {
-				userInfo: {},
-
+				userInfo: '',
+				bannerList: [],
 			};
 		},
 		onShow() {
 			this.getUserInfo()
+			this.getBannerList()
 		},
 		methods: {
+			//轮播图列表
+			getBannerList() {
+				const than = this;
+				const params = {
+					url: '/api/slideshow/list',
+					method: 'GET',
+					data: {}
+				}
+				this.$request(params).then(res => {
+					res.data.forEach(function(item, index) {
+						than.bannerList.push(item.url)
+					});
+				})
+			},
 			getUserInfo() {
 				const params = {
 					url: '/api/login/userInfo',
@@ -79,30 +97,47 @@
 				})
 			},
 			onClick(index) {
-				if (index == 3) {
+				if (index == 3 && parseInt(this.userInfo.userPermission) > 1) {
+					return
+				}
+				if (index == 2) { //员工入口
+					this.$wskj.to("/pagesMine/pages/yg_login")
+					// if (this.$wskj.isNull(uni.getStorageSync('userInfo_yg'))) {
+					// 	this.$wskj.to("/pagesMine/pages/yg_login")
+					// } else {
+					// 	this.$wskj.to("/pagesMine/pages/ygzy")
+					// }
+					return
+				}
+				if (parseInt(this.userInfo.userPermission) > 1) {
+					this.$wskj.showModal('提示', '只有业主以及其家人可使用该功能', false, null);
+					return
+				}
+				if (index == 3) { //编辑资料
 					this.$wskj.to("/pagesMine/pages/zlbj")
 					return
 				}
-				if (index == 4) {
+				if (index == 4) { //房屋信息
 					this.$wskj.to("/pagesMine/pages/fwxx")
 					return
 				}
-				if (index == 0) {
-					this.$wskj.to("/pagesMine/pages/wdfw")
+				if (parseInt(this.userInfo.userPermission) < 2 && this.$wskj.isNull(uni.getStorageSync("fwInfo"))) {
+					this.$wskj.showModal('提示', '请先选择房屋信息', true, (confirmed) => {
+						if (confirmed) {
+							this.$wskj.to("/pagesMine/pages/fwxx?type=1")
+						}
+					});
 					return
 				}
-				if (index == 1) {
-					this.$wskj.to("/pagesMain/pages/bxbs_lsgd")
+				if (index == 0) { //我的房屋
+					this.$wskj.to("/pagesMine/pages/wdfw")
 					return
 				}
-				if (index == 2) {
-					if (this.$wskj.isNull(uni.getStorageSync('userInfo_yg'))) {
-						this.$wskj.to("/pagesMine/pages/yg_login")
-					} else {
-						this.$wskj.to("/pagesMine/pages/ygzy")
-					}
+				if (index == 1) { //我的工单
+					this.$wskj.to("/pagesMain/pages/bxbs_lsgd")
 					return
 				}
+
 			}
 		}
 	};
diff --git a/pagesMain/pages/bxbs_lsgd.vue b/pagesMain/pages/bxbs_lsgd.vue
index d199705ea85ce1ed87bbfd418541924ee274b8bc..87cf3b12f0ce41e6c59a2437a054d51a660af1bb 100644
--- a/pagesMain/pages/bxbs_lsgd.vue
+++ b/pagesMain/pages/bxbs_lsgd.vue
@@ -25,10 +25,13 @@
 				<view v-for="(item, index) in list" :key="index" @click="onCz('详情',index)">
 					<view class="flex-column br-12 mt-30 mlr-24 pad-20"
 						style="box-shadow: 0px 0px 15px 1px rgba(142,142,142,0.16);background: white;">
-						<view class="flex vh-center mt-20">
+						<view class="flex vh-center mt-20 fs-24">
 							<image class="h-40 w-40 mr-15" src="/static/icon_gd.png"> </image>
 							<text class="fs-32 fw-700" style="flex: 1;">{{item.type==1?'居家报修':'公区报事'}}</text>
-							<text>{{item.state==1?'待处理':item.state==2?'待支付':item.state==3?'已完成':item.state==4?'已取消':''}}</text>
+							<text
+								:style="{ color: item.state==1?'#FF682D':item.state==2?'#EEA616':item.state==3?'#1FCA7C':'#23BBEE'}">
+								{{item.state==1?'待处理':item.state==2?'待支付':item.state==3?'已完成':item.state==4?'已取消':''}}
+							</text>
 						</view>
 						<text class="fs-28 br-6 pad-20 mtb-20"
 							style="background: #EBF5F0;">{{item.repairsDescription}}</text>
@@ -51,10 +54,9 @@
 				</view>
 
 			</scroll-view>
-			<view style="padding-top: 300rpx;">
-				<u-empty v-if="list.length==0" mode="data"></u-empty>
+			<view style="padding-top: 300rpx;" v-if="list.length==0">
+				<u-empty mode="data"></u-empty>
 			</view>
-
 		</view>
 
 	</view>
@@ -88,14 +90,46 @@
 					return
 				}
 				if (e == "关闭报修") {
-					this.gb(this.list[index].repairsId);
+					this.$wskj.showModal('提示', '确定关闭报修？', true, (confirmed) => {
+						if (confirmed) {
+							this.gb(this.list[index].repairsId);
+						}
+					});
 					return
 				}
 				if (e == "去支付") {
-
+					this.pay(index)
 					return
 				}
 			},
+			pay(index) {
+				const params = {
+					url: '/api/payRecord/pay',
+					loadingTip: '',
+					data: {
+						orderId: this.list[index].repairsId,
+						amount: this.list[index].money,
+						payBizCode: "MAINTAIN", //PRESTORE（预存）MAINTAIN（维修）
+					}
+				}
+				this.$request(params).then(res => {
+					uni.requestPayment({
+						provider: 'wxpay',
+						appid: res.data.data.appId, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致
+						nonceStr: res.data.data.nonceStr, // 随机字符串
+						package: res.data.data.package, // 固定值
+						timeStamp: res.data.data.timeStamp, // 时间戳（单位：秒）
+						paySign: res.data.data.paySign, // 签名，这里用的 MD5/RSA 签名
+						signType: 'MD5',
+						success: (res) => {
+							this.getData()
+						},
+						fail: (err) => {
+							console.log(err);
+						}
+					});
+				})
+			},
 			getNumberList() {
 				const params = {
 					url: '/api/repairs/userCountAll',
diff --git a/pagesMain/pages/bxbs_submit.vue b/pagesMain/pages/bxbs_submit.vue
index 5cb8e7a603abe0506a90bd5abed735da13d9b626..1cafe36884551a099504e044b1f44b8730805ea9 100644
--- a/pagesMain/pages/bxbs_submit.vue
+++ b/pagesMain/pages/bxbs_submit.vue
@@ -34,8 +34,8 @@
 			</view>
 			<view class="flex-column br-12 fs-28 mt-30 pad-30"
 				style="box-shadow: 0px 0px 15px 1px rgba(142,142,142,0.16);">
-				<u--textarea v-model="reason" height="260rpx" maxlength="100" placeholder="填写下详细报修内容，有助于工作人员快速帮您解决问题"
-					count border="border"></u--textarea>
+				<u-textarea v-model="reason" height="260rpx" maxlength="100" placeholder="填写下详细报修内容，有助于工作人员快速帮您解决问题"
+					count border="border" ref="textarea"></u-textarea>
 				<view class="mt-30">
 					<upload-image @upload="upload" v-model="imgurl" maxCount="3" width="70" height="70"
 						type="fullurl"></upload-image>
@@ -69,6 +69,16 @@
 			}
 			this.userinfo = uni.getStorageSync("userInfo")
 		},
+		onReady() {
+			// 如果需要兼容微信小程序的话，需要用此写法
+			this.$refs.textarea.setFormatter((value) => {
+				if (value.length >= 100) {
+					return value.substr(0, 100)
+				} else {
+					return value
+				}
+			})
+		},
 		methods: {
 			upload(e) {
 				this.images = e
@@ -93,10 +103,7 @@
 					}
 				}
 				this.$request(params).then(res => {
-					this.$wskj.toast('提交成功')
-					setTimeout(() => {
-						this.$wskj.goBack(1)
-					}, 600)
+					this.$wskj.redirectTo("/pagesMain/pages/tjsq?type=" + this.type)
 				})
 			}
 		},
diff --git a/pagesMain/pages/bxxq.vue b/pagesMain/pages/bxxq.vue
index 9c88457551db60fc2db05f02cd4341bc6169653a..01a2ab265d2178722c111a8c63e0f45e420c8e98 100644
--- a/pagesMain/pages/bxxq.vue
+++ b/pagesMain/pages/bxxq.vue
@@ -17,12 +17,14 @@
 			style="background: white;border-top-left-radius: 20rpx;border-top-right-radius: 20rpx;margin-top: -20rpx;">
 			<scroll-view scroll-y style="height: 100%;">
 				<view class="mar-20">
-					<view class="flex-column-center">
+					<view class="flex-column-center fs-24">
 						<image class="w-40 h-40 mr-10" src="/static/icon_gd.png"></image>
 						<text style="flex: 1;text-align: left;"
 							class="fs-32 fw-700">{{data.type==1?'居家报修':'公区报事'}}</text>
 						<text
-							style="font-size: 24rpx;color: #EEA616;">{{data.state==1?'待处理':data.state==2?'待支付':data.state==3?'已完成':data.state==4?'已取消':''}}</text>
+							:style="{ color: data.state==1?'#FF682D':data.state==2?'#EEA616':data.state==3?'#1FCA7C':'#23BBEE'}">
+							{{data.state==1?'待处理':data.state==2?'待支付':data.state==3?'已完成':data.state==4?'已取消':''}}
+						</text>
 					</view>
 					<view class="flex-column br-12 fs-28 mt-30" style="background: #EBF5F0;">
 						<view class="flex pad-30">
@@ -57,8 +59,8 @@
 						<text class="fw-700 fs-28">报修时间:</text>
 						<text class="fs-24 ml-10">{{data.repairsTime}}</text>
 						<text class="fs-24 ml-10" style="flex: 1;"></text>
-						<text @click="onCz('关闭报修')" v-if="data.state==2" class="fs-24 mr-10" style="color: #23BBEE;">
-							关闭报修</text>
+						<!-- <text @click="onCz('关闭报修')" v-if="data.state==1" class="fs-24 mr-10" style="color: #23BBEE;">
+							关闭报修</text> -->
 					</view>
 					<view v-if="data.state==2||data.state==3" class="flex-column br-12 fs-28 mt-30"
 						style="background: #EBF5F0;">
@@ -70,7 +72,7 @@
 							<text class="fw-700 w-200" style="text-align: left;">手机号：</text>
 							<text>{{data.accountMobile}}</text>
 						</view>
-						<view class="flex pad-30">
+						<view class="flex pad-30" v-if="data.state==3">
 							<text class="fw-700 w-200" style="text-align: left;">完成时间：</text>
 							<text>{{data.completeTime}}</text>
 						</view>
@@ -83,7 +85,7 @@
 			</scroll-view>
 		</view>
 		<view class="h-140 pt-20">
-			<view class="full-btn" v-if="data.state==2">
+			<view class="full-btn" v-if="data.state==2" style="color:#EEA616;" @click="onCz('去支付')">
 				去支付
 			</view>
 			<view @click="onCz('关闭报修')" class="full-btn" style="color: #FF682D;" v-if="data.state==1">
@@ -125,22 +127,52 @@
 					method: 'PUT',
 				}
 				this.$request(params).then(res => {
-					this.$wskj.toast('关闭成功')
-					setTimeout(() => {
-						this.$wskj.goBack(1)
-					}, 600)
+					this.getData()
 				})
 			},
 			onCz(e) {
 				if (e == "关闭报修") {
-					this.gb();
+					this.$wskj.showModal('提示', '确定关闭报修？', true, (confirmed) => {
+						if (confirmed) {
+							this.gb();
+						}
+					});
 					return
 				}
 				if (e == "去支付") {
-
+					this.pay()
 					return
 				}
 			},
+			pay() {
+				const params = {
+					url: '/api/payRecord/pay',
+					loadingTip: '',
+					data: {
+						orderId: this.id,
+						amount: this.data.money,
+						payBizCode: "MAINTAIN", //PRESTORE（预存）MAINTAIN（维修）
+					}
+				}
+				this.$request(params).then(res => {
+					uni.requestPayment({
+						provider: 'wxpay',
+						appid: res.data.data.appId, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致
+						nonceStr: res.data.data.nonceStr, // 随机字符串
+						package: res.data.data.package, // 固定值
+						timeStamp: res.data.data.timeStamp, // 时间戳（单位：秒）
+						paySign: res.data.data.paySign, // 签名，这里用的 MD5/RSA 签名
+						signType: 'MD5',
+						success: (res) => {
+							this.getData()
+						},
+						fail: (err) => {
+							console.log(err);
+						}
+					});
+				})
+			},
+
 		},
 	};
 </script>
diff --git a/pagesMain/pages/cydh.vue b/pagesMain/pages/cydh.vue
index 2aac6cb4fd859ec7b88cd7f626d9b3c7c8502901..79d1709300efd6ab75a44676cb02c4f3d0b3db3f 100644
--- a/pagesMain/pages/cydh.vue
+++ b/pagesMain/pages/cydh.vue
@@ -23,12 +23,12 @@
 								{{item.phone}}
 							</view>
 							<view class="flex vh-center" style="flex: 1;" @click="onZd(index)">
-								<view class="flex-column vh-center" style="flex: 1;">
+								<!-- <view class="flex-column vh-center" style="flex: 1;">
 									<image v-if="index==0" class="w-30 h-30" src="/pagesMain/static/icon_cydh_qxzd.png">
 									</image>
 									<image v-else class="w-30 h-30" src="/pagesMain/static/icon_cydh_zd.png"></image>
 									<text style="color: #999999;font-size: 18rpx;">{{index==0?"取消置顶":"置顶"}}</text>
-								</view>
+								</view> -->
 								<view class="flex-column vh-center ml-30" style="flex: 1;" @click="onBd(item.phone)">
 									<image class="w-30 h-30" src="/pagesMain/static/icon_cydh_dh.png"></image>
 									<text style="color: #999999;font-size: 18rpx;">一键拨打</text>
diff --git a/pagesMain/pages/jnzd_ccs.vue b/pagesMain/pages/jnzd_ccs.vue
index 10234a3207e597695b0b1b1fc5c97c807833e8d1..f758f7a96a5c903627c592337295dec262134d75 100644
--- a/pagesMain/pages/jnzd_ccs.vue
+++ b/pagesMain/pages/jnzd_ccs.vue
@@ -44,6 +44,7 @@
 				userinfo: '',
 				carportId: '',
 				money: '',
+				carIndex: 0,
 
 			};
 		},
@@ -72,15 +73,16 @@
 			confirm(e) {
 				this.show = false
 				this.monthsNumber = e.value[0]
-				this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.userinfo.carportVoList[e
-					.indexs[0]].monthMoney);
+				this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.userinfo.carportVoList[this
+					.carIndex].monthMoney);
 				this.money = this.money.toFixed(2)
 				console.log("LMG", this.money)
+
 			},
 			confirmCar(e) {
 				this.carShow = false
 				this.carNumber = e.value[0]
-				console.log("LMG", e.value[0])
+				this.carIndex = e.indexs[0]
 				this.carportId = this.userinfo.carportVoList[e.indexs[0]].carportId
 			},
 			onSubmit() {
diff --git a/pagesMain/pages/jnzd_czf.vue b/pagesMain/pages/jnzd_czf.vue
index 33f79fb54a0288007fa2c39635160fea292e3869..e4ecac16baed6224f2418639df7d55ba5f05732f 100644
--- a/pagesMain/pages/jnzd_czf.vue
+++ b/pagesMain/pages/jnzd_czf.vue
@@ -44,14 +44,18 @@
 				userinfo: '',
 				carportId: '',
 				money: '0',
+				carIndex: 0,
 
 			};
 		},
 		onLoad(options) {
 			this.type = options.type
 			this.userinfo = uni.getStorageSync("userInfo")
+			//1出售车库 2临时车辆 3固定车辆 4租赁车库）
 			this.userinfo.carportVoList.forEach(item => {
-				this.list[0].push(item.carportNumber)
+				if (item.type == 4) {
+					this.list[0].push(item.carportNumber)
+				}
 			})
 		},
 		methods: {
@@ -72,8 +76,8 @@
 			confirm(e) {
 				this.show = false
 				this.monthsNumber = e.value[0]
-				this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.userinfo.carportVoList[e
-					.indexs[0]].monthMoney);
+				this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.userinfo.carportVoList[this
+					.carIndex].monthMoney);
 				this.money = this.money.toFixed(2)
 				console.log("LMG", this.money)
 
@@ -81,7 +85,7 @@
 			confirmCar(e) {
 				this.carShow = false
 				this.carNumber = e.value[0]
-				console.log("LMG", e.value[0])
+				this.carIndex = e.indexs[0]
 				this.carportId = this.userinfo.carportVoList[e.indexs[0]].carportId
 			},
 			onSubmit() {
diff --git a/pagesMain/pages/jnzd_tcf.vue b/pagesMain/pages/jnzd_tcf.vue
index 925b30c2bb1175d20750b51e31622ff2028af4cb..150edd896ccac0d3aea3d01e76a32d844b83e9b9 100644
--- a/pagesMain/pages/jnzd_tcf.vue
+++ b/pagesMain/pages/jnzd_tcf.vue
@@ -44,14 +44,18 @@
 				userinfo: '',
 				carportId: '',
 				money: '',
+				carIndex: 0,
 
 			};
 		},
 		onLoad(options) {
 			this.type = options.type
 			this.userinfo = uni.getStorageSync("userInfo")
+			//1出售车库 2临时车辆 3固定车辆 4租赁车库）
 			this.userinfo.carportVoList.forEach(item => {
-				this.list[0].push(item.carportNumber)
+				if (item.type == 3) {
+					this.list[0].push(item.carportNumber)
+				}
 			})
 		},
 		methods: {
@@ -72,15 +76,16 @@
 			confirm(e) {
 				this.show = false
 				this.monthsNumber = e.value[0]
-				this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.userinfo.carportVoList[e
-					.indexs[0]].monthMoney);
+				this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.userinfo.carportVoList[this
+					.carIndex].monthMoney);
 				this.money = this.money.toFixed(2)
 				console.log("LMG", this.money)
+
 			},
 			confirmCar(e) {
 				this.carShow = false
 				this.carNumber = e.value[0]
-				console.log("LMG", e.value[0])
+				this.carIndex = e.indexs[0]
 				this.carportId = this.userinfo.carportVoList[e.indexs[0]].carportId
 			},
 			onSubmit() {
diff --git a/pagesMain/pages/jnzd_tcfmx.vue b/pagesMain/pages/jnzd_tcfmx.vue
index 241b691a70f5ad2c5a3c7b2f85d22759ce5c9bad..6192a10f0666c88ef8057f368c2282c0136e03aa 100644
--- a/pagesMain/pages/jnzd_tcfmx.vue
+++ b/pagesMain/pages/jnzd_tcfmx.vue
@@ -39,7 +39,7 @@
 						</view>
 					</view>
 				</view>
-				<text v-if="indexTab==1" class="fs-30 fw-700 ">未缴金额\n￥0.00</text>
+				<text v-if="indexTab==1" class="fs-30 fw-700 ">未缴金额\n￥{{money}}</text>
 			</view>
 		</view>
 		<view class="overflow-y" style="background: white;">
@@ -94,14 +94,18 @@
 				jfjlList: [],
 				djList: [],
 				carportId: '',
+				money: 0,
 
 			};
 		},
 		onLoad(options) {
 			this.type = options.type
 			this.userinfo = uni.getStorageSync("userInfo")
+			//1出售车库 2临时车辆 3固定车辆 4租赁车库）
 			this.userinfo.carportVoList.forEach(item => {
-				this.columns[0].push(item.carportNumber)
+				if (item.type == 3) {
+					this.columns[0].push(item.carportNumber)
+				}
 			})
 			this.getJfjlList()
 		},
@@ -136,6 +140,11 @@
 				}
 				this.$request(params).then(res => {
 					this.djList = res.data
+					const money = 0
+					this.res.data.forEach(item => {
+						money = money + parseFloat(item.money)
+					})
+					this.money = money.toFixed(2)
 				})
 			},
 			getJfjlList() {
diff --git a/pagesMain/pages/jnzd_wyfmx.vue b/pagesMain/pages/jnzd_wyfmx.vue
index 870a3300737b0cca1ed3bef41275bcf501d60ca8..77e7b25731da89b5a95301736110fe1f6681dabc 100644
--- a/pagesMain/pages/jnzd_wyfmx.vue
+++ b/pagesMain/pages/jnzd_wyfmx.vue
@@ -18,7 +18,7 @@
 						</view>
 					</view>
 				</view>
-				<text v-if="indexTab==1" class="fs-30 fw-700 ">未缴金额\n￥0.00</text>
+				<text v-if="indexTab==1" class="fs-30 fw-700 ">未缴金额\n￥{{money}}</text>
 			</view>
 		</view>
 		<view class="overflow-y" style="background: white;">
@@ -66,6 +66,7 @@
 				userinfo: '',
 				jfjlList: [],
 				djList: [],
+				money: 0,
 
 			};
 		},
@@ -95,6 +96,11 @@
 				}
 				this.$request(params).then(res => {
 					this.djList = res.data
+					const money = 0
+					this.res.data.forEach(item => {
+						money = money + parseFloat(item.money)
+					})
+					this.money = money.toFixed(2)
 				})
 			},
 			getJfjlList() {
diff --git a/pagesMain/pages/tjsq.vue b/pagesMain/pages/tjsq.vue
index 8845742c1b856676f5723192c98c8b63e7c12616..05e427b4a122d6ca69640e912e97354b8d70e03d 100644
--- a/pagesMain/pages/tjsq.vue
+++ b/pagesMain/pages/tjsq.vue
@@ -8,14 +8,13 @@
 		<view class="mar-20 br-12" style="margin-top: -100rpx;">
 			<view class="flex-column vh-center br-12 fs-28 mt-30 ptb-200"
 				style="box-shadow: 0px 0px 15px 1px rgba(142,142,142,0.16);background: white;">
-				<image class="w-150 h-150 mb-70" style="background: #1FCA7C;"></image>
-				<text style="font-size: 32rpx;">居家报修信息提交成功</text>
+				<image class="w-150 h-150 mb-70" src="/pagesMain/static/icon_tjsq.png"></image>
+				<text style="font-size: 32rpx;">{{name}}信息提交成功</text>
 				<text style="color: #999999;font-size: 24rpx;margin-top: 30rpx;">请耐心等待工作人员处理</text>
-				<text class="br-12 fs-30 ptb-25 plr-100 mt-100" style="color: #fff;background: #1FCA7C;">返回首页</text>
+				<text class="br-12 fs-30 ptb-25 plr-100 mt-100" style="color: #fff;background: #1FCA7C;"
+					@click="$wskj.goBack(1)">返回</text>
 			</view>
-
 		</view>
-
 	</view>
 </template>
 
@@ -24,10 +23,20 @@
 		data() {
 			return {
 				type: 0,
+				name: '',
 			};
 		},
 		onLoad(e) {
 			this.type = e.type
+			if (e.type == 1) {
+				this.name = "居家报修"
+			} else if (e.type == 2) {
+				this.name = "公区报事"
+			} else if (e.type == 3) {
+				this.name = "投诉"
+			} else if (e.type == 4) {
+				this.name = "表扬"
+			}
 		},
 		methods: {
 
diff --git a/pagesMain/pages/tsby_lsgd.vue b/pagesMain/pages/tsby_lsgd.vue
index 30174ef8cf9822c6b27b62cd4143159154628123..e6bd34ec67efd6067c01215337cf2d2c2c052ab4 100644
--- a/pagesMain/pages/tsby_lsgd.vue
+++ b/pagesMain/pages/tsby_lsgd.vue
@@ -8,8 +8,8 @@
 			<view class="flex mlr-10">
 				<view @click="onClick(index)" class="h-150 mlr-10 br-12 flex-column flex-between-center"
 					style="flex: 1;background: #FFFFFF;"
-					:style="{ color: index==0?'#FF682D':index==1?'#EEA616':index==2?'#1FCA7C':'#23BBEE'}"
-					v-for="(item, index) in 3" :key="index">
+					:style="{ color: index==0?'#FF682D':index==1?'#1FCA7C':'#23BBEE'}" v-for="(item, index) in 3"
+					:key="index">
 					<text class="mt-20 fs-36">{{numberList[(index+1)]}}</text>
 					<text class="mb-20 fs-24">{{index==0?'待处理':index==1?'已完成':index==2?'已取消':''}}</text>
 					<view v-if="index==tabIndex"
@@ -25,10 +25,12 @@
 				<view v-for="(item, index) in list" :key="index" @click="onCz('详情',index)">
 					<view class="flex-column br-12 mt-30 mlr-24 pad-20"
 						style="box-shadow: 0px 0px 15px 1px rgba(142,142,142,0.16);background: white;">
-						<view class="flex vh-center mt-20">
+						<view class="flex vh-center mt-20 fs-24">
 							<image class="h-40 w-40 mr-15" src="/static/icon_gd.png"> </image>
 							<text class="fs-32 fw-700" style="flex: 1;">{{item.type==1?'我要投诉':'我要表扬'}}</text>
-							<text>{{item.state==1?'待处理':item.state==2?'已完成':item.state==3?'已关闭':''}}</text>
+							<text :style="{ color: item.state==1?'#FF682D':item.state==2?'#1FCA7C':'#23BBEE'}">
+								{{item.state==1?'待处理':item.state==2?'已完成':item.state==3?'已关闭':''}}
+							</text>
 						</view>
 						<text class="fs-28 br-6 pad-20 mtb-20"
 							style="background: #EBF5F0;">{{item.commentDescription}}</text>
@@ -49,8 +51,8 @@
 					</view>
 				</view>
 			</scroll-view>
-			<view style="padding-top: 300rpx;">
-				<u-empty v-if="list.length==0" mode="data"></u-empty>
+			<view style="padding-top: 300rpx;" v-if="list.length==0">
+				<u-empty mode="data"></u-empty>
 			</view>
 		</view>
 
@@ -85,7 +87,11 @@
 					return
 				}
 				if (e == "关闭投诉表扬") {
-					this.gb(this.list[index].id);
+					this.$wskj.showModal('提示', '确定关闭？', true, (confirmed) => {
+						if (confirmed) {
+							this.gb(this.list[index].id);
+						}
+					});
 					return
 				}
 			},
@@ -116,7 +122,6 @@
 				this.$request(params).then(res => {
 					this.getList()
 					this.getNumberList()
-
 				})
 			}
 		},
diff --git a/pagesMain/pages/tsby_submit.vue b/pagesMain/pages/tsby_submit.vue
index d441e2733fea8d87a53dddc85a0b743ca89e065f..0b1bf8dcaf0fe5f79856304a3b7d0cb654031818 100644
--- a/pagesMain/pages/tsby_submit.vue
+++ b/pagesMain/pages/tsby_submit.vue
@@ -34,8 +34,8 @@
 			</view>
 			<view class="flex-column br-12 fs-28 mt-30 pad-30"
 				style="box-shadow: 0px 0px 15px 1px rgba(142,142,142,0.16);">
-				<u--textarea v-model="reason" height="260rpx" maxlength="100" placeholder="请输入信息" count
-					border="border"></u--textarea>
+				<u-textarea v-model="reason" height="260rpx" maxlength="100" placeholder="请输入信息" count border="border"
+					ref="textarea"></u-textarea>
 				<view class="mt-30">
 					<upload-image @upload="upload" v-model="imgurl" maxCount="3" width="70" height="70"
 						type="fullurl"></upload-image>
@@ -69,6 +69,16 @@
 			}
 			this.userinfo = uni.getStorageSync("userInfo")
 		},
+		onReady() {
+			// 如果需要兼容微信小程序的话，需要用此写法
+			this.$refs.textarea.setFormatter((value) => {
+				if (value.length >= 100) {
+					return value.substr(0, 100)
+				} else {
+					return value
+				}
+			})
+		},
 		methods: {
 			upload(e) {
 				this.images = e
@@ -93,10 +103,7 @@
 					}
 				}
 				this.$request(params).then(res => {
-					this.$wskj.toast('提交成功')
-					setTimeout(() => {
-						this.$wskj.goBack(1)
-					}, 600)
+					this.$wskj.redirectTo(`/pagesMain/pages/tjsq?type="${this.type==1?3:4}`)
 				})
 			}
 		},
diff --git a/pagesMain/pages/tsby_xq.vue b/pagesMain/pages/tsby_xq.vue
index 5127b42380582991adf42194715acc49b977e938..b070d30951e3cf54e08559bcbd391bab20eff93c 100644
--- a/pagesMain/pages/tsby_xq.vue
+++ b/pagesMain/pages/tsby_xq.vue
@@ -17,12 +17,12 @@
 			style="background: white;border-top-left-radius: 20rpx;border-top-right-radius: 20rpx;margin-top: -20rpx;">
 			<scroll-view scroll-y style="height: 100%;">
 				<view class="mar-20">
-					<view class="flex-column-center">
+					<view class="flex-column-center fs-24">
 						<image class="w-40 h-40 mr-10" src="/static/icon_gd.png"></image>
 						<text style="flex: 1;text-align: left;"
 							class="fs-32 fw-700">{{data.type==1?'我要投诉':'我要表扬'}}</text>
 						<text
-							style="font-size: 24rpx;color: #EEA616;">{{data.state==1?'待处理':data.state==2?'已完成':data.state==3?'已关闭':''}}</text>
+							:style="{ color: data.state==1?'#FF682D':data.state==2?'#1FCA7C':'#23BBEE'}">{{data.state==1?'待处理':data.state==2?'已完成':data.state==3?'已关闭':''}}</text>
 					</view>
 					<view class="flex-column br-12 fs-28 mt-30" style="background: #EBF5F0;">
 						<view class="flex pad-30">
@@ -107,14 +107,16 @@
 				}
 				this.$request(params).then(res => {
 					this.$wskj.toast('关闭成功')
-					setTimeout(() => {
-						this.$wskj.goBack(1)
-					}, 600)
+					this.getData()
 				})
 			},
 			onCz(e) {
 				if (e == "关闭报修") {
-					this.gb();
+					this.$wskj.showModal('提示', '确定关闭？', true, (confirmed) => {
+						if (confirmed) {
+							this.gb();
+						}
+					});
 					return
 				}
 			},
diff --git a/pagesMain/static/icon_tjsq.png b/pagesMain/static/icon_tjsq.png
new file mode 100644
index 0000000000000000000000000000000000000000..74cb85386d7d3d990d1473ece8e2e5ca55066ae2
Binary files /dev/null and b/pagesMain/static/icon_tjsq.png differ
diff --git a/pagesMine/pages/fwxx.vue b/pagesMine/pages/fwxx.vue
index 244fa1b5042bd99291dff7d4a587a8c1e91fb2e6..97816f30207229b7678e82b1f55393ed341aa08c 100644
--- a/pagesMine/pages/fwxx.vue
+++ b/pagesMine/pages/fwxx.vue
@@ -5,7 +5,7 @@
 			<text class="fs-32 fw-700 pad-30" style="text-align: left;">基本信息</text>
 			<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
 				<text>姓名</text>
-				<text>{{userInfo.name}}</text>
+				<text>{{$wskj.isNullStr(userInfo.name)}}</text>
 			</view>
 			<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
 				<text>手机号</text>
@@ -13,7 +13,7 @@
 			</view>
 			<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
 				<text>身份证号</text>
-				<text>{{userInfo.identityCard}}</text>
+				<text>{{$wskj.isNullStr(userInfo.identityCard)}}</text>
 			</view>
 		</view>
 		<view class="overflow-y">
@@ -66,17 +66,25 @@
 			};
 		},
 		onLoad(options) {
+			if (options.type == 1) {
+				uni.setNavigationBarTitle({
+					title: '选择房屋信息'
+				})
+			} else {
+				uni.setNavigationBarTitle({
+					title: '房屋信息'
+				})
+			}
 			this.userInfo = uni.getStorageSync('userInfo')
 			this.getHouseList()
 		},
 		methods: {
 			onClickSelecte(index) {
 				this.selecteIndex = index
-
 			},
 			onSubmit() {
 				if (this.selecteIndex == -1) {
-					this.$wskj.toast('请选择房屋')
+					this.$wskj.goBack(1)
 					return
 				}
 				this.setHouse()
@@ -102,7 +110,11 @@
 						this.selecteIndex].proprietorId,
 				}
 				this.$request(params).then(res => {
+					uni.setStorageSync('fwInfo', res.data)
 					this.$wskj.toast("设置成功")
+					setTimeout(() => {
+						this.$wskj.goBack(1)
+					}, 600)
 				})
 			},
 		}
diff --git a/pagesMine/pages/wx_lsgd.vue b/pagesMine/pages/wx_lsgd.vue
index a2761702207e5c8fc045939f86ad5a1551acd5d5..1e21597ea2311a4f63e143095cdbc41937c908ac 100644
--- a/pagesMine/pages/wx_lsgd.vue
+++ b/pagesMine/pages/wx_lsgd.vue
@@ -10,7 +10,7 @@
 					style="flex: 1;background: #FFFFFF;"
 					:style="{ color: index==0?'#FF682D':index==1?'#EEA616':index==2?'#1FCA7C':'#23BBEE'}"
 					v-for="(item, index) in 4" :key="index">
-					<text class="mt-20 fs-36">25</text>
+					<text class="mt-20 fs-36">{{numberList[(index+1)]||0}}</text>
 					<text class="mb-20 fs-24">{{index==0?'待处理':index==1?'待支付':index==2?'已完成':index==3?'已取消':''}}</text>
 					<view v-if="index==tabIndex"
 						style="background: #27CC81;height: 10rpx;width: 100%;border-radius: 12rpx;">
@@ -25,10 +25,13 @@
 				<view v-for="(item, index) in list" :key="index" @click="onCz('详情',index)">
 					<view class="flex-column br-12 mt-30 mlr-24 pad-20"
 						style="box-shadow: 0px 0px 15px 1px rgba(142,142,142,0.16);background: white;">
-						<view class="flex vh-center mt-20">
+						<view class="flex vh-center mt-20  fs-24">
 							<image class="h-40 w-40 mr-15" src="/static/icon_gd.png"> </image>
 							<text class="fs-32 fw-700" style="flex: 1;">{{item.communityName+item.room}}</text>
-							<text>{{item.state==1?'待处理':item.state==2?'待支付':item.state==3?'已完成':item.state==4?'已取消':''}}</text>
+							<text
+								:style="{ color: item.state==1?'#FF682D':item.state==2?'#EEA616':item.state==3?'#1FCA7C':'#23BBEE'}">
+								{{item.state==1?'待处理':item.state==2?'待支付':item.state==3?'已完成':item.state==4?'已取消':''}}
+							</text>
 						</view>
 						<text class="fs-28 br-6 pad-20 mtb-20"
 							style="background: #EBF5F0;">{{item.repairsDescription}}</text>
@@ -49,11 +52,11 @@
 					</view>
 				</view>
 			</scroll-view>
-			<view style="padding-top: 300rpx;">
-				<u-empty v-if="list.length==0" mode="data"></u-empty>
+			<view style="padding-top: 300rpx;" v-if="list.length==0">
+				<u-empty mode="data"></u-empty>
 			</view>
 			<u-popup :show="show" mode="center" @close="close" @open="open" round="10">
-				<view class="flex-column mlr-50" style="width:600rpx;text-align: center;">
+				<view class="flex-column mlr-50 pb-30" style="width:600rpx;text-align: center;">
 					<text class="fs-32 fw-600 mtb-20">设置维修费用</text>
 					<input class="br-6 mtb-20 h-100" placeholder="请输入维修费用金额" type="digit"
 						style="background: #EBF5F0; border-radius: 20rpx;" v-model="price" />
@@ -144,6 +147,7 @@
 				this.$request(params).then(res => {
 					this.close()
 					this.getList()
+					this.getNumberList()
 				})
 			}
 		},
diff --git a/pagesMine/pages/wx_xq.vue b/pagesMine/pages/wx_xq.vue
index cadda48d3a1ccb1ab9af522cc0c8b60387219c99..ca9fd2b85a429da01a3fd6154030ce8b2f09804c 100644
--- a/pagesMine/pages/wx_xq.vue
+++ b/pagesMine/pages/wx_xq.vue
@@ -17,12 +17,12 @@
 			style="background: white;border-top-left-radius: 20rpx;border-top-right-radius: 20rpx;margin-top: -20rpx;">
 			<scroll-view scroll-y style="height: 100%;">
 				<view class="mar-20">
-					<view class="flex-column-center">
+					<view class="flex-column-center fs-24">
 						<image class="w-40 h-40 mr-10" src="/static/icon_gd.png"></image>
 						<text style="flex: 1;text-align: left;"
 							class="fs-32 fw-700">{{data.communityName+data.room}}</text>
 						<text
-							style="font-size: 24rpx;color: #EEA616;">{{data.state==1?'待处理':data.state==2?'待支付':data.state==3?'已完成':data.state==4?'已取消':''}}</text>
+							:style="{ color: data.state==1?'#FF682D':data.state==2?'#EEA616':data.state==3?'#1FCA7C':'#23BBEE'}">{{data.state==1?'待处理':data.state==2?'待支付':data.state==3?'已完成':data.state==4?'已取消':''}}</text>
 					</view>
 					<view class="flex-column br-12 fs-28 mt-30" style="background: #EBF5F0;">
 						<view class="flex pad-30">
@@ -80,7 +80,7 @@
 				</view>
 			</scroll-view>
 			<u-popup :show="show" mode="center" @close="close" @open="open" round="10">
-				<view class="flex-column mlr-50" style="width:600rpx;text-align: center;">
+				<view class="flex-column mlr-50  pb-30" style="width:600rpx;text-align: center;">
 					<text class="fs-32 fw-600 mtb-20">设置维修费用</text>
 					<input class="br-6 mtb-20 h-100" placeholder="请输入维修费用金额" type="digit"
 						style="background: #EBF5F0; border-radius: 20rpx;" v-model="price" />
@@ -155,7 +155,7 @@
 				}
 				this.$request(params).then(res => {
 					this.close()
-					this.getList()
+					this.getData()
 				})
 			}
 		},
diff --git a/pagesMine/pages/yg_login.vue b/pagesMine/pages/yg_login.vue
index 54a375a9d53f493632a8437ccd3f1a50c6779fac..cd2fb20a57c0e3761c4665341938db1eff810828 100644
--- a/pagesMine/pages/yg_login.vue
+++ b/pagesMine/pages/yg_login.vue
@@ -6,7 +6,7 @@
 		</view>
 		<view class="flex-column mlr-70 mt-100" style="text-align: left;">
 			<text class="fs-48 fw-700">Hello!\n请登录员工账号</text>
-			<input class="h-86 lh-86 fs-28 plr-33 mt-80" style="background: #FFFFFF;" placeholder="手机号"
+			<input class="h-86 lh-86 fs-28 plr-33 mt-80" style="background: #FFFFFF;" placeholder="账号"
 				v-model="account" />
 			<input class="h-86 lh-86 fs-28 plr-33 mt-50" style="background: #FFFFFF;" placeholder="密码"
 				v-model="password" />
@@ -32,6 +32,14 @@
 		},
 		methods: {
 			login() {
+				if (!this.account) {
+					this.$wskj.toast('请输入账号');
+					return
+				}
+				if (!this.password) {
+					this.$wskj.toast('请输入密码');
+					return
+				}
 				const params = {
 					url: '/api/login/accountLogin/' + this.account + '/' + this.password,
 					loadingTip: '',
diff --git a/pagesMine/pages/zlbj.vue b/pagesMine/pages/zlbj.vue
index e34a9d083e74a6eaf8bb807f73af5c1996fe8ddd..a820b00b7e80789d62135438d0b0f8c42d42d343 100644
--- a/pagesMine/pages/zlbj.vue
+++ b/pagesMine/pages/zlbj.vue
@@ -6,7 +6,7 @@
 					<text class="fs-32 fw-700 pad-30" style="text-align: left;">基本信息</text>
 					<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
 						<text>姓名</text>
-						<text>{{userInfo.accountName}}</text>
+						<text>{{$wskj.isNullStr(userInfo.name)}}</text>
 					</view>
 					<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;" @click="open">
 						<text>性别</text>