From 85e802b56893d50230f816ab1c027d9c3426fd04 Mon Sep 17 00:00:00 2001
From: wangyuxin <2695255229ww>
Date: Mon, 20 Apr 2026 15:18:12 +0800
Subject: [PATCH] =?UTF-8?q?4/20=20=E6=B0=B4=E7=94=B5=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 property-uniapp-project/pages.json            |   7 +
 .../pages/my/myHouseIndex.vue                 |   1 +
 .../pages/payment-list/addHydropower.vue      | 519 ++++++++++++++++++
 .../pages/payment-list/addPayment.vue         |   6 +-
 .../pages/payment-list/paymentIndex.vue       |  22 +-
 .../static/propertyImgs/scanTheCodeIcon.png   | Bin 0 -> 1531 bytes
 6 files changed, 545 insertions(+), 10 deletions(-)
 create mode 100644 property-uniapp-project/pages/payment-list/addHydropower.vue
 create mode 100644 property-uniapp-project/static/propertyImgs/scanTheCodeIcon.png

diff --git a/property-uniapp-project/pages.json b/property-uniapp-project/pages.json
index da98ee5..0ac99a0 100644
--- a/property-uniapp-project/pages.json
+++ b/property-uniapp-project/pages.json
@@ -381,7 +381,14 @@
 						"navigationBarTitleText": "",
 						"navigationStyle": "custom"
 					}
+				}, {
+					"path": "addHydropower",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom"
+					}
 				}
+
 			]
 		},
 		{
diff --git a/property-uniapp-project/pages/my/myHouseIndex.vue b/property-uniapp-project/pages/my/myHouseIndex.vue
index 5488422..44744ab 100644
--- a/property-uniapp-project/pages/my/myHouseIndex.vue
+++ b/property-uniapp-project/pages/my/myHouseIndex.vue
@@ -326,6 +326,7 @@
 		margin-top:10rpx;
 		display: flex;
 		justify-content: space-between;
+		align-items: center;
 		z-index: 99 !important;
 	}
 
