3 Commits 6257d7919b ... 22ac05f1d9

Author SHA1 Message Date
  culturetown 22ac05f1d9 身份证明优化。已实名的用户,做姓名、签名与实名一致校验。未实名的,只做姓名与签名一致校验。 2 weeks ago
  culturetown 9ec7099224 Merge branch '推广版' of https://git.jdnx.me/tomy/JD_iOS into 推广版 3 weeks ago
  culturetown 31fa809979 优化存款。人民币支付未取到url时提示。 3 weeks ago

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

@@ -1071,22 +1071,6 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "5BF215CB-880F-41CD-902E-6EA2165149B9"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Koala/Modular/JDAssets/VC/JDAFiatDepositsViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "368"
-            endingLineNumber = "368"
-            landmarkName = "clickSubmitBtnAction()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
             uuid = "7F274D16-0770-4315-BB4D-B6E8D184288C"
             shouldBeEnabled = "No"
             ignoreCount = "0"

+ 15 - 3
Koala/Koala/Modular/JDAssets/VC/JDAFiatDepositsViewController.swift

@@ -291,6 +291,8 @@ extension JDAFiatDepositsViewController {
             "client": "IOS"
         ] as [String: Any]
 
+        print(param)
+        
         ProgressHUD.showMessage(status: switchLanguage("正在请求"))
         NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForInsertCashInto, parameters: param, success: { _, result in
             if let dict: NSDictionary = result as? NSDictionary {
@@ -313,10 +315,20 @@ extension JDAFiatDepositsViewController {
                             currentVc()?.navigationController?.present(safariVC, animated: true, completion: nil)
                         }
                     } else {
-                        let vc = JDDepositVerifyViewController()
-                        vc.orderNum = model.ordernum
                         
-                        self.navigationController?.pushViewController(vc, animated: true)
+                        
+                        if  self.selectCurrencyModel?.symbol == "CNY"{
+                            
+                            ProgressHUD.showError(status: switchLanguage("提交失败,请重试"))
+                            
+                        } else {
+                            
+                            let vc = JDDepositVerifyViewController()
+                            vc.orderNum = model.ordernum
+                            
+                            self.navigationController?.pushViewController(vc, animated: true)
+                        }
+                        
                     }
                 }
             }

+ 26 - 0
Koala/Koala/Modular/JDAssets/VC/JDIdentityFormViewController.swift

@@ -39,6 +39,21 @@ class JDIdentityFormViewController: BaseViewController {
             return
         }
         
