소스 검색

fix:461 【bcwin网站】提现界面 优化

Before 7 달 전
부모
커밋
a2891380ed
4개의 변경된 파일39개의 추가작업 그리고 16개의 파일을 삭제
  1. 3 1
      messages/br.json
  2. 3 1
      messages/en.json
  3. 3 0
      src/api/withdraw.ts
  4. 30 14
      src/app/[locale]/(navbar)/withdraw/WithdrawWidget.tsx

+ 3 - 1
messages/br.json

@@ -207,7 +207,9 @@
     "pointTips": "Bouns R$ ",
     "pointBet": " FALTA APOSTAR R$ ",
     "scoreTips":"SALDO R$",
-    "scoreTitle": "SACAR"
+    "scoreTitle": "SACAR",
+    "rulesRange": "Mín {min}, máx {max}",
+    "rulesToll": "{toll}% de taxa por saque. Em caso de saldo insuficiente, o montante creditado será deduzido"
   },
   "HeaderBack": {
     "Depósito": "Depósito"

+ 3 - 1
messages/en.json

@@ -206,7 +206,9 @@
     "pointTips": "Bouns R$ ",
     "pointBet": " FALTA APOSTAR R$ ",
     "scoreTips":"SALDO R$",
-    "scoreTitle": "SACAR"
+    "scoreTitle": "SACAR",
+    "rulesRange": "Mín {min}, máx {max}",
+    "rulesToll": "{toll}% de taxa por saque. Em caso de saldo insuficiente, o montante creditado será deduzido"
   },
   "HeaderBack": {
     "Depósito": "Depósito"

+ 3 - 0
src/api/withdraw.ts

@@ -15,6 +15,9 @@ export interface WithDrawType {
      * 最小充值金额
      */
     min_amount: number;
+
+    /// 手续费百分比
+    fee_rate: number;
 }
 
 export interface ChannelType {

+ 30 - 14
src/app/[locale]/(navbar)/withdraw/WithdrawWidget.tsx

@@ -238,6 +238,19 @@ const WithdrawWidget: FC<Props> = (props) => {
 
                     <h1>{t("WithdrawPage.Certifique")}</h1>
                     <p className={"text-[0.1rem] text-[#3bc117]"}>{t("WithdrawPage.keyTips")}</p>
+                    <ul className={"ml-[0.11rem] list-decimal text-[0.1rem]"}>
+                        <li>
+                            {t("WithdrawPage.rulesRange", {
+                                min: activeWallet.min_amount,
+                                max: activeWallet.max_amount,
+                            })}
+                        </li>
+                        <li>
+                            {t("WithdrawPage.rulesToll", {
+                                toll: activeWallet.fee_rate,
+                            })}
+                        </li>
+                    </ul>
                     {/* form */}
                     <Form
                         style={{
@@ -315,16 +328,16 @@ const WithdrawWidget: FC<Props> = (props) => {
                             <li>
                                 {t("WithdrawPage.SaqueDisponivel")}{" "}
                                 <span className="tip">
+                                    {/* 如果当前现金打码量等于当前目标打码量 则 可以提现,  如果当前打码量=== 100% 则可以提现 */}
                                     {flatPoint(
                                         wallet.target_score_rollover - wallet.current_score_rollover
-                                    ) === 0
+                                    ) === 0 ||
+                                    percentage(
+                                        wallet.current_score_rollover,
+                                        wallet.target_score_rollover
+                                    ) >= 100
                                         ? wallet.score
-                                        : percentage(
-                                                wallet.current_score_rollover,
-                                                wallet.target_score_rollover
-                                            ) < 100
-                                          ? 0
-                                          : wallet.score}{" "}
+                                        : 0}
                                     BRL
                                 </span>
                                 <span
@@ -333,14 +346,17 @@ const WithdrawWidget: FC<Props> = (props) => {
                                 ></span>
                             </li>
                             <li>
-                                {t("WithdrawPage.Valor")}{" "}
+                                {t("WithdrawPage.Valor")}
                                 <span className="tip">
-                                    {percentage(
-                                        wallet.current_point_rollover,
-                                        wallet.target_point_rollover
-                                    ) < 100
-                                        ? 0
-                                        : wallet.point}{" "}
+                                    {flatPoint(
+                                        wallet.target_score_rollover - wallet.current_score_rollover
+                                    ) === 0 ||
+                                    percentage(
+                                        wallet.current_score_rollover,
+                                        wallet.target_score_rollover
+                                    ) >= 100
+                                        ? (wallet.score || 0) + wallet.point
+                                        : 0}
                                     BRL
                                 </span>
                                 <span