Merge branch 'yinhe-live-1212' of...

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

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

@@ -81,7 +81,7 @@ class YHOrderDetailViewController: YHBaseViewController {
     }
     
     func setView() {
-        gk_navTitle = "我的订单"
+        gk_navTitle = "服务进度"
         gk_navBackgroundColor = UIColor.white
         gk_navBarAlpha = 1
         

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

@@ -238,10 +238,10 @@ extension YHServiceCenterViewController {
     }
     
     @objc func pushOrderView() {
-        var flag = true
-        if self.state == 1 || self.state == 3 {
-           flag = false
-        }
+//        var flag = true
+//        if self.state == 1 || self.state == 3 {
+        let flag = false
+//        }
         YHServiceMoreAlertView.show(flag) {[weak self] index in
             guard let self = self else { return }
             if index == 1 {
@@ -282,7 +282,7 @@ extension YHServiceCenterViewController {
             if self.state == 2 {
                 self.arrDataForSeviceCenterProgress = self.serviceCenterMainReqVM.mainModel.certificateSection.list
                 self.homeTableView.tableHeaderView = UIView()
-                self.titleLabel.setTitle("办证阶段", for: .normal)
+                self.titleLabel.setTitle("审批阶段", for: .normal)
                 self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
             }
             if self.state == 3 {
@@ -353,7 +353,7 @@ extension YHServiceCenterViewController {
             if self.state == 2 {
                 self.arrDataForSeviceCenterProgress = self.serviceCenterMainReqVM.mainModel.certificateSection.list
                 self.homeTableView.tableHeaderView = UIView()
-                self.titleLabel.setTitle("办证阶段", for: .normal)
+                self.titleLabel.setTitle("审批阶段", for: .normal)
                 if isCanSelectStep {
                     self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
                 } else {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHServiceSelectAlertView.swift

@@ -74,7 +74,7 @@ class YHServiceSelectAlertView: UICollectionViewCell {
         let label = UILabel()
         label.numberOfLines = 0
         let a: ASAttributedString = .init("期望银河在", .font(UIFont.PFSC_B(ofSize: 18)),.foreground(UIColor.mainTextColor))
-        let b: ASAttributedString = .init("办证阶段", .font(UIFont.PFSC_B(ofSize: 18)),.foreground(UIColor.brandMainColor))
+        let b: ASAttributedString = .init("审批阶段", .font(UIFont.PFSC_B(ofSize: 18)),.foreground(UIColor.brandMainColor))
         let c: ASAttributedString = .init("\n提供哪些服务", .font(UIFont.PFSC_B(ofSize: 18)),.foreground(UIColor.mainTextColor))
         label.attributed.text = a+b+c
         return label

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

@@ -24,7 +24,8 @@ class YHServiceNoOrderView: UIView {
         lable.textColor = UIColor.mainTextColor
         lable.font = UIFont.PFSC_M(ofSize: 14)
         lable.textAlignment = .center
-        lable.text = "您还没有相关订单"
+        lable.numberOfLines = 0
+        lable.text = "暂未识别到与您登录手机号相关联的签约订单，如您已签约银河服务，请改用签约手机号重新登录"
         return lable
     }()
     
@@ -71,7 +72,8 @@ class YHServiceNoOrderView: UIView {
         tipsLab.snp.makeConstraints { make in
             make.top.equalTo(iconImgV.snp.bottom).offset(12)
             make.centerX.equalToSuperview()
-            make.left.right.equalToSuperview()
+            make.left.equalToSuperview().offset(20)
+            make.right.equalToSuperview().offset(-20)
         }
         
         addSubview(noFindLab)

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

@@ -93,7 +93,7 @@ class YHServiceStepAlertView: UIView {
         guideButton = {
             let button = UIButton(type: .custom)
             button.setImage(UIImage(named: "service_step_select"), for: .selected)
-            button.setTitle("办证阶段", for: .normal)
+            button.setTitle("审批阶段", for: .normal)
             button.setImage(UIImage.init(color: UIColor.white, size: CGSize(width: 15, height: 15)), for: .normal)
             button.setTitleColor(UIColor.mainTextColor, for: .normal)
             button.setTitleColor(UIColor.brandMainColor, for: .selected)

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -35,7 +35,7 @@ enum YHPersonalModuleItemType: Int {
     case privaceAgreement//隐私协议
     case myOrder //我的订单 双十一订单入口
     case mycart //我的订单 双十一订单入口
-
+    case serviceStep
     //case liveEntryTest //直播入口
 }
 
@@ -289,6 +289,11 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
             items.append(item)
         }
         
+        if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_recharge_order_open {
+            let item = PersonalModuleItem(icon: "mine_item_service_center", title: "服务进度".local, type:.serviceStep)
+            items.append(item)
+        }
+        
         if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_recharge_order_open {
             let item = PersonalModuleItem(icon: "mine_item_card", title: "购物车".local, type:.mycart)
             items.append(item)
@@ -461,6 +466,8 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
                 vc.isSupportWebviewInterBackFlag = true
                 UIViewController.current?.navigationController?.pushViewController(vc)
             }
+        case .serviceStep:
+            UIViewController.current?.tabBarController?.selectedIndex = 1
         default:
             printLog("不需要响应")
         }

galaxy/galaxy/Res/Assets.xcassets/Mine/mine_item_service_center.imageset/Contents.json

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