From 491c3a320a549d660bbfe3637d41126a92657362 Mon Sep 17 00:00:00 2001
From: zhouyanli <593579392@qq.com>
Date: Tue, 4 Aug 2026 14:41:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E7=99=BB=E5=BD=95=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 huakai-app/pageSubPack/api/request.js         |  13 +-
 huakai-app/pageSubPack/loginSub/login.vue     |   4 +-
 huakai-app/pageSubPack/loginSub/pwd-login.vue |   4 +-
 .../payment-list/addHydropower.vue            | 545 ------------------
 .../pageSubPack/payment-list/addPayment.vue   | 522 -----------------
 .../payment-list/addPaymentSuccess.vue        | 160 -----
 .../payment-list/noArrearsPayment.vue         | 482 ----------------
 .../payment-list/paymentRecord.vue            | 397 -------------
 .../payment-list/selectPaymentEntity.vue      | 376 ------------
 huakai-app/pages.json                         |  92 +--
 .../pages/paymentIndex/paymentIndex.vue       | 364 ------------
 11 files changed, 62 insertions(+), 2897 deletions(-)
 delete mode 100644 huakai-app/pageSubPack/payment-list/addHydropower.vue
 delete mode 100644 huakai-app/pageSubPack/payment-list/addPayment.vue
 delete mode 100644 huakai-app/pageSubPack/payment-list/addPaymentSuccess.vue
 delete mode 100644 huakai-app/pageSubPack/payment-list/noArrearsPayment.vue
 delete mode 100644 huakai-app/pageSubPack/payment-list/paymentRecord.vue
 delete mode 100644 huakai-app/pageSubPack/payment-list/selectPaymentEntity.vue
 delete mode 100644 huakai-app/pages/paymentIndex/paymentIndex.vue

diff --git a/huakai-app/pageSubPack/api/request.js b/huakai-app/pageSubPack/api/request.js
index 1f0df05..fb0f56d 100644
--- a/huakai-app/pageSubPack/api/request.js
+++ b/huakai-app/pageSubPack/api/request.js
@@ -42,10 +42,21 @@ export default function request(url, data = {}, method = "GET") {
 
 				const resData = res.data || {};
 
-				// token 过期 — 静默清除登录态，不强制跳转登录页
+				// token 过期 — 清除登录态，提示用户，但不强制跳转（用户可继续浏览非敏感页面）
 				if (resData.code === 401) {
+					uni.showToast({ title: '登录已过期，请重新登录', icon: 'none', duration: 2000 });
 					uni.removeStorageSync('token');
 					uni.removeStorageSync('userId');
+					// 使用 navigateTo 而非 reLaunch，用户可通过返回按钮退出登录页
+					setTimeout(() => {
+						uni.navigateTo({
+							url: '/pageSubPack/loginSub/pwd-login',
+							fail: () => {
+								// 如果 navigateTo 失败（如页面栈满），则用 reLaunch
+								uni.reLaunch({ url: '/pageSubPack/loginSub/pwd-login' });
+							}
+						});
+					}, 1500);
 					reject({ msg: '登录过期', code: 401 });
 					return;
 				}
diff --git a/huakai-app/pageSubPack/loginSub/login.vue b/huakai-app/pageSubPack/loginSub/login.vue
index 24acf9b..fcc2c69 100644
--- a/huakai-app/pageSubPack/loginSub/login.vue
+++ b/huakai-app/pageSubPack/loginSub/login.vue
@@ -115,7 +115,7 @@ const handleCancel = () => {
   if (pages.length > 1) {
     uni.navigateBack();
   } else {
-    uni.redirectTo({ url: '/pages/paymentIndex/paymentIndex' });
+    uni.redirectTo({ url: '/pages/arrearsPayment/arrearsPayment' });
   }
 };
 
@@ -204,7 +204,7 @@ const handleLogin = () => {
 				// 登录成功后返回来源页
 				uni.navigateBack({
 					fail: () => {
-						uni.redirectTo({ url: '/pages/paymentIndex/paymentIndex' });
+						uni.redirectTo({ url: '/pages/arrearsPayment/arrearsPayment' });
 					}
 				});
 			},1500)
diff --git a/huakai-app/pageSubPack/loginSub/pwd-login.vue b/huakai-app/pageSubPack/loginSub/pwd-login.vue
index 6ec4fa2..08a351a 100644
--- a/huakai-app/pageSubPack/loginSub/pwd-login.vue
+++ b/huakai-app/pageSubPack/loginSub/pwd-login.vue
@@ -117,7 +117,7 @@ const handleCancel = () => {
   if (pages.length > 1) {
     uni.navigateBack();
   } else {
-    uni.redirectTo({ url: '/pages/paymentIndex/paymentIndex' });
+    uni.redirectTo({ url: '/pages/arrearsPayment/arrearsPayment' });
   }
 };
 
@@ -166,7 +166,7 @@ const handleLogin = () => {
 				// 登录成功后返回来源页
 				uni.navigateBack({
 					fail: () => {
-						uni.redirectTo({ url: '/pages/paymentIndex/paymentIndex' });
+						uni.redirectTo({ url: '/pages/arrearsPayment/arrearsPayment' });
 					}
 				});
 			},1000)
