Skip to content

万
万科
Commit dcf6e089 authored by Sandy's avatar Sandy
Browse files
Options

销售录入 历史纪录页面搭建

parent 886b84be
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 324 additions and 11 deletions
Podfile
View file @ dcf6e089
source 'https://github.com/CocoaPods/Specs.git'
# platform :ios, '6.1'
platform :ios, '7.0'
platform :ios, '8.0'
xcodeproj 'vanke.xcodeproj'
pod 'AFNetworking', '~> 2.3.1'
......@@ -19,7 +19,7 @@ pod 'MBProgressHUD', '~> 0.9.1'
pod 'SDWebImage', '~> 3.7.1'
#pod 'MBProgressHUD', '~> 0.8'
#pod 'SSKeychain', '~> 1.2'
pod 'IQKeyboardManager', '~> 4.0.0'
#pod 'IQKeyboardManager', '~> 3.2.3'
#pod 'Reachability'
#pod 'jastor', '~> 0.2.1' #lib. for jaskon object mapping
......
vanke.xcodeproj/project.pbxproj
View file @ dcf6e089
......@@ -12,6 +12,9 @@
1928FD041CC487A10077BE34 /* SalesInputTopView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1928FD011CC487A10077BE34 /* SalesInputTopView.xib */; };
1928FD081CC4ABD80077BE34 /* SalesInputTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1928FD061CC4ABD80077BE34 /* SalesInputTableViewCell.m */; };
1928FD091CC4ABD80077BE34 /* SalesInputTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1928FD071CC4ABD80077BE34 /* SalesInputTableViewCell.xib */; };
1928FD0C1CC4C59E0077BE34 /* HistoryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1928FD0B1CC4C59E0077BE34 /* HistoryViewController.m */; };
1928FD0F1CC4C8130077BE34 /* HistoryTopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1928FD0E1CC4C8130077BE34 /* HistoryTopView.m */; };
1928FD111CC4C8320077BE34 /* HistoryTopView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1928FD101CC4C8320077BE34 /* HistoryTopView.xib */; };
A0D453625552DAC91D4EB4A7 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C5987243B74E897E93DEC7D3 /* libPods.a */; };
C10F161B1BF77CA00065F18C /* ICRAboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C10F16121BF77CA00065F18C /* ICRAboutViewController.m */; };
C10F161C1BF77CA00065F18C /* ICRConfigurationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C10F16141BF77CA00065F18C /* ICRConfigurationViewController.m */; };
......@@ -719,6 +722,11 @@
1928FD051CC4ABD80077BE34 /* SalesInputTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SalesInputTableViewCell.h; sourceTree = "<group>"; };
1928FD061CC4ABD80077BE34 /* SalesInputTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SalesInputTableViewCell.m; sourceTree = "<group>"; };
1928FD071CC4ABD80077BE34 /* SalesInputTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SalesInputTableViewCell.xib; sourceTree = "<group>"; };
1928FD0A1CC4C59E0077BE34 /* HistoryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryViewController.h; sourceTree = "<group>"; };
1928FD0B1CC4C59E0077BE34 /* HistoryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryViewController.m; sourceTree = "<group>"; };
1928FD0D1CC4C8130077BE34 /* HistoryTopView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryTopView.h; sourceTree = "<group>"; };
1928FD0E1CC4C8130077BE34 /* HistoryTopView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryTopView.m; sourceTree = "<group>"; };
1928FD101CC4C8320077BE34 /* HistoryTopView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HistoryTopView.xib; sourceTree = "<group>"; };
710E0C5D8A5E02D32E5C6C2D /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
C10F16111BF77CA00065F18C /* ICRAboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ICRAboutViewController.h; path = view_iPhone/templates/settings/ICRAboutViewController.h; sourceTree = "<group>"; };
C10F16121BF77CA00065F18C /* ICRAboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ICRAboutViewController.m; path = view_iPhone/templates/settings/ICRAboutViewController.m; sourceTree = "<group>"; };
......@@ -1963,6 +1971,8 @@
children = (
1928FCFB1CC487A10077BE34 /* SalesInputViewController.h */,
1928FCFC1CC487A10077BE34 /* SalesInputViewController.m */,
1928FD0A1CC4C59E0077BE34 /* HistoryViewController.h */,
1928FD0B1CC4C59E0077BE34 /* HistoryViewController.m */,
);
path = Controller;
sourceTree = "<group>";
......@@ -1983,6 +1993,9 @@
1928FD051CC4ABD80077BE34 /* SalesInputTableViewCell.h */,
1928FD061CC4ABD80077BE34 /* SalesInputTableViewCell.m */,
1928FD071CC4ABD80077BE34 /* SalesInputTableViewCell.xib */,
1928FD0D1CC4C8130077BE34 /* HistoryTopView.h */,
1928FD0E1CC4C8130077BE34 /* HistoryTopView.m */,
1928FD101CC4C8320077BE34 /* HistoryTopView.xib */,
);
path = View;
sourceTree = "<group>";
......@@ -4389,6 +4402,7 @@
C1D595171BB42A7200D297FE /* spinner@2x.png in Resources */,
C11786621C0B416D00DB7E4B /* bill_default_image@2x.png in Resources */,
C19AC8961C1735E600DE260E /* money_reduce@2x.png in Resources */,
1928FD111CC4C8320077BE34 /* HistoryTopView.xib in Resources */,
C10F18661BF8EE020065F18C /* VankeStatementListItemCell_iPhone.xml in Resources */,
C165078D1BB96C2800CB2FC1 /* pwd_icon@2x.png in Resources */,
1928FD091CC4ABD80077BE34 /* SalesInputTableViewCell.xib in Resources */,
......@@ -4605,6 +4619,7 @@
C1D5984C1BB44B2000D297FE /* BeeMessage+BeeJSON.mm in Sources */,
C18A95451C01F56200429BF7 /* ICRDataBaseController.m in Sources */,
C18A95491C01F64500429BF7 /* LBorderView.m in Sources */,
1928FD0F1CC4C8130077BE34 /* HistoryTopView.m in Sources */,
C19BBC0E1BBE861700831290 /* VankeBusinessChartCell_iPhone.m in Sources */,
C1D598B11BB44B2000D297FE /* Bee_UITabBar.m in Sources */,
C10F18651BF8EE020065F18C /* VankeStatementListItemCell_iPhone.m in Sources */,
......@@ -4615,6 +4630,7 @@
C1D5989F1BB44B2000D297FE /* Bee_UIDatePicker.m in Sources */,
C10F18151BF7ACA80065F18C /* NSString+TrimmingAdditions.m in Sources */,
C10F18471BF7ACA80065F18C /* IBTUIScrollView.m in Sources */,
1928FD0C1CC4C59E0077BE34 /* HistoryViewController.m in Sources */,
C1D598A61BB44B2000D297FE /* Bee_UIMenuController.m in Sources */,
C10F161C1BF77CA00065F18C /* ICRConfigurationViewController.m in Sources */,
C1D598B31BB44B2000D297FE /* Bee_UITextField.m in Sources */,
......
vanke/view_iPhone/templates/affairs/VankeAffairsBoard_iPhone.m
View file @ dcf6e089
......@@ -123,12 +123,12 @@ ON_SIGNAL3(VankeAffairsBoard_iPhone, btnBill, signal) {
}
ON_SIGNAL3(VankeAffairsBoard_iPhone, btnSaleInput, signal) {
// SalesInputViewController *salesVC = [[SalesInputViewController alloc] init];
SalesInputViewController *salesVC = [SalesInputViewController board];
[self.stack pushBoard:salesVC animated:YES];
SalesInputViewController *salesVC = [[SalesInputViewController alloc] init];
// SalesInputViewController *salesVC = [SalesInputViewController board];
// [self.stack pushBoard:salesVC animated:YES];
// [salesVC setHidesBottomBarWhenPushed:YES];
// [self.navigationController pushViewController:salesVC animated:YES];
[self.navigationController pushViewController:salesVC animated:YES];
//[GEToast showWithText:@"销售录入正在开发中..." bottomOffset:60.0f duration:1.0f];
}
......
vanke/view_iPhone/templates/salesInput/Controller/HistoryViewController.h 0 → 100644
View file @ dcf6e089
//
// HistoryViewController.h
// vanke
//
// Created by Z on 16/4/18.
// Copyright © 2016年 gomore. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface HistoryViewController : UIViewController
@end
vanke/view_iPhone/templates/salesInput/Controller/HistoryViewController.m 0 → 100644
View file @ dcf6e089
//
// HistoryViewController.m
// vanke
//
// Created by Z on 16/4/18.
// Copyright © 2016年 gomore. All rights reserved.
//
#import "HistoryViewController.h"
#import "HistoryTopView.h"
#define kListWidth 100 //一个表格的宽度
#define kListHeight 44
#define kBottomHeight 60 //表格最底部的那行的宽度
@interface HistoryViewController ()
@property (nonatomic, strong) UICollectionView *collectionView;
@property (nonatomic, strong) NSArray *titles;
@property (nonatomic, strong) UIScrollView *scrollView;
@end
@implementation HistoryViewController
- (void)viewDidLoad {
[super viewDidLoad];
self.automaticallyAdjustsScrollViewInsets = NO;
self.title = @"历史";
self.titles = @[@"标题1",@"标题2",@"标题2",@"标题2",@"标题2"];
self.view.backgroundColor = [UIColor whiteColor];
[self setUpTopView];
[self setUPScrollView];
// Do any additional setup after loading the view.
}
- (void)setUPScrollView {
self.scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 150, SCREEN_WIDTH, SCREEN_HEIGHT - 150 - 64)];
self.scrollView.contentSize = CGSizeMake(kListWidth * self.titles.count, kListHeight * 19 + kBottomHeight);
for (int i = 0; i < self.titles.count; i++) {
UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(kListWidth * i, 0, kListWidth, 44)];
label.text = self.titles[i];
label.font = [UIFont systemFontOfSize:19];
label.textAlignment = NSTextAlignmentCenter;
[self.scrollView addSubview:label];
for (int j = 0; j < 19; j++) {
UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(kListWidth * i, kListHeight + kListHeight * j, kListWidth, kListHeight)];
label.textAlignment = NSTextAlignmentCenter;
label.text = [NSString stringWithFormat:@"假数据假%d", j];
[self.scrollView addSubview:label];
}
UILabel *labelBottom = [[UILabel alloc] initWithFrame:CGRectMake(kListWidth * i, kListHeight + kListHeight * 18, kListWidth, kBottomHeight)];
labelBottom.text = self.titles[i];
labelBottom.backgroundColor = [UIColor grayColor];
labelBottom.font = [UIFont systemFontOfSize:20];
labelBottom.textAlignment = NSTextAlignmentCenter;
[self.scrollView addSubview:labelBottom];
}
[self.view addSubview:self.scrollView];
}
- (void)setUpTopView {
HistoryTopView *topView = [self viewWithNibName:@"HistoryTopView"];
topView.frame = CGRectMake(0, 0, SCREEN_WIDTH, 150);
[self.view addSubview:topView];
}
- (id)viewWithNibName:(NSString *)viewName {
NSArray* nibView = [[NSBundle mainBundle] loadNibNamed:viewName owner:nil options:nil];
return [nibView objectAtIndex:0];
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
vanke/view_iPhone/templates/salesInput/Controller/SalesInputViewController.h
View file @ dcf6e089
......@@ -8,6 +8,6 @@
#import "IBTUIViewController.h"
@interface SalesInputViewController : IBTUIViewController
@interface SalesInputViewController : UIViewController
@end
vanke/view_iPhone/templates/salesInput/Controller/SalesInputViewController.m
View file @ dcf6e089
......@@ -10,6 +10,8 @@
#import "SalesInputTopView.h"
#import "SalesInputTableViewCell.h"
#import "VankeAppBoard_iPhone.h"
#import "HistoryViewController.h"
#define kCellID @"SalesInputTableViewCell.h"
@interface SalesInputViewController ()<UITableViewDelegate, UITableViewDataSource>
@property (nonatomic, strong) UITableView *tableView;
......@@ -28,6 +30,8 @@
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
[[VankeAppBoard_iPhone sharedInstance] hideMenu];
}
ON_WILL_APPEAR( signal )
......@@ -36,8 +40,8 @@ ON_WILL_APPEAR( signal )
}
- (void)setUpTableView {
self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT) style:UITableViewStylePlain];
self.tableView.contentInset = UIEdgeInsetsMake(364, 0, 0, 0);
self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT - 64) style:UITableViewStylePlain];
self.tableView.contentInset = UIEdgeInsetsMake(300, 0, 0, 0);
self.tableView.delegate = self;
self.tableView.dataSource = self;
......@@ -67,6 +71,7 @@ ON_WILL_APPEAR( signal )
UIBarButtonItem *rightBtn = [[UIBarButtonItem alloc] initWithTitle:@"历史" style:UIBarButtonItemStyleDone target:self action:@selector(goToHistory)];
rightBtn.tintColor = [UIColor whiteColor];
self.navigationItem.rightBarButtonItem = rightBtn;
self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
}
......@@ -83,7 +88,8 @@ ON_WILL_APPEAR( signal )
- (void)goToHistory {
HistoryViewController *history = [[HistoryViewController alloc] init];
[self.navigationController pushViewController:history animated:YES];
}
- (void)didReceiveMemoryWarning {
......
vanke/view_iPhone/templates/salesInput/View/HistoryTopView.h 0 → 100644
View file @ dcf6e089
//
// HistoryTopView.h
// vanke
//
// Created by Z on 16/4/18.
// Copyright © 2016年 gomore. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface HistoryTopView : UIView
@end
vanke/view_iPhone/templates/salesInput/View/HistoryTopView.m 0 → 100644
View file @ dcf6e089
//
// HistoryTopView.m
// vanke
//
// Created by Z on 16/4/18.
// Copyright © 2016年 gomore. All rights reserved.
//
#import "HistoryTopView.h"
@interface HistoryTopView ()
@property (weak, nonatomic) IBOutlet UIButton *buttonQuery;
@end
@implementation HistoryTopView
-(void)awakeFromNib {
self.buttonQuery.layer.cornerRadius = 5;
}
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
@end
vanke/view_iPhone/templates/salesInput/View/HistoryTopView.xib 0 → 100644
View file @ dcf6e089
This diff is collapsed.
vanke/view_iPhone/templates/salesInput/View/SalesInputTableViewCell.xib
View file @ dcf6e089
......@@ -18,7 +18,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="支付方式" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="42B-69-MrJ">
<rect key="frame" x="8" y="19" width="104" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="DwV-QQ-nIc">
......
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