From 5693f2df0e78e971b0a973d84b457a66cdb95831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E5=A8=81=E5=A8=81?= <1834256911@qq.com>
Date: Mon, 9 Jun 2025 19:11:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/wskj_function.js         |  19 ++++++
 pages/login/wechatlogin.png     | Bin 16939 -> 0 bytes
 pages/login/wechatlogin.vue     |  74 +++++++-------------
 pages/wy-bmfw.vue               |  93 +++++++++++++++++++++++--
 pages/wy-home.vue               | 117 ++++++++++++++++++++++++++++----
 pages/wy-mine.vue               |  79 +++++++++++++++------
 pagesMain/pages/bxbs_lsgd.vue   |  48 +++++++++++--
 pagesMain/pages/bxbs_submit.vue |  19 ++++--
 pagesMain/pages/bxxq.vue        |  56 +++++++++++----
 pagesMain/pages/cydh.vue        |   4 +-
 pagesMain/pages/jnzd_ccs.vue    |   8 ++-
 pagesMain/pages/jnzd_czf.vue    |  12 ++--
 pagesMain/pages/jnzd_tcf.vue    |  13 ++--
 pagesMain/pages/jnzd_tcfmx.vue  |  13 +++-
 pagesMain/pages/jnzd_wyfmx.vue  |   8 ++-
 pagesMain/pages/tjsq.vue        |  19 ++++--
 pagesMain/pages/tsby_lsgd.vue   |  21 +++---
 pagesMain/pages/tsby_submit.vue |  19 ++++--
 pagesMain/pages/tsby_xq.vue     |  14 ++--
 pagesMain/static/icon_tjsq.png  | Bin 0 -> 26563 bytes
 pagesMine/pages/fwxx.vue        |  20 ++++--
 pagesMine/pages/wx_lsgd.vue     |  16 +++--
 pagesMine/pages/wx_xq.vue       |   8 +--
 pagesMine/pages/yg_login.vue    |  10 ++-
 pagesMine/pages/zlbj.vue        |   2 +-
 25 files changed, 521 insertions(+), 171 deletions(-)
 delete mode 100644 pages/login/wechatlogin.png
 create mode 100644 pagesMain/static/icon_tjsq.png

diff --git a/common/wskj_function.js b/common/wskj_function.js
index 0b179e4..d992f5d 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
GIT binary patch
literal 0
HcmV?d00001

literal 16939
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
R??6GJsjBz1QsqVXe*@)u!mI!Q

diff --git a/pages/login/wechatlogin.vue b/pages/login/wechatlogin.vue
index 8c2581d..aab74d0 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 8dea181..7ca735a 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 591e358..9dd4f31 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 509fce8..2bc226c 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 d199705..87cf3b1 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 5cb8e7a..1cafe36 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 9c88457..01a2ab2 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 2aac6cb..79d1709 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 10234a3..f758f7a 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 33f79fb..e4ecac1 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 925b30c..150edd8 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 241b691..6192a10 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 870a330..77e7b25 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 8845742..05e427b 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 30174ef..e6bd34e 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 d441e27..0b1bf8d 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 5127b42..b070d30 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
GIT binary patch
literal 26563
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
Xyn5QKsvLx=Jit?RUA3CW@W}rIm`%iV

literal 0
HcmV?d00001

diff --git a/pagesMine/pages/fwxx.vue b/pagesMine/pages/fwxx.vue
index 244fa1b..97816f3 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 a276170..1e21597 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 cadda48..ca9fd2b 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 54a375a..cd2fb20 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 e34a9d0..a820b00 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>
-- 
2.22.0