diff --git a/web/src/pages/TopUp/index.js b/web/src/pages/TopUp/index.js index e327178d..a3a911cc 100644 --- a/web/src/pages/TopUp/index.js +++ b/web/src/pages/TopUp/index.js @@ -588,11 +588,10 @@ const TopUp = () => { selectPresetAmount(preset)} - className={`cursor-pointer !rounded-2xl transition-all hover:shadow-md ${ - selectedPreset === preset.value - ? 'border-blue-500' - : 'border-gray-200 hover:border-gray-300' - }`} + className={`cursor-pointer !rounded-2xl transition-all hover:shadow-md ${selectedPreset === preset.value + ? 'border-blue-500' + : 'border-gray-200 hover:border-gray-300' + }`} bodyStyle={{ textAlign: 'center' }} >
@@ -661,54 +660,139 @@ const TopUp = () => { />
-
- {/* - */} - {payMethods.map((payMethod) => ( - - ))} +
+ + {t('选择支付方式')} + + {payMethods.length === 2 ? ( +
+ {payMethods.map((payMethod) => ( + + ))} +
+ ) : payMethods.length === 3 ? ( +
+ {payMethods.map((payMethod) => ( + + ))} +
+ ) : payMethods.length > 3 ? ( +
+ {payMethods.map((payMethod) => ( + preTopUp(payMethod.type)} + disabled={!enableOnlineTopUp} + className={`cursor-pointer !rounded-xl p-0 transition-all hover:shadow-md ${paymentLoading && payWay === payMethod.type + ? 'border-blue-400' + : 'border-gray-200 hover:border-gray-300' + }`} + bodyStyle={{ + padding: '10px', + textAlign: 'center', + opacity: !enableOnlineTopUp ? 0.5 : 1 + }} + > + {paymentLoading && payWay === payMethod.type ? ( +
+
+
+
+
{t('处理中')}
+
+ ) : ( + <> +
+ {payMethod.type === 'zfb' ? ( + + ) : payMethod.type === 'wx' ? ( + + ) : ( + + )} +
+
{payMethod.name}
+ + )} +
+ ))} +
+ ) : ( +
+ {payMethods.map((payMethod) => ( + + ))} +
+ )}
@@ -941,48 +1025,71 @@ const TopUp = () => { /> -
- {/* - */} - {payMethods.map((payMethod) => ( - - ))} +
+ {payMethods.length === 2 ? ( +
+ {payMethods.map((payMethod) => ( + + ))} +
+ ) : ( +
+ {payMethods.map((payMethod) => ( + preTopUp(payMethod.type)} + disabled={!enableOnlineTopUp} + className={`cursor-pointer !rounded-xl p-0 transition-all ${paymentLoading && payWay === payMethod.type + ? 'border-blue-400' + : 'border-gray-200' + }`} + bodyStyle={{ + padding: '8px', + textAlign: 'center', + opacity: !enableOnlineTopUp ? 0.5 : 1 + }} + > + {paymentLoading && payWay === payMethod.type ? ( +
+ ) : ( + <> +
+ {payMethod.type === 'zfb' ? ( + + ) : payMethod.type === 'wx' ? ( + + ) : ( + + )} +
+
{payMethod.name}
+ + )} +
+ ))} +
+ )}