会员中心 ui bug以及测试bug修复

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

@@ -120,7 +120,7 @@ class YHMemberCenterViewController: YHBaseViewController {
             make.left.equalToSuperview()
             make.right.equalToSuperview()
             make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
-            make.bottom.equalTo(view.safeAreaLayoutGuide.snp.bottom)
+            make.bottom.equalToSuperview()
         }
         tableView.tableHeaderView = headerView
         tableView.tableFooterView = footerView
@@ -196,7 +196,10 @@ class YHMemberCenterViewController: YHBaseViewController {
                 datas.append(row)
             }
         case .gold:
+            if memberCenterInfo.currentLevel < currentLevel.rawValue {
                 datas.append(.currentPrivilege(currentLevel, currentLevel.privilegeCount, memberCenterInfo.currentLevel >= currentLevel.rawValue, myLevel))
+            }
+            
             datas.append(.myPrivilege(myLevel, myLevel.privilegeCount, memberCenterInfo.exchangeCount, memberCenterInfo.exchangeCount, memberCenterInfo.currentLevel > YHMembershipLevel.normal.rawValue))
             let services: [YHMemberCenterCellContent] = [.kidsBay, .luxury, .afternoonTea, .offlineSalons, .onSiteConsultation, .customerService, .pointsConsumption]
             let ids: [String] = [memberCenterInfo.highTeaBox.giftId, memberCenterInfo.experienceCenter.giftId,
@@ -215,7 +218,10 @@ class YHMemberCenterViewController: YHBaseViewController {
                 datas.append(row)
             }
         case .platinum:
+            if memberCenterInfo.currentLevel < currentLevel.rawValue {
                 datas.append(.currentPrivilege(currentLevel, currentLevel.privilegeCount, memberCenterInfo.currentLevel >= currentLevel.rawValue, myLevel))
+            }
+            
             datas.append(.myPrivilege(myLevel, myLevel.privilegeCount, memberCenterInfo.exchangeCount, memberCenterInfo.exchangeCount, memberCenterInfo.currentLevel > YHMembershipLevel.normal.rawValue))
             let services: [YHMemberCenterCellContent] = [.crossBorder, .kidsBay, .luxury, .afternoonTea, .offlineSalons, .onSiteConsultation, .customerService, .pointsConsumption]
             let ids: [String] = [memberCenterInfo.carTransfer.giftId,
@@ -236,7 +242,10 @@ class YHMemberCenterViewController: YHBaseViewController {
                 datas.append(row)
             }
         case .diamond:
+            if memberCenterInfo.currentLevel < currentLevel.rawValue {
                 datas.append(.currentPrivilege(currentLevel, currentLevel.privilegeCount, memberCenterInfo.currentLevel >= currentLevel.rawValue, myLevel))
+            }
+            
             datas.append(.myPrivilege(myLevel, myLevel.privilegeCount, memberCenterInfo.exchangeCount, memberCenterInfo.exchangeCount, memberCenterInfo.currentLevel > YHMembershipLevel.normal.rawValue))
             let services: [YHMemberCenterCellContent] = [.highEndMeeting, .crossBorder,  .hkTravel,.drivingLicense,  .schoolSelection, .brandPlanning, .kidsBay, .luxury,    .afternoonTea, .offlineSalons, .onSiteConsultation, .customerService, .pointsConsumption]
             let ids: [String] = [memberCenterInfo.highEndPrivilege.giftId,
@@ -408,7 +417,9 @@ class YHMemberCenterViewController: YHBaseViewController {
         guard let userId = YHLoginManager.shared.userModel?.id, userId.count > 0, let navigationController = UIViewController.current?.navigationController else {
             return
         }
+        YHHUD.show(.progress(message: "加载中..."))
         YHButlerServiceManager.shared.gotoButlerServiceSessionVC(navigationController: navigationController, completion: { _ in
+            YHHUD.hide()
         })
     }
 

galaxy/galaxy/Classes/Modules/Mine（我的）/Model/YHMemberCenterCellContent.swift

@@ -75,7 +75,7 @@ enum YHMemberCenterCellContent: String, CaseIterable {
         case .afternoonTea:
             return 65.0 / 311.0
         case .offlineSalons:
-            return 126.0 / 311.0
+            return 180.0 / 311.0
         case .onSiteConsultation:
             return 180.0 / 311.0
         case .customerService:

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHMemberCenterActionCell.swift

@@ -54,6 +54,7 @@ class YHMemberCenterActionCell: YHResignDocumentCell {
     }
 
     private func setupUI() {
+        subContainerView.radius = 4
         updateCellCorner(.single)
         subContainerView.addSubview(leftLabel)
         subContainerView.addSubview(rightLabel)

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHMemberCenterHeaderBannerCell.swift

@@ -125,10 +125,12 @@ class YHMemberCenterHeaderBannerCell: FSPagerViewCell {
             make.right.lessThanOrEqualTo(upgradeButton.snp.left).offset(-26)
         }
 
+        let progressViewWidth = KScreenWidth >= 375 ? 158 : 120
         progressView.snp.makeConstraints { make in
             make.left.equalTo(bannerTitleLabel)
             make.bottom.equalTo(tipsLabel.snp.top).offset(-6)
-            make.right.equalTo(upgradeButton.snp.left).offset(-26)
+            make.width.equalTo(progressViewWidth)
+//            make.right.equalTo(upgradeButton.snp.left).offset(-26)
             make.height.equalTo(2)
         }
 

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHMemberCenterMyPrivilegeCell.swift

@@ -50,7 +50,7 @@ class YHMemberCenterMyPrivilegeCell: YHResignDocumentCell {
     private lazy var privilegeLabel: UILabel = {
         let label = UILabel()
         label.text = "高端权益兑换"
-        label.font = .PFSC_R(ofSize: 12)
+        label.font = .PFSC_R(ofSize: 13)
         label.textColor = .mainTextColor
         return label
     }()
@@ -100,6 +100,7 @@ class YHMemberCenterMyPrivilegeCell: YHResignDocumentCell {
     }
 
     private func setupUI() {
+        subContainerView.radius = 4
         updateCellCorner(.single)
         subContainerView.addSubview(midLabel)
         subContainerView.addSubview(leftIcon)

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHMembershipGrowthGuideView.swift

@@ -50,13 +50,15 @@ class YHMembershipGrowthGuideView: UIView {
         view.backgroundColor = .clear
         view.showsVerticalScrollIndicator = false
         view.showsHorizontalScrollIndicator = false
+        view.isScrollEnabled = true
+        view.isUserInteractionEnabled = true
         return view
     }()
 
     lazy var bkgImageV: UIImageView = {
         let imageV = UIImageView()
         imageV.image = UIImage(named: "membership_growth_guide")
-        imageV.contentMode = .scaleAspectFit
+        imageV.contentMode = .scaleAspectFill
         imageV.clipsToBounds = true
         return imageV
     }()
@@ -81,7 +83,7 @@ extension YHMembershipGrowthGuideView {
         UIApplication.shared.yhKeyWindow()?.addSubview(self)
 
         UIView.animate(withDuration: 0.5) {
-            let whiteHeight = KScreenHeight - k_Height_NavigationtBarAndStatuBar
+            let whiteHeight = KScreenHeight - 120
             self.whiteContentView.frame = CGRect(x: 0, y: KScreenHeight - whiteHeight, width: KScreenWidth, height: whiteHeight)
         }
     }
@@ -113,7 +115,7 @@ private extension YHMembershipGrowthGuideView {
             make.edges.equalToSuperview()
         }
 
-        let whiteHeight = KScreenHeight - k_Height_NavigationtBarAndStatuBar
+        let whiteHeight = KScreenHeight - 120
         whiteContentView.frame = CGRect(x: 0, y: KScreenHeight, width: KScreenWidth, height: whiteHeight)
         whiteContentView.addSubview(topTitleLabel)
         whiteContentView.addSubview(closeButton)
@@ -134,15 +136,15 @@ private extension YHMembershipGrowthGuideView {
             make.top.equalToSuperview().offset(52)
             make.left.equalToSuperview().offset(20)
             make.right.equalToSuperview().offset(-20)
+            make.height.equalTo(1)
         }
         
         whiteContentView.addSubview(myScrollView)
         myScrollView.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(54)
+            make.top.equalToSuperview().offset(73)
             make.left.equalToSuperview()
-            make.right.equalToSuperview()
             make.width.equalTo(KScreenWidth)
-            make.height.equalTo(whiteHeight - 54)
+            make.height.equalTo(whiteHeight - 73)
         }
 
         if let _ = UIImage(named: "membership_growth_guide") {
@@ -152,11 +154,10 @@ private extension YHMembershipGrowthGuideView {
             bkgImageV.snp.makeConstraints { make in
                 make.top.equalToSuperview()
                 make.left.equalToSuperview().offset(margin)
-                make.right.equalToSuperview().offset(-margin)
-                make.width.equalTo(333.0)
-                make.height.equalTo(333.0 * radio)
+                make.width.equalTo((KScreenWidth - 2 * margin))
+                make.height.equalTo((KScreenWidth - 2 * margin) * radio)
             }
-            myScrollView.contentSize = CGSize(width: KScreenWidth, height: 333.0 * radio)
+            myScrollView.contentSize = CGSize(width: KScreenWidth, height: (KScreenWidth - 2 * margin) * radio + 34)
         }
     }
 }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_cell_afternoonTea.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_cell_afternoonTea@2x.png",
+      "filename" : "银河体验中心下午茶@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_cell_afternoonTea@3x.png",
+      "filename" : "银河体验中心下午茶@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_cell_brandPlanning.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_cell_brandPlanning@2x.png",
+      "filename" : "品牌策划方案@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_cell_brandPlanning@3x.png",
+      "filename" : "品牌策划方案@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_cell_crossBorder.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_cell_crossBorder@2x.png",
+      "filename" : "深港跨境出行预约@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_cell_crossBorder@3x.png",
+      "filename" : "深港跨境出行预约@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_cell_customerService.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_cell_customerService@2x.png",
+      "filename" : "专属客服服务@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_cell_customerService@3x.png",
+      "filename" : "专属客服服务@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_cell_drivingLicense.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_cell_drivingLicense@2x.png",
+      "filename" : "国际驾照续期@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_cell_drivingLicense@3x.png",
+      "filename" : "国际驾照续期@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_cell_highEndMeeting.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_cell_highEndMeeting@2x.png",
+      "filename" : "高端私董会@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_cell_highEndMeeting@3x.png",
+      "filename" : "高端私董会@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_cell_hkTravel.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_cell_hkTravel@2x.png",
+      "filename" : "香港境内出行预约@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_cell_hkTravel@3x.png",
+      "filename" : "香港境内出行预约@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_cell_kidsbay.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_cell_kidsbay@2x.png",
+      "filename" : "kidsbay高端早教盒子@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_cell_kidsbay@3x.png",
+      "filename" : "kidsbay高端早教盒子@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_cell_luxury.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_cell_luxury@2x.png",
+      "filename" : "体验中心图@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_cell_luxury@3x.png",
+      "filename" : "体验中心图@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_cell_offlineSalons.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_cell_offlineSalons@2x.png",
+      "filename" : "特色线下沙龙&分享会@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_cell_offlineSalons@3x.png",
+      "filename" : "特色线下沙龙&分享会@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_cell_onSiteConsultation.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_cell_onSiteConsultation@2x.png",
+      "filename" : "截屏2024-07-05 上午10.54.23 1@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_cell_onSiteConsultation@3x.png",
+      "filename" : "截屏2024-07-05 上午10.54.23 1@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_cell_pointsConsumption.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_cell_pointsConsumption@2x.png",
+      "filename" : "专属积分商城消费@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_cell_pointsConsumption@3x.png",
+      "filename" : "专属积分商城消费@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_cell_schoolSelection.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_cell_schoolSelection@2x.png",
+      "filename" : "香港择校规划@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_cell_schoolSelection@3x.png",
+      "filename" : "香港择校规划@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_center_bg_diamond.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_center_bg_diamond@2x.png",
+      "filename" : "头图-钻石会员@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_center_bg_diamond@3x.png",
+      "filename" : "头图-钻石会员@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_center_bg_gold.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_center_bg_gold@2x.png",
+      "filename" : "头图-黄金会员@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_center_bg_gold@3x.png",
+      "filename" : "头图-黄金会员@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_center_bg_normal.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_center_bg_normal@2x.png",
+      "filename" : "头图-大众会员@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_center_bg_normal@3x.png",
+      "filename" : "头图-大众会员@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_center_bg_platinum.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_center_bg_platinum@2x.png",
+      "filename" : "头图-铂金会员@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_center_bg_platinum@3x.png",
+      "filename" : "头图-铂金会员@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_center_card_diamond.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_center_card_diamond@2x.png",
+      "filename" : "钻石会员@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_center_card_diamond@3x.png",
+      "filename" : "钻石会员@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_center_card_gold.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_center_card_gold@2x.png",
+      "filename" : "黄金会员@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_center_card_gold@3x.png",
+      "filename" : "黄金会员@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_center_card_normal.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_center_card_normal@2x.png",
+      "filename" : "大众会员@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_center_card_normal@3x.png",
+      "filename" : "大众会员@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/memberCenter/member_center_card_platinum.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "member_center_card_platinum@2x.png",
+      "filename" : "铂金会员@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "member_center_card_platinum@3x.png",
+      "filename" : "铂金会员@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }