Merge branch 'master' into xudh

src/api/request.js

@@ -43,7 +43,9 @@ const checkResponse=(data)=>{
                 type:"main/updateOpenPay",
                 payload:1,
             }
-            if (global.dispatch)global.dispatch(action);
+            setTimeout(()=>{
+                if (global.dispatch)global.dispatch(action);
+            },1000)
         }
     }
 }

src/features/actions/hallClient.js

@@ -72,6 +72,11 @@ const roger=(message,dispatch)=>{
                             trackEvent(data.event,data.params)
                             break;
                         }
+                        case "refresh_mail":{
+                            //有新的邮件刷新邮件
+                            //播放动画newmail.json
+                            break;
+                        }
                     }
 
 

src/locales/languages/en_US.json

@@ -657,7 +657,14 @@
       "score_fail": "Amount must be an integer value.",
       "params_error": "params error",
       "pix_type_missing": "The PIX type is missing",
-      "cpf_number_used": "The CPF number has been used multiple times and cannot be saved"
+      "cpf_number_used": "The CPF number has been used multiple times and cannot be saved",
+      "no_withdraw_value": "Insufficient withdrawal amount",
+      "too_low": "Lower than the minimum withdrawal amount",
+      "too_high": "Higher than the maximum withdrawal amount",
+      "day_max": "Exceeded the daily withdrawal limit",
+      "no_enouth_score": "Not enough money on hand",
+      "in_game": "Opened in the game",
+      "no_deposit": "You need deposit to withdraw"
     },
     "payment": {
       "paytype_error": "PayType ERROR",

src/locales/languages/es_MX.json

@@ -646,7 +646,14 @@
       "score_fail": "La cantidad debe ser un valor entero.",
       "params_error": "error de parámetros",
       "pix_type_missing": "Falta el tipo de PIX",
-      "cpf_number_used": "El número de CPF ha sido utilizado varias veces y no se puede guardar"
+      "cpf_number_used": "El número de CPF ha sido utilizado varias veces y no se puede guardar",
+      "no_withdraw_value": "Monto de retiro insuficiente",
+      "too_low": "Inferior al monto mínimo de retiro",
+      "too_high": "Superior al monto máximo de retiro",
+      "day_max": "Límite diario de retiro excedido",
+      "no_enouth_score": "No hay suficiente dinero disponible",
+      "in_game": "Abierto en el juego",
+      "no_deposit": "Necesitas depositar para retirar"
     },
     "payment": {
       "paytype_error": "Error de tipo de pago",

src/locales/languages/pt_BR.json

@@ -646,7 +646,14 @@
       "score_fail": "O valor deve ser um valor inteiro.",
       "params_error": "erro nos parâmetros",
       "pix_type_missing": "O tipo de PIX está ausente",
-      "cpf_number_used": "O número do CPF foi usado várias vezes e não pode ser salvo"
+      "cpf_number_used": "O número do CPF foi usado várias vezes e não pode ser salvo",
+      "no_withdraw_value": "Montante de retirada insuficiente",
+      "too_low": "Abaixo do valor mínimo de retirada",
+      "too_high": "Acima do valor máximo de retirada",
+      "day_max": "Limite diário de retirada excedido",
+      "no_enouth_score": "Dinheiro insuficiente em mãos",
+      "in_game": "Aberto no jogo",
+      "no_deposit": "Você precisa depositar para retirar"
     },
     "payment": {
       "paytype_error": "Erro de tipo de pagamento",

src/locales/languages/ru_RU.json

@@ -646,7 +646,14 @@
       "score_fail": "Сумма должна быть целым числом.",
       "params_error": "ошибка параметров",
       "pix_type_missing": "Отсутствует тип PIX",
-      "cpf_number_used": "Номер CPF использовался несколько раз и не может быть сохранен"
+      "cpf_number_used": "Номер CPF использовался несколько раз и не может быть сохранен",
+      "no_withdraw_value": "Недостаточная сумма для вывода",
+      "too_low": "Ниже минимальной суммы вывода",
+      "too_high": "Превышает максимальную сумму вывода",
+      "day_max": "Превышен дневной лимит на вывод",
+      "no_enouth_score": "Недостаточно денег на руках",
+      "in_game": "Открыто в игре",
+      "no_deposit": "Для вывода необходимо внести депозит"
     },
     "payment": {
       "paytype_error": "Ошибка типа платежа",

src/locales/languages/zh_TW.json

@@ -646,7 +646,14 @@
       "score_fail": "金額必須是整數值。",
       "params_error": "參數錯誤",
       "pix_type_missing": "缺少PIX類型",
-      "cpf_number_used": "CPF號碼已多次使用，無法保存"
+      "cpf_number_used": "CPF號碼已多次使用，無法保存",
+      "no_withdraw_value": "提現金額不足",
+      "too_low": "低於最低提現金額",
+      "too_high": "高於最高提現金額",
+      "day_max": "超過每日提現限額",
+      "no_enouth_score": "手頭資金不足",
+      "in_game": "在遊戲中打開",
+      "no_deposit": "提現需要先充值"
     },
     "payment": {
       "paytype_error": "支付類型錯誤",

src/widgets/LoginForm/index.jsx

@@ -161,7 +161,7 @@ const LoginForm = ({close}) => {
                             if(isMobile())navigatRoute(ROUTE_PATH.SIGN_UP)
                             else setShowType(TYPE_REGISTER);
                         }}>
-                            {i18n.t("login.reg_new_btn")}
+                            {i18n.t("sign_up")}
                         </div>
                     </div>
                 </form>

src/widgets/WWithdraw/AccountEdit.jsx

@@ -1,9 +1,9 @@
 import styles from './styles.module.scss';
 import BRAccountEdit from "@widgets/WWithdraw/BR/BRAccountEdit";
-const AccountEdit=({close})=>{
+const AccountEdit=({...props})=>{
     return (
         <div className={styles.container}>
-            <BRAccountEdit/>
+            <BRAccountEdit {...props}/>
         </div>
     )
 }

src/widgets/WWithdraw/BR/BRAccountEdit.jsx

@@ -57,6 +57,7 @@ const BRAccountEdit=({close})=>{
     const callback=(data)=>{
         if (data&&data.code===200){
             // dispatch(reqWithdrawBaseInfo(callbackBase));
+            close();
         }
     }
     const handleChange=(data)=>{

src/widgets/WWithdraw/BR/BRWithdraw.jsx

@@ -27,9 +27,10 @@ const BRWithdraw=()=>{
     const dispatch = useDispatch();
     const status=useSelector(getWDPayoutStatus);
     useEffect(()=>{
-       if (info==null){
-           dispatch(reqWithdrawBaseInfo())
-       }
+       // if (info==null){
+       //     dispatch(reqWithdrawBaseInfo())
+       // }
+        dispatch(reqWithdrawBaseInfo())
     },[])
     const checkBank=()=>{
         if (info!=null){