Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2731,7 +2731,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2773,7 +2773,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHContactMainItemStatusModel.swift

@@ -22,10 +22,10 @@ class YHContactMainItemStatusModel {
                 iconName = "service_center_sfsq_wdpf_icon"
                 itemName = "我的评分"
             } else if type == 4 {
-                iconName = "service_center_sfsq_wdpf_icon"
+                iconName = "service_center_sfsq_wdws_icon"
                 itemName = "我的文书"
             } else if type == 5 {
-                iconName = "service_center_sfsq_wdpf_icon"
+                iconName = "service_center_sfsq_wdqz_icon"
                 itemName = "我的签字"
             } else if type == 6 {
                 iconName = "service_center_sfsq_wdpf_icon"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScheme(我的方案)/View/YHSchemeTableViewCell.swift

@@ -29,13 +29,13 @@ class YHSchemeTableViewCell: UITableViewCell {
         super.awakeFromNib()
         // Initialization code
     }
-
+    
     override func setSelected(_ selected: Bool, animated: Bool) {
         super.setSelected(selected, animated: animated)
-
+        
         // Configure the view for the selected state
     }
-
+    
     required init?(coder: NSCoder) {
         super.init(coder: coder)
     }
@@ -166,12 +166,17 @@ class YHSchemeTableViewCell: UITableViewCell {
         subMessageLabel.text = model.subMessage
     }
     
-    
-    
     @objc func goNext() {
         if  let title = titleButton.titleLabel?.text {
             if title.contains("资料清单") {
-                UIViewController.current?.navigationController?.pushViewController(YHFileListViewController())
+                if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
+                    let vc = YHMineCertificateEntryViewController()
+                    vc.orderId = orderID as? Int
+                    UIViewController.current?.navigationController?.pushViewController(vc)
+                } else {
+                    YHHUD.flash(message: "订单号为空")
+                }
+                
             } else if title.contains("文书写作") {
                 UIViewController.current?.navigationController?.pushViewController(YHMyDocumentsListViewController())
             }

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_sfsq_wdfa_icon.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Group 3490@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Group 3490@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_sfsq_wdqz_icon.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon-wenshuqingdan@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon-wenshuqingdan@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_sfsq_wdws_icon.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon-wenshuqingdan@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon-wenshuqingdan@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}