ソースを参照

fix: 调整陪玩中心的 UI

陈文艺 2 ヶ月 前
コミット
63ddc8998c

+ 1 - 1
Lanu/Views/Game/Join/Input/LNJoinUsViewController.swift

@@ -95,7 +95,7 @@ extension LNJoinUsViewController {
             guard let self else { return }
             guard let res else { return }
             
-            if res.step3Complete {
+            if res.step3Complete || res.underReview {
                 view.pushToJoinUsReview(false)
                 return
             }

+ 30 - 22
Lanu/Views/Game/OrderCenter/LNGameMateCenterViewController.swift

@@ -181,26 +181,23 @@ extension LNGameMateCenterViewController {
         descLabel.snp.makeConstraints { make in
             make.leading.equalToSuperview()
             make.verticalEdges.equalToSuperview()
-        }
-        
-        let arrow = UIImageView.arrowImageView(size: 12)
-        arrow.tintColor = .text_4
-        descView.addSubview(arrow)
-        arrow.snp.makeConstraints { make in
-            make.centerY.equalToSuperview()
             make.trailing.equalToSuperview()
-            make.leading.equalTo(descLabel.snp.trailing).offset(4)
         }
         
+//        let arrow = UIImageView.arrowImageView(size: 12)
+//        arrow.tintColor = .text_4
+//        descView.addSubview(arrow)
+//        arrow.snp.makeConstraints { make in
+//            make.centerY.equalToSuperview()
+//            make.trailing.equalToSuperview()
+//            make.leading.equalTo(descLabel.snp.trailing).offset(4)
+//        }
+        
         return container
     }
     
     private func buildDataView() -> UIView {
         let container = UIView()
-        container.onTap { [weak self] in
-            guard let self else { return }
-            view.pushToVisitors()
-        }
         
         let stackView = UIStackView()
         stackView.axis = .horizontal
@@ -211,8 +208,14 @@ extension LNGameMateCenterViewController {
             make.verticalEdges.equalToSuperview()
         }
         
-        stackView.addArrangedSubview(buildDataItemView(.init(key: "B00073"), contentLabel: exposureLabel))
-        stackView.addArrangedSubview(buildDataItemView(.init(key: "B00074"), contentLabel: visitorLabel))
+        stackView.addArrangedSubview(buildDataItemView(.init(key: "B00073"), contentLabel: exposureLabel, showArrow: false))
+        
+        let visitorView = buildDataItemView(.init(key: "B00074"), contentLabel: visitorLabel)
+        visitorView.onTap { [weak self] in
+            guard let self else { return }
+            view.pushToVisitors()
+        }
+        stackView.addArrangedSubview(visitorView)
         
         let line = buildLine()
         stackView.addSubview(line)
@@ -223,7 +226,7 @@ extension LNGameMateCenterViewController {
         return container
     }
     
-    private func buildDataItemView(_ title: String, contentLabel: UILabel) -> UIView {
+    private func buildDataItemView(_ title: String, contentLabel: UILabel, showArrow: Bool = true) -> UIView {
         let container = UIView()
         
         contentLabel.text = "0"
@@ -252,15 +255,20 @@ extension LNGameMateCenterViewController {
         descLabel.snp.makeConstraints { make in
             make.leading.equalToSuperview()
             make.verticalEdges.equalToSuperview()
+            if !showArrow {
+                make.trailing.equalToSuperview()
+            }
         }
         
-        let arrow = UIImageView.arrowImageView(size: 10)
-        arrow.tintColor = .text_4
-        descView.addSubview(arrow)
-        arrow.snp.makeConstraints { make in
-            make.centerY.equalToSuperview()
-            make.trailing.equalToSuperview()
-            make.leading.equalTo(descLabel.snp.trailing).offset(4)
+        if showArrow {
+            let arrow = UIImageView.arrowImageView(size: 10)
+            arrow.tintColor = .text_4
+            descView.addSubview(arrow)
+            arrow.snp.makeConstraints { make in
+                make.centerY.equalToSuperview()
+                make.trailing.equalToSuperview()
+                make.leading.equalTo(descLabel.snp.trailing).offset(4)
+            }
         }
         
         return container

+ 1 - 9
Lanu/Views/Game/OrderCenter/Skill/LNSkillManagerViewController.swift

@@ -142,15 +142,7 @@ extension LNSkillManagerViewController {
         container.backgroundColor = .fill
         container.onTap { [weak self] in
             guard let self else { return }
-            showLoading()
-            LNGameMateManager.shared.getSkillEditFields(id: skill.id) { [weak self] info in
-                dismissLoading()
-                guard let self else { return }
-                guard let info, !info.fields.isEmpty else { return }
-                
-                info.skillId = skill.id
-                view.pushToSkillEdit(info)
-            }
+            view.pushToSkillDetail(skill.id)
         }
         
         let infoView = UIView()