1、删除不使用的代码

2、修改一处bug

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2900,7 +2900,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;
@@ -3101,7 +3101,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;
@@ -3143,7 +3143,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(服务中心)/MyDocuments(我的文书)/C/YHHKPlanDoctumentVC.swift

@@ -100,8 +100,8 @@ extension YHHKPlanDoctumentVC {
     
     
     func updateUI() {
-        
-        if status > 3 {
+        //1、不展示 2、待确认 3、核对中 4、核对中 5、已驳回 6、已定稿
+        if status > 2 {
             canEditFlag = false
             bottomView.isHidden = true
             tableView.snp.removeConstraints()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocListCell.swift

@@ -146,18 +146,41 @@ class YHDocListCell: UITableViewCell {
             statusHoldView.isHidden = false
             /*
              docOpt: {
-                         1: '待确认',
-                         2: '待签章',
-                         3: '已驳回',
-                         4: '待核对',
-                         5: '已签章',
+                         1: '不展示',
+                         2: '待确认',
+                         3: '核对中',
+                         4: '核对中',
+                         5: '已驳回',
                          6: '已定稿',
-                         7: '已完成'
                      },
              */
+            
+            
             var statusTxt = ""
             var color : UIColor = .brandMainColor
             
+            if (dataSource.document.id == 0 && dataSource.file_type.contains("doc", caseSensitive: true)) || dataSource.file_type.contains("sign", caseSensitive: true) {
+                let signStatus = dataSource.status
+                switch signStatus {
+                case 2:
+                    statusTxt = "待签章"
+                    color = UIColor.brandMainColor
+                case 3:
+                    statusTxt = "已驳回"
+                    color = UIColor.failColor
+                case 5:
+                    statusTxt = "已签章"
+                    color = UIColor(hex: 0x49D2B1, alpha: 1.0)
+                case 7:
+                    statusTxt = "已完成"
+                    color = UIColor.labelTextColor2
+                default:
+                    statusTxt = "--"
+                    color = UIColor.failColor
+                    
+                    break
+                }
+            } else {
                 let status = dataSource.status
                 if status == 2 {
                     statusTxt = "待确认"
@@ -178,6 +201,8 @@ class YHDocListCell: UITableViewCell {
                     statusTxt = "--"
                     color = UIColor.failColor
                 }
+            }
+            
             statusLabel.text = statusTxt
             statusLabel.textColor = color
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocumentMessageTableViewCell.swift

@@ -225,7 +225,7 @@ class YHDocumentMessageTableViewCell: UITableViewCell {
                 lookButton.isHidden = true
             } else if status == 3 {
                 statusTxt = " 核对中 "
-                color = UIColor.failColor
+                color = UIColor.warnColor
                 editButton.isHidden = true
                 submitButton.isHidden = true
                 bottomCenterLineView.isHidden = true

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureListViewController.swift

@@ -382,124 +382,3 @@ extension YHMySignatureListViewController {
         }
     }
 }
-
-//class YHMySignatureListViewController: YHBaseViewController {
-//    var bottomView: UIView!
-//    var bottomButton: UIButton!
-//    var tableView: UITableView!
-//    var dataSource: [YHWorkItemListModel]?
-//    var viewModel: YHMySignatureListViewModel?
-//    var orderId: Int = 0
-//    override func viewDidLoad() {
-//        super.viewDidLoad()
-//        viewModel = YHMySignatureListViewModel()
-//        gk_navTitle = "我的签字"
-//        setView()
-//        getData()
-//        // Do any additional setup after loading the view.
-//    }
-//    
-//    override func viewWillAppear(_ animated: Bool) {
-//        super.viewWillAppear(animated)
-//        getData()
-//    }
-//    
-//    func getData() {
-//        viewModel.requestSignatureList("\(orderId)", callBackBlock: {[weak self] success, error in
-//            guard let self = self else { return }
-//            self.tableView.reloadData()
-//        })
-//    }
-//    
-//    func updateDataSource() {
-//       
-//        self.tableView.reloadData()
-//    }
-//    
-//    func setView() {
-//        tableView = {
-//            let tableView = UITableView(frame:.zero, style:.plain)
-//            if #available(iOS 11.0, *) {
-//                tableView.contentInsetAdjustmentBehavior = .never
-//            }
-//            tableView.backgroundColor = .clear
-//            tableView.separatorStyle = .none
-//            tableView.delegate = self
-//            tableView.dataSource = self
-//            tableView.register(cellWithClass: YHMySignatureListTableViewCell.self)
-//            return tableView
-//        }()
-//        view.addSubview(tableView)
-//        tableView.snp.makeConstraints { make in
-//            make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
-//            make.bottom.equalTo(-k_Height_safeAreaInsetsBottom() - 64)
-//            make.left.right.bottom.equalTo(view)
-//        }
-//        
-//        bottomView = {
-//            let bottom = UIView()
-//            bottom.backgroundColor = .white
-//            return bottom
-//        }()
-//        view.addSubview(bottomView)
-//        bottomView.snp.makeConstraints { make in
-//            make.left.right.bottom.equalToSuperview()
-//            make.height.equalTo(k_Height_safeAreaInsetsBottom() + 64)
-//        }
-//        
-//        bottomButton = {
-//            let button = UIButton(type: .custom)
-////            button.backgroundColor =  UIColor(hex:0x2274ee)
-//            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
-//            button.contentHorizontalAlignment = .center
-//            button.setTitle("提交", for: .normal)
-//            button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
-//            button.layer.cornerRadius = kCornerRadius6
-//            button.clipsToBounds = true
-//            button.addTarget(self, action: #selector(submit), for: .touchUpInside)
-//            return button
-//        }()
-//        bottomView.addSubview(bottomButton)
-//        bottomButton.snp.makeConstraints { make in
-//            make.right.equalTo(-16)
-//            make.top.equalTo(8)
-//            make.height.equalTo(48)
-//            make.left.equalTo(16)
-//        }
-//        
-//        bottomButton.layoutIfNeeded()
-//        bottomButton.addYinHeGradualLayer()
-//    }
-//    
-//    @objc func submit() {
-//        YHCommonAlertView.show("实名认证", "为保证签署有效，请先实名认证", "取消", "去认证") {
-//            
-//        }
-//    }
-//}
-//
-//extension YHMySignatureListViewController: UITableViewDelegate, UITableViewDataSource {
-//    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-//        return viewModel.mainModel?.list.count ?? 0
-//    }
-//    
-//    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-//        let cell = tableView.dequeueReusableCell(withClass: YHMySignatureListTableViewCell.self)
-//        cell.dataSource = viewModel.mainModel?.list[indexPath.row]
-//        cell.backgroundColor = .clear
-//        cell.contentView.backgroundColor = .clear
-//        return cell
-//    }
-//    
-//    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-//        return CGFloat(82)
-//    }
-//    
-//    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-//        let model = viewModel.mainModel?.list[indexPath.row]
-//        let vc = YHMySignatureDetailViewController()
-//        vc.id = model?.id ?? 0
-//        self.navigationController?.pushViewController(vc)
-//    }
-//}
-