提交内容

1、代码提交；

MTP_iOS/MTP2_iOS.xcodeproj/project.pbxproj

@@ -2772,7 +2772,7 @@
 				CODE_SIGN_ENTITLEMENTS = MTP2_iOS/BPML.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1005;
+				CURRENT_PROJECT_VERSION = 1007;
 				DEVELOPMENT_TEAM = QF38M2SZT9;
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2796,7 +2796,7 @@
 					"$(PROJECT_DIR)/MTP2_iOS/ThirdParty/WeChat",
 					"$(PROJECT_DIR)/MTP2_iOS/ThirdParty/UMSPosPayOnly",
 				);
-				MARKETING_VERSION = 1.0.5;
+				MARKETING_VERSION = 1.0.7;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_LIBTOOLFLAGS = "$(inherited)";
@@ -2823,7 +2823,7 @@
 				CODE_SIGN_ENTITLEMENTS = MTP2_iOS/BPML.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1005;
+				CURRENT_PROJECT_VERSION = 1007;
 				DEVELOPMENT_TEAM = QF38M2SZT9;
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2847,7 +2847,7 @@
 					"$(PROJECT_DIR)/MTP2_iOS/ThirdParty/WeChat",
 					"$(PROJECT_DIR)/MTP2_iOS/ThirdParty/UMSPosPayOnly",
 				);
-				MARKETING_VERSION = 1.0.5;
+				MARKETING_VERSION = 1.0.7;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",

MTP_iOS/MTP2_iOS/UserInterface/Trade/PaymentViewController.swift

@@ -203,7 +203,10 @@ class PaymentViewController: BaseViewController {
                     if resultCode == "0000" {
                         self.navigationController?.popViewController(animated: true)
                     } else {
-                        WHToast.showMessage("resultCode = \(resultCode ?? "")\nresultInfo = \(resultInfo ?? "")", duration: 1.5, finishHandler: {})
+                        let data = resultInfo?.data(using: .utf8)
+                        let dic = (try? JSONSerialization.jsonObject(with: data!, options: .allowFragments)) as? NSDictionary
+                        let msg = dic?["resultMsg"] as? String
+                        WHToast.showMessage("\(msg ?? "未知错误")", duration: 2.0, finishHandler: {})
                     }
                 }
             }
@@ -239,7 +242,10 @@ class PaymentViewController: BaseViewController {
                     if resultCode == "0000" {
                         self.navigationController?.popViewController(animated: true)
                     } else {
-                        WHToast.showMessage("resultCode = \(resultCode ?? "")\nresultInfo = \(resultInfo ?? "")", duration: 1.5, finishHandler: {})
+                        let data = resultInfo?.data(using: .utf8)
+                        let dic = (try? JSONSerialization.jsonObject(with: data!, options: .allowFragments)) as? NSDictionary
+                        let msg = dic?["resultMsg"] as? String
+                        WHToast.showMessage("\(msg ?? "未知错误")", duration: 1.5, finishHandler: {})
                     }
                 }
             }

MTP_iOS/MTP2_iOS/UserInterface/Trade/TradeViewController.swift

@@ -170,7 +170,7 @@ class TradeViewController: BaseViewController {
         qtyField.incrementIntNum = obj.lotsize
         qtyField.minIntNum = obj.lotsize
         qtyField.currentIntNumbers = obj.lotsize
-        qtyField.maxIntNum = obj.buymaxqty
+        qtyField.maxIntNum = obj.buymaxqty == 0 ? Int.max : obj.buymaxqty
         /// 查询资金信息
         accountManager.loginQueryReq(queryItem: "1,2") { (isComplete, error) in
             DispatchQueue.main.async {