处理 2处bug

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2152,7 +2152,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2172,7 +2172,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.1.2;
+				MARKETING_VERSION = 0.1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2194,7 +2194,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2214,7 +2214,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.1.2;
+				MARKETING_VERSION = 0.1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

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

@@ -78,7 +78,6 @@ class YHInformationPerfectListVC: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
-        loadData()
     }
     
     
@@ -90,10 +89,10 @@ class YHInformationPerfectListVC: YHBaseViewController {
 
 extension YHInformationPerfectListVC {
     func submitSweetNotify() {
-        let params = ["option":1,"orderId":orderId]
+        let params = ["option":1,"order_id":orderId]
         serviceCenterMainReqVM.submitSweetNotifyOp(params: params as [String : Any]) { success, error in
             if success == true {
-                self.hasSubmitFlag = true
+                YHInformationFillTipsAlertView.hideCheckView()
             } else {
                 YHHUD.flash(message: error?.errorMsg ?? "发生错误,请重试")
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/C/YHBasicInfoFillViewController.swift

@@ -97,11 +97,20 @@ extension YHBasicInfoFillViewController {
     
     
     private func saveData() {
+        submitAndSaveDataOp(isSaveFlag: true)
+    }
+    
+    private func submitData() {
+        //提交
+        submitAndSaveDataOp(isSaveFlag: false)
+    }
+    
+    private func submitAndSaveDataOp(isSaveFlag :  Bool) {
         //保存
         let arr = basicInfoVM.arrBasicInfoSessionDataForEdit
         
         
-        var param : [String : Any] = ["order_id":orderId as Any,"save_type": "save"]
+        var param : [String : Any] = ["order_id":orderId as Any,"save_type": isSaveFlag ? "save" : "submit"]
         
         for item in arr {
             if item.sessionTitle == "主申请人" {
@@ -197,18 +206,13 @@ extension YHBasicInfoFillViewController {
         
         basicInfoVM.saveBasicInfo(params: param) { success, error in
             if success == true {
-                YHHUD.flash(message: "保存成功")
+                YHHUD.flash(message: "操作成功")
             } else {
-                let msg = error?.errorMsg ?? "保存失败"
+                let msg = error?.errorMsg ?? "操作失败"
                 YHHUD.flash(message: msg)
             }
         }
     }
-    
-    private func submitData() {
-        //提交
-        
-    }
 }
 
 // MARK: - delegates

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/C/YHOtherInfoFillViewController.swift

@@ -131,9 +131,9 @@ extension YHOtherInfoFillViewController {
             
             otherInfoVM.saveOtherInfo(params: param) { success, error in
                 if success == true {
-                    YHHUD.flash(message: "保存成功")
+                    YHHUD.flash(message: "操作成功")
                 } else {
-                    let msg = error?.errorMsg ?? "保存失败"
+                    let msg = error?.errorMsg ?? "操作失败"
                     YHHUD.flash(message: msg)
                 }
             }

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

@@ -7,7 +7,9 @@
 //
 
 import UIKit
-//import AttributedString
+
+
+var gloabView : YHInformationFillTipsAlertView?
 
 class YHInformationFillTipsAlertView: UIView {
     typealias Block = (Bool) -> ()
@@ -47,16 +49,23 @@ class YHInformationFillTipsAlertView: UIView {
         return tableView
     }()
     
-    
-    
-    //类方法
+    //类方法 - 展示
     static func showCheckView(callBack: @escaping Block) {
         let view = YHInformationFillTipsAlertView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
         view.block = callBack
         let window = UIApplication.shared.yhKeyWindow()
         window?.addSubview(view)
+        
+        gloabView = view
     }
     
+    //类方法 隐藏
+    static func hideCheckView() {
+        guard let view = gloabView else { return }
+        view.dismiss()
+    }
+    
+    
     override init(frame: CGRect) {
         super.init(frame: frame)
         backgroundColor = UIColor(white: 0.5, alpha: 0.1)
@@ -197,7 +206,7 @@ class YHInformationFillTipsAlertView: UIView {
         
         if agreeButton.isSelected == true {
             block?(true)
-            dismiss()
+            dismiss() //for test hjl
         } else {
             YHHUD.flash(message: "请先勾选确认知悉内容")
         }
@@ -212,7 +221,7 @@ class YHInformationFillTipsAlertView: UIView {
     
     @objc func agree() {
         block?(true)
-        dismiss()
+//        dismiss()
     }
     
     @objc private func handleTap(_ sender: AnyObject?) {
@@ -239,8 +248,6 @@ extension YHInformationFillTipsAlertView: UIGestureRecognizerDelegate {
     }
 }
 
-
-
 // MARK: - UITableViewDelegate 和 UITableViewDataSource
 extension YHInformationFillTipsAlertView : UITableViewDelegate,UITableViewDataSource {
     

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

@@ -35,6 +35,7 @@ extension YHServiceCenterMainViewModel {
         loadLocalScoreData()
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.scoreDetailApi
+        
         let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
@@ -219,7 +220,10 @@ extension YHServiceCenterMainViewModel {
         let _ = YHNetRequest.postRequest(url: strUrl,params: params) {[weak self] json, code in
             //1. json字符串 转 对象
             printLog("model 是 ==> \(json)")
-            guard let self = self else { return }
+            guard let self = self else {
+                callBackBlock(false,nil)
+                return
+            }
             if json.code == 200 {
                 let dic = json.data
                 guard let resultModel = YHContactInfoScoreModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
@@ -241,10 +245,26 @@ extension YHServiceCenterMainViewModel {
     //提交 温馨提示弹窗
     func submitSweetNotifyOp( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Users.submitSweetNotifyApi
-        let _ = YHNetRequest.postRequest(url: strUrl,params: params) {json, code in
+        let _ = YHNetRequest.postRequest(url: strUrl,params: params) {[weak self] json, code in
             //1. json字符串 转 对象
             printLog("model 是 ==> \(json)")
-            callBackBlock(true,nil)
+            
+            guard let self = self else {
+                callBackBlock(false,nil)
+                return
+            }
+            if json.code == 200 {
+                let dic = json.data
+                guard let resultModel = YHContactInfoScoreModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                    callBackBlock(false,nil)
+                    return
+                }
+                self.allInfoScoreModel = resultModel
+                callBackBlock(true,nil)
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code),errorMsg: json.msg.count > 0 ? json.msg : "数据错误")
+                callBackBlock(false,error)
+            }
         } failBlock: { err in
             callBackBlock(false,err)
         }