Commit ef2a915b authored by 曹云霄's avatar 曹云霄

caoyunxiao

parent b3ed99d7
...@@ -10,4 +10,36 @@ ...@@ -10,4 +10,36 @@
@interface LoginViewController : BaseViewController @interface LoginViewController : BaseViewController
/**
* 账号登陆背景View
*/
@property (weak, nonatomic) IBOutlet UIView *userNameLoginView;
/**
* 账户名
*/
@property (weak, nonatomic) IBOutlet UITextField *userName;
/**
* 密码
*/
@property (weak, nonatomic) IBOutlet UITextField *passWord;
/**
* 忘记密码
*/
@property (weak, nonatomic) IBOutlet UIButton *forgotPasswordButton;
/**
* 登陆按钮
*/
@property (weak, nonatomic) IBOutlet UIButton *loginButton;
@end @end
...@@ -9,15 +9,24 @@ ...@@ -9,15 +9,24 @@
#import "LoginViewController.h" #import "LoginViewController.h"
#import "CustomTabbarController.h" #import "CustomTabbarController.h"
#import "AppDelegate.h" #import "AppDelegate.h"
#import "authenticateView.h"
@interface LoginViewController ()<RightVCselectedDelegate> @interface LoginViewController ()<RightVCselectedDelegate>
@property (weak, nonatomic) IBOutlet UIButton *loginButton;
@property (nonatomic,strong) MMDrawerController *drawerController; @property (nonatomic,strong) MMDrawerController *drawerController;
@property (nonatomic,strong) CustomTabbarController *customtabbar; @property (nonatomic,strong) CustomTabbarController *customtabbar;
/**
* 验证身份View
*/
@property (nonatomic,strong) authenticateView *identityView;
/**
* 重置密码View
*/
@property (nonatomic,strong) authenticateView *resetPasswordView;
@end @end
...@@ -88,6 +97,86 @@ ...@@ -88,6 +97,86 @@
#pragma mark -忘记密码
- (IBAction)ForgotpasswordButtonClick:(UIButton *)sender {
self.identityView = [[[NSBundle mainBundle] loadNibNamed:@"authenticateView" owner:self options:nil]firstObject];
[self.identityView.backLoginButton addTarget:self action:@selector(BackloginButtonClick) forControlEvents:UIControlEventTouchUpInside];
[self.identityView.nextButton addTarget:self action:@selector(NextButtonClick) forControlEvents:UIControlEventTouchUpInside];
self.identityView.alpha = 0;
self.identityView.frame = self.userNameLoginView.frame;
[self.view addSubview:self.identityView];
[UIView animateWithDuration:0.2 animations:^{
self.identityView.alpha = 1;
}];
}
#pragma mark -返回登陆界面
- (void)BackloginButtonClick
{
[UIView animateWithDuration:0.2 animations:^{
self.identityView.alpha = 0;
}completion:^(BOOL finished) {
[self.identityView removeFromSuperview];
}];
}
#pragma mark -下一步(重置密码界面)
- (void)NextButtonClick
{
self.resetPasswordView = [[[NSBundle mainBundle] loadNibNamed:@"authenticateView" owner:self options:nil]lastObject];
self.resetPasswordView.frame = self.userNameLoginView.frame;
[self.resetPasswordView.backValidationView addTarget:self action:@selector(backButonClick) forControlEvents:UIControlEventTouchUpInside];
[self.view addSubview:self.resetPasswordView];
self.resetPasswordView.alpha = 0;
[UIView animateWithDuration:0.2 animations:^{
self.resetPasswordView.alpha = 1;
}];
}
#pragma mark -返回验证信息界面
- (void)backButonClick
{
[UIView animateWithDuration:0.2 animations:^{
self.resetPasswordView.alpha = 0;
} completion:^(BOOL finished) {
[self.resetPasswordView removeFromSuperview];
}];
}
- (void)didReceiveMemoryWarning { - (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated. // Dispose of any resources that can be recreated.
......
//
// authenticateView.h
// Lighting
//
// Created by 曹云霄 on 16/5/7.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface authenticateView : UIView
/*************************验证身份************************************/
/**
* 返回账户登录
*/
@property (weak, nonatomic) IBOutlet UIButton *backLoginButton;
/**
* 账户名
*/
@property (weak, nonatomic) IBOutlet UITextField *userName;
/**
* 绑定的手机号
*/
@property (weak, nonatomic) IBOutlet UITextField *bindingPhoneNumber;
/**
* 发送验证码按钮
*/
@property (weak, nonatomic) IBOutlet UIButton *SendButton;
/**
* 验证码输入
*/
@property (weak, nonatomic) IBOutlet UITextField *verificationCode;
/**
* 下一步按钮
*/
@property (weak, nonatomic) IBOutlet UIButton *nextButton;
/*************************重置密码
******************************************/
/**
* 返回验证身份界面
*/
@property (weak, nonatomic) IBOutlet UIButton *backValidationView;
/**
* 新密码
*/
@property (weak, nonatomic) IBOutlet UITextField *newpass;
/**
* 确认新密码
*/
@property (weak, nonatomic) IBOutlet UITextField *confirmNewpass;
@end
//
// authenticateView.m
// Lighting
//
// Created by 曹云霄 on 16/5/7.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "authenticateView.h"
@implementation authenticateView
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
@end
This diff is collapsed.
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
} }
#pragma mark - UI #pragma mark - UI
- (void)uiConfigAction - (void)uiConfigAction
{ {
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
2928F8421CD0ABAC0036D761 /* ShoppingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8411CD0ABAC0036D761 /* ShoppingViewController.m */; }; 2928F8421CD0ABAC0036D761 /* ShoppingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8411CD0ABAC0036D761 /* ShoppingViewController.m */; };
2933934F1CD3158B000D997B /* instructionsLabe.m in Sources */ = {isa = PBXBuildFile; fileRef = 2933934E1CD3158B000D997B /* instructionsLabe.m */; }; 2933934F1CD3158B000D997B /* instructionsLabe.m in Sources */ = {isa = PBXBuildFile; fileRef = 2933934E1CD3158B000D997B /* instructionsLabe.m */; };
293393551CD3379E000D997B /* ShoppingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 293393541CD3379E000D997B /* ShoppingTableViewCell.m */; }; 293393551CD3379E000D997B /* ShoppingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 293393541CD3379E000D997B /* ShoppingTableViewCell.m */; };
2942F8A61CDD80C2005B377E /* authenticateView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2942F8A51CDD80C2005B377E /* authenticateView.m */; };
2942F8A81CDD80CE005B377E /* authenticateView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2942F8A71CDD80CE005B377E /* authenticateView.xib */; };
2949BABD1CD2EFA00049385A /* InformationTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2949BABC1CD2EFA00049385A /* InformationTableViewCell.m */; }; 2949BABD1CD2EFA00049385A /* InformationTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2949BABC1CD2EFA00049385A /* InformationTableViewCell.m */; };
2949BAC21CD3055A0049385A /* MMExampleDrawerVisualStateManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2949BAC11CD3055A0049385A /* MMExampleDrawerVisualStateManager.m */; }; 2949BAC21CD3055A0049385A /* MMExampleDrawerVisualStateManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2949BAC11CD3055A0049385A /* MMExampleDrawerVisualStateManager.m */; };
2949BAC41CD3086F0049385A /* weibo.png in Resources */ = {isa = PBXBuildFile; fileRef = 2949BAC31CD3086F0049385A /* weibo.png */; }; 2949BAC41CD3086F0049385A /* weibo.png in Resources */ = {isa = PBXBuildFile; fileRef = 2949BAC31CD3086F0049385A /* weibo.png */; };
...@@ -94,6 +96,9 @@ ...@@ -94,6 +96,9 @@
2933934E1CD3158B000D997B /* instructionsLabe.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = instructionsLabe.m; sourceTree = "<group>"; }; 2933934E1CD3158B000D997B /* instructionsLabe.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = instructionsLabe.m; sourceTree = "<group>"; };
293393531CD3379E000D997B /* ShoppingTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShoppingTableViewCell.h; sourceTree = "<group>"; }; 293393531CD3379E000D997B /* ShoppingTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShoppingTableViewCell.h; sourceTree = "<group>"; };
293393541CD3379E000D997B /* ShoppingTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShoppingTableViewCell.m; sourceTree = "<group>"; }; 293393541CD3379E000D997B /* ShoppingTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShoppingTableViewCell.m; sourceTree = "<group>"; };
2942F8A41CDD80C2005B377E /* authenticateView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = authenticateView.h; sourceTree = "<group>"; };
2942F8A51CDD80C2005B377E /* authenticateView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = authenticateView.m; sourceTree = "<group>"; };
2942F8A71CDD80CE005B377E /* authenticateView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = authenticateView.xib; sourceTree = "<group>"; };
2949BABB1CD2EFA00049385A /* InformationTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InformationTableViewCell.h; sourceTree = "<group>"; }; 2949BABB1CD2EFA00049385A /* InformationTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InformationTableViewCell.h; sourceTree = "<group>"; };
2949BABC1CD2EFA00049385A /* InformationTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InformationTableViewCell.m; sourceTree = "<group>"; }; 2949BABC1CD2EFA00049385A /* InformationTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InformationTableViewCell.m; sourceTree = "<group>"; };
2949BAC01CD3055A0049385A /* MMExampleDrawerVisualStateManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMExampleDrawerVisualStateManager.h; sourceTree = "<group>"; }; 2949BAC01CD3055A0049385A /* MMExampleDrawerVisualStateManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMExampleDrawerVisualStateManager.h; sourceTree = "<group>"; };
...@@ -236,8 +241,8 @@ ...@@ -236,8 +241,8 @@
0447085B1CD7C06B00555827 /* Login */ = { 0447085B1CD7C06B00555827 /* Login */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
0447085C1CD7C06B00555827 /* LoginViewController.h */, 2942F8A31CDD7EDB005B377E /* view */,
0447085D1CD7C06B00555827 /* LoginViewController.m */, 2942F8A21CDD7ECD005B377E /* controller */,
); );
path = Login; path = Login;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -376,6 +381,25 @@ ...@@ -376,6 +381,25 @@
name = view; name = view;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
2942F8A21CDD7ECD005B377E /* controller */ = {
isa = PBXGroup;
children = (
0447085C1CD7C06B00555827 /* LoginViewController.h */,
0447085D1CD7C06B00555827 /* LoginViewController.m */,
);
name = controller;
sourceTree = "<group>";
};
2942F8A31CDD7EDB005B377E /* view */ = {
isa = PBXGroup;
children = (
2942F8A41CDD80C2005B377E /* authenticateView.h */,
2942F8A51CDD80C2005B377E /* authenticateView.m */,
2942F8A71CDD80CE005B377E /* authenticateView.xib */,
);
name = view;
sourceTree = "<group>";
};
2949BABA1CD2EF800049385A /* view */ = { 2949BABA1CD2EF800049385A /* view */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -798,6 +822,7 @@ ...@@ -798,6 +822,7 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
29A938271CDAE31B00F21E54 /* ProductDetailsHeaderView.xib in Resources */, 29A938271CDAE31B00F21E54 /* ProductDetailsHeaderView.xib in Resources */,
2942F8A81CDD80CE005B377E /* authenticateView.xib in Resources */,
29807C651CD20F0F00F111B8 /* StoryboardwithCYX.storyboard in Resources */, 29807C651CD20F0F00F111B8 /* StoryboardwithCYX.storyboard in Resources */,
29EAAE901CDC3E9700C4DBA2 /* BillingInfoView.xib in Resources */, 29EAAE901CDC3E9700C4DBA2 /* BillingInfoView.xib in Resources */,
29706DB71CD082990003C412 /* LaunchScreen.storyboard in Resources */, 29706DB71CD082990003C412 /* LaunchScreen.storyboard in Resources */,
...@@ -884,6 +909,7 @@ ...@@ -884,6 +909,7 @@
2962D0791CD1CBC60058829D /* NetworkRequestClassManager.m in Sources */, 2962D0791CD1CBC60058829D /* NetworkRequestClassManager.m in Sources */,
29EAAEA01CDC79DC00C4DBA2 /* CustomerOrderViewController.m in Sources */, 29EAAEA01CDC79DC00C4DBA2 /* CustomerOrderViewController.m in Sources */,
2928F8321CD09E320036D761 /* Toolview.m in Sources */, 2928F8321CD09E320036D761 /* Toolview.m in Sources */,
2942F8A61CDD80C2005B377E /* authenticateView.m in Sources */,
29BB27681CD9D38E009A0813 /* AllpriceTableViewCell.m in Sources */, 29BB27681CD9D38E009A0813 /* AllpriceTableViewCell.m in Sources */,
29BB27771CD9DFBA009A0813 /* ProductLibraryViewController.m in Sources */, 29BB27771CD9DFBA009A0813 /* ProductLibraryViewController.m in Sources */,
29EAAEAA1CDC7FE800C4DBA2 /* AllCutomerTableViewCell.m in Sources */, 29EAAEAA1CDC7FE800C4DBA2 /* AllCutomerTableViewCell.m in Sources */,
......
{
"images" : [
{
"idiom" : "universal",
"filename" : "登录.jpg",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
platform:ios,'9.0' platform:ios,'9.0'
pod 'MBProgressHUD', '~> 0.9.2’ pod 'MBProgressHUD', '~> 0.9.2’
pod 'SVProgressHUD', '~> 2.0.3' pod 'SVProgressHUD', '~> 2.0.3'
pod 'IQKeyboardManager', '~> 4.0.0' pod 'IQKeyboardManager', '~> 4.0.0'
......
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