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

正常进度

parent 9e8538c5
//
// AddaddressViewController.h
// Lighting
//
// Created by 曹云霄 on 16/5/5.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface AddaddressViewController : BaseViewController
@end
//
// AddaddressViewController.m
// Lighting
//
// Created by 曹云霄 on 16/5/5.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "AddaddressViewController.h"
@interface AddaddressViewController ()
@end
@implementation AddaddressViewController
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
}
- (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
//
// AllCustomerViewController.h
// Lighting
//
// Created by 曹云霄 on 16/5/6.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface AllCustomerViewController : BaseViewController
/**
* 搜索栏背景
*/
@property (weak, nonatomic) IBOutlet UIView *searchBackview;
/**
* 搜索栏
*/
@property (weak, nonatomic) IBOutlet UITextField *searchTextfield;
/**
* 日期筛选起始时间
*/
@property (weak, nonatomic) IBOutlet UIButton *begindateButton;
/**
* 日期筛选结束时间
*/
@property (weak, nonatomic) IBOutlet UIButton *enddateButton;
/**
* 所有客户tableview
*/
@property (weak, nonatomic) IBOutlet UITableView *allCustomerTableview;
@end
//
// AllCustomerViewController.m
// Lighting
//
// Created by 曹云霄 on 16/5/6.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "AllCustomerViewController.h"
#import "AllCutomerTableViewCell.h"
@interface AllCustomerViewController ()<UITableViewDelegate,UITableViewDataSource>
@end
@implementation AllCustomerViewController
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
[self uiConfigAction];
}
#pragma mark -UI
- (void)uiConfigAction
{
self.allCustomerTableview.dataSource = self;
self.allCustomerTableview.delegate = self;
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
AllCutomerTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"allcustomercell" forIndexPath:indexPath];
cell.contentBackView.layer.masksToBounds = YES;
cell.contentBackView.layer.cornerRadius = kCornerRadius;
cell.backgroundColor = [UIColor clearColor];
return cell;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return 10;
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
return 116;
}
- (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
//
// AllCutomerTableViewCell.h
// Lighting
//
// Created by 曹云霄 on 16/5/6.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface AllCutomerTableViewCell : UITableViewCell
/**
* content背景View
*/
@property (weak, nonatomic) IBOutlet UIView *contentBackView;
/**
* 客户头像
*/
@property (weak, nonatomic) IBOutlet UIImageView *customerHeader;
/**
* 客户名称
*/
@property (weak, nonatomic) IBOutlet UILabel *customerName;
/**
* 联系电话
*/
@property (weak, nonatomic) IBOutlet UILabel *customerPhoneName;
/**
* 最近到访时间
*/
@property (weak, nonatomic) IBOutlet UILabel *cutomerTime;
/**
* 服务导购
*/
@property (weak, nonatomic) IBOutlet UILabel *serviceName;
/**
* 客户地址
*/
@property (weak, nonatomic) IBOutlet UILabel *customerAddress;
@end
//
// AllCutomerTableViewCell.m
// Lighting
//
// Created by 曹云霄 on 16/5/6.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "AllCutomerTableViewCell.h"
@implementation AllCutomerTableViewCell
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
//
// BillingInfoView.h
// Lighting
//
// Created by 曹云霄 on 16/5/6.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface BillingInfoView : UIView
@end
//
// BillingInfoView.m
// Lighting
//
// Created by 曹云霄 on 16/5/6.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BillingInfoView.h"
@implementation BillingInfoView
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
@end
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="BillingInfoView">
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<point key="canvasLocation" x="340" y="308"/>
</view>
</objects>
</document>
//
// CustomerOrderTableViewCell.h
// Lighting
//
// Created by 曹云霄 on 16/5/6.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface CustomerOrderTableViewCell : UITableViewCell
/**
* 日期
*/
@property (weak, nonatomic) IBOutlet UILabel *orderDate;
/**
* 订单编号
*/
@property (weak, nonatomic) IBOutlet UILabel *orderSerialNumber;
/**
* 操作员
*/
@property (weak, nonatomic) IBOutlet UILabel *shoppersName;
/**
* 客户头像
*/
@property (weak, nonatomic) IBOutlet UIImageView *customerHeader;
/**
* 订单状态
*/
@property (weak, nonatomic) IBOutlet UILabel *orderStatus;
/**
* 客户名称
*/
@property (weak, nonatomic) IBOutlet UILabel *customerName;
/**
* 款式数量
*/
@property (weak, nonatomic) IBOutlet UILabel *styleNumber;
/**
* 收货人
*/
@property (weak, nonatomic) IBOutlet UILabel *consigneeName;
/**
* 收货人电话
*/
@property (weak, nonatomic) IBOutlet UILabel *consigneePhoneNumber;
/**
* 商品品牌
*/
@property (weak, nonatomic) IBOutlet UILabel *goodsBrandName;
/**
* 联系电话
*/
@property (weak, nonatomic) IBOutlet UILabel *phoneNumber;
/**
* 购买数量
*/
@property (weak, nonatomic) IBOutlet UILabel *buyNumber;
/**
* 客户地址
*/
@property (weak, nonatomic) IBOutlet UILabel *consigneeAddress;
/**
* 订单总计
*/
@property (weak, nonatomic) IBOutlet UILabel *orderTotalPrice;
/**
* cell背景
*/
@property (weak, nonatomic) IBOutlet UIView *cellBackView;
@end
//
// CustomerOrderTableViewCell.m
// Lighting
//
// Created by 曹云霄 on 16/5/6.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "CustomerOrderTableViewCell.h"
@implementation CustomerOrderTableViewCell
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
//
// CustomerOrderViewController.h
// Lighting
//
// Created by 曹云霄 on 16/5/6.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface CustomerOrderViewController : BaseViewController
/**
* customerOrderTableView
*/
@property (weak, nonatomic) IBOutlet UITableView *customerOrderTableView;
/**
* 搜索客户订单
*/
@property (weak, nonatomic) IBOutlet UITextField *searchCustomerOrder;
/**
* 订单状态排序
*/
@property (weak, nonatomic) IBOutlet UIButton *orderStateButton;
@end
//
// CustomerOrderViewController.m
// Lighting
//
// Created by 曹云霄 on 16/5/6.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "CustomerOrderViewController.h"
#import "CustomerOrderTableViewCell.h"
@interface CustomerOrderViewController ()<UITableViewDataSource,UITableViewDelegate>
@end
@implementation CustomerOrderViewController
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
[self uiConfigAction];
}
#pragma mark -UI
- (void)uiConfigAction
{
self.customerOrderTableView.dataSource = self;
self.customerOrderTableView.delegate = self;
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
CustomerOrderTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"customerordercell" forIndexPath:indexPath];
cell.backgroundColor = [UIColor clearColor];
cell.cellBackView.layer.masksToBounds = YES;
cell.cellBackView.layer.cornerRadius = kCornerRadius;
return cell;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return 10;
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
return 260;
}
- (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
...@@ -56,38 +56,31 @@ ...@@ -56,38 +56,31 @@
#pragma mark -RightVCselectedDelegate 方法 #pragma mark -RightVCselectedDelegate 方法
- (void)SelectedControllerWithIndex:(NSInteger)index - (void)SelectedControllerWithIndex:(NSString *)Name
{ {
NSInteger selectedIndex; NSInteger selectedIndex;
switch (index) { if ([Name isEqualToString:@"体验中心"]) {
case 0:
{ selectedIndex = 6;
selectedIndex = 4;
} }else if ([Name isEqualToString:@"场景库"])
break; {
case 1: selectedIndex = 5;
{ }else if ([Name isEqualToString:@"产品库"])
selectedIndex = 3; {
} selectedIndex = 4;
break; }else if ([Name isEqualToString:@"客户管理"])
case 2: {
{ selectedIndex = 3;
selectedIndex = 2; }else if ([Name isEqualToString:@"所有客户"])
} {
break; selectedIndex = 2;
case 3: }else if ([Name isEqualToString:@"客户订单"])
{ {
selectedIndex = 1; selectedIndex = 1;
} }else if ([Name isEqualToString:@"关于"])
break; {
case 4: selectedIndex = 0;
{
selectedIndex = 0;
}
break;
default:
break;
} }
self.customtabbar.selectedIndex = selectedIndex; self.customtabbar.selectedIndex = selectedIndex;
......
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
[previewButton setTitle:@"预览" forState:UIControlStateNormal]; [previewButton setTitle:@"预览" forState:UIControlStateNormal];
previewButton.titleLabel.font = [UIFont systemFontOfSize:12]; previewButton.titleLabel.font = [UIFont systemFontOfSize:12];
[previewButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; [previewButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[previewButton addTarget:self action:@selector(PreviewButtonClick:) forControlEvents:UIControlEventTouchUpInside];
previewButton.backgroundColor = kMainBlueColor; previewButton.backgroundColor = kMainBlueColor;
previewButton.layer.masksToBounds = YES; previewButton.layer.masksToBounds = YES;
previewButton.layer.cornerRadius = kCornerRadius; previewButton.layer.cornerRadius = kCornerRadius;
...@@ -61,6 +62,7 @@ ...@@ -61,6 +62,7 @@
[printButton setTitle:@"打印" forState:UIControlStateNormal]; [printButton setTitle:@"打印" forState:UIControlStateNormal];
[printButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; [printButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
printButton.titleLabel.font = [UIFont systemFontOfSize:12]; printButton.titleLabel.font = [UIFont systemFontOfSize:12];
[printButton addTarget:self action:@selector(AirprintButtonClick:) forControlEvents:UIControlEventTouchUpInside];
printButton.layer.masksToBounds = YES; printButton.layer.masksToBounds = YES;
printButton.layer.cornerRadius = kCornerRadius; printButton.layer.cornerRadius = kCornerRadius;
printButton.backgroundColor = kMainBlueColor; printButton.backgroundColor = kMainBlueColor;
...@@ -190,7 +192,7 @@ ...@@ -190,7 +192,7 @@
break; break;
case 1: case 1:
{ {
return 140; return 160;
} }
break; break;
case 2: case 2:
...@@ -254,6 +256,34 @@ ...@@ -254,6 +256,34 @@
return 5; return 5;
} }
#pragma mark -打印订单
- (void)AirprintButtonClick:(UIButton *)button
{
[self callAirprintWithdata:nil];
}
#pragma mark -预览订单
- (void)PreviewButtonClick:(UIButton *)button
{
}
/* /*
#pragma mark - Navigation #pragma mark - Navigation
......
...@@ -30,39 +30,62 @@ ...@@ -30,39 +30,62 @@
{ {
self.productDetilsTableview.dataSource = self; self.productDetilsTableview.dataSource = self;
self.productDetilsTableview.delegate = self; self.productDetilsTableview.delegate = self;
[self CreateHeaderView]; [self CreateHeaderView];
} }
#pragma mark -头部视图 #pragma mark -头部视图
- (void)CreateHeaderView - (void)CreateHeaderView
{ {
self.headerView = [[[NSBundle mainBundle] loadNibNamed:@"ProductDetailsHeaderView" owner:self options:nil] lastObject]; self.headerView = [[[NSBundle mainBundle] loadNibNamed:@"ProductDetailsHeaderView" owner:self options:nil] lastObject];
self.productDetilsTableview.tableHeaderView = self.headerView; self.productDetilsTableview.tableHeaderView = self.headerView;
} }
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{ {
ProductDetailsTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"productDetailscell" forIndexPath:indexPath]; ProductDetailsTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"productDetailscell" forIndexPath:indexPath];
cell.selectionStyle = UITableViewCellSelectionStyleNone; cell.selectionStyle = UITableViewCellSelectionStyleNone;
return cell; return cell;
} }
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{ {
return 2; return 1;
} }
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{ {
return 170; return 170;
} }
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{
return 2;
}
- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
{
return 50;
}
- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
{
UIView *headerView = [[UIView alloc]initWithFrame:CGRectMake(0, 2, ScreenWidth, 46)];
headerView.backgroundColor = [UIColor grayColor];
UILabel *titleLabe = [[UILabel alloc]initWithFrame:CGRectMake(50, 15, 200, 20)];
titleLabe.textColor = [UIColor redColor];
titleLabe.font = [UIFont systemFontOfSize:12];
titleLabe.text = section?@"商品参数":@"图文详情";
[headerView addSubview:titleLabe];
return headerView;
}
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
*/ */
@required @required
- (void)SelectedControllerWithIndex:(NSInteger)index; - (void)SelectedControllerWithIndex:(NSString *)Name;
@end @end
......
...@@ -17,7 +17,10 @@ ...@@ -17,7 +17,10 @@
@interface RightViewController ()<UITableViewDataSource,UITableViewDelegate> @interface RightViewController ()<UITableViewDataSource,UITableViewDelegate>
@property (nonatomic,strong) UITableView *rightTableview; @property (nonatomic,strong) UITableView *rightTableview;
@property (nonatomic,strong) NSArray *dataArray; @property (nonatomic,strong) NSMutableArray *dataArray;
@property (nonatomic,assign) BOOL isOpen;
@end @end
...@@ -32,7 +35,7 @@ ...@@ -32,7 +35,7 @@
{ {
if (_dataArray == nil) { if (_dataArray == nil) {
_dataArray = [NSArray arrayWithObjects:@"体验中心",@"场景库",@"产品库",@"客户管理",@"关于", nil]; _dataArray = [NSMutableArray arrayWithObjects:@"体验中心",@"场景库",@"产品库",@"客户管理",@"关于", nil];
} }
return _dataArray; return _dataArray;
} }
...@@ -71,7 +74,10 @@ ...@@ -71,7 +74,10 @@
{ {
UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"rightcell" forIndexPath:indexPath]; UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"rightcell" forIndexPath:indexPath];
cell.textLabel.text = [self.dataArray objectAtIndex_opple:indexPath.row]; cell.textLabel.text = [self.dataArray objectAtIndex_opple:indexPath.row];
if (self.isOpen && ([cell.textLabel.text isEqualToString:@"所有客户"] || [cell.textLabel.text isEqualToString:@"客户订单"])) {
cell.backgroundColor = kMainBlueColor;
}
return cell; return cell;
} }
...@@ -82,17 +88,51 @@ ...@@ -82,17 +88,51 @@
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{ {
//收起右侧控制器 [tableView deselectRowAtIndexPath:indexPath animated:YES];
[SHARED_APPDELEGATE.mmdrawer toggleDrawerSide:MMDrawerSideRight animated:YES completion:nil]; UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
if ([cell.textLabel.text isEqualToString:@"客户管理"] ) {
if ([self.delegate respondsToSelector:@selector(SelectedControllerWithIndex:)]) {
if (!self.isOpen) {
[self.delegate SelectedControllerWithIndex:indexPath.row];
self.isOpen = YES;
[self.dataArray insertObject:@"所有客户" atIndex:self.dataArray.count-1];
[self.dataArray insertObject:@"客户订单" atIndex:self.dataArray.count-1];
[self.rightTableview insertRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:4 inSection:0],[NSIndexPath indexPathForRow:5 inSection:0]] withRowAnimation:UITableViewRowAnimationMiddle];
}
else
{
[self recoveryCell];
}
}else
{
//收起右侧控制器
[SHARED_APPDELEGATE.mmdrawer toggleDrawerSide:MMDrawerSideRight animated:YES completion:^(BOOL finished) {
[self recoveryCell];
}];
if ([self.delegate respondsToSelector:@selector(SelectedControllerWithIndex:)]) {
[self.delegate SelectedControllerWithIndex:[self.dataArray objectAtIndex_opple:indexPath.row]];
}
} }
} }
#pragma mark -复原cell
- (void)recoveryCell
{
if ([self.dataArray containsObject:@"所有客户"] && [self.dataArray containsObject:@"客户订单"]) {
self.isOpen = NO;
[self.dataArray removeObject:@"所有客户"];
[self.dataArray removeObject:@"客户订单"];
[self.rightTableview deleteRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:4 inSection:0],[NSIndexPath indexPathForRow:5 inSection:0]] withRowAnimation:UITableViewRowAnimationMiddle];
}
}
- (void)didReceiveMemoryWarning { - (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated. // Dispose of any resources that can be recreated.
......
...@@ -10,4 +10,40 @@ ...@@ -10,4 +10,40 @@
@interface SceneLibraryViewController : BaseViewController @interface SceneLibraryViewController : BaseViewController
/**
* SeceneLibraryCollectionView
*/
@property (weak, nonatomic) IBOutlet UICollectionView *seceneLibararyCollectionView;
/**
* SeceneLibraryLayout
*/
@property (weak, nonatomic) IBOutlet UICollectionViewFlowLayout *seceneLibraryCollectionLayout;
/**
* 显示风格(为一横排多少张,4、6、9)
*/
@property (weak, nonatomic) IBOutlet UIButton *accordingStyle;
/**
* 数据风格
*/
@property (weak, nonatomic) IBOutlet UIButton *dataStyleButton;
/**
* 房型风格
*/
@property (weak, nonatomic) IBOutlet UIButton *houseStyleButton;
/**
* 背景View
*/
@property (weak, nonatomic) IBOutlet UIView *backView;
@end @end
...@@ -7,8 +7,9 @@ ...@@ -7,8 +7,9 @@
// //
#import "SceneLibraryViewController.h" #import "SceneLibraryViewController.h"
#import "SeceneLibraryCollectionViewCell.h"
@interface SceneLibraryViewController () @interface SceneLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource>
@end @end
...@@ -17,9 +18,48 @@ ...@@ -17,9 +18,48 @@
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
self.view.backgroundColor = [UIColor grayColor];
[self uiConfigAction];
} }
#pragma mark -UI
- (void)uiConfigAction
{
self.seceneLibraryCollectionLayout.itemSize = CGSizeMake((ScreenWidth-6)/3, (ScreenWidth-6)/3-50);
self.seceneLibraryCollectionLayout.minimumLineSpacing = 2;
self.seceneLibraryCollectionLayout.minimumInteritemSpacing = 2;
self.seceneLibraryCollectionLayout.sectionInset = UIEdgeInsetsMake(5, 0, 5, 0);
self.seceneLibararyCollectionView.dataSource = self;
self.seceneLibararyCollectionView.delegate = self;
}
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
{
SeceneLibraryCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"secenelibrary" forIndexPath:indexPath];
return cell;
}
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
{
return 20;
}
#pragma mark -切换显示风格
- (IBAction)SwitchdisplayStyleClick:(UIButton *)sender {
self.seceneLibraryCollectionLayout.itemSize = CGSizeMake((ScreenWidth-10)/6, (ScreenWidth-10)/6-50);
[self.seceneLibararyCollectionView reloadData];
}
- (void)didReceiveMemoryWarning { - (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated. // Dispose of any resources that can be recreated.
......
//
// SeceneLibraryCollectionViewCell.h
// Lighting
//
// Created by 曹云霄 on 16/5/6.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface SeceneLibraryCollectionViewCell : UICollectionViewCell
@end
//
// SeceneLibraryCollectionViewCell.m
// Lighting
//
// Created by 曹云霄 on 16/5/6.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "SeceneLibraryCollectionViewCell.h"
@implementation SeceneLibraryCollectionViewCell
@end
//
// GenerateOrdersModifyTableViewCell.h
// Lighting
//
// Created by 曹云霄 on 16/5/5.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface GenerateOrdersModifyTableViewCell : UITableViewCell
@end
//
// GenerateOrdersModifyTableViewCell.m
// Lighting
//
// Created by 曹云霄 on 16/5/5.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "GenerateOrdersModifyTableViewCell.h"
@implementation GenerateOrdersModifyTableViewCell
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
//
// GenerateOrdersTableViewCell.h
// Lighting
//
// Created by 曹云霄 on 16/5/5.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface GenerateOrdersTableViewCell : UITableViewCell
@end
//
// GenerateOrdersTableViewCell.m
// Lighting
//
// Created by 曹云霄 on 16/5/5.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "GenerateOrdersTableViewCell.h"
@implementation GenerateOrdersTableViewCell
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
//
// GenerateOrdersViewController.h
// Lighting
//
// Created by 曹云霄 on 16/5/5.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface GenerateOrdersViewController : BaseViewController
/**
* 生成订单tableview
*/
@property (weak, nonatomic) IBOutlet UITableView *generateOrderTableview;
/**
* 返回购物车
*/
@property (weak, nonatomic) IBOutlet UIButton *backShoppingbagsButton;
/**
* 生成订单
*/
@property (weak, nonatomic) IBOutlet UIButton *createOrderButton;
/**
* 生成订单和返回购物车按钮背景
*/
@property (weak, nonatomic) IBOutlet UIView *BackView;
@end
//
// GenerateOrdersViewController.m
// Lighting
//
// Created by 曹云霄 on 16/5/5.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "GenerateOrdersViewController.h"
#import "GenerateOrdersTableViewCell.h"
#import "GenerateOrdersModifyTableViewCell.h"
#import "PersonInformationTableViewCell.h"
#import "CommodityListTableViewCell.h"
#import "AllpriceTableViewCell.h"
#import "AddaddressViewController.h"
#import "ModifyShippingAddressView.h"
#import "AppDelegate.h"
#import "OrderdetailsViewController.h"
@interface GenerateOrdersViewController ()<UITableViewDelegate,UITableViewDataSource>
/**
* 增加或者修改地址
*/
@property (nonatomic,strong) ModifyShippingAddressView *addressView;
@property (nonatomic,strong) UIView *Tabbarview;
@end
@implementation GenerateOrdersViewController
- (void)viewDidLoad {
[super viewDidLoad];
[self uiConfigAction];
}
#pragma mark -UI
- (void)uiConfigAction
{
self.generateOrderTableview.dataSource = self;
self.generateOrderTableview.delegate = self;
self.generateOrderTableview.tableFooterView = [UIView new];
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
if (indexPath.section == 0 && indexPath.row == 0) {
PersonInformationTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"secondcell" forIndexPath:indexPath];
return cell;
}
else if (indexPath.section == 1)
{
if (indexPath.row == 1) {
GenerateOrdersModifyTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Modifycell" forIndexPath:indexPath];
return cell;
}
GenerateOrdersTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"consigneecell" forIndexPath:indexPath];
return cell;
}
else if (indexPath.section == 2)
{
if (indexPath.row == 1) {
AllpriceTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"sixthcell" forIndexPath:indexPath];
return cell;
}
CommodityListTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"fourthcell" forIndexPath:indexPath];
return cell;
}
return nil;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
switch (section) {
case 0:
{
return 1;
}
break;
case 1:
{
return 2;
}
break;
case 2:
{
return 2;
}
break;
default:
break;
}
return 0;
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
switch (indexPath.section) {
case 0:
{
return 160;
}
break;
case 1:
{
return 56;
}
break;
case 2:
{
if (indexPath.row == 1) {
return 50;
}
return 80;
}
break;
default:
break;
}
return 0;
}
- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
{
switch (section) {
case 0:
{
return 0;
}
break;
case 1:
{
return 10;
}
break;
case 2:
{
return 44;
}
break;
default:
break;
}
return 0;
}
- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
{
UIView *view = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 44)];
view.backgroundColor = [UIColor redColor];
return view;
}
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{
return 3;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
[self CreateModifyShippingView];
}
#pragma mark -新增或者修改收货地址
- (void)CreateModifyShippingView
{
//修改收货地址弹出框
self.addressView = [[[NSBundle mainBundle] loadNibNamed:@"ModifyShippingAddressView" owner:self options:nil]firstObject];
self.addressView.frame = CGRectMake(0, ScreenHeight+NavigationHeight, ScreenWidth, ScreenHeight);
self.addressView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5];
[self.addressView.turnoffButton addTarget:self action:@selector(TurnofffButtonClick) forControlEvents:UIControlEventTouchUpInside];
[self.addressView.citySelected addTarget:self action:@selector(SelectedCityButtonClick) forControlEvents:UIControlEventTouchUpInside];
[self.view addSubview:self.addressView];
//tabbar遮罩
self.Tabbarview = [[UIView alloc]initWithFrame:CGRectMake(0, ScreenHeight, ScreenWidth, NavigationHeight)];
self.Tabbarview.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5];
[SHARED_APPDELEGATE.tabbar addSubview:self.Tabbarview];
[UIView animateWithDuration:0.2 animations:^{
self.Tabbarview.frame = CGRectMake(0, 0, ScreenWidth, NavigationHeight);
self.addressView.frame = CGRectMake(0, 0, ScreenWidth, ScreenHeight);
}];
}
#pragma mark -关闭按钮
- (void)TurnofffButtonClick
{
[UIView animateWithDuration:0.2 animations:^{
self.addressView.frame = CGRectMake(0, ScreenHeight+NavigationHeight, ScreenWidth, ScreenHeight);
self.Tabbarview.frame = CGRectMake(0, ScreenHeight, ScreenWidth, NavigationHeight);
}];
}
#pragma mark -生成订单
- (IBAction)CreateOrderButtonClick:(UIButton *)sender {
OrderdetailsViewController *orderDetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"orderdetails"];
[self.navigationController pushViewController:orderDetails animated:YES];
}
#pragma mark -返回购物车
- (IBAction)BackShoppingBagsButtonClick:(UIButton *)sender {
[self.navigationController popViewControllerAnimated:YES];
}
#pragma mark -城市选择器
- (void)SelectedCityButtonClick
{
ModifyShippingAddressView *view = [[[NSBundle mainBundle] loadNibNamed:@"ModifyShippingAddressView"
owner:self options:nil]lastObject];
view.frame = CGRectMake(0, self.addressView.popupView.frame.size.height, self.addressView.popupView.frame.size.width, 160);
[self.addressView.popupView addSubview:view];
view.tag = 100;
[view.selectedCityButton addTarget:self action:@selector(CompleteButton) forControlEvents:UIControlEventTouchUpInside];
[UIView animateWithDuration:0.2 animations:^{
view.frame = CGRectMake(0, self.addressView.popupView.frame.size.height-160, self.addressView.popupView.frame.size.width, 160);
}];
}
#pragma mark -完成按钮点击
- (void)CompleteButton
{
ModifyShippingAddressView *view = [self.view viewWithTag:100];
[UIView animateWithDuration:0.2 animations:^{
view.frame = CGRectMake(0, ScreenHeight, self.addressView.popupView.frame.size.width, 160);
}completion:^(BOOL finished) {
[view removeFromSuperview];
}];
}
- (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
//
// ModifyShippingAddressView.h
// Lighting
//
// Created by 曹云霄 on 16/5/5.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface ModifyShippingAddressView : UIView<UIPickerViewDelegate,UIPickerViewDataSource>
/**
* 关闭按钮
*/
@property (weak, nonatomic) IBOutlet UIButton *turnoffButton;
/**
* title
*/
@property (weak, nonatomic) IBOutlet UILabel *changAddressLabe;
/**
* 收件人
*/
@property (weak, nonatomic) IBOutlet UITextField *recipientPerson;
/**
* 手机号
*/
@property (weak, nonatomic) IBOutlet UITextField *PhoneNumber;
/**
* 邮箱
*/
@property (weak, nonatomic) IBOutlet UITextField *personEmail;
/**
* 地址选择(城市选择器)
*/
@property (weak, nonatomic) IBOutlet UIButton *citySelected;
/**
* 详细地址
*/
@property (weak, nonatomic) IBOutlet UITextField *detailsAddress;
/**
* 删除按钮(取消按钮)
*/
@property (weak, nonatomic) IBOutlet UIButton *delectAddressButton;
/**
* 修改按钮(新增按钮)
*/
@property (weak, nonatomic) IBOutlet UIButton *modifyButton;
/**
* 弹出框View
*/
@property (weak, nonatomic) IBOutlet UIView *popupView;
/**
* 城市选择器完成
*/
@property (weak, nonatomic) IBOutlet UIButton *selectedCityButton;
/**
* UIPickerView
*/
@property (weak, nonatomic) IBOutlet UIPickerView *cityPickerView;
@end
//
// ModifyShippingAddressView.m
// Lighting
//
// Created by 曹云霄 on 16/5/5.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "ModifyShippingAddressView.h"
@implementation ModifyShippingAddressView
{
NSMutableArray *provinces; //城市大数组
NSArray *cities; //城市小数组
NSString *provincesString; //省份
NSString *cityString; //城市
NSString *cityIDstring; //城市ID
NSString *_cityCode; //城市编码
}
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
- (void)awakeFromNib
{
[self uiConfigAction];
}
#pragma mark -UI
- (void)uiConfigAction
{
self.cityPickerView.delegate = self;
self.cityPickerView.dataSource = self;
NSString *path = [[NSBundle mainBundle] pathForResource:@"city" ofType:@"json"];
NSString *string = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:nil];
NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding];
provinces = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:nil];
cities = [[provinces objectAtIndex:0] objectForKey:@"list"];
}
#pragma mark -城市选择器代理方法
- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView
{
return 2;
}
- (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)componen
{
switch (componen) {
case 0:
{
return [provinces count];
}
break;
case 1:
{
return [cities count];
}
break;
default:
break;
}
return 0;
}
- (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component
{
switch (component)
{
case 0:
return [[provinces objectAtIndex:row] objectForKey:@"name"];
break;
case 1:
return [[cities objectAtIndex:row] objectForKey:@"name"];
break;
default:
return nil;
break;
}
}
- (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component
{
switch (component)
{
case 0:
cities = [[provinces objectAtIndex:row] objectForKey:@"list"];
[self.cityPickerView selectRow:0 inComponent:1 animated:NO];
[self.cityPickerView reloadComponent:1];
provincesString = [[provinces objectAtIndex:row] objectForKey:@"name"];
cityString = [[cities objectAtIndex:0] objectForKey:@"name"];
_cityCode = [[cities objectAtIndex:0] objectForKey:@"code"];//城市编码
break;
case 1:
cityString = [[cities objectAtIndex:row] objectForKey:@"name"];
cityIDstring = [[cities objectAtIndex:row] objectForKey:@"code"];
_cityCode = [NSString stringWithFormat:@"%@",[[cities objectAtIndex:row] objectForKey:@"code"]];//城市编码
break;
default:
break;
}
[self.citySelected setTitle:cityString forState:UIControlStateNormal];
}
- (UIView *)pickerView:(UIPickerView *)pickerView viewForRow:(NSInteger)row forComponent:(NSInteger)component reusingView:(UIView *)view{
UILabel* pickerLabel = (UILabel*)view;
if (!pickerLabel){
pickerLabel = [[UILabel alloc] init];
pickerLabel.adjustsFontSizeToFitWidth = YES;
pickerLabel.textColor = kMainBlueColor;
pickerLabel.textAlignment = NSTextAlignmentCenter;
[pickerLabel setBackgroundColor:[UIColor clearColor]];
[pickerLabel setFont:[UIFont boldSystemFontOfSize:15]];
}
// Fill the label text here
pickerLabel.text=[self pickerView:pickerView titleForRow:row forComponent:component];
return pickerLabel;
}
@end
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="ModifyShippingAddressView">
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" id="Qbt-Zv-kki">
<rect key="frame" x="227" y="302" width="315" height="420"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<subviews>
<view contentMode="scaleToFill" id="T9d-oj-fov">
<rect key="frame" x="0.0" y="0.0" width="315" height="46"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="修改收货地址" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bNU-wS-gLG">
<rect key="frame" x="24" y="13" width="150" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="qPY-KR-3Qx">
<rect key="frame" x="258" y="5" width="40" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" alpha="1" colorSpace="calibratedRGB"/>
<state key="normal" title="关闭"/>
</button>
</subviews>
<color key="backgroundColor" red="0.95686274509803915" green="0.95686274509803915" blue="0.95686274509803915" alpha="1" colorSpace="calibratedRGB"/>
</view>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="lpz-wE-m1b">
<rect key="frame" x="98" y="73" width="160" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收件人:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="jph-Cl-DLV">
<rect key="frame" x="28" y="78" width="50" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机号:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="n9i-HY-a6E">
<rect key="frame" x="28" y="123" width="50" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<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" textAlignment="natural" minimumFontSize="17" id="WDc-Fh-Qf5">
<rect key="frame" x="98" y="118" width="160" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" keyboardType="numberPad"/>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="邮箱:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="WM3-v3-jIB">
<rect key="frame" x="28" y="168" width="50" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<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" textAlignment="natural" minimumFontSize="17" id="U4J-HU-6Xl">
<rect key="frame" x="98" y="164" width="160" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" keyboardType="emailAddress"/>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="地址选择:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="RgK-NQ-0Ly">
<rect key="frame" x="28" y="217" width="70" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="详细地址:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wXU-SP-LZL">
<rect key="frame" x="28" y="260" width="65" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<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" textAlignment="natural" minimumFontSize="17" id="eGc-KR-3ez">
<rect key="frame" x="98" y="256" width="200" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="WiD-oe-Txw">
<rect key="frame" x="19" y="349" width="120" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.70412693910000002" blue="0.69044467629999995" alpha="1" colorSpace="calibratedRGB"/>
<state key="normal" title="删除"/>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="5eJ-1U-y43">
<rect key="frame" x="176" y="349" width="120" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
<state key="normal" title="修改">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="RNR-SD-iaW">
<rect key="frame" x="98" y="210" width="160" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/>
<state key="normal" title="城市选择"/>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
</subviews>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<connections>
<outlet property="PhoneNumber" destination="WDc-Fh-Qf5" id="TIK-I0-Bkf"/>
<outlet property="changAddressLabe" destination="bNU-wS-gLG" id="ipr-Md-LHc"/>
<outlet property="citySelected" destination="RNR-SD-iaW" id="Sv0-MD-cuY"/>
<outlet property="delectAddressButton" destination="WiD-oe-Txw" id="ppR-BO-oth"/>
<outlet property="detailsAddress" destination="eGc-KR-3ez" id="ZYh-dH-ufa"/>
<outlet property="modifyButton" destination="5eJ-1U-y43" id="C3L-Eh-R1I"/>
<outlet property="personEmail" destination="U4J-HU-6Xl" id="q0f-x0-TK9"/>
<outlet property="popupView" destination="Qbt-Zv-kki" id="Bpt-bL-4a6"/>
<outlet property="recipientPerson" destination="lpz-wE-m1b" id="DI0-PM-i2o"/>
<outlet property="turnoffButton" destination="qPY-KR-3Qx" id="hzf-qu-bx8"/>
</connections>
<point key="canvasLocation" x="443" y="258"/>
</view>
<view contentMode="scaleToFill" id="QMZ-sc-s58" customClass="ModifyShippingAddressView">
<rect key="frame" x="0.0" y="0.0" width="320" height="160"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="1qT-Vq-AnQ">
<rect key="frame" x="8" y="7" width="54" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.70412693910000002" blue="0.69044467629999995" alpha="1" colorSpace="calibratedRGB"/>
<state key="normal" title="完成"/>
</button>
<pickerView contentMode="scaleToFill" id="X1a-mQ-VBj">
<rect key="frame" x="0.0" y="40" width="320" height="120"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</pickerView>
<view contentMode="scaleToFill" id="x1x-QD-uXK">
<rect key="frame" x="0.0" y="0.0" width="320" height="1"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<connections>
<outlet property="cityPickerView" destination="X1a-mQ-VBj" id="1ER-g0-pjH"/>
<outlet property="selectedCityButton" destination="1qT-Vq-AnQ" id="41I-C5-0kF"/>
</connections>
<point key="canvasLocation" x="407" y="934"/>
</view>
</objects>
</document>
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
#import "ShoppingViewController.h" #import "ShoppingViewController.h"
#import "ShoppingTableViewCell.h" #import "ShoppingTableViewCell.h"
#import "AppDelegate.h" #import "AppDelegate.h"
#import "GenerateOrdersViewController.h"
@interface ShoppingViewController ()<UITableViewDelegate,UITableViewDataSource> @interface ShoppingViewController ()<UITableViewDelegate,UITableViewDataSource>
...@@ -79,11 +82,14 @@ ...@@ -79,11 +82,14 @@
#pragma mark -结算 #pragma mark -结算
- (IBAction)settlementButtonClick:(UIButton *)sender { - (IBAction)settlementButtonClick:(UIButton *)sender {
GenerateOrdersViewController *generateOrder = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"generateorders"];
[self.navigationController pushViewController:generateOrder animated:YES];
} }
#pragma mark -全选 #pragma mark -全选
- (IBAction)allSelectedButtonClick:(id)sender { - (IBAction)allSelectedButtonClick:(id)sender {
} }
...@@ -92,11 +98,6 @@ ...@@ -92,11 +98,6 @@
- (void)didReceiveMemoryWarning { - (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated. // Dispose of any resources that can be recreated.
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
#import "ProductLibraryViewController.h" #import "ProductLibraryViewController.h"
#import "CustomerManagementViewController.h" #import "CustomerManagementViewController.h"
#import "AboutViewController.h" #import "AboutViewController.h"
#import "AllCustomerViewController.h"
#import "CustomerOrderViewController.h"
@interface CustomTabbarController ()<TabbarButtonClickdelegate> @interface CustomTabbarController ()<TabbarButtonClickdelegate>
...@@ -35,7 +37,7 @@ ...@@ -35,7 +37,7 @@
{ {
if (_identifierArray == nil) { if (_identifierArray == nil) {
_identifierArray = [NSArray arrayWithObjects:@"shopping",@"Client",@"followheart",@"scenelibrary",@"productlibrary",@"customermanager",@"about", nil]; _identifierArray = [NSArray arrayWithObjects:@"shopping",@"Client",@"followheart",@"scenelibrary",@"productlibrary",@"customermanager",@"allcustomer",@"customerorder",@"about", nil];
} }
return _identifierArray return _identifierArray
; ;
...@@ -66,11 +68,9 @@ ...@@ -66,11 +68,9 @@
{ {
self.tabBar.frame = CGRectMake(Zero, Zero, ScreenWidth, NavigationHeight); self.tabBar.frame = CGRectMake(Zero, Zero, ScreenWidth, NavigationHeight);
Toolview *toolview = [[Toolview alloc]initWithFrame:CGRectMake(Zero, Zero, ScreenWidth, NavigationHeight)]; Toolview *toolview = [[Toolview alloc]initWithFrame:CGRectMake(Zero, Zero, ScreenWidth, NavigationHeight)];
toolview.delegate = self; toolview.delegate = self;
[self.tabBar addSubview:toolview]; [self.tabBar addSubview:toolview];
SHARED_APPDELEGATE.tabbar = self.tabBar;
} }
...@@ -86,7 +86,9 @@ ...@@ -86,7 +86,9 @@
SceneLibraryViewController *sceneVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:3]]; SceneLibraryViewController *sceneVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:3]];
ProductLibraryViewController *productVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:4]]; ProductLibraryViewController *productVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:4]];
CustomerManagementViewController *customerVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:5]]; CustomerManagementViewController *customerVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:5]];
AboutViewController *aboutVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:6]]; AllCustomerViewController *allcustomerVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:6]];
CustomerOrderViewController *customerOrderVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:7]];
AboutViewController *aboutVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:8]];
UINavigationController *shoppingNav = [[UINavigationController alloc]initWithRootViewController:shoppingVC]; UINavigationController *shoppingNav = [[UINavigationController alloc]initWithRootViewController:shoppingVC];
...@@ -95,11 +97,13 @@ ...@@ -95,11 +97,13 @@
UINavigationController *sceneNav = [[UINavigationController alloc]initWithRootViewController:sceneVC]; UINavigationController *sceneNav = [[UINavigationController alloc]initWithRootViewController:sceneVC];
UINavigationController *productNav = [[UINavigationController alloc]initWithRootViewController:productVC]; UINavigationController *productNav = [[UINavigationController alloc]initWithRootViewController:productVC];
UINavigationController *customerNav = [[UINavigationController alloc]initWithRootViewController:customerVC]; UINavigationController *customerNav = [[UINavigationController alloc]initWithRootViewController:customerVC];
UINavigationController *allcustomerNav = [[UINavigationController alloc]initWithRootViewController:allcustomerVC];
UINavigationController *cutomerorderNav = [[UINavigationController alloc]initWithRootViewController:customerOrderVC];
UINavigationController *aboutNav = [[UINavigationController alloc]initWithRootViewController:aboutVC]; UINavigationController *aboutNav = [[UINavigationController alloc]initWithRootViewController:aboutVC];
NSArray *vcArray = [NSArray arrayWithObjects:aboutNav,customerNav,productNav,sceneNav,followNav,clientNav,shoppingNav, nil]; NSArray *vcArray = [NSArray arrayWithObjects:aboutNav,cutomerorderNav,allcustomerNav,customerNav,productNav,sceneNav,followNav,clientNav,shoppingNav, nil];
self.viewControllers = vcArray; self.viewControllers = vcArray;
self.selectedIndex = 5; self.selectedIndex = 7;
} }
...@@ -137,14 +141,14 @@ ...@@ -137,14 +141,14 @@
//我的客户 //我的客户
case 102: case 102:
self.selectedIndex = 5; self.selectedIndex = 7;
break; break;
//购物车 //购物车
case 103: case 103:
self.selectedIndex = 6; self.selectedIndex = 8;
break; break;
......
...@@ -34,6 +34,12 @@ ...@@ -34,6 +34,12 @@
29706DB71CD082990003C412 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29706DB51CD082990003C412 /* LaunchScreen.storyboard */; }; 29706DB71CD082990003C412 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29706DB51CD082990003C412 /* LaunchScreen.storyboard */; };
29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29807C611CD20C2A00F111B8 /* Images.xcassets */; }; 29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29807C611CD20C2A00F111B8 /* Images.xcassets */; };
29807C651CD20F0F00F111B8 /* StoryboardwithCYX.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29807C641CD20F0F00F111B8 /* StoryboardwithCYX.storyboard */; }; 29807C651CD20F0F00F111B8 /* StoryboardwithCYX.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29807C641CD20F0F00F111B8 /* StoryboardwithCYX.storyboard */; };
299249371CDB3C6500786B1E /* GenerateOrdersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 299249361CDB3C6500786B1E /* GenerateOrdersViewController.m */; };
2992493A1CDB3E4500786B1E /* GenerateOrdersTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 299249391CDB3E4500786B1E /* GenerateOrdersTableViewCell.m */; };
2992493D1CDB3E8900786B1E /* GenerateOrdersModifyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2992493C1CDB3E8800786B1E /* GenerateOrdersModifyTableViewCell.m */; };
299249401CDB4D1D00786B1E /* AddaddressViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2992493F1CDB4D1D00786B1E /* AddaddressViewController.m */; };
299249441CDB51B100786B1E /* ModifyShippingAddressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 299249431CDB51B100786B1E /* ModifyShippingAddressView.m */; };
299249461CDB51C800786B1E /* ModifyShippingAddressView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 299249451CDB51C800786B1E /* ModifyShippingAddressView.xib */; };
299876271CD9837C00C90D0A /* OrderTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 299876261CD9837C00C90D0A /* OrderTableViewCell.m */; }; 299876271CD9837C00C90D0A /* OrderTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 299876261CD9837C00C90D0A /* OrderTableViewCell.m */; };
299876331CD997DF00C90D0A /* OrderInformationTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 299876321CD997DF00C90D0A /* OrderInformationTableViewCell.m */; }; 299876331CD997DF00C90D0A /* OrderInformationTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 299876321CD997DF00C90D0A /* OrderInformationTableViewCell.m */; };
299876361CD997F100C90D0A /* PersonInformationTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 299876351CD997F100C90D0A /* PersonInformationTableViewCell.m */; }; 299876361CD997F100C90D0A /* PersonInformationTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 299876351CD997F100C90D0A /* PersonInformationTableViewCell.m */; };
...@@ -53,6 +59,15 @@ ...@@ -53,6 +59,15 @@
29BB27801CD9DFD7009A0813 /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BB277F1CD9DFD7009A0813 /* AboutViewController.m */; }; 29BB27801CD9DFD7009A0813 /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BB277F1CD9DFD7009A0813 /* AboutViewController.m */; };
29C584E91CDA249300C6F677 /* ProductCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584E81CDA249200C6F677 /* ProductCollectionViewCell.m */; }; 29C584E91CDA249300C6F677 /* ProductCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584E81CDA249200C6F677 /* ProductCollectionViewCell.m */; };
29C584ED1CDA429500C6F677 /* ProductDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584EC1CDA429500C6F677 /* ProductDetailsViewController.m */; }; 29C584ED1CDA429500C6F677 /* ProductDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584EC1CDA429500C6F677 /* ProductDetailsViewController.m */; };
29EAAE8E1CDC3E8E00C4DBA2 /* BillingInfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29EAAE8D1CDC3E8E00C4DBA2 /* BillingInfoView.m */; };
29EAAE901CDC3E9700C4DBA2 /* BillingInfoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29EAAE8F1CDC3E9700C4DBA2 /* BillingInfoView.xib */; };
29EAAE951CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29EAAE941CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m */; };
29EAAE971CDC4B2900C4DBA2 /* The Swift Programming Language 中文版 - v1.2.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 29EAAE961CDC4B2900C4DBA2 /* The Swift Programming Language 中文版 - v1.2.pdf */; };
29EAAE9C1CDC74CA00C4DBA2 /* AllCustomerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29EAAE9B1CDC74CA00C4DBA2 /* AllCustomerViewController.m */; };
29EAAEA01CDC79DC00C4DBA2 /* CustomerOrderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29EAAE9F1CDC79DC00C4DBA2 /* CustomerOrderViewController.m */; };
29EAAEA51CDC7F7000C4DBA2 /* CustomerOrderTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29EAAEA41CDC7F7000C4DBA2 /* CustomerOrderTableViewCell.m */; };
29EAAEAA1CDC7FE800C4DBA2 /* AllCutomerTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29EAAEA91CDC7FE800C4DBA2 /* AllCutomerTableViewCell.m */; };
29EAAEAC1CDCA28300C4DBA2 /* city.json in Resources */ = {isa = PBXBuildFile; fileRef = 29EAAEAB1CDCA28300C4DBA2 /* city.json */; };
745C665EA695DD3EC6271ADE /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDC80D439AC474587DD59064 /* libPods.a */; }; 745C665EA695DD3EC6271ADE /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDC80D439AC474587DD59064 /* libPods.a */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
...@@ -105,6 +120,17 @@ ...@@ -105,6 +120,17 @@
29706DB81CD082990003C412 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 29706DB81CD082990003C412 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
29807C611CD20C2A00F111B8 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; }; 29807C611CD20C2A00F111B8 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
29807C641CD20F0F00F111B8 /* StoryboardwithCYX.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = StoryboardwithCYX.storyboard; sourceTree = "<group>"; }; 29807C641CD20F0F00F111B8 /* StoryboardwithCYX.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = StoryboardwithCYX.storyboard; sourceTree = "<group>"; };
299249351CDB3C6500786B1E /* GenerateOrdersViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenerateOrdersViewController.h; sourceTree = "<group>"; };
299249361CDB3C6500786B1E /* GenerateOrdersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GenerateOrdersViewController.m; sourceTree = "<group>"; };
299249381CDB3E4500786B1E /* GenerateOrdersTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenerateOrdersTableViewCell.h; sourceTree = "<group>"; };
299249391CDB3E4500786B1E /* GenerateOrdersTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GenerateOrdersTableViewCell.m; sourceTree = "<group>"; };
2992493B1CDB3E8800786B1E /* GenerateOrdersModifyTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenerateOrdersModifyTableViewCell.h; sourceTree = "<group>"; };
2992493C1CDB3E8800786B1E /* GenerateOrdersModifyTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GenerateOrdersModifyTableViewCell.m; sourceTree = "<group>"; };
2992493E1CDB4D1D00786B1E /* AddaddressViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddaddressViewController.h; sourceTree = "<group>"; };
2992493F1CDB4D1D00786B1E /* AddaddressViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddaddressViewController.m; sourceTree = "<group>"; };
299249421CDB51B100786B1E /* ModifyShippingAddressView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifyShippingAddressView.h; sourceTree = "<group>"; };
299249431CDB51B100786B1E /* ModifyShippingAddressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModifyShippingAddressView.m; sourceTree = "<group>"; };
299249451CDB51C800786B1E /* ModifyShippingAddressView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ModifyShippingAddressView.xib; sourceTree = "<group>"; };
299876251CD9837C00C90D0A /* OrderTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderTableViewCell.h; sourceTree = "<group>"; }; 299876251CD9837C00C90D0A /* OrderTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderTableViewCell.h; sourceTree = "<group>"; };
299876261CD9837C00C90D0A /* OrderTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderTableViewCell.m; sourceTree = "<group>"; }; 299876261CD9837C00C90D0A /* OrderTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderTableViewCell.m; sourceTree = "<group>"; };
299876311CD997DF00C90D0A /* OrderInformationTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderInformationTableViewCell.h; sourceTree = "<group>"; }; 299876311CD997DF00C90D0A /* OrderInformationTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderInformationTableViewCell.h; sourceTree = "<group>"; };
...@@ -142,6 +168,21 @@ ...@@ -142,6 +168,21 @@
29C584E81CDA249200C6F677 /* ProductCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductCollectionViewCell.m; sourceTree = "<group>"; }; 29C584E81CDA249200C6F677 /* ProductCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductCollectionViewCell.m; sourceTree = "<group>"; };
29C584EB1CDA429500C6F677 /* ProductDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductDetailsViewController.h; sourceTree = "<group>"; }; 29C584EB1CDA429500C6F677 /* ProductDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductDetailsViewController.h; sourceTree = "<group>"; };
29C584EC1CDA429500C6F677 /* ProductDetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductDetailsViewController.m; sourceTree = "<group>"; }; 29C584EC1CDA429500C6F677 /* ProductDetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductDetailsViewController.m; sourceTree = "<group>"; };
29EAAE8C1CDC3E8E00C4DBA2 /* BillingInfoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BillingInfoView.h; sourceTree = "<group>"; };
29EAAE8D1CDC3E8E00C4DBA2 /* BillingInfoView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BillingInfoView.m; sourceTree = "<group>"; };
29EAAE8F1CDC3E9700C4DBA2 /* BillingInfoView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BillingInfoView.xib; sourceTree = "<group>"; };
29EAAE931CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SeceneLibraryCollectionViewCell.h; sourceTree = "<group>"; };
29EAAE941CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SeceneLibraryCollectionViewCell.m; sourceTree = "<group>"; };
29EAAE961CDC4B2900C4DBA2 /* The Swift Programming Language 中文版 - v1.2.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = "The Swift Programming Language 中文版 - v1.2.pdf"; path = "Class/The Swift Programming Language 中文版 - v1.2.pdf"; sourceTree = "<group>"; };
29EAAE9A1CDC74CA00C4DBA2 /* AllCustomerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllCustomerViewController.h; sourceTree = "<group>"; };
29EAAE9B1CDC74CA00C4DBA2 /* AllCustomerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AllCustomerViewController.m; sourceTree = "<group>"; };
29EAAE9E1CDC79DC00C4DBA2 /* CustomerOrderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomerOrderViewController.h; sourceTree = "<group>"; };
29EAAE9F1CDC79DC00C4DBA2 /* CustomerOrderViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomerOrderViewController.m; sourceTree = "<group>"; };
29EAAEA31CDC7F7000C4DBA2 /* CustomerOrderTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomerOrderTableViewCell.h; sourceTree = "<group>"; };
29EAAEA41CDC7F7000C4DBA2 /* CustomerOrderTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomerOrderTableViewCell.m; sourceTree = "<group>"; };
29EAAEA81CDC7FE800C4DBA2 /* AllCutomerTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllCutomerTableViewCell.h; sourceTree = "<group>"; };
29EAAEA91CDC7FE800C4DBA2 /* AllCutomerTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AllCutomerTableViewCell.m; sourceTree = "<group>"; };
29EAAEAB1CDCA28300C4DBA2 /* city.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = city.json; sourceTree = "<group>"; };
CA5ED00287EA4EE622158E3C /* 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>"; }; CA5ED00287EA4EE622158E3C /* 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>"; };
D537F80EFAB9298B3ADA241A /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; }; D537F80EFAB9298B3ADA241A /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
DDC80D439AC474587DD59064 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; DDC80D439AC474587DD59064 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
...@@ -217,6 +258,9 @@ ...@@ -217,6 +258,9 @@
2906B5D61CD89246000849B4 /* ClientDetailsTableViewCell.m */, 2906B5D61CD89246000849B4 /* ClientDetailsTableViewCell.m */,
299876251CD9837C00C90D0A /* OrderTableViewCell.h */, 299876251CD9837C00C90D0A /* OrderTableViewCell.h */,
299876261CD9837C00C90D0A /* OrderTableViewCell.m */, 299876261CD9837C00C90D0A /* OrderTableViewCell.m */,
29EAAE8C1CDC3E8E00C4DBA2 /* BillingInfoView.h */,
29EAAE8D1CDC3E8E00C4DBA2 /* BillingInfoView.m */,
29EAAE8F1CDC3E9700C4DBA2 /* BillingInfoView.xib */,
); );
name = view; name = view;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -237,6 +281,7 @@ ...@@ -237,6 +281,7 @@
2928F7DE1CD085430036D761 /* Tools */ = { 2928F7DE1CD085430036D761 /* Tools */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
29EAAEAB1CDCA28300C4DBA2 /* city.json */,
2949BABF1CD305340049385A /* MMDrawerManager */, 2949BABF1CD305340049385A /* MMDrawerManager */,
2949BAC31CD3086F0049385A /* weibo.png */, 2949BAC31CD3086F0049385A /* weibo.png */,
2962D07E1CD1E5DD0058829D /* UIView+Frame */, 2962D07E1CD1E5DD0058829D /* UIView+Frame */,
...@@ -311,6 +356,8 @@ ...@@ -311,6 +356,8 @@
children = ( children = (
2928F8401CD0ABAC0036D761 /* ShoppingViewController.h */, 2928F8401CD0ABAC0036D761 /* ShoppingViewController.h */,
2928F8411CD0ABAC0036D761 /* ShoppingViewController.m */, 2928F8411CD0ABAC0036D761 /* ShoppingViewController.m */,
299249351CDB3C6500786B1E /* GenerateOrdersViewController.h */,
299249361CDB3C6500786B1E /* GenerateOrdersViewController.m */,
); );
name = controller; name = controller;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -318,8 +365,13 @@ ...@@ -318,8 +365,13 @@
293393521CD3377E000D997B /* view */ = { 293393521CD3377E000D997B /* view */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
299249411CDB517A00786B1E /* ModifytheShippingAddressView */,
293393531CD3379E000D997B /* ShoppingTableViewCell.h */, 293393531CD3379E000D997B /* ShoppingTableViewCell.h */,
293393541CD3379E000D997B /* ShoppingTableViewCell.m */, 293393541CD3379E000D997B /* ShoppingTableViewCell.m */,
299249381CDB3E4500786B1E /* GenerateOrdersTableViewCell.h */,
299249391CDB3E4500786B1E /* GenerateOrdersTableViewCell.m */,
2992493B1CDB3E8800786B1E /* GenerateOrdersModifyTableViewCell.h */,
2992493C1CDB3E8800786B1E /* GenerateOrdersModifyTableViewCell.m */,
); );
name = view; name = view;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -405,6 +457,7 @@ ...@@ -405,6 +457,7 @@
29706D981CD082980003C412 = { 29706D981CD082980003C412 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
29EAAE961CDC4B2900C4DBA2 /* The Swift Programming Language 中文版 - v1.2.pdf */,
2928F7DD1CD085430036D761 /* Class */, 2928F7DD1CD085430036D761 /* Class */,
2928F7DE1CD085430036D761 /* Tools */, 2928F7DE1CD085430036D761 /* Tools */,
29706DA31CD082990003C412 /* Lighting */, 29706DA31CD082990003C412 /* Lighting */,
...@@ -456,6 +509,16 @@ ...@@ -456,6 +509,16 @@
name = Controller; name = Controller;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
299249411CDB517A00786B1E /* ModifytheShippingAddressView */ = {
isa = PBXGroup;
children = (
299249421CDB51B100786B1E /* ModifyShippingAddressView.h */,
299249431CDB51B100786B1E /* ModifyShippingAddressView.m */,
299249451CDB51C800786B1E /* ModifyShippingAddressView.xib */,
);
name = ModifytheShippingAddressView;
sourceTree = "<group>";
};
299876281CD9962800C90D0A /* Orderdetails */ = { 299876281CD9962800C90D0A /* Orderdetails */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -514,8 +577,8 @@ ...@@ -514,8 +577,8 @@
29BB276D1CD9DEA8009A0813 /* SceneLibraryVC */ = { 29BB276D1CD9DEA8009A0813 /* SceneLibraryVC */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
29BB27721CD9DFAC009A0813 /* SceneLibraryViewController.h */, 29EAAE921CDC412C00C4DBA2 /* view */,
29BB27731CD9DFAC009A0813 /* SceneLibraryViewController.m */, 29EAAE911CDC412100C4DBA2 /* controller */,
); );
name = SceneLibraryVC; name = SceneLibraryVC;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -532,8 +595,9 @@ ...@@ -532,8 +595,9 @@
29BB27701CD9DF0B009A0813 /* CustomerManagementVC */ = { 29BB27701CD9DF0B009A0813 /* CustomerManagementVC */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
29BB277B1CD9DFCB009A0813 /* CustomerManagementViewController.h */, 29EAAE9D1CDC79C500C4DBA2 /* CustomerOrder */,
29BB277C1CD9DFCB009A0813 /* CustomerManagementViewController.m */, 29EAAE991CDC74A700C4DBA2 /* AllCustomer */,
29EAAE981CDC749E00C4DBA2 /* controller */,
); );
name = CustomerManagementVC; name = CustomerManagementVC;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -568,6 +632,89 @@ ...@@ -568,6 +632,89 @@
29A938231CDAE31200F21E54 /* ProductDetailsHeaderView.h */, 29A938231CDAE31200F21E54 /* ProductDetailsHeaderView.h */,
29A938241CDAE31200F21E54 /* ProductDetailsHeaderView.m */, 29A938241CDAE31200F21E54 /* ProductDetailsHeaderView.m */,
29A938261CDAE31B00F21E54 /* ProductDetailsHeaderView.xib */, 29A938261CDAE31B00F21E54 /* ProductDetailsHeaderView.xib */,
2992493E1CDB4D1D00786B1E /* AddaddressViewController.h */,
2992493F1CDB4D1D00786B1E /* AddaddressViewController.m */,
);
name = view;
sourceTree = "<group>";
};
29EAAE911CDC412100C4DBA2 /* controller */ = {
isa = PBXGroup;
children = (
29BB27721CD9DFAC009A0813 /* SceneLibraryViewController.h */,
29BB27731CD9DFAC009A0813 /* SceneLibraryViewController.m */,
);
name = controller;
sourceTree = "<group>";
};
29EAAE921CDC412C00C4DBA2 /* view */ = {
isa = PBXGroup;
children = (
29EAAE931CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.h */,
29EAAE941CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m */,
);
name = view;
sourceTree = "<group>";
};
29EAAE981CDC749E00C4DBA2 /* controller */ = {
isa = PBXGroup;
children = (
29BB277B1CD9DFCB009A0813 /* CustomerManagementViewController.h */,
29BB277C1CD9DFCB009A0813 /* CustomerManagementViewController.m */,
);
name = controller;
sourceTree = "<group>";
};
29EAAE991CDC74A700C4DBA2 /* AllCustomer */ = {
isa = PBXGroup;
children = (
29EAAEA71CDC7FCF00C4DBA2 /* view */,
29EAAEA61CDC7FC500C4DBA2 /* controller */,
);
name = AllCustomer;
sourceTree = "<group>";
};
29EAAE9D1CDC79C500C4DBA2 /* CustomerOrder */ = {
isa = PBXGroup;
children = (
29EAAEA21CDC7F4500C4DBA2 /* view */,
29EAAEA11CDC7F3900C4DBA2 /* controller */,
);
name = CustomerOrder;
sourceTree = "<group>";
};
29EAAEA11CDC7F3900C4DBA2 /* controller */ = {
isa = PBXGroup;
children = (
29EAAE9E1CDC79DC00C4DBA2 /* CustomerOrderViewController.h */,
29EAAE9F1CDC79DC00C4DBA2 /* CustomerOrderViewController.m */,
);
name = controller;
sourceTree = "<group>";
};
29EAAEA21CDC7F4500C4DBA2 /* view */ = {
isa = PBXGroup;
children = (
29EAAEA31CDC7F7000C4DBA2 /* CustomerOrderTableViewCell.h */,
29EAAEA41CDC7F7000C4DBA2 /* CustomerOrderTableViewCell.m */,
);
name = view;
sourceTree = "<group>";
};
29EAAEA61CDC7FC500C4DBA2 /* controller */ = {
isa = PBXGroup;
children = (
29EAAE9A1CDC74CA00C4DBA2 /* AllCustomerViewController.h */,
29EAAE9B1CDC74CA00C4DBA2 /* AllCustomerViewController.m */,
);
name = controller;
sourceTree = "<group>";
};
29EAAEA71CDC7FCF00C4DBA2 /* view */ = {
isa = PBXGroup;
children = (
29EAAEA81CDC7FE800C4DBA2 /* AllCutomerTableViewCell.h */,
29EAAEA91CDC7FE800C4DBA2 /* AllCutomerTableViewCell.m */,
); );
name = view; name = view;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -652,9 +799,13 @@ ...@@ -652,9 +799,13 @@
files = ( files = (
29A938271CDAE31B00F21E54 /* ProductDetailsHeaderView.xib in Resources */, 29A938271CDAE31B00F21E54 /* ProductDetailsHeaderView.xib in Resources */,
29807C651CD20F0F00F111B8 /* StoryboardwithCYX.storyboard in Resources */, 29807C651CD20F0F00F111B8 /* StoryboardwithCYX.storyboard in Resources */,
29EAAE901CDC3E9700C4DBA2 /* BillingInfoView.xib in Resources */,
29706DB71CD082990003C412 /* LaunchScreen.storyboard in Resources */, 29706DB71CD082990003C412 /* LaunchScreen.storyboard in Resources */,
29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */, 29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */,
299249461CDB51C800786B1E /* ModifyShippingAddressView.xib in Resources */,
29EAAEAC1CDCA28300C4DBA2 /* city.json in Resources */,
2949BAC41CD3086F0049385A /* weibo.png in Resources */, 2949BAC41CD3086F0049385A /* weibo.png in Resources */,
29EAAE971CDC4B2900C4DBA2 /* The Swift Programming Language 中文版 - v1.2.pdf in Resources */,
2928F83D1CD0A9CD0036D761 /* qq.png in Resources */, 2928F83D1CD0A9CD0036D761 /* qq.png in Resources */,
29706DB41CD082990003C412 /* Assets.xcassets in Resources */, 29706DB41CD082990003C412 /* Assets.xcassets in Resources */,
29706DAF1CD082990003C412 /* Main.storyboard in Resources */, 29706DAF1CD082990003C412 /* Main.storyboard in Resources */,
...@@ -720,8 +871,10 @@ ...@@ -720,8 +871,10 @@
2928F8381CD09E730036D761 /* CustomButton.m in Sources */, 2928F8381CD09E730036D761 /* CustomButton.m in Sources */,
2998763F1CD9985B00C90D0A /* AttachmentInformationTableViewCell.m in Sources */, 2998763F1CD9985B00C90D0A /* AttachmentInformationTableViewCell.m in Sources */,
293393551CD3379E000D997B /* ShoppingTableViewCell.m in Sources */, 293393551CD3379E000D997B /* ShoppingTableViewCell.m in Sources */,
29EAAE951CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m in Sources */,
2949BAC21CD3055A0049385A /* MMExampleDrawerVisualStateManager.m in Sources */, 2949BAC21CD3055A0049385A /* MMExampleDrawerVisualStateManager.m in Sources */,
29A938221CDADE4700F21E54 /* ProductDetailsTableViewCell.m in Sources */, 29A938221CDADE4700F21E54 /* ProductDetailsTableViewCell.m in Sources */,
2992493D1CDB3E8900786B1E /* GenerateOrdersModifyTableViewCell.m in Sources */,
29BB27741CD9DFAC009A0813 /* SceneLibraryViewController.m in Sources */, 29BB27741CD9DFAC009A0813 /* SceneLibraryViewController.m in Sources */,
2928F8421CD0ABAC0036D761 /* ShoppingViewController.m in Sources */, 2928F8421CD0ABAC0036D761 /* ShoppingViewController.m in Sources */,
299876331CD997DF00C90D0A /* OrderInformationTableViewCell.m in Sources */, 299876331CD997DF00C90D0A /* OrderInformationTableViewCell.m in Sources */,
...@@ -729,13 +882,17 @@ ...@@ -729,13 +882,17 @@
299876271CD9837C00C90D0A /* OrderTableViewCell.m in Sources */, 299876271CD9837C00C90D0A /* OrderTableViewCell.m in Sources */,
2998763C1CD9983A00C90D0A /* CommodityListTableViewCell.m in Sources */, 2998763C1CD9983A00C90D0A /* CommodityListTableViewCell.m in Sources */,
2962D0791CD1CBC60058829D /* NetworkRequestClassManager.m in Sources */, 2962D0791CD1CBC60058829D /* NetworkRequestClassManager.m in Sources */,
29EAAEA01CDC79DC00C4DBA2 /* CustomerOrderViewController.m in Sources */,
2928F8321CD09E320036D761 /* Toolview.m in Sources */, 2928F8321CD09E320036D761 /* Toolview.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 */,
29EAAE9C1CDC74CA00C4DBA2 /* AllCustomerViewController.m in Sources */,
2933934F1CD3158B000D997B /* instructionsLabe.m in Sources */, 2933934F1CD3158B000D997B /* instructionsLabe.m in Sources */,
29C584E91CDA249300C6F677 /* ProductCollectionViewCell.m in Sources */, 29C584E91CDA249300C6F677 /* ProductCollectionViewCell.m in Sources */,
299876361CD997F100C90D0A /* PersonInformationTableViewCell.m in Sources */, 299876361CD997F100C90D0A /* PersonInformationTableViewCell.m in Sources */,
2962D0711CD1A58B0058829D /* RightViewController.m in Sources */, 2962D0711CD1A58B0058829D /* RightViewController.m in Sources */,
29EAAEA51CDC7F7000C4DBA2 /* CustomerOrderTableViewCell.m in Sources */,
29706DA91CD082990003C412 /* AppDelegate.m in Sources */, 29706DA91CD082990003C412 /* AppDelegate.m in Sources */,
29706DA61CD082990003C412 /* main.m in Sources */, 29706DA61CD082990003C412 /* main.m in Sources */,
29A938251CDAE31200F21E54 /* ProductDetailsHeaderView.m in Sources */, 29A938251CDAE31200F21E54 /* ProductDetailsHeaderView.m in Sources */,
...@@ -744,11 +901,16 @@ ...@@ -744,11 +901,16 @@
299876391CD9981800C90D0A /* GoodsInformationTableViewCell.m in Sources */, 299876391CD9981800C90D0A /* GoodsInformationTableViewCell.m in Sources */,
2949BABD1CD2EFA00049385A /* InformationTableViewCell.m in Sources */, 2949BABD1CD2EFA00049385A /* InformationTableViewCell.m in Sources */,
29706DB21CD082990003C412 /* Lighting.xcdatamodeld in Sources */, 29706DB21CD082990003C412 /* Lighting.xcdatamodeld in Sources */,
299249401CDB4D1D00786B1E /* AddaddressViewController.m in Sources */,
299249371CDB3C6500786B1E /* GenerateOrdersViewController.m in Sources */,
2992493A1CDB3E4500786B1E /* GenerateOrdersTableViewCell.m in Sources */,
2962D0811CD1E6010058829D /* UIView+Frame.m in Sources */, 2962D0811CD1E6010058829D /* UIView+Frame.m in Sources */,
29C584ED1CDA429500C6F677 /* ProductDetailsViewController.m in Sources */, 29C584ED1CDA429500C6F677 /* ProductDetailsViewController.m in Sources */,
0447085E1CD7C06B00555827 /* LoginViewController.m in Sources */, 0447085E1CD7C06B00555827 /* LoginViewController.m in Sources */,
2928F83B1CD0A0CE0036D761 /* CustomTabbarController.m in Sources */, 2928F83B1CD0A0CE0036D761 /* CustomTabbarController.m in Sources */,
29EAAE8E1CDC3E8E00C4DBA2 /* BillingInfoView.m in Sources */,
044708611CD7C1E800555827 /* MainSetViewController.m in Sources */, 044708611CD7C1E800555827 /* MainSetViewController.m in Sources */,
299249441CDB51B100786B1E /* ModifyShippingAddressView.m in Sources */,
2906B5D71CD89246000849B4 /* ClientDetailsTableViewCell.m in Sources */, 2906B5D71CD89246000849B4 /* ClientDetailsTableViewCell.m in Sources */,
29BB27801CD9DFD7009A0813 /* AboutViewController.m in Sources */, 29BB27801CD9DFD7009A0813 /* AboutViewController.m in Sources */,
29BB277D1CD9DFCB009A0813 /* CustomerManagementViewController.m in Sources */, 29BB277D1CD9DFCB009A0813 /* CustomerManagementViewController.m in Sources */,
......
...@@ -30,6 +30,12 @@ ...@@ -30,6 +30,12 @@
*/ */
@property (nonatomic,strong) MMDrawerController *mmdrawer; @property (nonatomic,strong) MMDrawerController *mmdrawer;
/**
* tabbar控制器
*/
@property (nonatomic,strong) UITabBar *tabbar;
- (void)saveContext; - (void)saveContext;
- (NSURL *)applicationDocumentsDirectory; - (NSURL *)applicationDocumentsDirectory;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>en</string> <string>China(zh_CN)</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string> <string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -33,5 +33,30 @@ ...@@ -33,5 +33,30 @@
*/ */
- (void)SHOWPrompttext:(NSString *)Text ComcpleteBlock:(void(^)())completed; - (void)SHOWPrompttext:(NSString *)Text ComcpleteBlock:(void(^)())completed;
/**
* 获得我的storyboard对象
*/
- (UIStoryboard *)getStoryboardWithName;
/**
* 调用打印机
*/
- (void)callAirprintWithdata:(NSData *)PDFdata;
@end @end
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#import "BaseViewController.h" #import "BaseViewController.h"
@interface BaseViewController () @interface BaseViewController ()<UIPrintInteractionControllerDelegate>
@property (nonatomic,strong) MBProgressHUD*TCHud; @property (nonatomic,strong) MBProgressHUD*TCHud;
...@@ -95,5 +95,44 @@ ...@@ -95,5 +95,44 @@
} }
} }
#pragma mark -获得我的storyboard对象
- (UIStoryboard *)getStoryboardWithName
{
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
return storyboard;
}
#pragma mark 调用airPrint无线打印机
- (void)callAirprintWithdata:(NSData *)PDFdata
{
NSData *mypdfdata = [NSData dataWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"The Swift Programming Language 中文版 - v1.2" ofType:@"pdf"]];
UIPrintInteractionController *pic = [UIPrintInteractionController sharedPrintController];
if (pic && [UIPrintInteractionController canPrintData: mypdfdata] ) {
pic.delegate = self;
UIPrintInfo *printInfo = [UIPrintInfo printInfo];
printInfo.outputType = UIPrintInfoOutputGeneral;
printInfo.jobName = @"订单明细";
printInfo.duplex = UIPrintInfoDuplexLongEdge;
pic.printInfo = printInfo;
pic.showsPageRange = YES;
pic.printingItem = mypdfdata;
void (^completionHandler)(UIPrintInteractionController *, BOOL, NSError *) =
^(UIPrintInteractionController *pic, BOOL completed, NSError *error) {
if (!completed && error)
NSLog(@"FAILED! due to error in domain %@ with error code %ld",
error.domain, error.code);
};
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
[pic presentAnimated:YES completionHandler:completionHandler];
} else {
[pic presentAnimated:YES completionHandler:completionHandler];
}
}
}
@end @end
This source diff could not be displayed because it is too large. You can view the blob instead.
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