修改储值部分bug

pages/topUp/agreement.vue

@@ -89,16 +89,19 @@
 				submitting: false,
 				agreementVersion: '',
 				agreementTitle: '储值功能开通业务规则',
-				contentText: ''
+				contentText: '',
+				isReapply: false
 			};
 		},
-		onLoad() {
+		onLoad(options = {}) {
+			this.isReapply = String(options.reapply || '') === '1';
 			this.loadAgreement();
 			this.checkStatus();
 		},
 		onReady() {
 			const sys = uni.getSystemInfoSync();
-			this.scrollHeight = `${sys.windowHeight - uni.upx2px(280) - (sys.statusBarHeight || 0) - 44}px`;
+			// 底部固定栏（协议勾选 + 申请按钮 + 安全区）预留高度，避免末尾条款被遮挡
+			this.scrollHeight = `${sys.windowHeight - uni.upx2px(320) - (sys.statusBarHeight || 0) - 44}px`;
 		},
 		methods: {
 			checkStatus() {
@@ -106,7 +109,17 @@
 				if (!merchantId) return;
 				prepaidApi.getFeatureStatus(merchantId).then((res) => {
 					if (res.data.code !== 200) return;
-					const auditStatus = Number((res.data.result || {}).auditStatus);
+					const data = res.data.result || {};
+					const auditStatus = Number(data.auditStatus);
+					const reapplyStatus = Number(data.reapplyStatus);
+					// 驳回后重新申请：允许停留在申请页，避免又跳回驳回页
+					if (this.isReapply && auditStatus === 3) {
+						if (reapplyStatus === 1) {
+							uni.showToast({ title: '当前不可重新申请', icon: 'none' });
+							uni.redirectTo({ url: '/pages/topUp/status' });
+						}
+						return;
+					}
 					if (auditStatus === 1 || auditStatus === 3) {
 						uni.redirectTo({ url: '/pages/topUp/status' });
 					} else if (auditStatus === 2) {
@@ -116,12 +129,14 @@
 			},
 			loadAgreement() {
 				prepaidApi.getCurrentAgreement().then((res) => {
-					console.log('11111',res);
 					if (res.data.code !== 200 || !res.data.result) return;
 					const data = res.data.result;
 					this.agreementVersion = data.agreementVersion || '';
 					this.agreementTitle = data.agreementTitle || '储值功能开通业务规则';
-					this.contentText = data.contentText || '';
+					const apiText = (data.contentText || '').trim();
+					// 接口正文若缺少末条争议解决条款，回退本地完整协议，避免展示截断
+					const requiredClause = '因本协议产生争议';
+					this.contentText = apiText && apiText.includes(requiredClause) ? apiText : '';
 				});
 			},
 			buildIdempotencyKey() {
@@ -174,7 +189,7 @@
 
 <style scoped lang="scss">
 	.page {
-		min-height: 100vh;
+		// min-height: 100vh;
 		background: #f7f7f7;
 		display: flex;
 		flex-direction: column;
@@ -182,15 +197,16 @@
 
 	.content {
 		flex: 1;
-		padding: 24rpx 24rpx 0;
+		padding: 24rpx 24rpx 48rpx;
 		box-sizing: border-box;
+		padding-bottom: 220rpx;
 	}
 
 	.card {
 		background: #fff;
 		border-radius: 16rpx;
 		padding: 32rpx 28rpx 40rpx;
-		margin-bottom: 24rpx;
+		// margin-bottom: 24rpx;
 	}
 
 	.doc-title {

pages/topUp/status.vue

@@ -7,7 +7,7 @@
 				<!-- 审核中 auditStatus=1 -->
 				<template v-if="auditStatus === 1">
 					<view class="title">提交申请</view>
-					<view class="msg">你的提交申请，请耐心等待平台审核。</view>
+					<view class="msg">您已提交申请，请耐心等待平台审核。</view>
 					<view class="btn" @click="goHome">我知道了</view>
 				</template>