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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -242,6 +242,8 @@
 		0480976B2BA15269000B9DCA /* YHCertificateInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480976A2BA15269000B9DCA /* YHCertificateInfoCell.swift */; };
 		0480976D2BA158A1000B9DCA /* YHCertificateListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480976C2BA158A1000B9DCA /* YHCertificateListVC.swift */; };
 		048097712BA18D66000B9DCA /* YHCertificateSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048097702BA18D66000B9DCA /* YHCertificateSearchBar.swift */; };
+		048787D12BCE61B20036E221 /* YHServiceNoOrderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048787D02BCE61B20036E221 /* YHServiceNoOrderView.swift */; };
+		048787D32BCE6B7D0036E221 /* YHServiceOrderAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048787D22BCE6B7D0036E221 /* YHServiceOrderAlertView.swift */; };
 		048B2A442BC7901900A93BF0 /* YHHomeWebViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048B2A432BC7901900A93BF0 /* YHHomeWebViewModel.swift */; };
 		048B2A462BC7912400A93BF0 /* YHWebModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048B2A452BC7912400A93BF0 /* YHWebModel.swift */; };
 		048B2A482BC7CE4800A93BF0 /* YHFourKingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048B2A472BC7CE4800A93BF0 /* YHFourKingViewController.swift */; };
@@ -686,6 +688,8 @@
 		0480976A2BA15269000B9DCA /* YHCertificateInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateInfoCell.swift; sourceTree = "<group>"; };
 		0480976C2BA158A1000B9DCA /* YHCertificateListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateListVC.swift; sourceTree = "<group>"; };
 		048097702BA18D66000B9DCA /* YHCertificateSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateSearchBar.swift; sourceTree = "<group>"; };
+		048787D02BCE61B20036E221 /* YHServiceNoOrderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceNoOrderView.swift; sourceTree = "<group>"; };
+		048787D22BCE6B7D0036E221 /* YHServiceOrderAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceOrderAlertView.swift; sourceTree = "<group>"; };
 		048B2A432BC7901900A93BF0 /* YHHomeWebViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeWebViewModel.swift; sourceTree = "<group>"; };
 		048B2A452BC7912400A93BF0 /* YHWebModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHWebModel.swift; sourceTree = "<group>"; };
 		048B2A472BC7CE4800A93BF0 /* YHFourKingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFourKingViewController.swift; sourceTree = "<group>"; };
@@ -2125,6 +2129,7 @@
 				04CC2EEF2BC3DDB2000305DD /* YHServiceBannerView.swift */,
 				049AC4C72BC513AB00F857F4 /* YHOrderListView.swift */,
 				049AC4C92BC5141600F857F4 /* YHServerNoOrderView.swift */,
+				048787D02BCE61B20036E221 /* YHServiceNoOrderView.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -2221,6 +2226,7 @@
 				044414062BC3C54B00784A14 /* YHHomeCollectionViewCell.swift */,
 				044414082BC3CE8500784A14 /* YHHomeCollectionLayout.swift */,
 				A50A747D2BC91308003D28D9 /* YHHomeBannerIndicatorView.swift */,
+				048787D22BCE6B7D0036E221 /* YHServiceOrderAlertView.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -2551,6 +2557,7 @@
 				045EEE812B9F171A0022A143 /* YHPreviewQuestionAndAnswerModel.swift in Sources */,
 				045EEEB02B9F171A0022A143 /* YHWorkItemView.swift in Sources */,
 				0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */,
+				048787D12BCE61B20036E221 /* YHServiceNoOrderView.swift in Sources */,
 				04AA19FD2BB40D5C00C1CBBD /* Applegate(JPush).swift in Sources */,
 				0468D4362B57752F00CFB916 /* YHUserModel.swift in Sources */,
 				045EEE992B9F171A0022A143 /* YHPreviewInfoHoldView.swift in Sources */,
@@ -2600,6 +2607,7 @@
 				04174D642BCD52BD000BA46D /* YHTestViewController.swift in Sources */,
 				A5ACE92E2B4564F7002C94D2 /* YHValidateCodeInputView.swift in Sources */,
 				045EEED82B9F171A0022A143 /* YHQuestionInfo.swift in Sources */,
