From 986afb719fbe7d828232777948098d1e8c8e4321 Mon Sep 17 00:00:00 2001
From: wanganxp <wanganxp@gmail.com>
Date: Wed, 3 Apr 2024 23:48:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=B1=8F=E8=94=BDuni-pay?=
 =?UTF-8?q?=E9=87=8CAndroid=E4=B8=8A=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request-payment-uni-pay.uvue                   |  3 ---
 .../uni-pay-x/components/uni-pay/uni-pay.uvue      | 14 ++++++--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/pages/API/request-payment-uni-pay/request-payment-uni-pay.uvue b/pages/API/request-payment-uni-pay/request-payment-uni-pay.uvue
index 6a39da69..28338970 100644
--- a/pages/API/request-payment-uni-pay/request-payment-uni-pay.uvue
+++ b/pages/API/request-payment-uni-pay/request-payment-uni-pay.uvue
@@ -1,8 +1,5 @@
 <template>
 	<view class="app">
-		<view>
-			<text style="color: red;">注意：uni-app x暂不支持微信支付</text>
-		</view>
 		<view>
 			<view class="label">支付单号：</view>
 			<view><input class="input" v-model="out_trade_no" placeholder="点击发起支付会自动生成"/></view>
diff --git a/uni_modules/uni-pay-x/components/uni-pay/uni-pay.uvue b/uni_modules/uni-pay-x/components/uni-pay/uni-pay.uvue
index f8911be2..0de19932 100644
--- a/uni_modules/uni-pay-x/components/uni-pay/uni-pay.uvue
+++ b/uni_modules/uni-pay-x/components/uni-pay/uni-pay.uvue
@@ -156,7 +156,7 @@
 				type: String,
 				default: ""
 			},
-			/** 
+			/**
 			 * 收银台模式
 			 * mobile 手机版
 			 * pc 电脑版
@@ -282,14 +282,12 @@
 				}
 				// #ifdef APP
 				if (options['provider'] == "wxpay") {
-					// #ifdef APP
 					uni.showModal({
 						title: "提示",
-						content: "uni-app x 暂不支持微信支付",
+						content: "uni-pay 的 uni-app x 版本暂未适配微信支付",
 						showCancel: false
 					})
 					return;
-					// #endif
 				}
 				// #endif
 
@@ -624,11 +622,11 @@
 					background-color: #fff;
 					flex-direction: row;
 					border-bottom: 2rpx solid #f8f8f8;
-					
+
 					/* #ifdef H5 */
 					cursor: pointer;
 					/* #endif */
-					
+
 					&:hover {
 						background-color: #f1f1f1;
 					}
@@ -790,7 +788,7 @@
 
 				.pc-pay-popup-provider-item:hover {
 					background-color: #ffffff;
-					
+
 					/* #ifdef H5 */
 					cursor: pointer;
 					/* #endif */
@@ -901,4 +899,4 @@
 	}
 
 	/* 外部浏览器H5支付弹窗确认结束 */
-</style>
\ No newline at end of file
+</style>
-- 
GitLab