no message

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -210,6 +210,9 @@
 		A76068E222E44D6A008DF18F /* SheetSureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76068E122E44D6A008DF18F /* SheetSureView.swift */; };
 		A76068E422E47E0E008DF18F /* RegisterLoginModule.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A76068E322E47E0E008DF18F /* RegisterLoginModule.xcassets */; };
 		A76068E722E48DC5008DF18F /* BrowsePictureRouterModuleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76068E622E48DC5008DF18F /* BrowsePictureRouterModuleType.swift */; };
+		A76068E922E4922F008DF18F /* Skittles.json in Resources */ = {isa = PBXBuildFile; fileRef = A76068E822E4922F008DF18F /* Skittles.json */; };
+		A76068EB22E49BC1008DF18F /* collect.json in Resources */ = {isa = PBXBuildFile; fileRef = A76068EA22E49BC0008DF18F /* collect.json */; };
+		A76068ED22E4A2B4008DF18F /* verywell.json in Resources */ = {isa = PBXBuildFile; fileRef = A76068EC22E4A2B4008DF18F /* verywell.json */; };
 		A7636AC52268139C00374F9E /* LocationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7636AC42268139C00374F9E /* LocationViewController.swift */; };
 		A7636AC822682BAF00374F9E /* LocationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7636AC722682BAF00374F9E /* LocationView.swift */; };
 		A76390EB2248E27A0067EEE0 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A76390EA2248E27A0067EEE0 /* UserNotifications.framework */; };