+				048787D32BCE6B7D0036E221 /* YHServiceOrderAlertView.swift in Sources */,
 				A5ACE94E2B4564F7002C94D2 /* AlignedCollectionViewFlowLayout.swift in Sources */,
 				A592FE932BA6CFFC0062FACA /* YHCertificateEntryBottomView.swift in Sources */,
 				A5ACE93B2B4564F7002C94D2 /* UIFont+Extension.swift in Sources */,

galaxy/galaxy/AppDelegate.swift

@@ -123,30 +123,10 @@ extension AppDelegate {
     
     //1.设置主窗口
     private func setupRootVC() {
-        let tabBarController = YHTabBarViewController()
-        
-        let homeVC = YHHomePageViewController()
-        tabBarController.delegate = homeVC
-        let v0 = YHNavigationController(rootVC:homeVC)
-        let v1 = YHNavigationController(rootVC:YHServiceCenterMainViewController())
-        let v2 = YHNavigationController(rootVC:YHMessageListVC())
-        let v3 = YHNavigationController(rootVC:YHMyViewController())
-        
-        v0.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "首页", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
-        
-        v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "服务", image: UIImage(named: "service"), selectedImage: UIImage(named: "service_1"))
-        
-        v2.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "消息", image: UIImage(named: "msg"), selectedImage: UIImage(named: "msg_1"))
-        
-        v3.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "我的", image: UIImage(named: "me"), selectedImage: UIImage(named: "me_1"))
-        
-        tabBarController.viewControllers = [v0,v1,v2,v3]
-        tabBarController.tabBar.backgroundColor = .white
-        
+        let nav = YHNavigationController(rootVC:YHStartPageViewController())
         window = UIWindow(frame: UIScreen.main.bounds)
-        window?.rootViewController = YHStartPageViewController()
+        window?.rootViewController = nav
         window?.makeKeyAndVisible()
-        
     }
 }
 

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHFourKingViewController.swift

