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

Koala/Koala/FX/Macro/PublicMethod.swift

@@ -1434,6 +1434,25 @@ func getHomePageUrl() -> String {
     }
 }
 
+// 获取活动链接
+
+func getActivityCenterUrlByTab(tab : String) -> String {
+    var url = ACTIVITYCENTER+"?tab="+tab
+           
+           switch GlobalSingle.sharedInstance.currentLan {
+           case .EnglishLanguage:
+               url = url+"&language=en"
+           case .TraditionalLanguage:
+               url = url+"&language=zh-TW"
+           case .ChineseLanguage:
+               url = url+"&language=zh-CN"
+           default:
+               url = url+"&language=en"
+           }
+    
+    return url
+}
+
 // 获取推送语言包语言
 func getLanguageForNotifiction() -> String {
     switch GlobalSingle.sharedInstance.currentLan {

Koala/Koala/Modular/JDAssets/V/JDFuncLimitResultPopView.swift

@@ -278,7 +278,7 @@ extension JDFuncLimitResultPopView {
                 
                 let formatString = switchLanguage("您的账号存在异常，暂时无法使用该功能，您已提交编号为%@的验证资料，因“%@”的原因未能通过审核，请通过以下链接重新提交资料，谢谢！")
                 
-                detailLabel.text = String(format: formatString, model.ordernum ?? "", reason ?? "")
+                detailLabel.text = String(format: formatString, model.ordernum ?? "", reason)
                 self.detailButton.setTitle(switchLanguage("重新提交资料"), for: .normal)
             }
        

Koala/Koala/Modular/JDMine/VC/JDMineViewController.swift

@@ -292,20 +292,7 @@ extension JDMineViewController: UITableViewDelegate {
             } else if indexPath.row == 3 {
                 let vc = BaseWebViewController()
                 
-                var url = ACTIVITYCENTER+"?tab=1"
-                
-                switch GlobalSingle.sharedInstance.currentLan {
-                case .EnglishLanguage:
-                    url = ACTIVITYCENTER+"?tab=1&language=en"
-                case .TraditionalLanguage:
-                    url = ACTIVITYCENTER+"?tab=1&language=zh-TW"
-                case .ChineseLanguage:
-                    url = ACTIVITYCENTER+"?tab=1&language=zh-CN"
-                default:
-                    url = ACTIVITYCENTER+"?tab=1&language=en"
-                }
-                
-                vc.url = url
+                vc.url = getActivityCenterUrlByTab(tab: "1") 
                 vc.myNavigationBar.title_Label.text = switchLanguage("活动中心")
                 
                 let navBtn: UIButton = {
@@ -411,20 +398,7 @@ extension JDMineViewController: UITableViewDelegate {
     @objc func activityBtnAction() {
         let vc = BaseWebViewController()
         
-        var url = ACTIVITYCENTER+"?tab=2"
-        
-        switch GlobalSingle.sharedInstance.currentLan {
-        case .EnglishLanguage:
-            url = ACTIVITYCENTER+"?tab=2&language=en"
-        case .TraditionalLanguage:
-            url = ACTIVITYCENTER+"?tab=2&language=zh-TW"
-        case .ChineseLanguage:
-            url = ACTIVITYCENTER+"?tab=2&language=zh-CN"
-        default:
-            url = ACTIVITYCENTER+"?tab=2"
-        }
-        
-        vc.url = url
+        vc.url = getActivityCenterUrlByTab(tab: "2")
         vc.myNavigationBar.title_Label.text = switchLanguage("往期活动")
         
         currentVc()?.navigationController?.pushViewController(vc, animated: true)