@@ -918,6 +921,9 @@
 		A76068E122E44D6A008DF18F /* SheetSureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SheetSureView.swift; sourceTree = "<group>"; };
 		A76068E322E47E0E008DF18F /* RegisterLoginModule.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = RegisterLoginModule.xcassets; sourceTree = "<group>"; };
 		A76068E622E48DC5008DF18F /* BrowsePictureRouterModuleType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrowsePictureRouterModuleType.swift; sourceTree = "<group>"; };
+		A76068E822E4922F008DF18F /* Skittles.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = Skittles.json; sourceTree = "<group>"; };
+		A76068EA22E49BC0008DF18F /* collect.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = collect.json; sourceTree = "<group>"; };
+		A76068EC22E4A2B4008DF18F /* verywell.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = verywell.json; sourceTree = "<group>"; };
 		A7636AC42268139C00374F9E /* LocationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationViewController.swift; sourceTree = "<group>"; };
 		A7636AC722682BAF00374F9E /* LocationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationView.swift; sourceTree = "<group>"; };
 		A76390EA2248E27A0067EEE0 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
@@ -4453,6 +4459,9 @@
 		A7F3069222E1698700DC7917 /* JSON */ = {
 			isa = PBXGroup;
 			children = (
+				A76068E822E4922F008DF18F /* Skittles.json */,
+				A76068EA22E49BC0008DF18F /* collect.json */,
+				A76068EC22E4A2B4008DF18F /* verywell.json */,
 				A75B787722E07A50007B986A /* communityModuleTabbar.json */,
 				A75B787622E07A50007B986A /* messageModuleTabbar.json */,
 				A75B787922E07A50007B986A /* MineModuleTabbar.json */,
@@ -5843,6 +5852,7 @@
 				A7CC74DE22703B4A003C4F38 /* MineModule.xcassets in Resources */,
 				A7BF202422B392D600396DB3 /* CommunityModule.xcassets in Resources */,
 				BDD54A2522C31D5F005BBE19 /* music.json in Resources */,
+				A76068E922E4922F008DF18F /* Skittles.json in Resources */,
 				A71AF0BE226F1792001730FE /* ShoppingMallModule.xcassets in Resources */,
 				A7778C9722438F5D00C7C47A /* AlipaySDK.bundle in Resources */,
 				BDD54A2722C31D60005BBE19 /* tail.png in Resources */,
@@ -5858,12 +5868,14 @@
 				BD108C9B22A60C3300837DAB /* HGImage.storyboard in Resources */,
 				A7FF1577228C824300A85748 /* OrderModule.xcassets in Resources */,
 				BD4B50AC22BC7DEA0073B516 /* FilterResource.bundle in Resources */,
+				A76068EB22E49BC1008DF18F /* collect.json in Resources */,
 				A7778C9922438F5D00C7C47A /* README.txt in Resources */,
 				BDD54A2922C31D60005BBE19 /* LocalMV.json in Resources */,
 				A7BF202722B3930100396DB3 /* MessageModule.xcassets in Resources */,
 				BDD54A2B22C31D78005BBE19 /* filter in Resources */,
 				BD108C9A22A60C3300837DAB /* HGImage.xcassets in Resources */,
 				A7F3069922E1C72D00DC7917 /* json_Image_1.png in Resources */,
+				A76068ED22E4A2B4008DF18F /* verywell.json in Resources */,
 				A729B5AA2266F6FD004AE098 /* Launch Screen.storyboard in Resources */,
 				BD24FABB22B509CF00C7AA3B /* PublishModule.xcassets in Resources */,
 			);

RainbowPlanet/RainbowPlanet/Manager/WebViewJavascriptBridgeManager/WebViewJavascriptBridgeManager.swift

@@ -62,6 +62,11 @@ class WebViewJavascriptBridgeManager: NSObject {
                 let viewController = viewController as? CommunityViewController
                 viewController?.reloadSegmentedView()
             }
+            // 兑换商城
+            if wvjbModel?.params?.paramsModelPage == .exchange {
+                let viewController = viewController as? CommunityViewController
+                viewController?.tabBarController?.selectedIndex = 1
+            }
         }
         // 跳转原生
         if wvjbModel?.modelType  == .follow {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/Action/CardContentActionTableViewCell.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import RxSwift
+import Lottie
 
 class CardContentActionTableViewCell: UITableViewCell {
     
@@ -45,6 +46,8 @@ class CardContentActionTableViewCell: UITableViewCell {
         addSubview(collectButton)
         addSubview(praiseButton)
         addSubview(lineLabel)
+        collectButton.addSubview(collectAnimationView)
+        praiseButton.imageView?.addSubview(praiseAnimationView)
     }
     
     private func setupLayouts() {
@@ -70,11 +73,17 @@ class CardContentActionTableViewCell: UITableViewCell {
             make.right.equalTo(shareButton.snp_left).offset(-21)
             make.size.equalTo(22)
         }
+        collectAnimationView.snp.makeConstraints { (make) in
+            make.edges.equalToSuperview()
+        }
         praiseButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.right.equalTo(collectButton.snp_left).offset(-21)
         }
         praiseButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 7)
+        praiseAnimationView.snp.makeConstraints { (make) in
+            make.edges.equalToSuperview()
+        }
         lineLabel.snp.makeConstraints { (make) in
             make.bottom.equalToSuperview()
             make.left.equalTo(14)
@@ -129,6 +138,24 @@ class CardContentActionTableViewCell: UITableViewCell {
         collectButton.setImage(kImage(name: "btn_collect_pre"), for: .selected)
         collectButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
+            
+            if self?.communityRecommendDataModel != nil {
+                if self?.communityRecommendDataModel?.isCollect == 0 {
+                    self?.collectAnimationView.isHidden = false
+                    self?.collectAnimationView.play(completion: { (_) in
+                        self?.collectAnimationView.isHidden = true
+                    })
+                }
+            }
+            
+            if  self?.communityFollowDataModel != nil {
+                if self?.communityFollowDataModel?.relateData?.isCollect == 0 {
+                    self?.collectAnimationView.isHidden = false
+                    self?.collectAnimationView.play(completion: { (_) in
+                        self?.collectAnimationView.isHidden = true
+                    })
+                }
+            }
             if let collectClosureName = self?.collectClosureName {
                  collectClosureName(collectButton)
             }
@@ -136,6 +163,26 @@ class CardContentActionTableViewCell: UITableViewCell {
         return collectButton
     }()
     
+    private lazy var collectAnimationView: AnimationView = {
+        let collectAnimationView = AnimationView()
+        let animation = Animation.named("collect")
+        collectAnimationView.animation = animation
+        collectAnimationView.contentMode = .scaleAspectFit
+        collectAnimationView.loopMode = .playOnce
+        collectAnimationView.isHidden = true
+        return collectAnimationView
+    }()
+    
+    private lazy var praiseAnimationView: AnimationView = {
+        let praiseAnimationView = AnimationView()
+        let animation = Animation.named("verywell")
+        praiseAnimationView.animation = animation
+        praiseAnimationView.contentMode = .scaleAspectFit
+        praiseAnimationView.loopMode = .playOnce
+        praiseAnimationView.isHidden = true
+        return praiseAnimationView
+    }()
+    
     typealias PraiseClosureName = (UIButton) -> Void
     var praiseClosureName : PraiseClosureName?
     private lazy var praiseButton: UIButton = {
@@ -147,6 +194,25 @@ class CardContentActionTableViewCell: UITableViewCell {
         praiseButton.titleLabel?.font = kRegularFont12
         praiseButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
+            
+            if self?.communityRecommendDataModel != nil {
+                if self?.communityRecommendDataModel?.isLike == 0 {
+                    self?.praiseAnimationView.isHidden = false
+                    self?.praiseAnimationView.play(completion: { (_) in
+                        self?.praiseAnimationView.isHidden = true
+                    })
+                }
+            }
+            
+            if  self?.communityFollowDataModel != nil {
+                if self?.communityFollowDataModel?.relateData?.isLike == 0 {
+                    self?.praiseAnimationView.isHidden = false
+                    self?.praiseAnimationView.play(completion: { (_) in
+                        self?.praiseAnimationView.isHidden = true
+                    })
+                }
+            }
+            
             if let praiseClosureName = self?.praiseClosureName {
                praiseClosureName(praiseButton)
             }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/CommunityNavigationBarView.swift

@@ -9,6 +9,7 @@
 import UIKit
 import DPScrollNumberLabel
 import RxSwift
+import Lottie
 
 class CommunityNavigationBarView: BaseView {
     
@@ -33,6 +34,7 @@ class CommunityNavigationBarView: BaseView {
         searchBgView.addSubview(searchTextField)
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("userMemberGetTotalBean"), object: nil, queue: OperationQueue.main) {[weak self] (notification) in
             let totalBeanModel = notification.object as? TotalBeanModel
+            self?.rightButton.play()
             self?.scrollNumberLabel!.change(to: NSNumber(value: totalBeanModel?.todayBean ?? 0) , animated: true)
             
             self?.scrollNumberLabel!.snp_remakeConstraints { (make) in
@@ -57,7 +59,7 @@ class CommunityNavigationBarView: BaseView {
             make.centerY.equalToSuperview()
             make.right.equalTo(scrollNumberLabel!.snp_left).offset(-2)
             make.height.equalTo(20)
-            make.width.greaterThanOrEqualTo(20)
+            make.width.equalTo(20)
         }
         
         scrollNumberLabel!.snp_makeConstraints { (make) in
@@ -99,14 +101,35 @@ class CommunityNavigationBarView: BaseView {
         return leftButton
     }()
     
-    lazy var rightButton: UIButton = {
-        let rightButton = UIButton(type: UIButton.ButtonType.custom)
-        rightButton.setImage(kImage(name: "navbar_bean_org"), for: UIControl.State.normal)
-        rightButton.setTitleColor(kFFA42FColor, for: UIControl.State.normal)
-        rightButton.titleLabel?.font = kMediumFont16
+//    lazy var rightButton: UIButton = {
+//        let rightButton = UIButton(type: UIButton.ButtonType.custom)
+//        rightButton.setImage(kImage(name: "navbar_bean_org"), for: UIControl.State.normal)
+//        rightButton.setTitleColor(kFFA42FColor, for: UIControl.State.normal)
+//        rightButton.titleLabel?.font = kMediumFont16
+//        return rightButton
+//    }()
+    
+    lazy var rightButton: AnimationView = {
+        let rightButton = AnimationView()
+        let animation = Animation.named("Skittles")
+        rightButton.animation = animation
+        rightButton.contentMode = .scaleAspectFit
+        rightButton.loopMode = .playOnce
+        rightButton.addTapGesture(1, target: self, action: #selector(skittles))
         return rightButton
     }()
     
+    typealias RightButtonClosure = () -> Void
+    
+    var rightButtonClosure : RightButtonClosure?
+    
+    @objc func skittles() {
+        rightButton.play()
+        if let rightButtonClosure = rightButtonClosure {
+            rightButtonClosure()
+        }
+    }
+    
     private lazy var searchBgView: UIView = {
         let searchBgView = UIView()
         searchBgView.backgroundColor = kf7f8faColor

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift

@@ -85,12 +85,10 @@ class CommunityViewController: BaseViewController {
 
         }
         //彩虹豆
-        communityNavigationBarView.rightButton.rx.tap.subscribe(onNext: { (data) in
-            self.segmentedView.selectItemAt(index: 2)
-            self.segmentedView.defaultSelectedIndex = 2
-            self.listContainerView.defaultSelectedIndex = 2
-            self.segmentedDataSource.reloadData(selectedIndex: 2)
-        }).disposed(by: disposeBag)
+        communityNavigationBarView.rightButtonClosure = {
+            [weak self] in
+            self?.reloadSegmentedStarView()
+        }
         
         // 找朋友 查看全部推荐关注
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityFindFriends"), object: nil, queue: OperationQueue.main) { [weak self] (notification) in
@@ -333,6 +331,7 @@ class CommunityViewController: BaseViewController {
     /// navigationBar
     private lazy var communityNavigationBarView: CommunityNavigationBarView = {
         let communityNavigationBarView = CommunityNavigationBarView()
+        
         return communityNavigationBarView
     }()
 

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/RecommendBottomCommentView.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import RxSwift
+import Lottie
 
 enum BottomClickType {
     case typeComment
@@ -29,6 +30,8 @@ class RecommendBottomCommentView: BaseView {
         bgView.addSubview(likeBtn)
         bgView.addSubview(collectBtn)
         bgView.addSubview(commentBtn)
+        collectBtn.imageView?.addSubview(collectAnimationView)
+        likeBtn.imageView?.addSubview(praiseAnimationView)
     }
     
     override func setupLayouts() {
@@ -49,6 +52,9 @@ class RecommendBottomCommentView: BaseView {
             make.height.equalTo(37)
         }
         collectBtn.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 5)
+        collectAnimationView.snp.makeConstraints { (make) in
+            make.edges.equalToSuperview()
+        }
         
         likeBtn.snp.makeConstraints { (make) in
             make.right.equalTo(collectBtn.snp_left).offset(-15)
@@ -56,6 +62,9 @@ class RecommendBottomCommentView: BaseView {
             make.height.equalTo(37)
         }
         likeBtn.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 5)
+        praiseAnimationView.snp.makeConstraints { (make) in
+            make.edges.equalToSuperview()
+        }
         
         commentView.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
@@ -106,6 +115,26 @@ class RecommendBottomCommentView: BaseView {
         return textBtn
     }()
     
+    private lazy var collectAnimationView: AnimationView = {
+        let collectAnimationView = AnimationView()
+        let animation = Animation.named("collect")
+        collectAnimationView.animation = animation
+        collectAnimationView.contentMode = .scaleAspectFit
+        collectAnimationView.loopMode = .playOnce
+        collectAnimationView.isHidden = true
+        return collectAnimationView
+    }()
+    
+    private lazy var praiseAnimationView: AnimationView = {
+        let praiseAnimationView = AnimationView()
+        let animation = Animation.named("verywell")
+        praiseAnimationView.animation = animation
+        praiseAnimationView.contentMode = .scaleAspectFit
+        praiseAnimationView.loopMode = .playOnce
+        praiseAnimationView.isHidden = true
+        return praiseAnimationView
+    }()
+    
     private lazy var likeBtn: UIButton = {
         let likeBtn = UIButton(type: UIButton.ButtonType.custom)
         likeBtn.setTitleColor(k313334Color, for: UIControl.State.normal)
@@ -114,6 +143,12 @@ class RecommendBottomCommentView: BaseView {
         likeBtn.titleLabel?.font = kRegularFont14
         likeBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
             likeBtn.isSelected = !likeBtn.isSelected
+            if self?.communityPostDetailModel?.isLike == 0 {
+                self?.praiseAnimationView.isHidden = false
+                self?.praiseAnimationView.play(completion: { (_) in
+                    self?.praiseAnimationView.isHidden = true
+                })
+            }
             if let bottomClickClosure = self?.bottomClickClosure {
                 bottomClickClosure(BottomClickType.typeLike)
             }
@@ -129,6 +164,12 @@ class RecommendBottomCommentView: BaseView {
         collectBtn.titleLabel?.font = kRegularFont14
         collectBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
             collectBtn.isSelected = !collectBtn.isSelected
+            if self?.communityPostDetailModel?.isCollect == 0 {
+                self?.collectAnimationView.isHidden = false
+                self?.collectAnimationView.play(completion: { (_) in
+                    self?.collectAnimationView.isHidden = true
+                })
+            }
             if let bottomClickClosure = self?.bottomClickClosure {
                 bottomClickClosure(BottomClickType.typeCollect)
             }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoCoverCollectionCell.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import RxSwift
+import Lottie
 
 enum videoBtnClickType {
     case typeComment
@@ -95,6 +96,8 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
         bottomCommentView.addSubview(commentView)
         commentView.addSubview(commentLabel)
         commentView.addSubview(textBtn)
+        collectBtn.imageView?.addSubview(collectAnimationView)
+        likeBtn.imageView?.addSubview(praiseAnimationView)
         
         // 话题View
         addSubview(topicView)
@@ -176,6 +179,9 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
             make.height.equalTo(37)
         }
         collectBtn.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 5)
+        collectAnimationView.snp.makeConstraints { (make) in
+            make.edges.equalToSuperview()
+        }
         
         likeBtn.snp.makeConstraints { (make) in
             make.right.equalTo(collectBtn.snp_left).offset(-15)
@@ -183,6 +189,9 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
             make.height.equalTo(37)
         }
         likeBtn.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 5)
+        praiseAnimationView.snp.makeConstraints { (make) in
+            make.edges.equalToSuperview()
+        }
         
         commentView.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
@@ -469,6 +478,26 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
         return commentBtn
     }()
     
+    private lazy var collectAnimationView: AnimationView = {
+        let collectAnimationView = AnimationView()
+        let animation = Animation.named("collect")
+        collectAnimationView.animation = animation
+        collectAnimationView.contentMode = .scaleAspectFit
+        collectAnimationView.loopMode = .playOnce
+        collectAnimationView.isHidden = true
+        return collectAnimationView
+    }()
+    
+    private lazy var praiseAnimationView: AnimationView = {
+        let praiseAnimationView = AnimationView()
+        let animation = Animation.named("verywell")
+        praiseAnimationView.animation = animation
+        praiseAnimationView.contentMode = .scaleAspectFit
+        praiseAnimationView.loopMode = .playOnce
+        praiseAnimationView.isHidden = true
+        return praiseAnimationView
+    }()
+    
     private lazy var collectBtn: UIButton = {
         let collectBtn = UIButton(type: UIButton.ButtonType.custom)
         collectBtn.setTitleColor(kffffffColor, for: UIControl.State.normal)
@@ -482,6 +511,10 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
             if self?.videoItemMdl?.isCollect == 0 {
                 collectBtn.setTitle("\(collectCount)", for: .normal)
                 collectBtn.setTitle("\(collectCount+1)", for: .selected)
+                self?.collectAnimationView.isHidden = false
+                self?.collectAnimationView.play(completion: { (_) in
+                    self?.collectAnimationView.isHidden = true
+                })
             } else {
                 collectBtn.setTitle("\(collectCount)", for: .selected)
                 collectBtn.setTitle("\(collectCount-1)", for: .normal)
@@ -507,6 +540,10 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
             if self?.videoItemMdl?.isLike == 0 {
                 likeBtn.setTitle("\(praiseCount)", for: .normal)
                 likeBtn.setTitle("\(praiseCount+1)", for: .selected)
+                self?.praiseAnimationView.isHidden = false
+                self?.praiseAnimationView.play(completion: { (_) in
+                    self?.praiseAnimationView.isHidden = true
+                })
             } else {
                 likeBtn.setTitle("\(praiseCount)", for: .selected)
                 likeBtn.setTitle("\(praiseCount-1)", for: .normal)

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/UserPersonalCenter/View/UserPersonalCenterHeaderView/UserPersonalCenterHeaderView.swift

@@ -14,7 +14,7 @@ class UserPersonalCenterHeaderView: BaseView {
         self.backgroundColor = kffffffColor
         addSubview(personViewUserAndOtherHeaderView)
         addSubview(rainbowBeanPhysicalView)
-        addSubview(userPersonalCenterOrderView)
+//        addSubview(userPersonalCenterOrderView)
     }
     
     override func setupLayouts() {
@@ -27,12 +27,12 @@ class UserPersonalCenterHeaderView: BaseView {
             make.left.right.equalToSuperview()
             make.height.equalTo(109)
         }
-        userPersonalCenterOrderView.snp.makeConstraints { (make) in
-            make.top.equalTo(rainbowBeanPhysicalView.snp_bottom)
-            make.left.equalTo(14)
-            make.right.equalTo(-14)
-            make.height.equalTo(90)
-        }
+//        userPersonalCenterOrderView.snp.makeConstraints { (make) in
+//            make.top.equalTo(rainbowBeanPhysicalView.snp_bottom)
+//            make.left.equalTo(14)
+//            make.right.equalTo(-14)
+//            make.height.equalTo(90)
+//        }
         
     }
     
@@ -47,10 +47,10 @@ class UserPersonalCenterHeaderView: BaseView {
         return rainbowBeanPhysicalView
     }()
     
-    private lazy var userPersonalCenterOrderView: UserPersonalCenterOrderView = {
-        let userPersonalCenterOrderView = UserPersonalCenterOrderView()
-        return userPersonalCenterOrderView
-    }()
+//    private lazy var userPersonalCenterOrderView: UserPersonalCenterOrderView = {
+//        let userPersonalCenterOrderView = UserPersonalCenterOrderView()
+//        return userPersonalCenterOrderView
+//    }()
     
     var userDetailModel: UserDetailModel? {
         didSet {

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/UserPersonalCenter/ViewController/UserPersonalCenterViewController.swift

@@ -21,7 +21,7 @@ class UserPersonalCenterViewController: BaseViewController {
     }
     weak var observe : NSObjectProtocol?
     
-    let JXTableHeaderViewHeight: Int = Int(140 + kNavBarTotalHeight + 109 + 104)
+    let JXTableHeaderViewHeight: Int = Int(140 + kNavBarTotalHeight + 109)
     let JXheightForHeaderInSection: Int = 44
     var cmsTemplateTitles = ["发布 0", "收藏 0", "分享 0"]
     var userPersonalCenterVCType : Int = 0