UI走查

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterSecondViewController.swift

@@ -42,16 +42,24 @@ class YHServiceCenterSecondViewController: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
+        loadData2()
         loadData()
     }
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        loadData2()
         loadData()
     }
 }
 
 extension YHServiceCenterSecondViewController {
+    func loadData2() {
+        guard let orderId = orderId else { return}
+        self.serviceCenterMainReqVM.getPersonInfoFillStep(params: ["orderId":orderId]) { success, error in
+        }
+    }
+    
     func loadData() {
         guard let orderId = orderId else { return}
         self.serviceCenterMainReqVM.getContactStatus(params: ["orderId":orderId]) { success, error in
@@ -171,6 +179,11 @@ extension YHServiceCenterSecondViewController : UITableViewDelegate,UITableViewD
         
         
         if model.type == 1 {
+            if self.serviceCenterMainReqVM.informationFillStepModel?.sweet_notify_status == 0 {
+                self.showTipsAlert()
+                return
+            }
+            
             let vc = YHInformationPerfectListVC()
             vc.orderId = orderId
             navigationController?.pushViewController(vc)
@@ -202,3 +215,29 @@ extension YHServiceCenterSecondViewController : UITableViewDelegate,UITableViewD
         }
     }
 }
+
+private extension YHServiceCenterSecondViewController {
+    func showTipsAlert() {
+        YHInformationFillTipsAlertView.showCheckView { agree in
+            if agree == true {
+                printLog("点击了 确认 按钮")
+                self.submitSweetNotify()
+            } else {
+                printLog("点击了 取消 按钮")
+            }
+        }
+    }
+    
+    
+    
+    func submitSweetNotify() {
+        let params = ["option":1,"order_id":orderId]
+        serviceCenterMainReqVM.submitSweetNotifyOp(params: params as [String : Any]) { success, error in
+            if success == true {
+                YHInformationFillTipsAlertView.hideCheckView()
+            } else {
+                YHHUD.flash(message: error?.errorMsg ?? "发生错误,请重试")
+            }
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/BaseInformation(基本资料)/V/YHBasicInfoFillCell.swift

@@ -11,13 +11,6 @@ import UIKit
 class YHBasicInfoFillCell: UITableViewCell {
     static let cellReuseIdentifier = "YHBasicInfoFillCell"
     
-//    var arrData : [YHBasicInfoSessionModel]? {
-//        didSet {
-//            updateUI()
-//        }
-//    }
-    
-    
     var dataModel: YHBasicInfoSessionModel? {
         didSet {
             updateUI()
@@ -46,6 +39,10 @@ extension YHBasicInfoFillCell {
         contentView.removeSubviews()
         
         
+        backgroundColor = .clear
+        contentView.backgroundColor = .clear
+        
+        
         //主申请人
         let holdView1 = UIView()
         holdView1.backgroundColor = .white

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHDatePickView.swift

@@ -75,7 +75,6 @@ class YHDatePickView: UIView {
         centerView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 16
             return view
         }()
         addSubview(centerView)
@@ -163,6 +162,16 @@ class YHDatePickView: UIView {
             make.right.equalTo(-16)
         }
         pickerView.selectRow(100, inComponent: 0, animated: true)
+        
+        
+        
+        centerView.layoutIfNeeded()
+        let corner = UIRectCorner(rawValue: UIRectCorner.topLeft.rawValue | UIRectCorner.topRight.rawValue)
+        let path = UIBezierPath(roundedRect:bounds,byRoundingCorners: corner,cornerRadii:CGSizeMake(8, 8));
+        let layer = CAShapeLayer();
+        layer.frame = centerView.bounds;
+        layer.path = path.cgPath;
+        centerView.layer.mask = layer;
     }
     
     @objc private func handleTap(_ sender: AnyObject?) {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHInformationFillTipsAlertView.swift

@@ -83,6 +83,7 @@ class YHInformationFillTipsAlertView: UIView {
             let view = UIView()
             view.backgroundColor = .white
             view.layer.cornerRadius = kCornerRadius8
+            view.clipsToBounds = true
             return view
         }()
         addSubview(centerView)
@@ -181,9 +182,11 @@ class YHInformationFillTipsAlertView: UIView {
         closeBtn.snp.makeConstraints { make in
             make.centerY.equalTo(lable01.snp.centerY)
             make.right.equalTo(-25)
-            make.width.height.equalTo(20)
+            make.width.height.equalTo(24)
         }
         
+        closeBtn.YH_clickEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
+        
         let line = UIView()
         line.backgroundColor = UIColor.separatorColor
         topView.addSubview(line)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift

@@ -14,6 +14,7 @@ class YHServiceCenterMainViewModel: YHBaseViewModel {
     
     //合同对应的状态
     var arrContactStausItmes: [YHContactMainItemStatusModel] = []
+    var contactDetailData: YHContactMainItemStatusModel2?
     
     //信息完善列表
     var arrInfoFillStep : [YHInformationPerfectModel] = []
@@ -128,6 +129,7 @@ extension YHServiceCenterMainViewModel {
                     return
                 }
 
+                self.contactDetailData = resultModel
                 if resultModel.fill_info_step > 6 {
                     //resultModel.fill_info_step == 7的时候表示 我的信息填写完成
                     let model = YHContactMainItemStatusModel()
@@ -137,7 +139,7 @@ extension YHServiceCenterMainViewModel {
                     
                     
                    
-                    if true || resultModel.supplement_not_submit_num > 0 { //for test hjl 方便测试
+                    if resultModel.supplement_not_submit_num > 0 {
                         let model2 = YHContactMainItemStatusModel()
                         model2.type = 2
                         model2.isFinished = false

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/个人信息表/person_info_close_btn.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Frame 33332868@2x.png",
+      "filename" : "Group 2849@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Frame 33332868@3x.png",
+      "filename" : "Group 2849@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }