Explorar el Código

账户划转-申请兑换限制连续多次点击申请。资金不足弹窗提示立即存款点击闪退。

culturetown hace 2 semanas
padre
commit
e4fed30d0d

+ 10 - 1
Koala/Koala/Modular/JDAssets/VC/JDAFiatExchangeViewController.swift

@@ -293,6 +293,8 @@ extension JDAFiatExchangeViewController {
             
             print(param)
             
+            self.submitBtn.isEnabled = false
+            
             NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForCashToTransaction, parameters: param as [String: Any], success: { _, _ in
                 ProgressHUD.showSuccess(status: switchLanguage("操作成功"))
                 // 划转成功通知
@@ -301,8 +303,12 @@ extension JDAFiatExchangeViewController {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
                     self.navigationController?.popViewController(animated: true)
                 }
+                
+                
             }) { _, result in
                 ProgressHUD.showError(status: result as! String)
+                
+                self.submitBtn.isEnabled = true
             }
         } else {
             let fromAccountModel = self.accountList[self.selectFromAccountIndex]
@@ -313,7 +319,7 @@ extension JDAFiatExchangeViewController {
                 "account": fromAccountModel.account
                 // "input_currency" :getCashUnitByAccount(model: fromAccountModel)
             ]
-
+            self.submitBtn.isEnabled = false
             NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForTransactionToCash, parameters: param as [String: Any], success: { _, _ in
                 ProgressHUD.showSuccess(status: switchLanguage("操作成功"))
                 
@@ -325,6 +331,9 @@ extension JDAFiatExchangeViewController {
                 }
             }) { _, result in
                 ProgressHUD.showError(status: result as! String)
+                
+                self.submitBtn.isEnabled = true
+                
             }
         }
     }

+ 14 - 6
Koala/Koala/Modular/PopUpView/LackOfFundsPopUpView.swift

@@ -183,30 +183,38 @@ class LackOfFundsPopUpView: UIView {
     @objc func depositClick() {
         self.dismissAnimated()
 
+        
+        print(self.server)
         if self.server == "US" {
             let vc = JDAFiatDepositsViewController()
 
-            vc.selectAccountIndex = 4
+            vc.selectAccountIndex = 3
             currentVc()?.navigationController?.pushViewController(vc, animated: true)
         } else if self.server == "HK" {
             let vc = JDAFiatDepositsViewController()
 
-            vc.selectAccountIndex = 1
+            vc.selectAccountIndex = 2
             currentVc()?.navigationController?.pushViewController(vc, animated: true)
         } else if self.server == "SH" {
             let vc = JDAFiatDepositsViewController()
 
-            vc.selectAccountIndex = 2
+            vc.selectAccountIndex = 1
             currentVc()?.navigationController?.pushViewController(vc, animated: true)
         } else if self.server == "SZ" {
             let vc = JDAFiatDepositsViewController()
 
-            vc.selectAccountIndex = 3
+            vc.selectAccountIndex = 1
             currentVc()?.navigationController?.pushViewController(vc, animated: true)
-        } else if self.server == "CFD" {
+        }else if self.server == "CN" {
             let vc = JDAFiatDepositsViewController()
 
-            vc.selectAccountIndex = 5
+            vc.selectAccountIndex = 1
+            currentVc()?.navigationController?.pushViewController(vc, animated: true)
+        }
+        else if self.server == "CFD" {
+            let vc = JDAFiatDepositsViewController()
+
+            vc.selectAccountIndex = 4
             currentVc()?.navigationController?.pushViewController(vc, animated: true)
         } else {
             // 存入