diff --git a/property-uniapp-project/pages/payment-list/addHydropower.vue b/property-uniapp-project/pages/payment-list/addHydropower.vue
new file mode 100644
index 0000000..4323d94
--- /dev/null
+++ b/property-uniapp-project/pages/payment-list/addHydropower.vue
@@ -0,0 +1,519 @@
+<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=='水'?'/static/propertyImgs/water.png':'/static/propertyImgs/electric.png'">
+					</image>
+					<text class="card-title">{{paymentType+'费'}}</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="/static/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>
+	export default {
+		onReady: function(e) {},
+		components: {
+
+		},
+
+		computed: {
+
+
+
+
+		},
+		created() {
+
+		},
+		onShow() {
+
+		},
+
+		mounted() {},
+
+		onReady() {
+			this.$nextTick(() => {
+
+			})
+		},
+		data() {
+			return {
+				paymentType: uni.getStorageSync('addPaymentType'),
+				deviceNo: '', // 设备号
+				isAgree: false, // 是否同意协议
+
+
+
+
+			}
+		},
+
+
+		methods: {
+			handleAgreeChange(e) {
+				// e.detail.value 是数组，有值 = 选中，空 = 未选中
+				this.isAgree = e.detail.value.length > 0
+			},
+			// 扫码获取设备号 【uniapp+微信小程序双端兼容】
+			async scanCode() {
+				try {
+					const res = await uni.scanCode({
+						onlyFromCamera: false, // 允许相册+相机
+						scanType: ['qrCode', 'barCode'] // 支持二维码+条形码
+					})
+					// 扫码结果赋值给设备号输入框
+					this.deviceNo = res.result
+				} catch (err) {
+					console.log('扫码取消/失败', err)
+				}
+			},
+			// 缴费提交
+			goPay() {
+				if (!this.deviceNo) {
+					uni.showToast({
+						title: '请输入设备号',
+						icon: 'none'
+					})
+					return
+				}
+				if (!this.isAgree) {
+					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();
+								this.goNext()
+							}, 2500);
+				
+				
+						}
+					}
+				})
+			},
+			goNext() {
+				uni.redirectTo({
+					url: '/pages/payment-list/addPaymentSuccess',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			goBack() {
+				uni.switchTab({
+					url: '/pages/payment/paymentIndex',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+
+		},
+
+
+	}
+</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/property-uniapp-project/pages/payment-list/addPayment.vue b/property-uniapp-project/pages/payment-list/addPayment.vue
index 15b382f..d31e782 100644
--- a/property-uniapp-project/pages/payment-list/addPayment.vue
+++ b/property-uniapp-project/pages/payment-list/addPayment.vue
@@ -66,7 +66,7 @@
 
 
  		</scroll-view>
- 		<!-- 底部协议和提交按钮 -->
+ 		<!-- 底部协议和立即缴费按钮 -->
  		<view class="bottom-area">
  			<view class="agreement">
  				<checkbox-group @change="handleAgreeChange">
@@ -75,10 +75,8 @@
  				<text class="agreement-text">我已阅并同意</text>
  				<text class="agreement-link" @click="handleProtocol">《协议链接》</text>
  			</view>
-
-
  			<button class="submit-btn" @click="handleSubmit">
- 				提交
+ 				立即缴费
  			</button>
  		</view>
  	</view>
diff --git a/property-uniapp-project/pages/payment-list/paymentIndex.vue b/property-uniapp-project/pages/payment-list/paymentIndex.vue
index f52b235..128f219 100644
--- a/property-uniapp-project/pages/payment-list/paymentIndex.vue
+++ b/property-uniapp-project/pages/payment-list/paymentIndex.vue
@@ -180,13 +180,23 @@
 			},
 			// 跳转到新增缴费
 			goToAdd(type) {
+				if (type.name == '燃气') {
+					uni.redirectTo({
+						url: '/pages/payment-list/selectPaymentEntity',
+						success: res => {},
+						fail: () => {},
+						complete: () => {}
+					});
+				}else if(type.name == '水'||type.name == '电') {
+					uni.redirectTo({
+						url: '/pages/payment-list/addHydropower',
+						success: res => {},
+						fail: () => {},
+						complete: () => {}
+					});
+				}
 				uni.setStorageSync('addPaymentType', type.name)
-				uni.redirectTo({
-					url: '/pages/payment-list/selectPaymentEntity',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
+
 			},
 			goBack() {
 				uni.switchTab({
diff --git a/property-uniapp-project/static/propertyImgs/scanTheCodeIcon.png b/property-uniapp-project/static/propertyImgs/scanTheCodeIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d93291d54a36f7b5b5428d9e49784f4dd16ee73
GIT binary patch
literal 1531
zcmV<X1qAwuP)<h;3K|Lk000e1NJLTq004;q004{#0{{R3e>Zwa0001ZP)t-s|NsB~
z{{H>_{ey#p`1tsYjEseag=uMN;o;%X(9qo6+_tv1)YR0arKMzKWT>d9adB~eetxsF
zv-<k_?(XjB=;(TSdc?%Uc6N4}nwoBIZp_Tghlhvs^z@&fpOBD{U|?WcT3WfexvZ?L
z$;ru<mX_Y$-oL-U-$8Gh000F(Nkl<Zc-rlni*}+g5I~)X@-U(hK;9w<{{J8D1PVo1
z+HS&j-JV>n#mB@;5=a=cQ79A&g+ifFDE>YGn->9IL<L$1=R1U;;{y+-X^hO@USDKM
zg-f6bV_KGJ<QsYr-)&fY1L2jz;15hdv@L-!vS5N9)1rs1_t&Pc5H2on0s~#0%p0@+
zz77C*FNP4lq4CBPLGuiYnn`l!T*lljZ|*&Ov1cWhdru#V|4nN7nUG1=B;~2TcI?Jn
zOJlK505cxZl~Z?gvH1MxUT_aY@XSNx6gQ;6$1z1j`OYH%a}%1!MN!y2LvVPl5?{!~
ze?;3e7OBUGKIVMvO~~AYSXB^D&~^KEiydB<A{g#Awr_SE1dihbBSNRLx~|F4WC}6d
zG<d?nkhr)NdU&EjCe~5MI@N=8-cb%lcTlt@^SZ2eyL15i2tEz<8&aEsCNVaRQ&)$w
zED!F8gXwdVg>lEDr90+uz~IQyu~s5s6FUyCE^Q3MXsj`Q_GSVLNB@MzD(f(|?MSe7
zPG>#b9+M2FXSUG`pHCK`^`+G|)W6LH`F0anFhRcG1YX1hK$*yxfHIlU_HTOnIVO8F
zAqa?@@F^}aPtMsEHEDVi#xzF6O%NdF5lw_gz`;b*G$vyLtw~&nkHv5Ogdq}j0tmJa
zpa0e3vx2jeV?W_Y9mPQKC_dXac@sdS&aptNeJIyYxJg^yDrfs#^w<g8exhw;$DK`Q
z632ojM!DNxYnRHJ05`G9`kJP$C1m2!vV2^q&(<*U>7y)5>Is>!%=bMn(}?uh9{4od
z$I>#kk%7pM#rVfGvSyNrOo7koKG$C_!b&RSk5!&N$RGZe%4Y=+5&Uy<Ch`Cmc&#k%
z&j1GGijmG6!w9+k8E=c_9#^4hnts#EgiJgfDtZnwxb0(!cT+Iqcge3kJ8@FHy>UG>
zg1N^!<?LIwvS0~<vjXtT>wb~J>}!(vDcqx-D^@3H(w8!j4$R$_o%^_*SnGh7RL6nS
zha8s~f-Ah=eGw7J44Sl<Yd|Uf85sze5TYR&-qwI2-9@d43Br(t*$5fIKDiO-&#)pU
zy$XLAL?-Wll|D|;1m=^og;D8q6RB~h|BkPWfUv|YSWT4_Uq~8&VC0%>7>I^2A{3h$
zNn+B*TSX-^%;bKzJkgm_lvkIAtYPBct30Y7hG-@y4)!OLZR7#VO#`0E5zjrQCsW(3
zfaUIjSQj?Y?bS>unuur1bGzUs8LV(+-<k;L9&^1oV~$$hgb+rn)`W_iY*#Z$v2|oj
zoO~4%&BV;GF4JRMlg$csf_ZxxlXx(Z@3Cu`XwoKle+d&Hu$~FLjtM9eWui>}<aa<j
z4(f;RP5JnD8j^WW_`HBi9-M_u8Z^=4{qb>`VR?Woua~@xdGG>GyI8lyO+wqY&uNrL
z6Y_^akfr?G{TPj?>l!1{uqX;N5ngSm7kcPyoeA5DE?)={<FIqa1OY~b`pwqEBNfep
zZqGJ0(0K}$$a)dz8Lhx{&NE`W;43g2ArmjDYR4{G>@kHNB^uc*m@s<e{sVSTP-DhV
z%*47>(KZOeFbtk?PP8|HcX|_kY2!T6#%!ZXbfvE5Tjr&7=TvTDXk^H7O-+1r2s(6h
z+ZR)G^)k`2tUVpf@iInw5ds5mVb38R^0twozbup0j_+%9Cv}1>98_Fc+Tz1<ry}!_
z;kokUX6C<DnIFZ=BI8E<3nnl(;VhWI8YaJO9+;af14}g`&vb3-zXRS-Cdx#aD3hOR
hvQa1$3WehT;um2nsM1K>a)1B;002ovPDHLkV1f@A>d62A

literal 0
HcmV?d00001