@@ -42,6 +42,9 @@ extension YHFourKingViewController {
                     if self.classId == 0 {
                         gk_navTitle = model.name
                         self.sectionView.items = model.children
+                        if model.children.count == 1 {
+                            self.updateAllView()
+                        }
                         let classifyID = model.children.first?.id ?? 0
                         self.classId = classifyID
                         self.homeViewModel.getList(true, classifyID) {[weak self] success, error in
@@ -53,6 +56,18 @@ extension YHFourKingViewController {
             }
         }
     }
+     
+    func updateAllView() {
+        sectionView.snp.remakeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
+            make.height.equalTo(0)
+        }
+        tableFootView.snp.makeConstraints { make in
+            make.bottom.left.right.equalToSuperview()
+            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
+        }
+    }
     
     func setupUI() {
         gk_navBarAlpha = 1

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHServiceOrderAlertView.swift

+//
+//  YHServiceOrderAlertView.swift
+//  galaxy
+//
+//  Created by EDY on 2024/4/16.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import AttributedString
+
+class YHServiceOrderAlertView: UIView {
+    var centerView: UIView!
+    var titleLabel: UILabel!
+    var closeButton: UIButton!
+    var lineView: UIView!
+    var knowButton: UIButton!
+    var measageLabel: UILabel!
+    var subMeasageLabel: UILabel!
+
+    static func show() {
+        let view = YHServiceOrderAlertView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
+        let window = UIApplication.shared.yhKeyWindow()
+        window?.addSubview(view)
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        backgroundColor = UIColor(white: 0.5, alpha: 0.1)
+        let tap = UITapGestureRecognizer(target: self, action: #selector(handleTap))
+        tap.delegate = self
+        addGestureRecognizer(tap)
+        setView()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setView() {
+        backgroundColor = UIColor(hex: 0x0000, alpha: 0.5)
+        centerView = {
+            let view = UIView()
+            view.backgroundColor = .white
+            view.layer.cornerRadius = kCornerRadius8
+            return view
+        }()
+        addSubview(centerView)
+        centerView.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(401)
+        }
+        
+        titleLabel = {
+            let label = UILabel()
+            label.text = "原因说明"
+            label.font = UIFont.PFSC_M(ofSize: 17)
+            label.textColor = UIColor.mainTextColor
+            label.textAlignment = .center
+            return label
+        }()
+        centerView.addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(16)
+            make.left.height.equalTo(21)
+            make.right.equalTo(-21)
+        }
+        
+        closeButton = {
+            let button = UIButton(type: .custom)
+            button.setBackgroundImage(UIImage(named: "service_card_close"), for: .normal)
+            button.addTarget(self, action: #selector(dismiss), for: .touchUpInside)
+            return button
+        }()
+        centerView.addSubview(closeButton)
+        closeButton.snp.makeConstraints { make in
+            make.right.equalTo(-21)
+            make.width.height.equalTo(24)
+            make.top.equalTo(16)
+        }
+        
+        lineView = {
+            let view = UIView()
+            view.backgroundColor = UIColor.separatorColor
+            return view
+        }()
+        centerView.addSubview(lineView)
+        lineView.snp.makeConstraints { make in
+            make.right.equalTo(-21)
+            make.left.equalTo(21)
+            make.top.equalTo(52)
+            make.height.equalTo(1)
+        }
+        
+        knowButton = {
+            let button = UIButton(type: .custom)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
+            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(goNext), for: .touchUpInside)
+            return button
+        }()
+        centerView.addSubview(knowButton)
+        knowButton.snp.makeConstraints { make in
+            make.right.equalTo(-16)
+            make.left.equalTo(16)
+            make.height.equalTo(48)
+            make.bottom.equalTo(-29)
+        }
+        
+        measageLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 14)
+            label.textColor = UIColor.mainTextColor
+            label.numberOfLines = 0
+            return label
+        }()
+        centerView.addSubview(measageLabel)
+        measageLabel.snp.makeConstraints { make in
+            make.right.equalTo(-21)
+            make.left.equalTo(21)
+            make.top.equalTo(73)
+        }
+        
+        subMeasageLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 14)
+            label.textColor = UIColor.mainTextColor
+            label.numberOfLines = 0
+            return label
+        }()
+        centerView.addSubview(subMeasageLabel)
+        subMeasageLabel.snp.makeConstraints { make in
+            make.right.equalTo(-21)
+            make.left.equalTo(21)
+            make.top.equalTo(157)
+        }
+        
+        let a: ASAttributedString = .init("1.当前仅支持查看", .font(UIFont.PFSC_M(ofSize: 15)),.foreground(UIColor(hex: 0x121a26).withAlphaComponent(0.7)))
+        
+        let aa: ASAttributedString = .init(NSAttributedString(string: "优才订单"), .font(UIFont.PFSC_M(ofSize: 15)),.foreground(UIColor.brandMainColor))
+        
+        
+        let aaa: ASAttributedString = .init("，如果是签约了其他高才、专才、留学等其他订单，请与您的服务管家或销售顾问企微沟通联系哦\n\n", .font(UIFont.PFSC_M(ofSize: 15)),.foreground(UIColor(hex: 0x121a26).withAlphaComponent(0.7)))
+        
+        let b: ASAttributedString = .init(NSAttributedString(string: "2.使用其他手机号签约合同/订单，请退出登录"), .font(UIFont.PFSC_M(ofSize: 15)),.foreground(UIColor(hex: 0x121a26).withAlphaComponent(0.7)))
+        
+        let bb: ASAttributedString = .init("切换账号", .font(UIFont.PFSC_M(ofSize: 15)),.foreground(UIColor.brandMainColor))
+        let bbb: ASAttributedString = .init("查看", .font(UIFont.PFSC_M(ofSize: 15)),.foreground(UIColor(hex: 0x121a26).withAlphaComponent(0.7)))
+
+        measageLabel.attributed.text = a + aa + aaa
+        subMeasageLabel.attributed.text = b + bb + bbb
+        
+        knowButton.backgroundColor = .brandMainColor
+        knowButton.addYinHeGradualLayer()
+    }
+    
+    @objc private func handleTap(_ sender: AnyObject?) {
+        print("处理点击手势")
+        dismiss()
+    }
+    
+    @objc func dismiss() {
+        removeFromSuperview()
+    }
+    
+    @objc func goNext() {
+        dismiss()
+    }
+}
+
+extension YHServiceOrderAlertView: UIGestureRecognizerDelegate {
+    func gestureRecognizer(_ gestureRecognizer:UIGestureRecognizer, shouldReceive touch:UITouch) -> Bool {
+        if touch.view == self {
+            return true
+        }
+        return false
+    }
+}
+
+

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

