Skip to content

G
GeliBusinessPlatform
Commit 6b7b45a4 authored by lujunye's avatar lujunye
Browse files
Options

账号信息，修改密码，放大显示密码按钮触控范围

parent 25f3b71d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 247 additions and 15 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 6b7b45a4
......@@ -38,6 +38,10 @@
E09B03C32445BD9500211A51 /* NavViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E09B03C22445BD9500211A51 /* NavViewController.swift */; };
E09B03C62445BF6700211A51 /* NavBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E09B03C52445BF6700211A51 /* NavBarView.swift */; };
E09B03C82445BF9300211A51 /* SwiftNotice.swift in Sources */ = {isa = PBXBuildFile; fileRef = E09B03C72445BF9300211A51 /* SwiftNotice.swift */; };
E0D4165F24482AAF008DCAB4 /* AccountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0D4165D24482AAF008DCAB4 /* AccountViewController.swift */; };
E0D4166024482AAF008DCAB4 /* AccountViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0D4165E24482AAF008DCAB4 /* AccountViewController.xib */; };
E0D4166424483058008DCAB4 /* ChangePassViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0D4166224483058008DCAB4 /* ChangePassViewController.swift */; };
E0D4166524483058008DCAB4 /* ChangePassViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0D4166324483058008DCAB4 /* ChangePassViewController.xib */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
......@@ -98,6 +102,10 @@
E09B03C22445BD9500211A51 /* NavViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavViewController.swift; sourceTree = "<group>"; };
E09B03C52445BF6700211A51 /* NavBarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavBarView.swift; sourceTree = "<group>"; };
E09B03C72445BF9300211A51 /* SwiftNotice.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftNotice.swift; sourceTree = "<group>"; };
E0D4165D24482AAF008DCAB4 /* AccountViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountViewController.swift; sourceTree = "<group>"; };
E0D4165E24482AAF008DCAB4 /* AccountViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AccountViewController.xib; sourceTree = "<group>"; };
E0D4166224483058008DCAB4 /* ChangePassViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangePassViewController.swift; sourceTree = "<group>"; };
E0D4166324483058008DCAB4 /* ChangePassViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ChangePassViewController.xib; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -313,6 +321,8 @@
E09B03AD2445B0BA00211A51 /* ViewController */ = {
isa = PBXGroup;
children = (
E0D4166124483045008DCAB4 /* 修改密码 */,
E0D4165C24482A7D008DCAB4 /* 账号信息 */,
E0516F792448066300E373CE /* 消息中心 */,
E0516F742448000F00E373CE /* 支付账号（设置，修改） */,
E088CC8E24470F84000DAA8A /* 换绑支付账号（绑定，换绑） */,
......@@ -356,6 +366,24 @@
path = NavBarView;
sourceTree = "<group>";
};
E0D4165C24482A7D008DCAB4 /* 账号信息 */ = {
isa = PBXGroup;
children = (
E0D4165D24482AAF008DCAB4 /* AccountViewController.swift */,
E0D4165E24482AAF008DCAB4 /* AccountViewController.xib */,
);
path = "账号信息";
sourceTree = "<group>";
};
E0D4166124483045008DCAB4 /* 修改密码 */ = {
isa = PBXGroup;
children = (
E0D4166224483058008DCAB4 /* ChangePassViewController.swift */,
E0D4166324483058008DCAB4 /* ChangePassViewController.xib */,
);
path = "修改密码";
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
......@@ -469,7 +497,9 @@
E0516F782448003D00E373CE /* PayViewController.xib in Resources */,
E088CC942447124D000DAA8A /* BindViewController.xib in Resources */,
E00D85EB244561FE00F5F816 /* LaunchScreen.storyboard in Resources */,
E0D4166024482AAF008DCAB4 /* AccountViewController.xib in Resources */,
E01C26B12446989700ADCC70 /* Interface_Z.plist in Resources */,
E0D4166524483058008DCAB4 /* ChangePassViewController.xib in Resources */,
E00D85E8244561FE00F5F816 /* Preview Assets.xcassets in Resources */,
E00D85E5244561FE00F5F816 /* Assets.xcassets in Resources */,
);
......@@ -543,6 +573,7 @@
E00D85DF244561FD00F5F816 /* AppDelegate.swift in Sources */,
E0516F7F244806C500E373CE /* MsgCenterViewController.swift in Sources */,
E0516F822448086700E373CE /* MsgCenterCell.swift in Sources */,
E0D4166424483058008DCAB4 /* ChangePassViewController.swift in Sources */,
E09B03C62445BF6700211A51 /* NavBarView.swift in Sources */,
E00D85E1244561FD00F5F816 /* SceneDelegate.swift in Sources */,
E09B03A12445AF7100211A51 /* Define.swift in Sources */,
......@@ -550,6 +581,7 @@
E09B03C02445B96500211A51 /* FgPassViewController.swift in Sources */,
E09B03AB2445B0A300211A51 /* LoginModel.swift in Sources */,
E09B03C82445BF9300211A51 /* SwiftNotice.swift in Sources */,
E0D4165F24482AAF008DCAB4 /* AccountViewController.swift in Sources */,
E01C26B62446AF3100ADCC70 /* DemoViewController.swift in Sources */,
E0516F772448003D00E373CE /* PayViewController.swift in Sources */,
E09B03A32445AF9500211A51 /* NetworkRequest.swift in Sources */,
......
GeliBusinessPlatform/Assets.xcassets/登录界面图/信息中心/Contents.json 0 → 100644
View file @ 6b7b45a4
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/Assets.xcassets/登录界面图/信息中心/jinru.imageset/Contents.json 0 → 100644
View file @ 6b7b45a4
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "jinru@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "jinru@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/Assets.xcassets/登录界面图/信息中心/msgBanner.imageset/Contents.json 0 → 100644
View file @ 6b7b45a4
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "banner@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "banner@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/Assets.xcassets/登录界面图/信息中心/xiaoxi.imageset/Contents.json 0 → 100644
View file @ 6b7b45a4
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "xiaoxi@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "xiaoxi@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/ViewController/修改密码/ChangePassViewController.swift 0 → 100644
View file @ 6b7b45a4
//
// ChangePassViewController.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/4/16.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
import LGButton
class ChangePassViewController: BaseViewController,NavBarViewDelegate {
@IBOutlet weak var newPBtn: UIButton!
@IBOutlet weak var oldPBtn: UIButton!
@IBOutlet weak var newPassTF: UITextField!
@IBOutlet weak var oldPassTF: UITextField!
@IBOutlet weak var fisrtView: UIView!
@IBOutlet weak var submitBtn: LGButton!
//MARK: -方法
@IBAction func newPassAction(_ sender: UIButton) {
newPBtn.isSelected = !newPBtn.isSelected
newPassTF.isSecureTextEntry = !newPBtn.isSelected
}
@IBAction func oldPassAction(_ sender: UIButton) {
oldPBtn.isSelected = !oldPBtn.isSelected
oldPassTF.isSecureTextEntry = !oldPBtn.isSelected
}
@IBAction func submitAction(_ sender: Any) {
}
override func viewDidLoad() {
super.viewDidLoad()
let navbar = NavBarView(frame: NavCGRect)
navbar.title = "账号信息"
navbar.deleagte = self
self.view.addSubview(navbar)
newPassTF.isSecureTextEntry = true
oldPassTF.isSecureTextEntry = true
newPassTF.addTarget(self, action: #selector(tfChange(sender:)), for: .editingChanged)
oldPassTF.addTarget(self, action: #selector(tfChange(sender:)), for: .editingChanged)
// Do any additional setup after loading the view.
fisrtView.snp.makeConstraints({ (make) in
make.top.equalTo(NavCGRect.height)
make.left.right.equalTo(0)
make.height.equalTo(50)
})
// Do any additional setup after loading the view.
}
@objc func tfChange(sender:UITextField){
if oldPassTF.text!.count > 0 && newPassTF.text!.count > 0 {
submitBtn.alpha = 1
}else{
submitBtn.alpha = 0.45
}
}
//MARK: -delegate方法
func backAction() {
self.navigationController?.popViewController(animated: true)
}
}
GeliBusinessPlatform/ViewController/消息中心/MsgCenterViewController.swift
View file @ 6b7b45a4
......@@ -23,6 +23,7 @@ class MsgCenterViewController: BaseViewController,NavBarViewDelegate,UITableView
navbar.title = "消息中心"
navbar.deleagte = self
self.view.addSubview(navbar)
// Do any additional setup after loading the view.
msgTbv = UITableView()
msgTbv?.backgroundColor = UIColor(named: "app底色")
......
GeliBusinessPlatform/ViewController/登录/LoginViewController.swift
View file @ 6b7b45a4
......@@ -21,13 +21,13 @@ self.navigationController?.pushViewController(vc, animated: true)
}
@IBAction func shPassAction(_ sender: UIButton) {
sender.isSelected = !sender.isSelected
passTF.isSecureTextEntry = !sender.isSelected
shBtn.isSelected = !shBtn.isSelected
passTF.isSecureTextEntry = !shBtn.isSelected
}
@IBAction func loginAction(_ sender: Any) {
print("loginAction")
let vc = MsgCenterViewController()
let vc = ChangePassViewController()
self.navigationController?.pushViewController(vc, animated: true)
}
//MARK: - 输入账号、密码、验证码
......@@ -37,6 +37,7 @@ self.navigationController?.pushViewController(vc, animated: true)
@IBOutlet weak var codeTF: UITextField!
@IBOutlet weak var bannerImg: UIImageView!
@IBOutlet weak var topImg: UIImageView!
@IBOutlet weak var shBtn: UIButton!
//MARK: - viewWillAppear
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
......@@ -61,16 +62,4 @@ self.navigationController?.pushViewController(vc, animated: true)
}
}
/*
// MARK: - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destination.
// Pass the selected object to the new view controller.
}
*/
}
GeliBusinessPlatform/ViewController/登录/LoginViewController.xib
View file @ 6b7b45a4
......@@ -15,6 +15,7 @@
<outlet property="codeView" destination="dgy-iq-Edz" id="6HM-ez-mXt"/>
<outlet property="passTF" destination="ipW-Al-eG6" id="P2q-AH-6SO"/>
<outlet property="phoneTF" destination="xEL-ml-rz8" id="wzo-Rz-RWS"/>
<outlet property="shBtn" destination="xgv-CB-GLZ" id="3XV-lQ-3ja"/>
<outlet property="topImg" destination="5Z0-Os-dI3" id="FoU-Ay-ylS"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
......@@ -141,6 +142,16 @@
<action selector="shPassAction:" destination="-1" eventType="touchUpInside" id="S3P-pI-hyJ"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="49B-fO-IDj">
<rect key="frame" x="291" y="5" width="46" height="46"/>
<constraints>
<constraint firstAttribute="height" constant="46" id="4ox-Gd-KdC"/>
<constraint firstAttribute="width" constant="46" id="wMa-BI-uDu"/>
</constraints>
<connections>
<action selector="shPassAction:" destination="-1" eventType="touchUpInside" id="a1q-uC-b3Y"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
......@@ -155,9 +166,11 @@
<constraint firstItem="xgv-CB-GLZ" firstAttribute="leading" secondItem="ipW-Al-eG6" secondAttribute="trailing" constant="15" id="W8f-1r-MAj"/>
<constraint firstAttribute="trailing" secondItem="xgv-CB-GLZ" secondAttribute="trailing" constant="52.5" id="crQ-SX-Q2S"/>
<constraint firstItem="Mlw-Ng-8f9" firstAttribute="top" secondItem="hAO-bO-280" secondAttribute="bottom" id="qTb-8R-WjZ"/>
<constraint firstItem="49B-fO-IDj" firstAttribute="centerY" secondItem="xgv-CB-GLZ" secondAttribute="centerY" id="rbj-OE-Nwl"/>
<constraint firstItem="hAO-bO-280" firstAttribute="leading" secondItem="OaN-ws-ype" secondAttribute="leading" constant="52.5" id="uHI-YO-GLX"/>
<constraint firstItem="Mlw-Ng-8f9" firstAttribute="leading" secondItem="OaN-ws-ype" secondAttribute="leading" constant="42.5" id="vaj-M3-2ae"/>
<constraint firstItem="xgv-CB-GLZ" firstAttribute="centerY" secondItem="hAO-bO-280" secondAttribute="centerY" id="xYu-7C-4aY"/>
<constraint firstItem="49B-fO-IDj" firstAttribute="centerX" secondItem="xgv-CB-GLZ" secondAttribute="centerX" id="ymi-Tz-Knr"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZRL-RS-ju7">
......
GeliBusinessPlatform/ViewController/账号信息/AccountViewController.swift 0 → 100644
View file @ 6b7b45a4
//
// AccountViewController.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/4/16.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class AccountViewController: BaseViewController,NavBarViewDelegate{
@IBOutlet weak var phoneLbl: UILabel!
@IBOutlet weak var accountLbl: UILabel!
@IBOutlet weak var nameLbl: UILabel!
@IBOutlet weak var firstView: UIView!
//MARK: -方法
@IBAction func gotoDetailAction(_ sender: Any) {
print("进入商家详情")
}
@IBAction func changPassAction(_ sender: Any) {
print("修改密码")
}
@IBAction func logOutAction(_ sender: Any) {
print("退出登录")
}
override func viewDidLoad() {
super.viewDidLoad()
let navbar = NavBarView(frame: NavCGRect)
navbar.title = "账号信息"
navbar.deleagte = self
self.view.addSubview(navbar)
// Do any additional setup after loading the view.
firstView?.snp.makeConstraints({ (make) in
make.top.equalTo(NavCGRect.height)
make.left.right.equalTo(0)
make.height.equalTo(50)
})
}
//MARK: -delegate方法
func backAction() {
self.navigationController?.popViewController(animated: true)
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment