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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  刷新

galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/V/YHInvitationWithGiftsSecondTableViewCell.swift

@@ -461,6 +461,10 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
                     self.tableData = self.viewModel.recordModel
                     self.tableView.reloadData()
                 }
+                self.viewModel.getOverviewRecord {[weak self] success, error in
+                    guard let self = self else { return }
+                    self.headData = self.viewModel.overviewModel
+                }
             }
         }
     }

galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/VM/YHInvitationWithGiftsViewModel.swift

@@ -41,7 +41,17 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel {
 
     func getOverviewRecord(callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Share.overview
-        let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
+        var param: [String : Any] = [:]
+        if self.startTime.count != 0 {
+            param.updateValue(self.startTime, forKey: "registered_date.begin_date")
+        }
+        if self.endTime.count != 0 {
+            param.updateValue(self.endTime, forKey: "egistered_date.end_date")
+        }
+        if self.state < 3 {
+            param.updateValue(self.state + 1, forKey: "status")
+        }
+        let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
             guard let self = self else { return }
             //1. json字符串 转 对象
             if json.code == 200 {
@@ -63,12 +73,22 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel {
     
     func postRecord(page: Int, callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Share.record
-        let registered_date: [String: Any] = ["begin_date": self.startTime,
-                                              "end_date": self.endTime]
-        let param: [String: Any] = ["page": page,
-                                    "pagesize": 20,
-                                    "registered_date": registered_date,
-                                    "status": self.state + 1 < 4 ? self.state + 1: 0]
+        var registered_date: [String: Any] = [:]
+        if self.startTime.count != 0 {
+            registered_date.updateValue(self.startTime, forKey: "begin_date")
+        }
+        if self.endTime.count != 0 {
+            registered_date.updateValue(self.endTime, forKey: "end_date")
+        }
+        var param: [String: Any] = ["page": page,
+                                    "pagesize": 20]
+        if self.state < 3 {
+            param.updateValue(self.state + 1, forKey: "status")
+        }
+        if registered_date.isEmpty {
+            param.updateValue(registered_date, forKey: "registered_date")
+        }
+        
         let _ = YHNetRequest.postRequest(url: strUrl, params: param) { [weak self] json, code in
             guard let self = self else { return }
             //1. json字符串 转 对象

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

@@ -101,7 +101,7 @@ class YHServiceCenterMainViewController: YHBaseViewController {
             YHServiceOrderAlertView.show()
         }
         
-        
+        NotificationCenter.default.addObserver(self, selector: #selector(logoutSuccess), name: YhConstant.YhNotification.didLogoutSuccessNotifiction, object: nil)
         noDataView.isHidden = false
         nameBgImageView.isHidden = true
         segmentedView.isHidden = true
@@ -109,6 +109,11 @@ class YHServiceCenterMainViewController: YHBaseViewController {
         orderButton.isHidden = true
     }
     
+    @objc func logoutSuccess() {
+        self.model = YHContactItemModel()
+        self.oldModel = YHContactItemModel()
+    }
+    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         loadData()