@@ -21,16 +21,8 @@ class YHServiceCenterMainViewController: YHBaseViewController {
         
     }()
     
-    private let loginTipsView : YHLoginTipsView = {
-        let view = YHLoginTipsView()
-        view.viewType = 0
-        view.isHidden = true
-        return view
-    }()
-    
-    private let noDataView : YHLoginTipsView = {
-        let view = YHLoginTipsView()
-        view.viewType = 1
+    private let noDataView : YHServiceNoOrderView = {
+        let view = YHServiceNoOrderView()
         view.isHidden = true
         return view
     }()
@@ -56,8 +48,25 @@ class YHServiceCenterMainViewController: YHBaseViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        
         setupUI()
         handleRightUI()
+        
+        noDataView.clickMoreBtnClickkBlock = {[weak self] in
+            guard let self = self else { return }
+            let vc = YHServiceViewController()
+            vc.defaltIndex = 0
+            self.navigationController?.pushViewController(vc)
+        }
+        noDataView.clickBackBtnClickBlock = {[weak self] in
+            guard let self = self else { return }
+            if let vc = UIApplication.shared.keyWindow?.rootViewController as? YHTabBarViewController {
+                vc.selectedIndex = 0
+            }
+        }
+        noDataView.clickShowBtnClickBlock = {[weak self] in
+            YHServiceOrderAlertView.show()
+        }
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -87,30 +96,19 @@ extension YHServiceCenterMainViewController {
     func setupUI() {
         gk_navTitle = "服务"
         gk_navBarAlpha = 1.0
-        
-        loginTipsView.clickLoginBtnCallBackBlock = {
-            self.loginOp()
-        }
-        
+        view.backgroundColor = .white
         view.addSubview(topBkg)
         topBkg.snp.makeConstraints { make in
             make.top.left.right.equalToSuperview()
             make.height.equalTo(216)
         }
         
-        
-        view.addSubview(loginTipsView)
-        loginTipsView.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.centerY.equalToSuperview()
-            make.width.equalTo(KScreenWidth)
-        }
-        
         view.addSubview(noDataView)
         noDataView.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
             make.centerY.equalToSuperview()
             make.width.equalTo(KScreenWidth)
+            make.height.equalTo(225)
         }
         
         view.addSubview(homeTableView)
@@ -206,12 +204,9 @@ extension YHServiceCenterMainViewController {
     
     private func handleRightUI() {
         if YHLoginManager.shared.isLogin() == false {
-            loginTipsView.isHidden = false
             noDataView.isHidden = true
             homeTableView.isHidden = true
         } else {
-            loginTipsView.isHidden = true
-            
             if serviceCenterMainReqVM.arrContactList.isEmpty {
                 homeTableView.isHidden = true
                 noDataView.isHidden = false

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

+//
+//  YHServiceNoOrderView.swift
+//  galaxy
+//
+//  Created by EDY on 2024/4/16.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHServiceNoOrderView: UIView {
+    public var clickMoreBtnClickkBlock : (()->())?
+    public var clickBackBtnClickBlock : (()->())?
+    public var clickShowBtnClickBlock : (()->())?
+
+    private lazy var iconImgV : UIImageView = {
+        let imagV = UIImageView()
+        imagV.image = UIImage(named: "service_center_no_data")
+        imagV.contentMode = .scaleAspectFill
+        return imagV
+    }()
+    
+    private lazy var tipsLab : UILabel = {
+        let lable = UILabel()
+        lable.textColor = UIColor.labelTextColor2
+        lable.font = UIFont.PFSC_R(ofSize: 14)
+        lable.textAlignment = .center
+        lable.text = "您还没有相关订单"
+        return lable
+    }()
+    
+    private lazy var noFindLab : UILabel = {
+        let lable = UILabel()
+        lable.textColor = UIColor.labelTextColor2
+        lable.font = UIFont.PFSC_R(ofSize: 12)
+        lable.textAlignment = .center
+        lable.text = "找不到订单"
+        return lable
+    }()
+    
+    private lazy var showBtn : UIButton = {
+        let btn = UIButton(type: .custom)
+        btn.setBackgroundImage(UIImage(named: "service_no_order_alert"), for: .normal)
+        return btn
+    }()
+    
+    private lazy var moreBtn : UIButton = {
+        let btn = UIButton(type: .custom)
+        btn.setTitle("更多资讯", for: .normal)
+        btn.layer.cornerRadius = kCornerRadius6
+        btn.clipsToBounds = true
+        btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
+        btn.setTitleColor(UIColor.mainTextColor, for: .normal)
+        btn.backgroundColor = UIColor.contentBkgColor
+        return btn
+    }()
+    
+    private lazy var backBtn : UIButton = {
+        let btn = UIButton(type: .custom)
+        btn.setTitle("返回首页", for: .normal)
+        btn.layer.cornerRadius = kCornerRadius6
+        btn.clipsToBounds = true
+        btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
+        btn.setTitleColor(.white, for: .normal)
+        return btn
+    }()
+    
+    public override init(frame: CGRect) {
+        super.init(frame:frame)
+        initView()
+    }
+    
+    private func initView() {
+        addSubview(iconImgV)
+        iconImgV.snp.makeConstraints { make in
+            make.top.equalToSuperview()
+            make.centerX.equalToSuperview()
+            make.height.equalTo(93)
+            make.width.equalTo(93)
+        }
+        
+        addSubview(tipsLab)
+        tipsLab.snp.makeConstraints { make in
+            make.top.equalTo(iconImgV.snp.bottom).offset(12)
+            make.centerX.equalToSuperview()
+            make.left.right.equalToSuperview()
+        }
+        
+        addSubview(noFindLab)
+        noFindLab.snp.makeConstraints { make in
+            make.top.equalTo(tipsLab.snp.bottom).offset(8.5)
+            make.centerX.equalToSuperview().offset(-8)
+        }
+        
+        addSubview(showBtn)
+        showBtn.snp.makeConstraints { make in
+            make.left.equalTo(noFindLab.snp.right).offset(2)
+            make.centerY.equalTo(noFindLab.snp.centerY)
+            make.width.height.equalTo(16)
+        }
+        
+        addSubview(moreBtn)
+        moreBtn.snp.makeConstraints { make in
+            make.top.equalTo(noFindLab.snp.bottom).offset(22.5)
+            make.right.equalTo(self.snp.centerX).offset(-8.5)
+            make.height.equalTo(38)
+            make.width.equalTo(84)
+        }
+        
+        addSubview(backBtn)
+        backBtn.snp.makeConstraints { make in
+            make.top.equalTo(noFindLab.snp.bottom).offset(22.5)
+            make.left.equalTo(self.snp.centerX).offset(8.5)
+            make.height.equalTo(38)
+            make.width.equalTo(84)
+        }
+        showBtn.addTarget(self, action: #selector(showBtnClick), for: .touchUpInside)
+        backBtn.addTarget(self, action: #selector(backBtnClick), for: .touchUpInside)
+        moreBtn.addTarget(self, action: #selector(moreBtnClick), for: .touchUpInside)
+        showBtn.YH_clickEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
+        layoutIfNeeded()
+        backBtn.backgroundColor = .brandMainColor
+        backBtn.addYinHeGradualLayer()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    @objc func moreBtnClick() {
+        self.clickMoreBtnClickkBlock?()
+    }
+    
+    @objc func backBtnClick() {
+        self.clickBackBtnClickBlock?()
+    }
+    
+    @objc func showBtnClick() {
+        self.clickShowBtnClickBlock?()
+    }
+}

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

@@ -29,7 +29,7 @@ class YHServiceTableFootView: UIView {
         collectinoView.register(YHHomeCollectionViewCell.self, forCellWithReuseIdentifier:YHHomeCollectionViewCell.cellReuseIdentifier)
         collectinoView.delegate = self
         collectinoView.dataSource = self
-        collectinoView.bounces = false
+//        collectinoView.bounces = false
         collectinoView.translatesAutoresizingMaskIntoConstraints = false
         collectinoView.alwaysBounceVertical = true
         return collectinoView

galaxy/galaxy/Res/Assets.xcassets/Home/kingkong/kingkong_sffl.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_no_order_alert.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/other/launch_screen_image.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "超级app启动页占位图.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "启动页@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "启动页@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }