From 85cdeac804c7bda839129a39180f5a172ce37fca Mon Sep 17 00:00:00 2001
From: luo <luo@qq.com>
Date: Fri, 26 Jun 2026 18:01:01 +0800
Subject: [PATCH] fix:pay

---
 pages/alipay-payment/alipay-payment.vue | 84 +++++++++++++++----------
 utils/payment.js                        | 27 +++++++-
 2 files changed, 76 insertions(+), 35 deletions(-)

diff --git a/pages/alipay-payment/alipay-payment.vue b/pages/alipay-payment/alipay-payment.vue
index eb9fc00..92df60c 100644
--- a/pages/alipay-payment/alipay-payment.vue
+++ b/pages/alipay-payment/alipay-payment.vue
@@ -1,12 +1,6 @@
 <template>
 	<view class="container alipay-page">
-		<view v-if="!hasPaymentUrl" class="empty-card">
-			<view class="empty-title">支付链接已失效</view>
-			<view class="empty-desc">请返回后重新发起支付宝支付</view>
-			<up-button class="primary-button" type="primary" @tap="goBack">返回</up-button>
-		</view>
-
-		<view v-else class="pay-content">
+		<view class="pay-content">
 			<view class="method-card">
 				<view class="method-header">
 					<view class="method-index">方式一</view>
@@ -31,23 +25,64 @@
 </template>
 
 <script setup>
-	import { computed, ref } from 'vue';
+	import { ref } from 'vue';
 	import { onShow } from '@dcloudio/uni-app';
 	import { getPendingAlipayPaymentData } from '@/utils/payment.js';
 
 	const browserUrl = ref('');
 	const qrUrl = ref('');
+	const hasRedirected = ref(false);
 
-	const hasPaymentUrl = computed(() => !!browserUrl.value || !!qrUrl.value);
+	const isInWechat = () => /micromessenger/i.test(navigator.userAgent);
+
+	const decodePaymentUrl = (value) => {
+		if (!value) {
+			return '';
+		}
+
+		try {
+			const normalized = value.replace(/-/g, '+').replace(/_/g, '/');
+			const padding = '='.repeat((4 - normalized.length % 4) % 4);
+			return decodeURIComponent(escape(atob(normalized + padding)));
+		} catch (e) {
+			return '';
+		}
+	};
+
+	const getQueryParam = (key) => {
+		// #ifdef H5
+		const params = new URLSearchParams(window.location.search);
+		return params.get(key) || '';
+		// #endif
+		// #ifndef H5
+		return '';
+		// #endif
+	};
+
+	const getPayUrlFromQuery = () => {
+		return decodePaymentUrl(getQueryParam('pay64'));
+	};
+
+	const getQrUrlFromQuery = () => {
+		return decodePaymentUrl(getQueryParam('qr64'));
+	};
+
+	const redirectToAlipayInBrowser = () => {
+		// #ifdef H5
+		if (hasRedirected.value || isInWechat() || !browserUrl.value) {
+			return;
+		}
+
+		hasRedirected.value = true;
+		window.location.href = browserUrl.value;
+		// #endif
+	};
 
 	const loadPaymentData = () => {
 		const data = getPendingAlipayPaymentData();
-		browserUrl.value = data?.copyUrl || data?.qrUrl || '';
-		qrUrl.value = data?.qrUrl || data?.copyUrl || '';
-	};
-
-	const goBack = () => {
-		uni.navigateBack();
+		browserUrl.value = getPayUrlFromQuery() || data?.copyUrl || data?.qrUrl || '';
+		qrUrl.value = getQrUrlFromQuery() || data?.qrUrl || data?.copyUrl || browserUrl.value;
+		redirectToAlipayInBrowser();
 	};
 
 	onShow(() => {
@@ -69,8 +104,7 @@
 		gap: 24rpx;
 	}
 
-	.method-card,
-	.empty-card {
+	.method-card {
 		background: var(--bg-primary);
 		border-radius: 28rpx;
 		padding: 32rpx;
@@ -78,7 +112,6 @@
 		border: 1rpx solid rgba(10, 132, 255, 0.08);
 	}
 
-	.empty-desc,
 	.qr-desc {
 		margin-top: 14rpx;
 		font-size: 26rpx;
@@ -119,11 +152,6 @@
 		text-align: center;
 	}
 
-	.primary-button {
-		width: 100%;
-		margin-top: 18rpx;
-	}
-
 	.tips-image {
 		display: block;
 		width: 100%;
@@ -142,14 +170,4 @@
 		border: 1rpx dashed rgba(10, 132, 255, 0.24);
 	}
 
-	.empty-card {
-		margin-top: 160rpx;
-		text-align: center;
-	}
-
-	.empty-title {
-		font-size: 34rpx;
-		font-weight: 700;
-		color: var(--text-primary);
-	}
 </style>
diff --git a/utils/payment.js b/utils/payment.js
index 2b3f5b4..b4180bb 100644
--- a/utils/payment.js
+++ b/utils/payment.js
@@ -58,11 +58,34 @@ export function getPendingAlipayPaymentData() {
 	return uni.getStorageSync(ALIPAY_PAYMENT_DATA_KEY) || null;
 }
 
-function getAlipayPaymentPageUrl(refreshTarget) {
+function encodePaymentUrl(value) {
+	try {
+		return btoa(unescape(encodeURIComponent(value)))
+			.replace(/\+/g, '-')
+			.replace(/\//g, '_')
+			.replace(/=+$/, '');
+	} catch (e) {
+		return '';
+	}
+}
+
+function getAlipayPaymentPageUrl(refreshTarget, payUrl, qrUrl) {
 	const params = [`t=${Date.now()}`];
 	if (refreshTarget) {
 		params.push(`from=${encodeURIComponent(refreshTarget)}`);
 	}
+	if (payUrl) {
+		const encodedPayUrl = encodePaymentUrl(payUrl);
+		if (encodedPayUrl) {
+			params.push(`pay64=${encodedPayUrl}`);
+		}
+	}
+	if (qrUrl) {
+		const encodedQrUrl = encodePaymentUrl(qrUrl);
+		if (encodedQrUrl) {
+			params.push(`qr64=${encodedQrUrl}`);
+		}
+	}
 
 	return `/pages/alipay-payment/alipay-payment?${params.join('&')}`;
 }
@@ -120,7 +143,7 @@ export function openAlipayPayment(paymentLink, refreshTarget) {
 			timestamp: Date.now()
 		});
 
-		navigateToAlipayPaymentPage(getAlipayPaymentPageUrl(refreshTarget), resolve, reject);
+		navigateToAlipayPaymentPage(getAlipayPaymentPageUrl(refreshTarget, copyUrl, qrUrl), resolve, reject);
 	});
 }