diff --git a/SwiftProject/SwiftProject.xcodeproj/project.pbxproj b/SwiftProject/SwiftProject.xcodeproj/project.pbxproj index 840a84e..64ed6a6 100644 --- a/SwiftProject/SwiftProject.xcodeproj/project.pbxproj +++ b/SwiftProject/SwiftProject.xcodeproj/project.pbxproj @@ -984,7 +984,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.3; + CURRENT_PROJECT_VERSION = 1.4; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 8DQD6BV6H9; ENABLE_APP_SANDBOX = NO; @@ -1037,7 +1037,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.3; + CURRENT_PROJECT_VERSION = 1.4; DEVELOPMENT_TEAM = 8DQD6BV6H9; ENABLE_APP_SANDBOX = NO; GCC_PREPROCESSOR_DEFINITIONS = ( diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index d35a322..4017108 100644 Binary files a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVCConfigureView.swift b/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVCConfigureView.swift index 58f5177..544a70a 100644 --- a/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVCConfigureView.swift +++ b/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVCConfigureView.swift @@ -11,6 +11,8 @@ extension MembershipVC { func configureUI() { + + self.view.backgroundColor = .black self.navLine?.isHidden = true self.setLeftOneBtnImg(imgStr: "membership_close") @@ -35,11 +37,23 @@ extension MembershipVC { self.view.addSubview(mTopImgView) + let scrollView = UIScrollView() + self.view.addSubview(scrollView) + scrollView.snp.makeConstraints { make in + make.left.right.bottom.equalTo(0) + make.top.equalToSuperview().offset(100) + } + scrollView.contentSize = CGSize(width: KScreenWidth, height: KScreenHeight+100) + scrollView.showsVerticalScrollIndicator = false + + let bgView = UIView(frame: CGRectMake(0, 0, KScreenWidth, KScreenHeight)) + scrollView.addSubview(bgView) + let topView = self.topView() - self.view.addSubview(topView) + bgView.addSubview(topView) topView.snp.makeConstraints { make in make.left.right.equalTo(0) - make.top.equalToSuperview().offset(120) + make.top.equalToSuperview().offset(0) make.height.equalTo(254) } @@ -49,7 +63,7 @@ extension MembershipVC { var acView = topView if UserInfo.sharedInstance.isMemberShip == false { let centerView = self.centerView() - self.view.addSubview(centerView) + bgView.addSubview(centerView) centerView.snp.makeConstraints { make in make.left.equalToSuperview().offset(20) make.right.equalToSuperview().offset(-20) @@ -58,16 +72,22 @@ extension MembershipVC { } acView = centerView } + else { + scrollView.contentSize = CGSize(width: KScreenWidth, height: KScreenHeight - 168) + } let bottomView = self.bottomView() - self.view .addSubview(bottomView) + bgView.addSubview(bottomView) bottomView.snp.makeConstraints { make in make.left.equalToSuperview().offset(20) make.right.equalToSuperview().offset(-20) make.top.equalTo(acView.snp.bottom).offset(20) make.bottom.equalToSuperview() } + +// scrollView.contentOffset = CGPoint(x: 0, y: 0) +// scrollView.scrollRectToVisible(CGRect(x: 0, y: 0, width: KScreenWidth, height: scrollView.frame.size.height), animated: false) }