diff --git a/huakai-app/pageSubPack/payment-list/addHydropower.vue b/huakai-app/pageSubPack/payment-list/addHydropower.vue
deleted file mode 100644
index cc7637f..0000000
--- a/huakai-app/pageSubPack/payment-list/addHydropower.vue
+++ /dev/null
@@ -1,545 +0,0 @@
-<template>
-	<view class="contentStyle" style="">
-		<view class="status-bar"></view>
-		<uni-nav-bar :title="'新增'+paymentType+'缴费'" left-icon="left" @clickLeft="goBack" backgroundColor="transparent"
-			:border="false">
-		</uni-nav-bar>
-		<!-- 表单区域 -->
-		<scroll-view class="page" scroll-y="true">
-			<view class="card-box">
-				<!-- 头部水表标题+水滴图标 -->
-				<view class="card-header">
-					<image class="iconStyle"
-						:src="paymentType=='水表'?'https://wuyeadmin.bugtc.com/images/propertyImgs/water.png':'https://wuyeadmin.bugtc.com/images/propertyImgs/electric.png'">
-					</image>
-					<text class="card-title">{{paymentType}}</text>
-				</view>
-				<!-- 分割线 -->
-				<view class="line"></view>
-				<view class="input-item">
-					<view class="input-label">缴费单位</view>
-					<text class="company-name">花开物业</text>
-				</view>
-				<!-- 分割线 -->
-				<view class="line"></view>
-				<!-- 设备号输入项 -->
-				<view class="input-item">
-					<view class="input-label">缴费设备号</view>
-					<view class="input-wrap">
-						<!-- 输入框 -->
-						<input class="input" placeholder="请输入设备号" placeholder-class="input-placeholder"
-							v-model="deviceNo" />
-						<!-- 右边扫码图标 text标签直接用 双端不乱码 -->
-						<image class="scanTheCodeIconStyle"
-							src="https://wuyeadmin.bugtc.com/images/propertyImgs/scanTheCodeIcon.png" @click="scanCode">
-						</image>
-					</view>
-				</view>
-
-				<!-- 底部分割线 -->
-				<view class="line"></view>
-			</view>
-
-
-			<!-- 底部协议和提交按钮 -->
-			<view class="bottom-area">
-				<!-- <view class="agreement">
-					<checkbox-group @change="handleAgreeChange">
-						<checkbox :checked="isAgree" />
-					</checkbox-group>
-					<text class="agreement-text">我已阅并同意</text>
-					<text class="agreement-link" @click="handleProtocol">《协议链接》</text>
-				</view> -->
-
-
-				<button class="submit-btn" @click="goPay">
-					提交
-				</button>
-			</view>
-
-
-
-
-
-
-
-
-		</scroll-view>
-
-
-	</view>
-
-
-
-</template>
-
-<script setup>
-	import {
-		ref,
-		onMounted,
-		computed
-
-	} from 'vue'
-	import {
-		onShow,
-		onReady,
-		onReachBottom,
-		onLoad,
-		onUnload,
-		onPullDownRefresh
-	} from '@dcloudio/uni-app'
-
-	import {
-		getTopUpBindDevice,
-		getopenIdByCode
-	} from '/pageSubPack/api/apiSub.js'
-import { showApiError } from '/pageSubPack/api/request.js'
-
-	// 响应式数据
-	const paymentType = ref(uni.getStorageSync('addPaymentType'))
-	const deviceNo = ref('')
-	const isAgree = ref(false)
-	// 生命周期
-	onMounted(() => {})
-
-	// 扫码
-	const scanCode = async () => {
-		try {
-			uni.showLoading({
-				title: '扫码中...',
-				mask: true
-			})
-
-			const res = await uni.scanCode({
-				onlyFromCamera: false,
-				scanType: ['qrCode', 'barCode']
-			})
-
-			// 扫码成功，赋值
-			deviceNo.value = res.result
-			uni.hideLoading()
-			uni.showToast({
-				title: '扫码成功',
-				icon: 'success'
-			})
-		} catch (err) {
-			uni.hideLoading()
-			console.log('扫码失败', err)
-			uni.showToast({
-				title: '扫码取消/失败',
-				icon: 'none'
-			})
-		}
-	}
-
-	// 提交缴费
-	const goPay = async () => {
-		if (!deviceNo.value) {
-			uni.showToast({
-				title: '请输入设备号',
-				icon: 'none'
-			})
-			return
-		}
-
-		uni.showModal({
-			title: '确认提交',
-			content: '确认要提交吗?',
-			success: async (res) => {
-				if (res.confirm) {
-					uni.showLoading({
-						title: '提交中...',
-						mask: true
-					})
-
-					try {
-						// // 获取 openid
-						// const loginRes = await wx.login()
-						// if (!loginRes.code) {
-						// 	uni.hideLoading()
-						// 	uni.showToast({
-						// 		title: '登录失败',
-						// 		icon: 'none'
-						// 	})
-						// 	return
-						// }
-						// // 用 code 换 openid
-						// const openIdRes = await getopenIdByCode({
-						// 	code: loginRes.code
-						// })
-						// if (openIdRes.code !== 200 || !openIdRes.data) {
-						// 	uni.hideLoading()
-						// 	uni.showToast({
-						// 		title: '获取openid失败',
-						// 		icon: 'none'
-						// 	})
-						// 	return
-						// }
-						const openid = uni.getStorageSync('openid')
-						await getTopUpBindDevice({
-							deviceType: paymentType.value=='水表'?'2':'1',
-							deviceCode: deviceNo.value,
-							openid: openid,
-							residentUserId: uni.getStorageSync('userId')
-						})
-						uni.hideLoading()
-						uni.showToast({
-							title: '提交成功',
-							icon: 'success'
-						})
-						setTimeout(() => {
-							goNext()
-						}, 1500)
-					} catch (err) {
-						uni.hideLoading()
-						showApiError(err)
-						console.error('绑定设备失败：', err)
-					}
-				}
-			}
-		})
-	}
-
-
-
-	// 跳转成功页
-	const goNext = () => {
-		uni.redirectTo({
-			url: '/pageSubPack/payment-list/addPaymentSuccess'
-		})
-	}
-
-	// 返回
-	const goBack = () => {
-		uni.redirectTo({
-			url: '/pages/paymentIndex/paymentIndex'
-		})
-	}
-</script>
-<style lang="scss">
-	page {
-		background: #f2f1f6;
-	}
-</style>
-
-<style scoped>
-	.contentStyle {
-		display: flex;
-		flex-direction: column;
-		height: 100vh;
-		/* 关键：占满屏幕高度 */
-		background-color: #f9f9f9;
-	}
-
-	.page {
-		flex: 1;
-		overflow-y: auto;
-		padding: 0px 40rpx;
-		box-sizing: border-box;
-	}
-
-
-	/* 白色卡片容器 */
-	.card-box {
-		background: #ffffff;
-		border-radius: 24rpx;
-		padding: 32rpx;
-	}
-
-	/* 头部水表标题 */
-	.card-header {
-		display: flex;
-		align-items: center;
-		gap: 16rpx;
-		margin-bottom: 32rpx;
-	}
-
-	.iconStyle {
-		width: 88rpx;
-		height: 88rpx;
-	}
-
-	.scanTheCodeIconStyle {
-		width: 48rpx;
-		height: 48rpx;
-		padding-left: 20rpx;
-	}
-
-	.water-icon {
-		font-size: 32rpx;
-	}
-
-	.card-title {
-		font-size: 32rpx;
-		color: #333;
-		font-weight: 500;
-	}
-
-	/* 分割线 */
-	.line {
-		width: 100%;
-		height: 1rpx;
-		background: #eeeeee;
-	}
-
-	/* 输入项整体 */
-	.input-item {
-		padding: 32rpx 0;
-	}
-
-	.input-label {
-		font-size: 28rpx;
-		color: #333;
-		margin-bottom: 24rpx;
-	}
-
-	/* 输入框+扫码图标横向布局 */
-	.input-wrap {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-	}
-
-	.input {
-		flex: 1;
-		font-size: 32rpx;
-		color: #333;
-	}
-
-	/* 占位符样式 */
-	.input-placeholder {
-		color: #cccccc;
-	}
-
-
-
-	/* 底部协议+按钮区域 */
-	.bottom-area {
-		margin-top: 60rpx;
-		padding: 0 10rpx;
-	}
-
-	/* 协议勾选 */
-	.agree-item {
-		display: flex;
-		align-items: center;
-		gap: 16rpx;
-		margin-bottom: 40rpx;
-	}
-
-	.radio-box {
-		width: 36rpx;
-		height: 36rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.radio-icon {
-		font-size: 32rpx;
-		color: #999;
-	}
-
-	.agree-text {
-		font-size: 28rpx;
-		color: #666;
-	}
-
-	.agree-link {
-		font-size: 28rpx;
-		color: #007aff;
-	}
-
-	/* 立即缴费按钮 */
-	.pay-btn {
-		width: 100%;
-		height: 96rpx;
-		background: #007aff;
-		border-radius: 16rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.pay-text {
-		font-size: 36rpx;
-		color: #ffffff;
-	}
-
-	/* 白色卡片容器 */
-	.card-box {
-		background: #ffffff;
-		border-radius: 24rpx;
-		padding: 32rpx;
-	}
-
-	/* 头部水表标题 */
-	.card-header {
-		display: flex;
-		align-items: center;
-		gap: 16rpx;
-		margin-bottom: 32rpx;
-	}
-
-	.water-icon {
-		font-size: 48rpx;
-	}
-
-	.card-title {
-		font-size: 36rpx;
-		color: #333;
-		font-weight: 500;
-	}
-
-	/* 分割线 */
-	.line {
-		width: 100%;
-		height: 1rpx;
-		background: #eeeeee;
-	}
-
-	/* 输入项整体 */
-	.input-item {
-		padding: 32rpx 0;
-	}
-
-	.input-label {
-		font-size: 32rpx;
-		color: #333;
-		margin-bottom: 24rpx;
-	}
-
-	/* 输入框+扫码图标横向布局 */
-	.input-wrap {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-	}
-
-	.input {
-		flex: 1;
-		font-size: 32rpx;
-		color: #333;
-	}
-
-	/* 占位符样式 */
-	.input-placeholder {
-		color: #cccccc;
-	}
-
-	/* 右边扫码图标 text标签直接用 双端不乱码 */
-	.scan-icon {
-		font-size: 40rpx;
-		color: #999;
-		padding-left: 20rpx;
-	}
-
-	/* 底部协议+按钮区域 */
-	.bottom-area {
-		margin-top: 60rpx;
-		padding: 0 10rpx;
-	}
-
-	/* 协议勾选 */
-	.agree-item {
-		display: flex;
-		align-items: center;
-		gap: 16rpx;
-		margin-bottom: 40rpx;
-	}
-
-	.radio-box {
-		width: 36rpx;
-		height: 36rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.radio-icon {
-		font-size: 32rpx;
-		color: #999;
-	}
-
-	.agree-text {
-		font-size: 28rpx;
-		color: #666;
-	}
-
-	.agree-link {
-		font-size: 28rpx;
-		color: #007aff;
-	}
-
-	/* 立即缴费按钮 */
-	.pay-btn {
-		width: 100%;
-		height: 96rpx;
-		background: #007aff;
-		border-radius: 16rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.pay-text {
-		font-size: 36rpx;
-		color: #ffffff;
-	}
-
-	.status-bar {
-		width: 100vw;
-		height: 46px;
-	}
-
-	/* 底部区域 */
-	.bottom-area {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		padding: 30rpx;
-		box-sizing: border-box;
-	}
-
-	.agreement {
-		display: flex;
-		align-items: center;
-		margin-bottom: 20rpx;
-	}
-
-	.agreement checkbox {
-		transform: scale(0.8);
-		margin-right: 10rpx;
-	}
-
-	.agreement-text {
-		font-size: 24rpx;
-		color: #333;
-	}
-
-	.agreement-link {
-		font-size: 28rpx;
-		color: #4080ff;
-		margin-left: 10rpx;
-	}
-
-	.submit-btn {
-		width: 100%;
-		height: 90rpx;
-		line-height: 90rpx;
-		background-color: #4080ff;
-		color: #fff;
-		border-radius: 10rpx;
-		font-size: 36rpx;
-		font-weight: 500;
-		border: none;
-		outline: none;
-	}
-
-	.submit-btn[disabled] {
-		background-color: #a0c4ff;
-		color: #fff;
-		opacity: 0.7;
-	}
-</style>
\ No newline at end of file
diff --git a/huakai-app/pageSubPack/payment-list/addPayment.vue b/huakai-app/pageSubPack/payment-list/addPayment.vue
deleted file mode 100644
index e62f7e1..0000000
--- a/huakai-app/pageSubPack/payment-list/addPayment.vue
+++ /dev/null
@@ -1,522 +0,0 @@
- <template>
- 	<view class="contentStyle" style="">
- 		<view class="status-bar"></view>
- 		<uni-nav-bar :title="'新增'+paymentType+'缴费'" left-icon="left" @clickLeft="goBack" backgroundColor="transparent"
- 			:border="false">
- 		</uni-nav-bar>
-
-
- 		<!-- 表单区域 -->
- 		<scroll-view class="page" scroll-y="true">
- 			<view class="container">
- 				<!-- 顶部蓝色标题栏 -->
- 				<view class="header-card">
- 					<view class="header-icon">
- 						<image class="iconStyle"
- 							:src="paymentType=='燃气'?'https://wuyeadmin.bugtc.com/images/propertyImgs/gas.png':'https://wuyeadmin.bugtc.com/images/propertyImgs/heating.png'">
- 							></image>
- 					</view>
- 					<text class="header-title">{{paymentType+'费'}}</text>
- 				</view>
-
- 				<!-- 缴费信息卡片 -->
- 				<view class="info-card">
- 					<view class="form-item" @click="goToChange()">
- 						<text class="label">缴费单位</text>
- 						<text class="company-name">XXXXXXXX有限公司</text>
- 					</view>
-
- 					<view class="form-item">
- 						<text class="label">缴费单位</text>
- 						<view class="input-wrapper">
- 							<input type="number" placeholder="请输入户号" class="input-field" v-model="userNo" />
- 							<text class="help-link" @click="showPopup = true">如何获取户号?</text>
- 						</view>
- 					</view>
- 				</view>
-
-
- 			</view>
-
-
-
- 			<!-- 快速获取户号 底部弹窗 -->
- 			<view v-if="showPopup" class="popup-mask" @click="showPopup = false">
- 				<view class="popup-content" @click.stop>
- 					<view class="popup-header">
- 						<text class="popup-title">快速获取户号</text>
- 						<text class="popup-close" @click="showPopup = false">×</text>
- 					</view>
- 					<view class="popup-list">
- 						<view class="popup-item">
- 							<view class="item-number">1</view>
- 							<view class="item-content">
- 								<text class="item-title">查看缴费通知单</text>
- 								<text class="item-desc">在纸质缴费/催费通知单上查找户号。</text>
- 							</view>
- 						</view>
- 						<view class="popup-item">
- 							<view class="item-number">2</view>
- 							<view class="item-content">
- 								<text class="item-title">查询通知短信</text>
- 								<text class="item-desc">搜索手机由缴费单位发送的催缴短信，短信中包含户号</text>
- 							</view>
- 						</view>
- 					</view>
- 				</view>
- 			</view>
-
-
- 		</scroll-view>
- 		<!-- 底部协议和立即缴费按钮 -->
- 		<view class="bottom-area">
- 			<view class="agreement">
- 				<checkbox-group @change="handleAgreeChange">
- 					<checkbox :checked="isAgree" />
- 				</checkbox-group>
- 				<text class="agreement-text">我已阅并同意</text>
- 				<text class="agreement-link" @click="handleProtocol">《协议链接》</text>
- 			</view>
- 			<button class="submit-btn" @click="handleSubmit">
- 				立即缴费
- 			</button>
- 		</view>
- 	</view>
-
-
-
- </template>
-
- <script setup>
- 	import {
- 		ref,
- 		onMounted,
- 		computed
-
- 	} from 'vue'
- 	import {
- 		onShow,
- 		onReady,
- 		onReachBottom,
- 		onLoad,
- 		onUnload,
- 		onPullDownRefresh
- 	} from '@dcloudio/uni-app'
- 	// 响应式数据
- 	const statusBarHeight = ref(20)
- 	const paymentType = ref(uni.getStorageSync('addPaymentType'))
- 	const userNo = ref('')
- 	const isAgree = ref(false)
- 	const showPopup = ref(false)
-
- 	// 生命周期
- 	onShow(() => {})
- 	onMounted(() => {})
- 	onReady(() => {
- 		// nextTick 用法
- 		// nextTick(() => {})
- 	})
-
- 	// 勾选协议
- 	const handleAgreeChange = (e) => {
- 		isAgree.value = e.detail.value.length > 0
- 	}
-
- 	// 协议链接点击
- 	const handleProtocol = () => {
- 		uni.navigateTo({})
- 	}
-
- 	// 提交
- 	const handleSubmit = () => {
- 		if (!userNo.value) {
- 			uni.showToast({
- 				title: '请输入户号',
- 				icon: 'none'
- 			})
- 			return
- 		}
-
- 		if (!isAgree.value) {
- 			uni.showToast({
- 				title: '请先同意协议',
- 				icon: 'none'
- 			})
- 			return
- 		}
-
- 		uni.showModal({
- 			title: '确认提交',
- 			content: '确认要提交吗?',
- 			success: (res) => {
- 				if (res.confirm) {
- 					uni.showLoading({
- 						title: '提交中...',
- 						mask: true
- 					})
-
- 					setTimeout(() => {
- 						uni.showToast({
- 							title: '提交成功',
- 							icon: 'success'
- 						})
- 					}, 1000)
-
- 					setTimeout(() => {
- 						uni.hideLoading()
- 						goNext()
- 					}, 2500)
- 				}
- 			}
- 		})
- 	}
-
- 	// 跳转成功页
- 	const goNext = () => {
- 		uni.redirectTo({
- 			url: '/pageSubPack/payment-list/addPaymentSuccess'
- 		})
- 	}
-
- 	// 切换（注释保留）
- 	const goToChange = () => {
- 		// uni.redirectTo({
- 		//   url: '/pageSubPack/payment-list/selectPaymentEntity'
- 		// })
- 	}
-
- 	// 返回
- 	const goBack = () => {
- 		uni.redirectTo({ url: '/pages/paymentIndex/paymentIndex' });
- 	}
- </script>
- <style lang="scss">
- 	page {
- 		background: #f9f9f9;
- 	}
- </style>
-
- <style scoped>
- 	.contentStyle {
- 		display: flex;
- 		flex-direction: column;
- 		height: 100vh;
- 		/* 关键：占满屏幕高度 */
- 		background-color: #f9f9f9;
- 	}
-
- 	.page {
- 		flex: 1;
- 		overflow-y: auto;
- 		padding: 0px 40rpx;
- 		box-sizing: border-box;
- 	}
-
- 	.container {
- 		border-radius: 10rpx;
- 	}
-
- 	/* 顶部标题栏 */
- 	.header-card {
- 		background: #fff;
- 		padding: 30rpx;
- 		display: flex;
- 		align-items: center;
- 		border-bottom: 2rpx solid #ededed;
-
- 	}
-
- 	.header-icon {
- 		width: 56rpx;
- 		height: 56rpx;
- 		background-color: #fff;
- 		border-radius: 50%;
- 		display: flex;
- 		align-items: center;
- 		justify-content: center;
- 		margin-right: 20rpx;
-
- 	}
-
- 	.iconStyle {
- 		width: 100%;
- 		height: 100%;
- 	}
-
- 	.icon-fire {
- 		font-size: 32rpx;
- 		color: #4080ff;
- 	}
-
- 	.header-title {
- 		font-size: 32rpx;
- 		font-weight: bold;
- 	}
-
- 	/* 信息卡片 */
- 	.info-card {
- 		background-color: #fff;
- 		border-radius: 10rpx;
- 		/* padding: 30rpx; */
- 		margin-bottom: 40rpx;
- 	}
-
- 	.form-item {
- 		/* margin-bottom: 40rpx; */
- 		border-bottom: 2rpx solid #ededed;
- 		padding: 30rpx;
- 	}
-
- 	.form-item:last-child {
- 		margin-bottom: 0;
- 	}
-
- 	.label {
- 		display: block;
- 		font-size: 28rpx;
- 		color: #222;
- 		margin-bottom: 20rpx;
- 	}
-
- 	.company-name {
- 		display: block;
- 		font-size: 32rpx;
- 		color: #333;
- 		font-weight: 600;
- 	}
-
- 	.input-wrapper {
- 		display: flex;
- 		align-items: center;
- 		justify-content: space-between;
- 	}
-
- 	.input-field {
- 		flex: 1;
- 		font-size: 32rpx;
- 		color: #333;
- 		padding: 10rpx 0;
- 		border: none;
- 		outline: none;
- 	}
-
- 	.input-field::placeholder {
- 		color: #ccc;
- 	}
-
- 	.help-link {
- 		font-size: 28rpx;
- 		color: #4080ff;
- 		white-space: nowrap;
- 		margin-left: 20rpx;
- 	}
-
- 	/* 底部区域 */
- 	.bottom-area {
- 		position: fixed;
- 		bottom: 0;
- 		left: 0;
- 		right: 0;
- 		padding: 30rpx;
- 		box-sizing: border-box;
- 	}
-
- 	.agreement {
- 		display: flex;
- 		align-items: center;
- 		margin-bottom: 20rpx;
- 	}
-
- 	.agreement checkbox {
- 		transform: scale(0.8);
- 		margin-right: 10rpx;
- 	}
-
- 	.agreement-text {
- 		font-size: 24rpx;
- 		color: #333;
- 	}
-
- 	.agreement-link {
- 		font-size: 28rpx;
- 		color: #4080ff;
- 		margin-left: 10rpx;
- 	}
-
- 	.submit-btn {
- 		width: 100%;
- 		height: 90rpx;
- 		line-height: 90rpx;
- 		background-color: #4080ff;
- 		color: #fff;
- 		border-radius: 10rpx;
- 		font-size: 36rpx;
- 		font-weight: 500;
- 		border: none;
- 		outline: none;
- 	}
-
- 	.submit-btn[disabled] {
- 		background-color: #a0c4ff;
- 		color: #fff;
- 		opacity: 0.7;
- 	}
-
- 	/* 弹窗遮罩层 */
- 	.popup-mask {
- 		position: fixed;
- 		top: 0;
- 		left: 0;
- 		right: 0;
- 		bottom: 0;
- 		background-color: rgba(0, 0, 0, 0.5);
- 		z-index: 999;
- 		display: flex;
- 		align-items: flex-end;
- 	}
-
- 	/* 弹窗内容 */
- 	.popup-content {
- 		width: 100%;
- 		background-color: #fff;
- 		border-radius: 20rpx 20rpx 0 0;
- 		padding: 30rpx 40rpx 60rpx;
- 		box-sizing: border-box;
- 		animation: slideUp 0.3s ease-out;
- 	}
-
- 	/* 弹窗标题栏 */
- 	.popup-header {
- 		display: flex;
- 		align-items: center;
- 		justify-content: space-between;
- 		margin-bottom: 40rpx;
- 	}
-
- 	.popup-title {
- 		font-size: 32rpx;
- 		line-height: 60rpx;
- 		font-weight: bold;
- 		color: #333;
- 		width: 100%;
- 		display: flex;
- 		/* align-items: center; */
- 		justify-content: space-evenly;
- 		border-bottom: 2rpx solid #ebebeb;
- 	}
-
- 	.popup-close {
- 		font-size: 48rpx;
- 		color: #999;
- 		line-height: 1;
- 	}
-
- 	/* 弹窗列表 */
- 	.popup-list {
- 		padding: 0 10rpx;
-
- 	}
-
- 	.popup-item {
- 		display: flex;
- 		align-items: flex-start;
- 		margin-bottom: 40rpx;
- 	}
-
- 	.popup-item:last-child {
- 		margin-bottom: 0;
- 	}
-
- 	.item-number {
- 		width: 40rpx;
- 		height: 40rpx;
- 		line-height: 40rpx;
- 		text-align: center;
- 		border: 2rpx solid #4080ff;
- 		border-radius: 6rpx;
- 		font-size: 28rpx;
- 		font-weight: bold;
- 		color: #4080ff;
- 		margin-right: 20rpx;
- 		flex-shrink: 0;
- 	}
-
- 	.item-content {
- 		flex: 1;
- 		display: flex;
- 		flex-direction: column;
- 	}
-
- 	.item-title {
- 		font-size: 32rpx;
- 		font-weight: bold;
- 		color: #333;
- 		margin-bottom: 16rpx;
- 	}
-
- 	.item-desc {
- 		font-size: 28rpx;
- 		color: #666;
- 		line-height: 1.5;
- 	}
-
- 	/* 弹窗动画 */
- 	/* @keyframes slideUp {
- 		from {
- 			transform: translateY(100%);
- 		}
-
- 		to {
- 			transform: translateY(0);
- 		}
- 	} */
-
- 	/* 成功提示弹窗 */
- 	.toast-mask {
- 		position: fixed;
- 		top: 0;
- 		left: 0;
- 		right: 0;
- 		bottom: 0;
- 		display: flex;
- 		align-items: center;
- 		justify-content: center;
- 		background-color: transparent;
- 		z-index: 9999;
- 	}
-
- 	.toast-content {
- 		background-color: rgba(0, 0, 0, 0.8);
- 		padding: 40rpx 60rpx;
- 		border-radius: 8rpx;
- 		display: flex;
- 		flex-direction: column;
- 		align-items: center;
- 		justify-content: center;
- 	}
-
- 	.toast-icon {
- 		width: 60rpx;
- 		height: 60rpx;
- 		line-height: 60rpx;
- 		border-radius: 50%;
- 		background-color: #fff;
- 		color: #1677ff;
- 		font-size: 40rpx;
- 		font-weight: bold;
- 		margin-bottom: 20rpx;
- 		display: flex;
- 		align-items: center;
- 		justify-content: center;
- 	}
-
- 	.toast-text {
- 		color: #fff;
- 		font-size: 28rpx;
- 	}
-
- 	.status-bar {
- 		width: 100vw;
- 		height: 46px;
- 	}
- </style>
\ No newline at end of file
diff --git a/huakai-app/pageSubPack/payment-list/addPaymentSuccess.vue b/huakai-app/pageSubPack/payment-list/addPaymentSuccess.vue
deleted file mode 100644
index 5e219b6..0000000
--- a/huakai-app/pageSubPack/payment-list/addPaymentSuccess.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<template>
-	<view class="contentStyle" style="">
-		<view class="status-bar"></view>
-		<uni-nav-bar :title="'新增'+paymentType+'缴费'" left-icon="left" @clickLeft="goBack" backgroundColor="transparent"
-			:border="false">
-		</uni-nav-bar>
-
-		<!-- 表单区域 -->
-		<scroll-view class="page" scroll-y="true">
-			<view class="container">
-				<!-- 成功图标 -->
-				<view class="success-icon">
-					<text class="icon-check">✓</text>
-				</view>
-
-				<!-- 主标题 -->
-				<view class="title">绑定成功</view>
-
-				<!-- 提示文案 -->
-				<view class="desc">
-					恭喜您绑定成功，费用将在24小时内更新，<br>
-					请您按时查看，避免造成费用欠费
-				</view>
-
-				<!-- 操作按钮 -->
-				<view class="btn-wrap">
-					<button class="btn-back" @click="goBack">返回生活缴费</button>
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script setup>
-	import {
-		ref,
-		onMounted,
-		computed
-
-	} from 'vue'
-	import {
-		onShow,
-		onReady,
-		onReachBottom,
-		onLoad,
-		onUnload,
-		onPullDownRefresh
-	} from '@dcloudio/uni-app'
-
-	// 响应式数据
-	const statusBarHeight = ref(20)
-	const paymentType = ref(uni.getStorageSync('addPaymentType'))
-
-	// 生命周期
-	onShow(() => {})
-	onMounted(() => {})
-	onReady(() => {})
-
-	// 方法
-	const goBack = () => {
-		uni.redirectTo({ url: '/pages/paymentIndex/paymentIndex' });
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background: #f9f9f9;
-	}
-</style>
-
-<style scoped>
-	.contentStyle {
-		display: flex;
-		flex-direction: column;
-		height: 100vh;
-		background-color: #f9f9f9;
-	}
-
-	.page {
-		flex: 1;
-		overflow-y: auto;
-		padding: 0px 40rpx;
-		box-sizing: border-box;
-	}
-</style>
-
-<style scoped>
-	/* 全局容器 */
-	.container {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	/* 成功图标 */
-	.success-icon {
-		width: 220rpx;
-		height: 220rpx;
-		border-radius: 50%;
-		background-color: #1677ff;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin-top: 200rpx;
-		margin-bottom: 30rpx;
-	}
-
-	.icon-check {
-		color: #fff;
-		font-size: 130rpx;
-		font-weight: bold;
-		line-height: 1;
-	}
-
-	/* 主标题 */
-	.title {
-		font-size: 44rpx;
-		font-weight: bold;
-		color: #000;
-		margin-bottom: 40rpx;
-	}
-
-	/* 提示文案 */
-	.desc {
-		font-size: 32rpx;
-		color: #666;
-		line-height: 1.6;
-		text-align: center;
-		margin-bottom: 150rpx;
-	}
-
-	/* 按钮容器 */
-	.btn-wrap {
-		width: 100%;
-	}
-
-	/* 返回按钮 */
-	.btn-back {
-		width: 100%;
-		height: 96rpx;
-		line-height: 96rpx;
-		background-color: #1677ff;
-		color: #fff;
-		font-size: 36rpx;
-		border-radius: 8rpx;
-		border: none;
-		padding: 0;
-		margin: 0;
-	}
-
-	/* 按钮默认样式重置（解决uni-app button默认样式问题） */
-	.btn-back::after {
-		border: none;
-	}
-
-	.status-bar {
-		width: 100vw;
-		height: 46px;
-	}
-</style>
\ No newline at end of file
diff --git a/huakai-app/pageSubPack/payment-list/noArrearsPayment.vue b/huakai-app/pageSubPack/payment-list/noArrearsPayment.vue
deleted file mode 100644
index 5a5e97d..0000000
--- a/huakai-app/pageSubPack/payment-list/noArrearsPayment.vue
+++ /dev/null
@@ -1,482 +0,0 @@
-<template>
-	<view class="contentStyle" style="">
-		<view class="status-bar"></view>
-		<uni-nav-bar :title="arrearsPayment" left-icon="left" @clickLeft="goBack" backgroundColor="transparent"
-			:border="false">
-		</uni-nav-bar>
-
-		<!-- 表单区域 -->
-		<scroll-view class="page" scroll-y="true">
-			<view class="container">
-				<!-- 1. 物业费详情页 -->
-				<view class="pay-page">
-					<!-- 未欠费 -->
-					 <!-- v-if="arrearsPayment=='暖气费'" -->
-					<view class="no-arrears-section">
-						<image src="https://wuyeadmin.bugtc.com/images/propertyImgs/noArrears.png"
-							class="background-image-style"></image>
-						<text class="noArrearsText">暂未查到欠费</text>
-						<view class="recordText">
-							<text>{{'最近充值：'+paymentItem.LastRechargeTime || '-'}}</text>
-							<text class="lineStyle">{{'|'}}</text>
-							<text>{{'充值金额：'+paymentItem.LastRechargeAmount+'元' || '-'}}</text>
-						</view>
-					</view>
-					<!-- <view>
-						<view class="amount-section">
-							<text class="amount-text">{{'¥'+ Math.abs(paymentItem.balance || 0).toFixed(2)}}</text>
-						</view>
-						<view style="border-bottom: 2rpx solid #ededed;margin:10rpx 0rpx;"></view>
-					</view> -->
-					<!-- 缴费信息 -->
-					<view class="info-section" style="">
-						<view v-if="arrearsPayment=='物业费'">
-							<view class="info-item">
-								<text class="info-label">户名</text>
-								<text
-									class="info-value">{{paymentItem.villageName+ paymentItem.fullAddress || '-' }}</text>
-							</view>
-							<view class="info-item">
-								<text class="info-label">户主</text>
-								<text class="info-value">{{ paymentItem.name || '-' }}</text>
-							</view>
-							<view class="info-item">
-								<text class="info-label">缴费单位</text>
-								<text class="info-value">花开物业</text>
-							</view>
-							<view class="info-item">
-								<text class="info-label">可用余额</text>
-								<text class="info-value">{{ Math.abs(paymentItem.balance || 0).toFixed(2) }}元</text>
-							</view>
-						</view>
-						<view v-else>
-							<view class="info-item">
-								<text class="info-label">房屋</text>
-								<text class="info-value">{{ paymentItem.fullAddress || '-' }}</text>
-							</view>
-							<view class="info-item">
-								<text class="info-label">户号</text>
-								<text class="info-value">{{ paymentItem.deviceCode || '-' }}</text>
-							</view>
-							<view class="info-item">
-								<text class="info-label">户主</text>
-								<text class="info-value">{{ paymentItem.name || '-' }}</text>
-							</view>
-							<view class="info-item">
-								<text class="info-label">缴费单位</text>
-								<text class="info-value">花开物业</text>
-							</view>
-							<view class="info-item">
-								<text class="info-label">可用余额</text>
-								<text class="info-value">{{ Math.abs(paymentItem.balance || 0).toFixed(2) }}元</text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script setup>
-	import {
-		ref,
-		reactive,
-		onMounted,
-		computed
-
-	} from 'vue'
-	import {
-		onShow,
-		onReady,
-		onReachBottom,
-		onLoad,
-		onUnload,
-		onPullDownRefresh
-	} from '@dcloudio/uni-app'
-
-	// 响应式数据
-	const statusBarHeight = ref(20)
-	const paymentItem = reactive(uni.getStorageSync('arrearsPayment') || {})
-	const arrearsPayment = computed(() => paymentItem.type || '缴费')
-
-	// 生命周期
-	onShow(() => {})
-	onMounted(() => {})
-	onReady(() => {})
-
-	// 方法
-	const goBack = () => {
-		uni.redirectTo({
-			url: '/pages/paymentIndex/paymentIndex'
-		});
-	}
-
-	// 以下为原代码保留的方法（未使用但保持功能完整）
-	const handlePay = () => {}
-	const closePasswordModal = () => {}
-	const selectBank = () => {}
-	const inputPassword = () => {}
-	const deletePassword = () => {}
-	const handleConfirmPay = () => {}
-	const handleBackToList = () => {}
-</script>
-
-<style lang="scss">
-	page {
-		background: #f9f9f9;
-	}
-</style>
-
-<style scoped>
-	.contentStyle {
-		display: flex;
-		flex-direction: column;
-		height: 100vh;
-		background-color: #f9f9f9;
-	}
-
-	.page {
-		flex: 1;
-		overflow-y: auto;
-		padding: 0px 40rpx;
-		box-sizing: border-box;
-	}
-
-	.pay-page {
-		width: 100%;
-	}
-
-	.amount-section {
-		padding: 60rpx 0;
-		text-align: center;
-	}
-
-	.no-arrears-section {
-		padding: 30rpx 0;
-		text-align: center;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		color: #999999;
-	}
-
-	.amount-text {
-		font-size: 56rpx;
-		font-weight: 600;
-		color: #007aff;
-	}
-
-	.background-image-style {
-		width: 466rpx;
-		height: 250rpx;
-		margin-bottom: 140rpx;
-	}
-
-	.noArrearsText {
-		padding-bottom: 50rpx;
-		width: 100%;
-		border-bottom: 2rpx solid #ededed;
-	}
-
-	.recordText {
-		font-size: 24rpx;
-		color: #222;
-		margin-top: 20rpx;
-		font-weight: 600;
-	}
-
-	.lineStyle {
-		margin: 0rpx 30rpx;
-	}
-
-	.info-item {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		height: 80rpx;
-	}
-
-	.info-label {
-		font-size: 30rpx;
-		color: #666;
-	}
-
-	.info-value {
-		font-size: 30rpx;
-		color: #333;
-	}
-
-	.info-payAmountItem {
-		height: 100rpx;
-		line-height: 100rpx;
-		margin-bottom: 60rpx;
-	}
-
-	.info-payAmount {
-		font-size: 50rpx;
-		color: #333;
-		font-weight: 600;
-	}
-
-	.input-section {
-		padding: 0 30rpx;
-		margin-bottom: 60rpx;
-	}
-
-	.amount-input {
-		width: 100%;
-		height: 100rpx;
-		font-size: 48rpx;
-		border: none;
-		outline: none;
-	}
-
-	.btn-section {
-		padding: 0 30rpx;
-	}
-
-	.pay-btn {
-		width: 100%;
-		height: 100rpx;
-		line-height: 100rpx;
-		background-color: #007aff;
-		color: #fff;
-		border-radius: 16rpx;
-		font-size: 32rpx;
-		border: none;
-		outline: none;
-	}
-
-	.modal-overlay {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, 0.5);
-		z-index: 999;
-		display: flex;
-		align-items: flex-end;
-	}
-
-	.password-modal {
-		width: 100%;
-		background-color: #fff;
-		border-radius: 24rpx 24rpx 0 0;
-		padding-bottom: 40rpx;
-	}
-
-	.modal-header {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		height: 100rpx;
-		padding: 0 30rpx;
-		border-bottom: 2rpx solid #f0f0f0;
-	}
-
-	.close-icon {
-		font-size: 44rpx;
-		width: 80rpx;
-		height: 100rpx;
-		display: flex;
-		align-items: center;
-	}
-
-	.modal-title {
-		font-size: 32rpx;
-		font-weight: 500;
-		color: #000;
-	}
-
-	.header-right {
-		width: 80rpx;
-	}
-
-	.pay-info {
-		padding: 40rpx 30rpx;
-		text-align: center;
-	}
-
-	.merchant-name {
-		display: block;
-		font-size: 32rpx;
-		color: #333;
-		margin-bottom: 20rpx;
-	}
-
-	.pay-amount {
-		font-size: 64rpx;
-		font-weight: 500;
-		color: #000;
-	}
-
-	.pay-way {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 30rpx;
-		border-bottom: 2rpx solid #f0f0f0;
-	}
-
-	.way-label {
-		font-size: 30rpx;
-		color: #666;
-	}
-
-	.way-content {
-		display: flex;
-		align-items: center;
-	}
-
-	.bank-icon {
-		width: 32rpx;
-		height: 32rpx;
-		margin-right: 6rpx;
-	}
-
-	.bank-name {
-		font-size: 30rpx;
-		color: #333;
-		margin-right: 16rpx;
-	}
-
-	.arrow-icon {
-		font-size: 28rpx;
-		color: #999;
-	}
-
-	.bank-list {
-		padding: 0 30rpx;
-		border-bottom: 2rpx solid #f0f0f0;
-	}
-
-	.bank-item {
-		display: flex;
-		align-items: center;
-		height: 100rpx;
-		border-bottom: 2rpx solid #f5f5f5;
-	}
-
-	.bank-item:last-child {
-		border-bottom: none;
-	}
-
-	.bank-item-icon {
-		width: 48rpx;
-		height: 48rpx;
-		margin-right: 20rpx;
-	}
-
-	.bank-item-name {
-		flex: 1;
-		font-size: 30rpx;
-		color: #333;
-	}
-
-	.check-icon {
-		font-size: 36rpx;
-		color: #007aff;
-	}
-
-	.password-input {
-		display: flex;
-		justify-content: space-between;
-		padding: 40rpx 30rpx;
-	}
-
-	.password-item {
-		width: 100rpx;
-		height: 100rpx;
-		background-color: #efefef;
-		border-radius: 8rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.password-dot {
-		width: 24rpx;
-		height: 24rpx;
-		background-color: #000;
-		border-radius: 50%;
-	}
-
-	.keyboard {
-		width: 100%;
-	}
-
-	.keyboard-row {
-		display: flex;
-	}
-
-	.keyboard-item {
-		flex: 1;
-		height: 54px;
-		line-height: 54px;
-		text-align: center;
-		font-size: 48rpx;
-		color: #000;
-		border: 2rpx solid #f0f0f0;
-		background-color: #fff;
-	}
-
-	.keyboard-item:active {
-		background-color: #e5e5e5;
-	}
-
-	.keyboard-item.empty {
-		background-color: #f5f5f5;
-		border: none;
-	}
-
-	.keyboard-item.delete {
-		background-color: #f5f5f5;
-		border: none;
-	}
-
-	.success-page {
-		width: 100%;
-		min-height: 100vh;
-		background-color: #fff;
-		text-align: center;
-	}
-
-	.icon-box {
-		display: flex;
-		justify-content: center;
-		width: 100vw;
-		height: 1100rpx;
-		padding: 60rpx 0px;
-	}
-
-	.success-icon {
-		margin-bottom: 40rpx;
-		width: 100px;
-		height: 100px;
-		font-size: 80px;
-		color: #007aff;
-		background-color: #007aff;
-		color: #fff;
-		border-radius: 50%;
-	}
-
-	.success-text {
-		font-size: 40rpx;
-		font-weight: 600;
-		color: #000;
-		margin-bottom: 20rpx;
-	}
-
-	.success-desc {
-		font-size: 30rpx;
-		color: #999;
-		margin-bottom: 100rpx;
-	}
-
-	.status-bar {
-		width: 100vw;
-		height: 46px;
-	}
-</style>
\ No newline at end of file
diff --git a/huakai-app/pageSubPack/payment-list/paymentRecord.vue b/huakai-app/pageSubPack/payment-list/paymentRecord.vue
deleted file mode 100644
index 64daa6e..0000000
--- a/huakai-app/pageSubPack/payment-list/paymentRecord.vue
+++ /dev/null
@@ -1,397 +0,0 @@
-<template>
-	<view class="contentStyle" style="">
-		<view class="status-bar"></view>
-		<uni-nav-bar title="缴费记录" left-icon="left" @clickLeft="goBack" backgroundColor="transparent" :border="false">
-		</uni-nav-bar>
-
-		<!-- 表单区域 -->
-		<scroll-view class="page" scroll-y="true">
-
-			<!-- 累计缴费 -->
-			<view class="total-box">
-				<view class="top-box">
-					<view class="total-title">累计缴费</view>
-					<view class="total-price">¥{{ totalAmount }}</view>
-				</view>
-
-				<view class="chart-box">
-					<view v-if="chartData.length === 0" class="empty-state">
-						<uni-icons type="info" size="60" color="#ccc"></uni-icons>
-						<text class="empty-text">
-							{{ '暂无数据'}}
-						</text>
-					</view>
-					<!-- 循环6个月柱状图 -->
-					<view class="chart-item" v-for="(item,index) in chartData" :key="index">
-						<!-- 柱子顶部金额文字 -->
-						<view class="chart-label">{{ item.price }}元</view>
-						<!-- 柱状图柱子 -->
-						<view class="chart-bar" :style="{ height: barHeight(item.price) }"></view>
-						<!-- 底部月份文字 -->
-						<view class="chart-month">{{ item.month }}</view>
-					</view>
-				</view>
-
-			</view>
-
-			<!-- 缴费明细 -->
-			<view class="list-wrapper">
-				<!-- 按月份分组渲染 -->
-				<view v-if="monthGroups.length === 0" class="empty-state">
-					<uni-icons type="info" size="60" color="#ccc"></uni-icons>
-					<text class="empty-text">
-						{{ '暂无数据'}}
-					</text>
-				</view>
-				<view class="month-group" v-for="(item, idx) in monthGroups" :key="idx">
-					<view class="month-title">
-						{{ item.month }}月 缴费 ¥{{ item.total }}元
-					</view>
-
-					<view class="item-list">
-						<view class="bill-item" v-for="bill in item.list" :key="bill.id">
-							<view class="bill-icon">
-								<image class="iconStyle" src="https://wuyeadmin.bugtc.com/images/propertyImgs/water.png"
-									v-if="bill.name=='水表'"></image>
-								<image class="iconStyle" src="https://wuyeadmin.bugtc.com/images/propertyImgs/electric.png"
-									v-if="bill.name=='电表'"></image>
-				
-							</view>
-							<view class="bill-info">
-								<view class="name">{{ bill.name }}</view>
-								<view class="account">{{ bill.account }}</view>
-							</view>
-							<view class="bill-price">-{{ bill.amount }}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-
-		</scroll-view>
-	</view>
-</template>
-
-<script setup>
-	import {
-		ref,
-		onMounted,
-		computed
-
-	} from 'vue'
-	import {
-		onShow,
-		onReady,
-		onReachBottom,
-		onLoad,
-		onUnload,
-		onPullDownRefresh
-	} from '@dcloudio/uni-app'
-
-	import {
-		getTopupRecordWithStat
-	} from '/pageSubPack/api/apiSub.js'
-	// 响应式数据
-	const statusBarHeight = ref(20)
-	const pageNum = ref(1)
-	const pageSize = ref(10)
-	const totalAmount = ref('0.00')
-	const chartData = ref([])
-	const maxPrice = ref(100)
-	const barMaxHeight = ref(300)
-
-	const billList = ref([])
-
-	// 图标映射
-	const iconMap = {
-		'水表': 'https://wuyeadmin.bugtc.com/images/propertyImgs/water.png',
-		'电表': 'https://wuyeadmin.bugtc.com/images/propertyImgs/electric.png',
-		'物业费': 'https://wuyeadmin.bugtc.com/images/propertyImgs/property.png',
-		'暖气费': 'https://wuyeadmin.bugtc.com/images/propertyImgs/heating.png',
-		'燃气费': 'https://wuyeadmin.bugtc.com/images/propertyImgs/gas.png'
-	}
-
-	// 获取缴费记录
-	const getRecords = async () => {
-		try {
-			const res = await getTopupRecordWithStat({
-				residentUserId: uni.getStorageSync('userId'),
-				pageNum: pageNum.value,
-				pageSize: pageSize.value
-			})
-			if (res.code === 200) {
-				const records = res.data.records || []
-				// 转换记录格式
-				billList.value = records.map(item => ({
-					id: item.id,
-					month: item.rechargeTime && item.rechargeTime.split('-')[1] ? parseInt(item.rechargeTime.split('-')[1], 10) : 1,
-					name: item.type == 1 ? '电表' : item.type == 2 ? '水表' : '',
-					account: item.deviceCode || '-',
-					amount: Number(item.rechargeAmount) || 0,
-					icon: iconMap[item.type == 1 ? '电表' : item.type == 2 ? '水表' : ''] || 'https://wuyeadmin.bugtc.com/images/propertyImgs/water.png'
-				}))
-				// 累计缴费金额
-				const total = records.reduce((sum, item) => sum + (Number(item.rechargeAmount) || 0), 0)
-				totalAmount.value = total.toFixed(2)
-				// 更新图表数据（根据 records 计算最近6个月）
-				updateChartData()
-			}
-		} catch (err) {
-			console.error('获取缴费记录失败', err)
-		}
-	}
-
-	// 更新图表数据（根据 records 计算最近6个月）
-	const updateChartData = () => {
-		// 按月份汇总金额
-		const monthTotal = {}
-		billList.value.forEach(bill => {
-			const monthKey = bill.month
-			if (!monthTotal[monthKey]) {
-				monthTotal[monthKey] = 0
-			}
-			monthTotal[monthKey] += bill.amount
-		})
-		// 取最近6个月（当前月往前）
-		const now = new Date()
-		const currentMonth = now.getMonth() + 1 // 1-12
-		const currentYear = now.getFullYear()
-		const months = []
-		for (let i = 0; i < 6; i++) {
-			let month = currentMonth - i
-			let year = currentYear
-			if (month <= 0) {
-				month += 12
-				year -= 1
-			}
-			months.push({
-				month,
-				year
-			})
-		}
-		chartData.value = months.map((m, i) => ({
-			month: (m.year + '').slice(-2) + '年' + m.month + '月',
-			year: m.year,
-			sortMonth: m.year * 12 + m.month,
-			price: monthTotal[m.month] || 0,
-			index: i
-		})).sort((a, b) => a.sortMonth - b.sortMonth)
-		const prices = chartData.value.map(c => c.price)
-		maxPrice.value = Math.max(...prices, 100)
-	}
-
-	// 计算属性 —— 月份分组
-	const monthGroups = computed(() => {
-		let map = {}
-		billList.value.forEach(bill => {
-			if (!map[bill.month]) {
-				map[bill.month] = {
-					month: bill.month,
-					total: 0,
-					list: []
-				}
-			}
-			map[bill.month].list.push(bill)
-			map[bill.month].total += bill.amount
-		})
-		return Object.values(map).sort((a, b) => b.month - a.month)
-	})
-
-	// 生命周期
-	onShow(() => {})
-	onMounted(() => {})
-	onLoad(() => {
-		getRecords()
-	})
-	onReady(() => {})
-
-	// 方法
-	const barHeight = (price) => {
-		const height = (price / maxPrice.value) * barMaxHeight.value
-		return `${height}rpx`
-	}
-
-	const goBack = () => {
-		uni.redirectTo({
-			url: '/pages/paymentIndex/paymentIndex'
-		});
-	}
-</script>
-
-<style lang="scss">
-	page {
-		// background: #f2f1f6;
-	}
-</style>
-
-<style scoped>
-	.contentStyle {
-		display: flex;
-		flex-direction: column;
-		height: 100vh;
-		background: linear-gradient(to left bottom, #e2efff 0%, #f9f9f9 50%);
-	}
-
-	.page {
-		flex: 1;
-		overflow-y: auto;
-		padding: 0px 40rpx;
-		box-sizing: border-box;
-	}
-
-	.total-box {
-		margin-bottom: 30rpx;
-	}
-
-	.empty-state {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		padding: 100rpx 0;
-		color: #ccc;
-	}
-
-	.empty-text {
-		font-size: 32rpx;
-		color: #999;
-		margin-top: 20rpx;
-		margin-bottom: 10rpx;
-	}
-
-	.top-box {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-
-	.total-title {
-		font-size: 32rpx;
-		font-weight: 600;
-		color: #333;
-	}
-
-	.total-price {
-		font-size: 48rpx;
-		font-weight: bold;
-		margin-top: 10rpx;
-		margin-bottom: 20rpx;
-	}
-
-	.chart-canvas {
-		width: calc(100vw - 60rpx);
-		height: 30vh;
-	}
-
-	.list-wrapper {
-		padding: 10rpx 0rpx;
-	}
-
-	.month-group {
-		border-bottom: 2rpx solid #f2f2f2;
-		padding: 30rpx;
-		background-color: #fff;
-		margin-bottom: 30rpx;
-		border-radius: 10rpx;
-	}
-
-	.month-title {
-		font-size: 32rpx;
-		font-weight: 600;
-		margin-bottom: 30rpx;
-	}
-
-	.bill-item {
-		display: flex;
-		align-items: center;
-		margin-bottom: 30rpx;
-		padding-bottom: 30rpx;
-		border-bottom: 1px solid #ebebeb;
-	}
-
-	.bill-item:last-child {
-		border-bottom: none;
-		margin-bottom: 0rpx;
-		padding-bottom: 0rpx;
-	}
-
-	.bill-icon {
-		width: 80rpx;
-		height: 80rpx;
-		border-radius: 50%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		color: #4080FF;
-		margin-right: 24rpx;
-		font-size: 36rpx;
-	}
-
-	.iconStyle {
-		width: 100%;
-		height: 100%;
-	}
-
-	.bill-info {
-		flex: 1;
-	}
-
-	.name {
-		font-size: 28rpx;
-		color: #333;
-		font-weight: 600;
-	}
-
-	.account {
-		font-size: 24rpx;
-		color: #999;
-		margin-top: 8rpx;
-	}
-
-	.bill-price {
-		font-size: 32rpx;
-		color: #333;
-	}
-
-	.status-bar {
-		width: 100vw;
-		height: 46px;
-	}
-</style>
-
-<style scoped>
-	.chart-box {
-		width: 100%;
-		height: 444rpx;
-		display: flex;
-		align-items: flex-end;
-		justify-content: space-around;
-		box-sizing: border-box;
-	}
-
-	.chart-item {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: flex-end;
-		width: 120rpx;
-		font-size: 24rpx;
-	}
-
-	.chart-label {
-		font-size: 32rpx;
-		color: #333;
-		margin-bottom: 20rpx;
-	}
-
-	.chart-bar {
-		width: 40rpx;
-		background: #3388ff;
-		border-radius: 40rpx 40rpx 0 0;
-	}
-
-	.chart-month {
-		font-size: 26rpx;
-		color: #666;
-		margin-top: 24rpx;
-	}
-</style>
\ No newline at end of file
diff --git a/huakai-app/pageSubPack/payment-list/selectPaymentEntity.vue b/huakai-app/pageSubPack/payment-list/selectPaymentEntity.vue
deleted file mode 100644
index 53beb52..0000000
--- a/huakai-app/pageSubPack/payment-list/selectPaymentEntity.vue
+++ /dev/null
@@ -1,376 +0,0 @@
-<template>
-	<view class="contentStyle" style="">
-		<view class="status-bar"></view>
-		<uni-nav-bar title="选择缴费单位" left-icon="left" @clickLeft="goBack" backgroundColor="transparent" :border="false">
-		</uni-nav-bar>
-
-		<!-- 表单区域 -->
-		<scroll-view class="page" scroll-y="true">
-			<!-- 城市 + 搜索 -->
-			<view class="search-section">
-				<!-- 城市选择器 -->
-				<uni-data-picker placeholder="选择省市" popup-title="选择省市" :localdata="alladdress"
-					field="code as value, value as text" orderby="value asc" :step-searh="true" self-field="code"
-					parent-field="code" @change="onchange" v-model="cityValue" class="city-picker">
-					<view class="city-select">
-						<text class="city-text ellipsis">{{ selectedCity }}</text>
-						<text class="arrow-icon"></text>
-					</view>
-				</uni-data-picker>
-
-				<!-- 搜索框 -->
-				<view class="search-box">
-					<input class="search-input" v-model="searchKey" placeholder="请输入缴费单位名称"
-						placeholder-class="input-placeholder" @input="onSearch" />
-					<uni-icons type="search" size="20" color="#999" />
-				</view>
-			</view>
-
-			<view v-if="filterList.length === 0" class="empty-state">
-				<uni-icons type="info" size="60" color="#ccc"></uni-icons>
-				<text class="empty-text">{{ '暂无数据' }}</text>
-			</view>
-
-			<view v-for="item in filterList">
-				<view class="group-title">{{item.name}}</view>
-				<view class="item" v-for="itemChild in item.children" :key="itemChild.id"
-					@click="selectItem(itemChild)">
-					{{ itemChild.name }}
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script setup>
-	import {
-		ref,
-		onMounted,
-		computed
-
-	} from 'vue'
-	import {
-		onShow,
-		onReady,
-		onReachBottom,
-		onLoad,
-		onUnload,
-		onPullDownRefresh
-	} from '@dcloudio/uni-app'
-
-	// 响应式数据
-	const selectedCity = ref('选择城市')
-	const cityValue = ref('')
-	const alladdress = ref([{
-		text: "北京市",
-		value: "110000000000",
-		children: [{
-			text: "市辖区",
-			value: "110100000000",
-			children: [{
-					text: "东城区",
-					value: "110101000000"
-				},
-				{
-					text: "西城区",
-					value: "110102000000"
-				},
-				{
-					text: "朝阳区",
-					value: "110105000000"
-				},
-				{
-					text: "丰台区",
-					value: "110106000000"
-				},
-				{
-					text: "石景山区",
-					value: "110107000000"
-				},
-				{
-					text: "海淀区",
-					value: "110108000000"
-				},
-				{
-					text: "门头沟区",
-					value: "110109000000"
-				},
-				{
-					text: "房山区",
-					value: "110111000000"
-				},
-				{
-					text: "通州区",
-					value: "110112000000"
-				},
-				{
-					text: "顺义区",
-					value: "110113000000"
-				},
-				{
-					text: "昌平区",
-					value: "110114000000"
-				},
-				{
-					text: "大兴区",
-					value: "110115000000"
-				},
-				{
-					text: "怀柔区",
-					value: "110116000000"
-				},
-				{
-					text: "平谷区",
-					value: "110117000000"
-				},
-				{
-					text: "密云区",
-					value: "110118000000"
-				},
-				{
-					text: "延庆区",
-					value: "110119000000"
-				}
-			]
-		}]
-	}])
-
-	const searchKey = ref('')
-	const statusBarHeight = ref(20)
-	const showPicker = ref(false)
-	const keyword = ref('')
-
-	const companyList = ref([{
-			id: 7,
-			name: '官方机构',
-			children: [{
-					id: 1,
-					name: "XX市燃气集团有限公司"
-				},
-				{
-					id: 2,
-					name: "XX市供水有限公司"
-				},
-				{
-					id: 3,
-					name: "XX供电服务中心"
-				},
-				{
-					id: 4,
-					name: "XX新能源服务公司"
-				},
-				{
-					id: 5,
-					name: "XX公共事业缴费中心"
-				},
-				{
-					id: 6,
-					name: "XX综合能源服务站"
-				}
-			]
-		},
-		{
-			id: 8,
-			name: '非智享日照提供的服务单位',
-			children: [{
-					id: 9,
-					name: "XX市燃气集团有限公司"
-				},
-				{
-					id: 10,
-					name: "XX能源集团"
-				}
-			]
-		}
-	])
-
-	// 计算属性：搜索过滤
-	const filterList = computed(() => {
-		if (!searchKey.value) return companyList.value
-		const key = searchKey.value.trim().toLowerCase()
-
-		return companyList.value.filter(group => {
-			const hasChild = group.children.some(child =>
-				child.name.toLowerCase().includes(key)
-			)
-			const groupMatch = group.name.toLowerCase().includes(key)
-			return hasChild || groupMatch
-		}).map(group => {
-			return {
-				...group,
-				children: group.children.filter(child =>
-					child.name.toLowerCase().includes(key)
-				)
-			}
-		})
-	})
-
-	// 生命周期
-	onShow(() => {})
-	onMounted(() => {})
-	onReady(() => {})
-
-	// 方法
-	const selectItem = (item) => {
-		console.log(item)
-		uni.redirectTo({
-			url: '/pageSubPack/payment-list/addPayment'
-		})
-	}
-
-	const onchange = (e) => {
-		console.log('选中text数组:', e.detail.value)
-		const arr = e.detail.value
-		let city = ''
-		if (arr[1].text === '市辖区') {
-			city = arr[0].text
-		} else {
-			city = arr[1].text
-		}
-		selectedCity.value = city
-	}
-
-	const onSearch = () => {}
-
-	const goBack = () => {
-		uni.redirectTo({ url: '/pages/paymentIndex/paymentIndex' });
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background: #f9f9f9;
-	}
-</style>
-
-<style scoped>
-	.contentStyle {
-		display: flex;
-		flex-direction: column;
-		height: 100vh;
-		background-color: #f9f9f9;
-	}
-
-	.page {
-		flex: 1;
-		overflow-y: auto;
-		box-sizing: border-box;
-		background-color: #fff;
-	}
-
-	.search-section {
-		background-color: #fff;
-		padding: 20rpx;
-		display: flex;
-		align-items: center;
-	}
-
-	.city-picker {
-		display: block;
-		width: auto;
-	}
-
-	.city-select {
-		display: flex;
-		align-items: center;
-		padding: 8rpx 0;
-		cursor: pointer;
-		width: 80px;
-		height: 70rpx;
-	}
-
-	.ellipsis {
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-	}
-
-	.city-text {
-		font-size: 28rpx;
-		font-weight: 600;
-		color: #000000;
-		line-height: 1;
-	}
-
-	.arrow-icon {
-		width: 0;
-		height: 0;
-		border-left: 10rpx solid transparent;
-		border-right: 10rpx solid transparent;
-		border-top: 16rpx solid #333333;
-		margin-top: 4rpx;
-	}
-
-	.search-box {
-		display: flex;
-		width: 100%;
-		align-items: center;
-		background-color: #f3f4f6;
-		border-radius: 20rpx;
-		padding: 0 30rpx;
-		margin: 10rpx 0px 0px 10rpx;
-		height: 70rpx;
-	}
-
-	.search-input {
-		flex: 1;
-		height: 100%;
-		font-size: 30rpx;
-		border: none;
-		background: transparent;
-	}
-
-	.input-placeholder {
-		color: #999;
-		font-size: 30rpx;
-	}
-
-	.search-icon {
-		font-size: 36rpx;
-		color: #999;
-	}
-
-	.group-title {
-		padding: 20rpx 40rpx;
-		font-size: 28rpx;
-		color: #666;
-		background-color: #f3f3f3;
-	}
-
-	.item {
-		background: #fff;
-		padding: 20rpx 40rpx;
-		font-size: 28rpx;
-		border-bottom: 2rpx solid #f2f2f2;
-	}
-
-	.item:active {
-		background: #f2f2f2;
-	}
-
-	::v-deep .selected-item {
-		margin-left: 10rpx !important;
-		margin-right: 10rpx !important;
-	}
-
-	.status-bar {
-		width: 100vw;
-		height: 46px;
-	}
-
-	.empty-state {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		padding: 100rpx 0;
-		color: #ccc;
-	}
-
-	.empty-text {
-		font-size: 32rpx;
-		color: #999;
-		margin-top: 20rpx;
-		margin-bottom: 10rpx;
-	}
-</style>
\ No newline at end of file
diff --git a/huakai-app/pages.json b/huakai-app/pages.json
index 97fdb16..1c1575b 100644
--- a/huakai-app/pages.json
+++ b/huakai-app/pages.json
@@ -8,52 +8,52 @@
 		}
 	],
 	"subPackages": [
-		// {
-		// 	"root": "pageSubPack/loginSub",
-		// 	"pages": [
-		// 		{
-		// 			"path": "register-new-user",
-		// 			"style": {
-		// 				"navigationBarTitleText": "注册新用户",
-		// 				"navigationStyle": "custom"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "pwd-login",
-		// 			"style": {
-		// 				"navigationBarTitleText": "账号密码登录",
-		// 				"navigationStyle": "custom"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "login",
-		// 			"style": {
-		// 				"navigationBarTitleText": "验证码登录",
-		// 				"navigationStyle": "custom"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "forget-pwd",
-		// 			"style": {
-		// 				"navigationBarTitleText": "忘记密码",
-		// 				"navigationStyle": "custom"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "change-pwd",
-		// 			"style": {
-		// 				"navigationBarTitleText": "修改密码",
-		// 				"navigationStyle": "custom"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "privacy",
-		// 			"style": {
-		// 				"navigationBarTitleText": "用户隐私政策"
-		// 			}
-		// 		}
-		// 	]
-		// },
+		{
+			"root": "pageSubPack/loginSub",
+			"pages": [
+				{
+					"path": "register-new-user",
+					"style": {
+						"navigationBarTitleText": "注册新用户",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "pwd-login",
+					"style": {
+						"navigationBarTitleText": "账号密码登录",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "login",
+					"style": {
+						"navigationBarTitleText": "验证码登录",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "forget-pwd",
+					"style": {
+						"navigationBarTitleText": "忘记密码",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "change-pwd",
+					"style": {
+						"navigationBarTitleText": "修改密码",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "privacy",
+					"style": {
+						"navigationBarTitleText": "用户隐私政策"
+					}
+				}
+			]
+		},
 		{
 			"root": "pageSubPack/payment-list",
 			"pages": [
diff --git a/huakai-app/pages/paymentIndex/paymentIndex.vue b/huakai-app/pages/paymentIndex/paymentIndex.vue
deleted file mode 100644
index 439b110..0000000
--- a/huakai-app/pages/paymentIndex/paymentIndex.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-<template>
-	<view class="contentStyle" style="">
-		<view class="status-bar"></view>
-		<uni-nav-bar title="生活缴费"  backgroundColor="transparent" :border="false">
-		</uni-nav-bar>
-		<view class="topbox">
-			<!-- <image class="titleImg" src="https://wuyeadmin.bugtc.com/images/propertyImgs/payTitle.png"></image> -->
-			<image class="payImg" src="https://wuyeadmin.bugtc.com/images/propertyImgs/payImg.png"></image>
-		</view>
-		<scroll-view class="page" scroll-y="true">
-			<view class="container">
-				<!-- 账单列表 -->
-				<view class="bill-list" v-if="paymentList.length > 0">
-
-					<view class="bill-item" @click="goToBill(item)" v-for="item,index in paymentList" :key="index">
-						<image class="billIcon" src="https://wuyeadmin.bugtc.com/images/propertyImgs/water.png"
-							v-if="item.type=='水费'"></image>
-						<image class="billIcon" src="https://wuyeadmin.bugtc.com/images/propertyImgs/electric.png"
-							v-if="item.type=='电费'"></image>
-						<view class="bill-info">
-							<view class="bill-title">{{item.type}}
-								<view class="bill-status debt" v-if="item.balance<0">已欠费</view>
-								<text :class="item.balance<0 ? 'balance-debt' : 'balance-normal'">(余额：{{item.balance|| 0.00}}元)</text>
-							</view>
-							<view class="bill-desc">{{item.villageName+"-"+item.buildingName+'-'+formatAddress(item.fullAddress)}}</view>
-						</view>
-						<view class="arrow"></view>
-					</view>
-				</view>
-
-				<!-- 新增缴费区域 -->
-			<!-- 	<view class="add-section">
-					<view class="section-header">
-						<text class="section-title">新增缴费</text>
-						<text class="record-link" @click="goToRecord">缴费记录</text>
-					</view>
-
-					<view class="grid-list">
-						<view class="grid-item" v-for="(item, index) in addList" :key="index" @click="goToAdd(item)">
-							<view class="icon-box" :class="item.iconClass">
-								<image class="iconStyle" :src="item.icon"></image>
-							</view>
-							<text class="item-name">{{ item.name}}</text>
-						</view>
-					</view>
-				</view> -->
-
-				<view style="width: 100%;height: 30rpx;"></view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script setup>
-	import { ref } from 'vue'
-	import { onShow, onLoad } from '@dcloudio/uni-app'
-	import { getTopUpSelectByResident, getopenIdByCode, postInsertOpenId } from '/pageSubPack/api/apiSub.js'
-	import { isLoggedIn } from '/pageSubPack/api/auth.js'
-	import { getAppPaymentData, clearAppPaymentData, buildPaymentItemFromApp } from '/pageSubPack/api/appLaunch.js'
-
-	const isLogin = ref(false)
-	const paymentList = ref([])
-
-	const addList = ref([
-		{
-			name: "水表",
-			type: "water",
-			icon: "https://wuyeadmin.bugtc.com/images/propertyImgs/water.png",
-			iconClass: "water"
-		},
-	])
-
-	// ===== 刷新登录状态 =====
-	const refreshLoginState = () => {
-		isLogin.value = isLoggedIn();
-		if (!isLogin.value) {
-			// 未登录时清空账单数据
-			paymentList.value = [];
-		}
-	};
-
-	// ===== openid 相关 =====
-	const postOpenId = async () => {
-		if (!isLogin.value) return;
-		try {
-			const loginRes = await wx.login()
-			if (!loginRes.code) {
-				console.error('wx.login 失败')
-				return
-			}
-			const openIdRes = await getopenIdByCode({ code: loginRes.code })
-			if (openIdRes.code !== 200 || !openIdRes.data) {
-				console.error('获取openid失败')
-				return
-			}
-			uni.setStorageSync('openid', openIdRes.data)
-			await postInsertOpenId({
-				openid: openIdRes.data,
-				residentUserId: uni.getStorageSync('userId')
-			})
-		} catch (err) {
-			console.error('postOpenId 报错：', err)
-		}
-	};
-
-	// ===== 获取缴费列表 =====
-	// const getPayList = async () => {
-	// 	if (!isLogin.value) return;
-	// 	try {
-	// 		const res = await getTopUpSelectByResident({
-	// 			residentUserId: uni.getStorageSync('userId')
-	// 		})
-	// 		paymentList.value = res.data || []
-	// 	} catch (err) {
-	// 		console.error('列表接口报错：', err)
-	// 	}
-	// };
-
-	// ===== 生命周期 =====
-	onLoad(() => {
-		refreshLoginState();
-		postOpenId();
-		// 检查是否由 App 跳转而来，携带了支付参数
-		checkAppLaunchPayment();
-	});
-
-	onShow(() => {
-		refreshLoginState();
-	});
-
-	// ===== App 跳转支付：检测 extraData 并直接进入支付页 =====
-	const checkAppLaunchPayment = () => {
-		const appData = getAppPaymentData()
-		if (!appData) return // 非 App 跳转，正常展示账单列表
-
-		console.log("检测到 App 支付参数:", appData)
-		const paymentItem = buildPaymentItemFromApp(appData)
-		if (!paymentItem) return
-
-		// 清除已消费的启动数据
-		clearAppPaymentData()
-		// 存入 storage 供 arrearsPayment 使用
-		uni.setStorageSync("arrearsPayment", paymentItem)
-		// 直接跳转支付页
-		uni.redirectTo({ url: "/pages/arrearsPayment/arrearsPayment" })
-	}
-
-	// ===== 点击事件 =====
-
-	// 点击账单明细
-	const goToBill = (item) => {
-		uni.setStorageSync('arrearsPayment', item)
-		uni.redirectTo({ url: '/pages/arrearsPayment/arrearsPayment' })
-	};
-
-	// 点击缴费记录
-	const goToRecord = () => {
-		uni.redirectTo({ url: '/pageSubPack/payment-list/paymentRecord' })
-	};
-
-	// 点击新增缴费（水表/电表等）
-	const goToAdd = (type) => {
-		if (type.name == '燃气' || type.name == '暖气') {
-			uni.redirectTo({ url: '/pageSubPack/payment-list/selectPaymentEntity' })
-		} else if (type.name == '水表' || type.name == '电表') {
-			uni.redirectTo({ url: '/pageSubPack/payment-list/addHydropower' })
-		}
-		uni.setStorageSync('addPaymentType', type.name)
-	};
-
-	const formatAddress = (addr) => {
-		if (!addr) return ''
-		return addr.replace(/\d+[层楼]\s*/g, '').replace(/单元\s*/g, '-').replace(/\s+/g, '')
-	};
-</script>
-
-<style lang="scss">
-	page {
-		background: linear-gradient(180deg, #dfedfd, #F6FAFF);
-	}
-</style>
-
-<style scoped>
-	.contentStyle {
-		display: flex;
-		flex-direction: column;
-		height: 100vh;
-		background: linear-gradient(180deg, #dfedfd, #F6FAFF);
-	}
-
-	.page {
-		flex: 1;
-		overflow-y: auto;
-		padding: 0px 40rpx;
-		box-sizing: border-box;
-	}
-
-	.topbox {
-		height: 150rpx;
-		width: 100%;
-		position: relative;
-	}
-
-	.titleImg {
-		width: 262rpx;
-		height: 74rpx;
-		position: absolute;
-		left: 40rpx;
-		bottom: 20rpx;
-	}
-
-	.payImg {
-		width: 349.97rpx;
-		height: 313.57rpx;
-		position: absolute;
-		right: -80rpx;
-		bottom: -140rpx;
-	}
-
-	.bill-list {
-		margin-bottom: 40rpx;
-		background-color: #fff;
-		padding: 30rpx;
-		border-radius: 10rpx;
-	}
-
-	.bill-item {
-		display: flex;
-		align-items: center;
-		background-color: #F6F9FE;
-		border-radius: 12rpx;
-		padding: 20rpx 20rpx 20rpx 0px;
-		margin-bottom: 20rpx;
-	}
-
-	.bill-item:last-child {
-		margin-bottom: 0rpx;
-	}
-
-	.bill-info {
-		width: calc(90% - 100rpx);
-		flex: 1;
-	}
-
-	.billIcon {
-		width: 64rpx;
-		height: 64rpx;
-		margin: 20rpx;
-	}
-
-	.bill-title {
-		font-size: 32rpx;
-		font-weight: 600;
-		color: #333;
-		margin-bottom: 10rpx;
-		display: flex;
-		align-items: center;
-		gap: 10rpx;
-	}
-
-	.bill-desc {
-		font-size: 28rpx;
-		font-weight: 600;
-		color: #999;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	.bill-status {
-		padding: 2rpx 16rpx;
-		border-radius: 30rpx;
-		font-size: 24rpx;
-		font-weight: 500;
-		color: #fff;
-		background-color: #E34D59;
-	}
-
-	.balance-normal {
-		font-size: 28rpx;
-		color: #333;
-	}
-
-	.balance-debt {
-		font-size: 28rpx;
-		color: #E34D59;
-	}
-
-	.arrow {
-		width: 12rpx;
-		height: 12rpx;
-		border-right: 4rpx solid #ccc;
-		border-bottom: 4rpx solid #ccc;
-		transform: rotate(-45deg);
-	}
-
-	.add-section {
-		background-color: #fff;
-		padding: 30rpx;
-		border-radius: 10rpx;
-	}
-
-	.section-header {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-bottom: 30rpx;
-	}
-
-	.section-title {
-		font-size: 32rpx;
-		font-weight: 600;
-		color: #333;
-	}
-
-	.record-link {
-		font-size: 28rpx;
-		color: #1677ff;
-	}
-
-	.grid-list {
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: flex-start;
-		gap: 26rpx;
-	}
-
-	.grid-item {
-		width: calc(25% - 50rpx);
-		background-color: #F6F9FE;
-		border-radius: 12rpx;
-		padding: 20rpx;
-		margin-bottom: 20rpx;
-		display: flex;
-		align-items: center;
-		flex-direction: column;
-	}
-
-	.icon-box {
-		width: 88rpx;
-		height: 88rpx;
-		border-radius: 50%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 40rpx;
-	}
-
-	.iconStyle {
-		width: 100%;
-		height: 100%;
-	}
-
-	.item-name {
-		font-size: 28rpx;
-		font-weight: 600;
-		color: #333;
-	}
-
-	.status-bar {
-		width: 100vw;
-		height: 46px;
-	}
-</style>