+        let realName = OperationalUserInfoData.getUserInfoDataModel().identity_name
+        
+        let realNameStatus = OperationalUserInfoData.getUserInfoDataModel().identity_status
+        
+        if realNameStatus == "1" {
+
+            guard self.viewModel.name == realName else {
+                
+                ProgressHUD.showInfo(status: switchLanguage("姓名与实名不一致"))
+                return
+            }
+            
+        }
+        
+        
         guard (self.viewModel.idno.length) > 0 else {
             
             ProgressHUD.showInfo(status: switchLanguage("请输入证件号码"))
@@ -190,6 +205,17 @@ class JDIdentityFormViewController: BaseViewController {
             return
         }
         
+
+        if realNameStatus == "1" {
+ 
+            guard self.viewModel.sign == realName else {
+                
+                ProgressHUD.showInfo(status: switchLanguage("签名与实名不一致"))
+                return
+            }
+            
+        }
+        
         
         self.viewModel.netCreate()
         

+ 2 - 1
Koala/Koala/Modular/JDMine/VC/JDMineSettingViewController.swift

@@ -184,7 +184,8 @@ extension JDMineSettingViewController {
     
     func getCachSize() async -> CGFloat {
         do {
-            let cache = try await ImageCache.default.diskStorageSize
+//            let cache = try await ImageCache.default.diskStorageSize
+            let cache = try await ImageCache.default.diskStorage.totalSize()
             return CGFloat(cache) / 1024.0 / 1024.0
         } catch {
             return 0.0

+ 12 - 0
Koala/Koala/Other/Language_CH.plist

@@ -4106,5 +4106,17 @@
 	<array>
 		<string>号码格式错误</string>
 	</array>
+	<key>提交失败,请重试</key>
+	<array>
+		<string>提交失败,请重试</string>
+	</array>
+	<key>姓名与实名不一致</key>
+	<array>
+		<string>姓名与实名不一致</string>
+	</array>
+	<key>签名与实名不一致</key>
+	<array>
+		<string>签名与实名不一致</string>
+	</array>
 </dict>
 </plist>

+ 12 - 0
Koala/Koala/Other/Language_CHF.plist

@@ -4152,5 +4152,17 @@
 	<array>
 		<string>號碼格式錯誤</string>
 	</array>
+	<key>提交失败,请重试</key>
+	<array>
+		<string>提交失敗,請重試</string>
+	</array>
+    <key>姓名与实名不一致</key>
+    <array>
+        <string>姓名與實名不一致</string>
+    </array>
+    <key>签名与实名不一致</key>
+    <array>
+        <string>簽名與實名不一致</string>
+    </array>
 </dict>
 </plist>

+ 12 - 0
Koala/Koala/Other/Language_EN.plist

@@ -4644,5 +4644,17 @@
 	<array>
 		<string>Number format error</string>
 	</array>
+	<key>提交失败,请重试</key>
+	<array>
+		<string>Submission failed, please try again</string>
+	</array>
+    <key>姓名与实名不一致</key>
+    <array>
+        <string>The name is not consistent with the real name</string>
+    </array>
+    <key>签名与实名不一致</key>
+    <array>
+        <string>The signature is inconsistent with the real name</string>
+    </array>
 </dict>
 </plist>

+ 12 - 0
Koala/Koala/Other/Language_RU.plist

@@ -4410,5 +4410,17 @@
 	<array>
 		<string>Ошибка формата номера</string>
 	</array>
+	<key>提交失败,请重试</key>
+	<array>
+		<string>Отправка не удалась, попробуйте еще раз</string>
+	</array>
+    <key>姓名与实名不一致</key>
+    <array>
+        <string>Имя не совпадает с настоящим именем</string>
+    </array>
+    <key>签名与实名不一致</key>
+    <array>
+        <string>Подпись не совпадает с настоящим именем</string>
+    </array>
 </dict>
 </plist>

+ 12 - 0
Koala/Koala/Other/Language_TH.plist

@@ -4231,5 +4231,17 @@
 	<array>
 		<string>รูปแบบหมายเลขไม่ถูกต้อง</string>
 	</array>
+	<key>提交失败,请重试</key>
+	<array>
+		<string>การส่งล้มเหลว โปรดลองอีกครั้ง</string>
+	</array>
+    <key>姓名与实名不一致</key>
+    <array>
+        <string>ชื่อไม่สอดคล้องกับชื่อจริง</string>
+    </array>
+    <key>签名与实名不一致</key>
+    <array>
+        <string>ลายเซ็นไม่สอดคล้องกับชื่อจริง</string>
+    </array>
 </dict>
 </plist>

+ 12 - 0
Koala/Koala/Other/Language_VT.plist

@@ -4224,5 +4224,17 @@ Công thức tính tỷ lệ ký quỹ: </string>
 	<array>
 		<string>Lỗi định dạng số</string>
 	</array>
+	<key>提交失败,请重试</key>
+	<array>
+		<string>Gửi không thành công, vui lòng thử lại</string>
+	</array>
+    <key>姓名与实名不一致</key>
+    <array>
+        <string>Tên không phù hợp với tên thật</string>
+    </array>
+    <key>签名与实名不一致</key>
+    <array>
+        <string>Chữ ký không phù hợp với tên thật</string>
+    </array>
 </dict>
 </plist>