Browse Source

Merge branch '推广版' of http://156.254.127.134:3000/tomy/JD_iOS into 推广版

lintong 1 tuần trước cách đây
mục cha
commit
4ee3ff6dbb

+ 3 - 3
Koala/Koala.xcworkspace/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -190,9 +190,9 @@
             filePath = "Koala/Modular/JDAssets/VC/JDAFiatTransferViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "204"
-            endingLineNumber = "204"
-            landmarkName = "netInsertTransfer()"
+            startingLineNumber = "206"
+            endingLineNumber = "206"
+            landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

+ 5 - 0
Koala/Koala/Modular/JDAssets/VC/JDAFiatDepositsViewController.swift

@@ -293,9 +293,13 @@ extension JDAFiatDepositsViewController {
 
         print(param)
         
+        self.submitButton.isEnabled = false
         ProgressHUD.showMessage(status: switchLanguage("正在请求"))
         NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForInsertCashInto, parameters: param, success: { _, result in
             if let dict: NSDictionary = result as? NSDictionary {
+                
+                self.submitButton.isEnabled = true
+                
                 let model = JDDepositResultModel.deserialize(from: dict)!
                 
                 if self.selectCashChannelModel?.type == "3" {
@@ -334,6 +338,7 @@ extension JDAFiatDepositsViewController {
             }
         }) { _, result in
             ProgressHUD.showError(status: result as! String)
+            self.submitButton.isEnabled = true
         }
     }
 }

+ 2 - 0
Koala/Koala/Modular/JDAssets/VC/JDAFiatTransferViewController.swift

@@ -161,6 +161,7 @@ extension JDAFiatTransferViewController {
             param.add(["account": self.areaCode + self.account])
         }
        
+        self.submitBtn.isEnabled = false
         ProgressHUD.showMessage(status: switchLanguage("正在请求"))
         NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForUserExchange, parameters: param, success: { _, _ in
             ProgressHUD.showSuccess(status: switchLanguage("提交成功"))
@@ -170,6 +171,7 @@ extension JDAFiatTransferViewController {
             }
         }) { _, result in
             ProgressHUD.showError(status: result as! String)
+            self.submitBtn.isEnabled = true
         }
     }
 }

+ 4 - 0
Koala/Koala/Modular/JDAssets/VC/JDAFiatWithdrawViewController.swift

@@ -208,6 +208,9 @@ extension JDAFiatWithdrawViewController {
         //            param.add(["account":self.accountInfoModel.account as Any])
         //        }
         
+        
+        self.submitBtn.isEnabled = false
+        
         ProgressHUD.showMessage(status: switchLanguage("正在请求"))
         NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForInsertCashOut, parameters: param, success: { _, _ in
             ProgressHUD.showSuccess(status: switchLanguage("提交成功"))
@@ -217,6 +220,7 @@ extension JDAFiatWithdrawViewController {
             }
         }) { _, result in
             ProgressHUD.showError(status: result as! String)
+            self.submitBtn.isEnabled = true
         }
     }