旅行证件准备 列表

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(4旅行证件准备)/C/YHTravelDocsPreparationListViewController.swift

@@ -129,6 +129,13 @@ extension YHTravelDocsPreparationListViewController: UITableViewDelegate, UITabl
         
         if 0 <= indexPath.section && indexPath.section < viewModel.arrTravelDocs.count {
             
+            if let model = viewModel.arrTravelDocs[indexPath.section] {
+                if model.status == -1 {
+                    return
+                } else {
+                    //TODO:  pete 跳转到上传详情
+                }
+            }
         }
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(4旅行证件准备)/V/YHTravelDocsPreparationListCell.swift

@@ -81,17 +81,39 @@ private extension YHTravelDocsPreparationListCell {
             subtTitleLable.text = ""
         }
 
-        
-        //状态 1-已上传 2-未上传
-        if model.status == 1 {
-            statusLable.text = "已上传"
-            statusLable.textColor = UIColor.successColor
-            statusImageView.image = UIImage(named: "green_right_arrow")
+        titleLable.textColor = .mainTextColor
+        //status 缴费状态 -1-未缴费 0-待上传 1-待审核 2-已拒绝 3-已完成
+        if model.status == -1 {
+            statusLable.text = "未开启"
+            titleLable.textColor = .mainTextColor30
+            statusLable.textColor = UIColor.mainTextColor30
+            statusImageView.image = UIImage(named: "disable_right_arrow")
             
-        } else {
+        } else if model.status == 0 {
             statusLable.text = "待上传"
             statusLable.textColor = UIColor.brandMainColor
             statusImageView.image = UIImage(named: "blue_right_arrow")
+            
+        } else if model.status == 1 {
+            statusLable.text = "审核中"
+            statusLable.textColor = UIColor.warnColor
+            statusImageView.image = UIImage(named: "orange_right_arrow")
+            
+        } else if model.status == 2 {
+            statusLable.text = "已驳回"
+            statusLable.textColor = UIColor.failColor
+            statusImageView.image = UIImage(named: "red_right_arrow")
+            
+        } else if model.status == 3 {
+            statusLable.text = "已完成"
+            statusLable.textColor = UIColor.mainTextColor
+            statusImageView.image = UIImage(named: "grey_right_arrow")
+            
+        }
+        else {
+            statusLable.text = "-"
+            statusLable.textColor = UIColor.failColor
+            statusImageView.image = UIImage(named: "red_right_arrow")
         }
     }
     

galaxy/galaxy/Classes/Tools/Extention/UIDevice+Extension.swift

@@ -206,6 +206,8 @@ extension UIDevice {
         }
         return name
     }
+    
+    static func iPhoneVersion() -> String {
+        return "iOS" + (Device.current.systemVersion ?? "")
+    }
 }
-
-

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -100,6 +100,7 @@ class YHNetRequest: NSObject {
         requestHeader.add(name:"app_channel",value:"appStore")
         
         requestHeader.add(name:"app_phoneModel",value:UIDevice.iPhoneModelName())
+        requestHeader.add(name:"os_version_name",value:UIDevice.iPhoneVersion())
         
         requestHeader.add(name:"pass",value:"")
         

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/办证段/7上传过关证件/disable_right_arrow.imageset/Contents.json

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