Skip to content

O
Opple-iOS
Commit 6d40a954 authored by 曹云霄's avatar 曹云霄
Browse files
Options

完成商品列表的显示、筛选功能的实现、场景模块接口对接成功-暂时无数据

parent 8e76f5ac
Show whitespace changes
Inline Side-by-side
Showing with 3183 additions and 1065 deletions
Lighting/Class/Login/LoginViewController.m
View file @ 6d40a954
......@@ -83,8 +83,8 @@
- (IBAction)LoginButtonClick:(UIButton *)sender {
[self SetTheRootViewController];
return;
// [self SetTheRootViewController];
// return;
if (self.userName.text.length == 0) {
......
Lighting/Class/OrderdetailsViewController.m
View file @ 6d40a954
......@@ -13,6 +13,7 @@
#import "CommodityListTableViewCell.h"
#import "AllpriceTableViewCell.h"
#import "AttachmentInformationTableViewCell.h"
#import "SettlementViewController.h"
@interface OrderdetailsViewController ()<UITableViewDelegate,UITableViewDataSource>
......@@ -87,6 +88,7 @@
[payButton setTitle:@"支付" forState:UIControlStateNormal];
payButton.titleLabel.font = [UIFont systemFontOfSize:12];
[payButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[payButton addTarget:self action:@selector(PayButtonClick) forControlEvents:UIControlEventTouchUpInside];
payButton.backgroundColor = kMainBlueColor;
payButton.layer.masksToBounds = YES;
payButton.layer.cornerRadius = kCornerRadius;
......@@ -95,6 +97,21 @@
}
#pragma mark -调出支付框
- (void)PayButtonClick
{
SettlementViewController *settlement = [[SettlementViewController alloc]init];
settlement.preferredContentSize = CGSizeMake(380, 500);
settlement.modalPresentationStyle = UIModalPresentationFormSheet;
UIPopoverPresentationController *pop = settlement.popoverPresentationController;
pop.sourceView = settlement.view;
pop.permittedArrowDirections = UIPopoverArrowDirectionAny;
[self presentViewController:settlement animated:YES completion:nil];
}
#pragma mark - Table view data source
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
......
Lighting/Class/ProductLibraryViewController.m
View file @ 6d40a954
......@@ -14,7 +14,7 @@
#import "screeningSecondView.h"
@interface ProductLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UIGestureRecognizerDelegate,ScreeningButtonClickdelegate,TableviewSelectedIndexdelegate>
@interface ProductLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UIGestureRecognizerDelegate,ScreeningButtonClickdelegate,TableviewSelectedIndexdelegate,SelectedCollectionItemDelegate>
/**
* 筛选背景框View
......@@ -37,6 +37,21 @@
*/
@property (nonatomic,strong) NSMutableArray *screeningDatas;
/**
* 当前筛选按钮选中状态
*/
@property (nonatomic,assign) NSInteger selectedIndex;
/**
* 商品数据源对象
*/
@property (nonatomic,strong) GoodsResponse *datasArray;
/**
* 复选返回时临时保存数据
*/
@property (nonatomic,strong) GoodsResponse *temporaryArray;
@end
@implementation ProductLibraryViewController
......@@ -54,6 +69,14 @@
}
- (void)viewWillAppear:(BOOL)animated
{
if (self.productCollectionView != nil) {
[self getGoodsListDatas];
}
}
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
......@@ -61,14 +84,38 @@
[self uiConfigAction];
[self getScreeningdatas];
[self getGoodsListdatas];
}
#pragma mark -获取商品列表数据
- (void)getGoodsListDatas
{
//默认数据
GoodsCondition *conditon = [[GoodsCondition alloc]init];
//分页数据
DataPage *Newpage = [[DataPage alloc]init];
Newpage.page = 0;
conditon.page = Newpage;
__weak typeof(self)weakSelf = self;
[self getGoodsListdatas:conditon returnResponse:^(GoodsResponse *response) {
if (response.goodsEntity.count == 0) {
[self ErrorMBProgressView:@"暂无数据"];
return ;
}
weakSelf.datasArray = response;
[weakSelf.productCollectionView reloadData];
}];
}
#pragma mark -获取产品筛选数据
- (void)getScreeningdatas
{
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/goods/getGoodsFilter"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -80,7 +127,7 @@
[self.screeningDatas addObject:goodsStyle.material];
[self.screeningDatas addObject:goodsStyle.price];
NSLog(@"%@",self.screeningDatas);
// NSLog(@"%@",self.screeningDatas);
}
else
{
......@@ -96,40 +143,8 @@
}];
}
#pragma mark -获取商品列表数据
- (void)getGoodsListdatas
{
GoodsCondition *conditon = [[GoodsCondition alloc]init];
conditon.page = 0;
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/goods/query"] WithRequestType:0 WithParameter:conditon WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
NSLog(@"%@",returnValue);
}
else
{
// [self ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
} WithFailureBlock:^(id error) {
}];
}
/*
{
code = 0;
data = {
......@@ -149,21 +164,9 @@
name = "\U5eca\U706f";
}
);
id = "<null>";
id = 0b44439e54997ce20154998630210002;
name = "\U73b0\U4ee3\U706f";
},
{
children = (
);
id = "<null>";
name = "<null>";
},
{
children = (
);
id = "<null>";
name = "<null>";
},
{
children = (
{
......@@ -173,34 +176,61 @@
name = "\U53a8\U623f\U706f";
}
);
id = "<null>";
id = 0b44439e54997ce201549989c8b10005;
name = "\U7167\U660e\U706f";
},
{
children = (
);
id = "<null>";
name = "<null>";
}
);
material = (
"\U91d1",
"\U94f6",
"\U6728\U8d28"
{
typecode = 001;
typename = "\U91d1";
},
{
typecode = 002;
typename = "\U94f6";
},
{
typecode = 003;
typename = "\U6728\U8d28";
}
);
price = (
"500\U4ee5\U4e0b",
"500\U52301000",
"1000\U52302000"
{
typecode = 001;
typename = "500\U4ee5\U4e0b";
},
{
typecode = 002;
typename = "500\U52301000";
},
{
typecode = 003;
typename = "1000\U52302000";
}
);
space = (
"15\U5e73\U7c73",
"20\U5e73\U7c73",
"35\U5e73\U7c73"
{
typecode = 001;
typename = "15\U5e73\U7c73";
},
{
typecode = 002;
typename = "20\U5e73\U7c73";
},
{
typecode = 003;
typename = "35\U5e73\U7c73";
}
);
styles = (
"\U4e2d\U56fd\U98ce",
"\U82f1\U56fd\U98ce"
{
typecode = 001;
typename = "\U4e2d\U56fd\U98ce";
},
{
typecode = 002;
typename = "\U82f1\U56fd\U98ce";
}
);
};
message = "\U64cd\U4f5c\U6210\U529f";
......@@ -209,17 +239,49 @@
*/
#pragma mark -获取商品列表数据
- (void)getGoodsListdatas:(GoodsCondition *)conditon returnResponse:(void(^)(GoodsResponse *))finish
{
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/goods/query"] WithRequestType:0 WithParameter:conditon WithReturnValueBlock:^(id returnValue) {
[self RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
GoodsResponse *sponse = [[GoodsResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
//返回结果
finish(sponse);
}
else
{
[self ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
} WithFailureBlock:^(id error) {
[self RemoveMBProgressHUDLoding];
}];
}
#pragma mark -布局
- (void)uiConfigAction
{
self.productCollectionLayout.itemSize = CGSizeMake((ScreenWidth-100)/3, (ScreenWidth-100)/3);
self.productCollectionLayout.sectionInset = UIEdgeInsetsMake(20, 30, 20, 30);
self.productCollectionLayout.minimumLineSpacing = 20;
self.productCollectionLayout.minimumInteritemSpacing = 20;
self.productCollectionView.dataSource = self;
self.productCollectionView.delegate = self;
self.productCollectionView.alwaysBounceVertical = YES;
[self CreatescreeningButton];
}
......@@ -256,13 +318,16 @@
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
{
ProductCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"productcell" forIndexPath:indexPath];
NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@/%@",ServerAddress,[[self.datasArray.goodsEntity objectAtIndex_opple:indexPath.row] pictures]]];
[cell.productImageView sd_setImageWithURL:url placeholderImage:nil];
return cell;
}
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
{
return 20;
return self.datasArray.goodsEntity.count;
}
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
......@@ -274,7 +339,6 @@
}
#pragma mark -筛选
- (void)ScreeningButtonClick
{
......@@ -299,15 +363,10 @@
[UIView animateWithDuration:0.2 animations:^{
self.screenView.alpha = 1;
}];
}
#pragma mark -分类、筛选view切换
- (void)sortingSegmentedClick:(UISegmentedControl *)sender {
......@@ -338,7 +397,8 @@
//分类View
self.screenFirstView = [[[NSBundle mainBundle] loadNibNamed:@"screeningFirstView" owner:self options:nil] firstObject];
self.screenFirstView.frame = CGRectMake(0, 50, 470, 310);
self.screenFirstView.datasArray = [self.screeningDatas firstObject];
self.screenFirstView.delegate = self;
[self screeningButtonClick:self.selectedIndex];
[self.screenView.backgroundView addSubview:self.screenFirstView];
}
......@@ -349,7 +409,8 @@
self.screenSecondView = [[[NSBundle mainBundle] loadNibNamed:@"screeningSecondView" owner:self options:nil] firstObject];
self.screenSecondView.frame = CGRectMake(0, 50, 470, 310);
self.screenSecondView.delegate = self;
self.screenSecondView.datasArray = [self.screeningDatas firstObject];
[self screeningButtonClick:self.selectedIndex];
self.screenSecondView.totalNumber = self.datasArray.total;
[self.screenView.backgroundView addSubview:self.screenSecondView];
}
......@@ -358,6 +419,7 @@
#pragma mark -ScreeningButtonClickdelegate代理
- (void)screeningButtonClick:(NSInteger)buttontag
{
self.selectedIndex = buttontag;
//分类
if (self.screenView.sortingSegmented.selectedSegmentIndex == 0) {
......@@ -367,21 +429,92 @@
//筛选
else if (self.screenView.sortingSegmented.selectedSegmentIndex == 1)
{
self.screenSecondView.selectedIndex = buttontag;
self.screenSecondView.datasArray = [self.screeningDatas objectAtIndex_opple:buttontag];
}
}
#pragma mark -选中条件
- (void)selectedItem:(NSString *)typecode
{
[self DismissScreenView];
GoodsCondition *condition = [[GoodsCondition alloc]init];
DataPage *page = [[DataPage alloc]init];
page.page = 0;
condition.page = page;
condition.categoryEquals = typecode;
//分类模块筛选
__weak typeof(self)Weakself = self;
[self getGoodsListdatas:condition returnResponse:^(GoodsResponse *response) {
Weakself.datasArray = response;
[Weakself.productCollectionView reloadData];
if (response.goodsEntity.count == 0) {
[self ErrorMBProgressView:@"暂无数据"];
}
}];
}
#pragma mark -筛选子模块的
- (void)tableSelectedindex:(NSInteger)index
{
[self screeningButtonClick:index];
self.screenView.indexselected = index;
}
#pragma mark -筛选复选模块选中的uicollection cell
- (void)collectionSelectedindexWithStyleCode:(NSString *)styleCode
withCategories:(NSString *)categoriesCode
withSpace:(NSString *)spaceCode
withMaterial:(NSString *)materialCode
withPrice:(NSString *)priceTitle
{
GoodsCondition *condition = [[GoodsCondition alloc]init];
DataPage *page = [[DataPage alloc]init];
page.page = 0;
condition.page = page;
condition.styleEquals = styleCode;
condition.categoryEquals = categoriesCode;
condition.spaceEquals = spaceCode;
condition.materialEqueals = materialCode;
//价格字符串切割
NSArray *spacrArray = [priceTitle componentsSeparatedByString:@"到"];
condition.startprice = [NSNumber numberWithInteger:[[spacrArray objectAtIndex_opple:0] integerValue]];
condition.endprice = [NSNumber numberWithInteger:[[spacrArray objectAtIndex_opple:1] integerValue]];
__weak typeof (self) Weakself = self;
NSLog(@"%@",[condition toDictionary]);
[self getGoodsListdatas:condition returnResponse:^(GoodsResponse *response) {
Weakself.screenSecondView.totalNumber = response.total;
//临时保存
self.temporaryArray = response;
}];
}
#pragma mark -显示筛选后的结果
- (void)ShowScreeningResponse
{
if (self.temporaryArray.goodsEntity.count == 0) {
[self ErrorMBProgressView:@"暂无数据"];
return;
}
self.datasArray = self.temporaryArray;
[self.productCollectionView reloadData];
[self DismissScreenView];
}
#pragma mark -移除筛选框
......@@ -399,8 +532,6 @@
}
#pragma mark -UIGestureRecognizerDelegate代理方法
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch
{
......
Lighting/Class/SceneLibraryViewController.m
View file @ 6d40a954
......@@ -11,6 +11,17 @@
@interface SceneLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource>
/**
* 筛选数据源
*/
@property (nonatomic,strong) SceneFilter *filter;
/**
* 列表数据
*/
@property (nonatomic,strong) SceneResponse *response;
@end
@implementation SceneLibraryViewController
......@@ -20,6 +31,8 @@
// Do any additional setup after loading the view.
[self uiConfigAction];
[self getdatasAction];
[self getSceneLibrarydatas];
}
#pragma mark -UI
......@@ -38,12 +51,59 @@
- (void)getdatasAction
{
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/scene/getSceneFilter"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[self RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
self.filter = [[SceneFilter alloc]initWithDictionary:returnValue[@"data"] error:nil];
}
else
{
[self ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
} WithFailureBlock:^(id error) {
[self RemoveMBProgressHUDLoding];
}];
}
#pragma mark -获取场景列表数据
- (void)getSceneLibrarydatas
{
SceneCondition *condition = [[SceneCondition alloc]init];
DataPage *page = [[DataPage alloc]init];
page.page = 0;
condition.page = page;
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/scene/query"] WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
NSLog(@"%@",returnValue);
self.response = [[SceneResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
}
else
{
[self ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
} WithFailureBlock:^(id error) {
}];
}
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
......
Lighting/Class/ScreeningCollectionReusableView.m
View file @ 6d40a954
......@@ -24,16 +24,24 @@
#pragma mark -UI
- (void)uiCOnfigAction
{
self.sectionLabe = [[UILabel alloc]init];
self.sectionLabe.layer.masksToBounds = YES;
self.sectionLabe.layer.cornerRadius = kCornerRadius;
self.sectionLabe.layer.borderWidth = 1;
self.sectionLabe.layer.borderColor = kMainBlueColor.CGColor;
self.sectionLabe = [[UILabel alloc]initWithFrame:self.bounds];
self.sectionLabe.textColor = kMainBlueColor;
self.sectionLabe.font = [UIFont systemFontOfSize:12];
self.sectionLabe.textAlignment = NSTextAlignmentCenter;
[self addSubview:self.sectionLabe];
[self.sectionLabe mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake((self.frame.size.width-120)/4, 35));
make.top.equalTo(self.mas_top).offset(20);
make.left.equalTo(self.mas_left).offset(20);
}];
}
@end
Lighting/Class/ScreeningSecondCollectionReusableView.h
View file @ 6d40a954
......@@ -13,9 +13,15 @@
/**
* 区头按钮
* 区头按钮(全部)
*/
@property (nonatomic,strong) UIButton *alltitleButton;
/**
* 副标题按钮
*/
@property (nonatomic,strong) UIButton *subTitleButton;
@end
Lighting/Class/ScreeningSecondCollectionReusableView.m
View file @ 6d40a954
......@@ -43,6 +43,19 @@
}];
//副标题按钮
self.subTitleButton = [UIButton buttonWithType:UIButtonTypeSystem];
[self.subTitleButton setTitle:@"副标题" forState:UIControlStateNormal];
[self addSubview:self.subTitleButton];
self.subTitleButton.titleLabel.font = [UIFont systemFontOfSize:12];
[self.subTitleButton setTitleColor:kMainBlueColor forState:UIControlStateNormal];
[self.subTitleButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake((WIDTH-127)/3, 35));
make.right.equalTo(self.mas_right).offset(-30);
make.top.equalTo(self.mas_top).offset(75);
}];
}
......
Lighting/Class/SettlementViewController.h 0 → 100644
View file @ 6d40a954
//
// SettlementViewController.h
// Lighting
//
// Created by 曹云霄 on 16/5/11.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface SettlementViewController : BaseViewController
/**
*
*/
@end
Lighting/Class/SettlementViewController.m 0 → 100644
View file @ 6d40a954
//
// SettlementViewController.m
// Lighting
//
// Created by 曹云霄 on 16/5/11.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "SettlementViewController.h"
@interface SettlementViewController ()
@end
@implementation SettlementViewController
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view from its nib.
}
- (void)viewWillAppear:(BOOL)animated
{
self.view.superview.layer.cornerRadius = 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
Lighting/Class/SettlementViewController.xib 0 → 100644
View file @ 6d40a954
<?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" customClass="SettlementViewController">
<connections>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="380" height="500"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总数量:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="KHc-WJ-xQd">
<rect key="frame" x="25" y="64" width="50" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" id="V10-sC-tjf">
<rect key="frame" x="83" y="59" width="160" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="kfb-PC-RSU">
<rect key="frame" x="10" y="0.0" width="150" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/>
</view>
<view contentMode="scaleToFill" id="JWa-n5-tJQ">
<rect key="frame" x="0.0" y="0.0" width="380" height="46"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="结算信息" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SoB-nK-luK">
<rect key="frame" x="8" 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>
</subviews>
<color key="backgroundColor" red="0.95686274510000002" green="0.95686274510000002" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总金额:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Bjc-Ns-VND">
<rect key="frame" x="25" y="103" width="50" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" id="kRj-KI-B8x">
<rect key="frame" x="83" y="98" width="160" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="Wku-Nz-Jvr">
<rect key="frame" x="10" y="0.0" width="150" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="支付方式:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Fxz-0O-dsP">
<rect key="frame" x="25" y="144" width="58" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<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="BtK-gu-0KG">
<rect key="frame" x="83" y="140" 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="13"/>
<state key="normal" title="刷卡、支票、转账">
<color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
</state>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="pfa-IW-8J9">
<rect key="frame" x="83" y="180" 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"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="刷卡、支票、转账">
<color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
</state>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="u1Q-iA-oUv">
<rect key="frame" x="83" y="219" 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"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="刷卡、支票、转账">
<color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
</state>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="发票抬头:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="58b-Vg-zBQ">
<rect key="frame" x="25" y="376" width="58" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" id="beF-Oa-HVo">
<rect key="frame" x="83" y="372" width="250" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="nrc-w9-AuC">
<rect key="frame" x="10" y="0.0" width="240" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="是否开票:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="WiP-Ps-rLM">
<rect key="frame" x="25" y="287" width="58" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<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="RrC-9S-Ofh">
<rect key="frame" x="83" y="283" 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"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="刷卡、支票、转账">
<color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
</state>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="发票类型:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="IOP-zc-e6A">
<rect key="frame" x="25" y="331" width="58" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<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="h52-sh-k1p">
<rect key="frame" x="83" y="327" 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"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="刷卡、支票、转账">
<color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
</state>
</button>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="evA-uJ-YEb">
<rect key="frame" x="255" y="143.5" width="100" height="100"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="wNR-jl-cxy">
<rect key="frame" x="203" y="445" width="130" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<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="vDt-el-S5r">
<rect key="frame" x="25" y="445" width="130" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<state key="normal" title="取消">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="521" y="319.5"/>
</view>
</objects>
<resources>
<image name="05产品库-详情_03" width="500" height="375"/>
</resources>
</document>
Lighting/Class/Shoppingcart/AddressViewController.xib
View file @ 6d40a954
......@@ -54,25 +54,25 @@
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="收货人:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Yb-LU-Kjn">
<rect key="frame" x="28" y="78" width="50" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<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" fixedFrame="YES" text="手机号:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j1Y-ze-xvQ">
<rect key="frame" x="28" y="123" width="50" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<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" fixedFrame="YES" text="地址选择：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J6K-Vq-zSy">
<rect key="frame" x="28" y="168" width="70" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<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" fixedFrame="YES" text="详细地址:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZxP-Pp-hw9">
<rect key="frame" x="28" y="212" width="65" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
......
Lighting/Class/screeningFirstView.h
View file @ 6d40a954
......@@ -8,6 +8,19 @@
#import <UIKit/UIKit.h>
/**
* 选中item
*/
@protocol SelectedCollectionItemDelegate <NSObject>
//传回code
- (void)selectedItem:(NSString *)typecode;
@end
@interface screeningFirstView : UIView<UICollectionViewDelegate,UICollectionViewDataSource>
......@@ -31,4 +44,25 @@
*/
@property (nonatomic) NSInteger selectedIndex;
/**
* 代理
*/
@property (nonatomic,assign) id<SelectedCollectionItemDelegate>delegate;
@end
Lighting/Class/screeningFirstView.m
View file @ 6d40a954
......@@ -61,16 +61,26 @@
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
{
ScreeningFirstCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"cell" forIndexPath:indexPath];
cell.titleLabe.text = [self.datasArray objectAtIndex_opple:indexPath.row];
return cell;
if (self.selectedIndex == 1) {
cell.titleLabe.text = [[[[self.datasArray objectAtIndex_opple:indexPath.section] children] objectAtIndex_opple:indexPath.row] name];
}
else
{
cell.titleLabe.text = [[self.datasArray objectAtIndex_opple:indexPath.row] typename];
}
return cell;
}
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
{
if (self.selectedIndex == 1) {
// return [[self.datasArray objectAtIndex_opple:section][@"children"] count];
return [[[self.datasArray objectAtIndex_opple:section] children] count];
}
return self.datasArray.count;
......@@ -78,7 +88,18 @@
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
{
NSLog(@"选中%ld",indexPath.item);
if ([self.delegate respondsToSelector:@selector(selectedItem:)]) {
if (self.selectedIndex == 1 ) {
[self.delegate selectedItem:[[[self.datasArray objectAtIndex_opple:indexPath.section] children][indexPath.row] fid]];
}else
{
[self.delegate selectedItem:[[self.datasArray objectAtIndex_opple:indexPath.row] typecode]];
}
}
}
- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
......@@ -94,7 +115,7 @@
if (self.selectedIndex == 1) {
return CGSizeMake(200, 40);
return CGSizeMake(200, 75);
}
return CGSizeMake(0, 0);
}
......@@ -104,7 +125,7 @@
{
ScreeningCollectionReusableView *sectionView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"Sectioncell" forIndexPath:indexPath];
sectionView.backgroundColor = [UIColor redColor];
sectionView.sectionLabe.text = [[self.datasArray objectAtIndex_opple:indexPath.section] name];
return sectionView;
}
......
Lighting/Class/screeningSecondView.h
View file @ 6d40a954
......@@ -14,8 +14,17 @@
*/
@protocol TableviewSelectedIndexdelegate <NSObject>
//UITableview
- (void)tableSelectedindex:(NSInteger)index;
//UICollectionView选中后返回所有被选中的类型
- (void)collectionSelectedindexWithStyleCode:(NSString *)styleCode withCategories:(NSString *)categoriesCode withSpace:(NSString *)spaceCode withMaterial:(NSString *)materialCode withPrice:(NSString *)priceTitle;
//显示筛选结果
- (void)ShowScreeningResponse;
@end
......@@ -61,10 +70,22 @@
@property (nonatomic,assign) id<TableviewSelectedIndexdelegate>delegate;
/**
* 筛选按钮选中的index
*/
@property (nonatomic) NSInteger selectedIndex;
/**
* 通过复选搜索到的总条数
*/
@property (nonatomic,assign) NSInteger totalNumber;
/**
* 默认数据源
*/
@property (nonatomic,strong) NSMutableArray *defaultDatasArray;
@end
Lighting/Class/screeningSecondView.m
View file @ 6d40a954
......@@ -29,6 +29,13 @@
- (void)awakeFromNib
{
// [self uiConfigAction];
self.defaultDatasArray = [NSMutableArray array];
for (int i=0; i<5; i++) {
NSDictionary *defaultDict = @{@"typecode":@" ",@"typename":@"全部"};
[self.defaultDatasArray addObject:defaultDict];
}
[self uiConfigAction];
}
......@@ -36,8 +43,6 @@
- (void)setDatasArray:(NSArray *)datasArray
{
_datasArray = datasArray;
[self uiConfigAction];
[self.screeningTableview reloadData];
[self.screeningCollectionView reloadData];
}
......@@ -45,15 +50,17 @@
#pragma mark - 布局
- (void)uiConfigAction
{
self.screeningTableview.delegate = self;
self.screeningTableview.dataSource = self;
self.screeningTableview.tableFooterView = [UIView new];
self.screeningTableview.backgroundColor = [UIColor grayColor];
[self.screeningTableview registerClass:[UITableViewCell class] forCellReuseIdentifier:@"tableviewcell"];
self.screeningLayout.itemSize = CGSizeMake((WIDTH-127)/3, 35);
self.screeningLayout.minimumLineSpacing = 30;
self.screeningLayout.minimumInteritemSpacing = 10;
self.screeningLayout.sectionInset = UIEdgeInsetsMake(20, 30, 20, 30);
self.screeningResultButton.layer.masksToBounds = YES;
self.screeningResultButton.layer.cornerRadius = kCornerRadius;
[self.screeningCollectionView registerClass:[ScreeningFirstCollectionViewCell class] forCellWithReuseIdentifier:@"cell"];
[self.screeningCollectionView registerClass:[ScreeningSecondCollectionReusableView class] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"screeningcell"];
self.screeningCollectionView.dataSource = self;
......@@ -65,7 +72,8 @@
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"tableviewcell" forIndexPath:indexPath];
cell.textLabel.text = @"全部";
cell.textLabel.text = [self.defaultDatasArray objectAtIndex_opple:indexPath.row][@"typename"];
cell.textLabel.font = [UIFont systemFontOfSize:10];
cell.selectedBackgroundView.backgroundColor = [UIColor whiteColor];
cell.backgroundColor = [UIColor grayColor];
cell.textLabel.textAlignment = NSTextAlignmentCenter;
......@@ -74,7 +82,7 @@
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return 5;
return self.defaultDatasArray.count;
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
......@@ -94,12 +102,24 @@
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
{
ScreeningFirstCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"cell" forIndexPath:indexPath];
cell.titleLabe.text = [self.datasArray objectAtIndex_opple:indexPath.item];
if (self.selectedIndex == 1) {
cell.titleLabe.text = [[[[self.datasArray objectAtIndex_opple:indexPath.section] children] objectAtIndex_opple:indexPath.row] name];
}
else
{
cell.titleLabe.text = [[self.datasArray objectAtIndex_opple:indexPath.row] typename];
}
return cell;
}
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
{
if (self.selectedIndex == 1) {
return [[[self.datasArray objectAtIndex_opple:section] children] count];
}
return self.datasArray.count;
}
......@@ -108,29 +128,98 @@
- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
{
ScreeningSecondCollectionReusableView *cell = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"screeningcell" forIndexPath:indexPath];
self.selectedIndex == 1?(cell.subTitleButton.hidden = NO):(cell.subTitleButton.hidden = YES);
[cell.alltitleButton addTarget:self action:@selector(AllButtonClick:) forControlEvents:UIControlEventTouchUpInside];
if (self.selectedIndex == 1) {
NSString *subTitle = [[self.datasArray objectAtIndex_opple:indexPath.section] name];
[cell.subTitleButton setTitle:subTitle forState:UIControlStateNormal];
}
return cell;
}
- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section{
if (self.selectedIndex == 1 && section == 0) {
return CGSizeMake(self.screeningCollectionView.frame.size.width, 130);
}
return CGSizeMake(self.screeningCollectionView.frame.size.width, 75);
}
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
{
//选中后的tableview赋值，并传递typecode筛选商品
UITableViewCell *cell = [self.screeningTableview cellForRowAtIndexPath:[NSIndexPath indexPathForRow:self.selectedIndex inSection:0]];
//选中类型的文本
NSString *selectedTitle = nil;
//选中的key
NSString *selectedTypecode = nil;
if (self.selectedIndex == 1) {
selectedTitle = [[[[self.datasArray objectAtIndex_opple:indexPath.section] children] objectAtIndex_opple:indexPath.row] name];
selectedTypecode = [[[[self.datasArray objectAtIndex_opple:indexPath.section] children] objectAtIndex_opple:indexPath.row] fid];
}
else
{
selectedTitle = [[self.datasArray objectAtIndex_opple:indexPath.row] typename];
selectedTypecode = [[self.datasArray objectAtIndex_opple:indexPath.row] typecode];
}
NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:selectedTitle,@"typename",selectedTypecode,@"typecode", nil];
[self.defaultDatasArray replaceObjectAtIndex:self.selectedIndex withObject:dict];
cell.textLabel.text = selectedTitle;
[self JudgeDelegateIsPerformWithPassParamater];
}
#pragma mark -区头的全部按钮点击
- (void)AllButtonClick:(UIButton *)button
{
UITableViewCell *cell = [self.screeningTableview cellForRowAtIndexPath:[NSIndexPath indexPathForRow:self.selectedIndex inSection:0]];
cell.textLabel.text = @"全部";
NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:button.currentTitle,@"typename", nil];
[self.defaultDatasArray replaceObjectAtIndex:self.selectedIndex withObject:dict];
[self JudgeDelegateIsPerformWithPassParamater];
}
#pragma mark -判断代理是否被执行，并传递复选的参数
- (void)JudgeDelegateIsPerformWithPassParamater
{
if ([self.delegate respondsToSelector:@selector(collectionSelectedindexWithStyleCode:withCategories:withSpace:withMaterial:withPrice:)]) {
//传回选中的所有条件
[self.delegate collectionSelectedindexWithStyleCode:[self.defaultDatasArray objectAtIndex_opple:0][@"typecode"] withCategories:[self.defaultDatasArray objectAtIndex_opple:1][@"typecode"] withSpace:[self.defaultDatasArray objectAtIndex_opple:2][@"typecode"] withMaterial:[self.defaultDatasArray objectAtIndex_opple:3][@"typecode"] withPrice:[self.defaultDatasArray objectAtIndex_opple:4][@"typename"]];
}
}
#pragma mark -筛选结果点击
- (IBAction)ScreeningResultButtonClick:(UIButton *)sender {
if ([self.delegate respondsToSelector:@selector(ShowScreeningResponse)]) {
[self.delegate ShowScreeningResponse];
}
}
#pragma mark -传入满足搜索条件的个数
- (void)setTotalNumber:(NSInteger)totalNumber
{
_totalNumber = totalNumber;
[self.screeningResultButton setTitle:[NSString stringWithFormat:@"筛选结果共%ld件商品",totalNumber] forState:UIControlStateNormal];
}
......
Lighting/Class/screeningSecondView.xib
View file @ 6d40a954
......@@ -31,7 +31,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<state key="normal" title="筛选结果共122件商品">
<state key="normal" title="筛选结果共0件商品">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
......
Lighting/Lighting.xcodeproj/project.pbxproj
View file @ 6d40a954
......@@ -35,6 +35,8 @@
2962D0791CD1CBC60058829D /* NetworkRequestClassManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2962D0781CD1CBC60058829D /* NetworkRequestClassManager.m */; };
2962D07D1CD1E4490058829D /* NSArray+Objectwithindex.m in Sources */ = {isa = PBXBuildFile; fileRef = 2962D07C1CD1E4490058829D /* NSArray+Objectwithindex.m */; };
2962D0811CD1E6010058829D /* UIView+Frame.m in Sources */ = {isa = PBXBuildFile; fileRef = 2962D0801CD1E6010058829D /* UIView+Frame.m */; };
29698D611CE2C11500D72CE7 /* SettlementViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29698D5F1CE2C11500D72CE7 /* SettlementViewController.m */; };
29698D621CE2C11500D72CE7 /* SettlementViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29698D601CE2C11500D72CE7 /* SettlementViewController.xib */; };
29706DA61CD082990003C412 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29706DA51CD082990003C412 /* main.m */; };
29706DA91CD082990003C412 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 29706DA81CD082990003C412 /* AppDelegate.m */; };
29706DAF1CD082990003C412 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29706DAD1CD082990003C412 /* Main.storyboard */; };
......@@ -152,6 +154,9 @@
2962D07C1CD1E4490058829D /* NSArray+Objectwithindex.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+Objectwithindex.m"; sourceTree = "<group>"; };
2962D07F1CD1E6010058829D /* UIView+Frame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Frame.h"; sourceTree = "<group>"; };
2962D0801CD1E6010058829D /* UIView+Frame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Frame.m"; sourceTree = "<group>"; };
29698D5E1CE2C11500D72CE7 /* SettlementViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettlementViewController.h; sourceTree = "<group>"; };
29698D5F1CE2C11500D72CE7 /* SettlementViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettlementViewController.m; sourceTree = "<group>"; };
29698D601CE2C11500D72CE7 /* SettlementViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettlementViewController.xib; sourceTree = "<group>"; };
29706DA11CD082990003C412 /* Lighting.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Lighting.app; sourceTree = BUILT_PRODUCTS_DIR; };
29706DA51CD082990003C412 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
29706DA71CD082990003C412 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
......@@ -694,6 +699,9 @@
children = (
299876401CD99E4000C90D0A /* OrderdetailsViewController.h */,
299876411CD99E4000C90D0A /* OrderdetailsViewController.m */,
29698D5E1CE2C11500D72CE7 /* SettlementViewController.h */,
29698D5F1CE2C11500D72CE7 /* SettlementViewController.m */,
29698D601CE2C11500D72CE7 /* SettlementViewController.xib */,
);
name = controller;
sourceTree = "<group>";
......@@ -1006,6 +1014,7 @@
29807C651CD20F0F00F111B8 /* StoryboardwithCYX.storyboard in Resources */,
29EAAE901CDC3E9700C4DBA2 /* BillingInfoView.xib in Resources */,
29706DB71CD082990003C412 /* LaunchScreen.storyboard in Resources */,
29698D621CE2C11500D72CE7 /* SettlementViewController.xib in Resources */,
29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */,
29834EB61CDF1EB6001A484F /* screeningSecondView.xib in Resources */,
299249461CDB51C800786B1E /* ModifyShippingAddressView.xib in Resources */,
......@@ -1093,6 +1102,7 @@
2992493D1CDB3E8900786B1E /* GenerateOrdersModifyTableViewCell.m in Sources */,
29BB27741CD9DFAC009A0813 /* SceneLibraryViewController.m in Sources */,
2928F8421CD0ABAC0036D761 /* ShoppingViewController.m in Sources */,
29698D611CE2C11500D72CE7 /* SettlementViewController.m in Sources */,
299876331CD997DF00C90D0A /* OrderInformationTableViewCell.m in Sources */,
2928F7E71CD087FE0036D761 /* BaseViewController.m in Sources */,
299876271CD9837C00C90D0A /* OrderTableViewCell.m in Sources */,
......@@ -1267,7 +1277,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
COMPRESS_PNG_FILES = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Tools/PrefixHeader.pch";
......@@ -1303,9 +1313,9 @@
"-framework",
"\"UIKit\"",
);
PRODUCT_BUNDLE_IDENTIFIER = com.cntaiping.opple;
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "1984600d-9582-4f80-b666-2975a03aee8f";
PROVISIONING_PROFILE = "f89bebf5-81e2-4c61-9052-8c7bb0f9ddd6";
STRIP_PNG_TEXT = NO;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
};
......@@ -1318,8 +1328,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
COMPRESS_PNG_FILES = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Tools/PrefixHeader.pch";
......@@ -1355,9 +1365,9 @@
"-framework",
"\"UIKit\"",
);
PRODUCT_BUNDLE_IDENTIFIER = com.cntaiping.opple;
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "1984600d-9582-4f80-b666-2975a03aee8f";
PROVISIONING_PROFILE = "f89bebf5-81e2-4c61-9052-8c7bb0f9ddd6";
STRIP_PNG_TEXT = NO;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
};
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/backView.imageset/Contents.json
View file @ 6d40a954
......@@ -4,6 +4,14 @@
"idiom" : "universal",
"filename" : "backView.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/10-副本.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "10-副本@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/Folder.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "Folder@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/Friends-Circle.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "Friends-Circle@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/Trash.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "Trash@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/bg.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "bg@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/box.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "box@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/wechat.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "wechat@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/weibo.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "weibo@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果一体验中心_iPhone_assets/1.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "1@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果一体验中心_iPhone_assets/10.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "10@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果一体验中心_iPhone_assets/2.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "2@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果一体验中心_iPhone_assets/4.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "4@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果一体验中心_iPhone_assets/5.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "5@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果一体验中心_iPhone_assets/d.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "d@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果一体验中心_iPhone_assets/产品.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "产品@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果一体验中心_iPhone_assets/场景.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "场景@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/1-副本.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "1-副本@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/10.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "10@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/4.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "4@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/5.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "5@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/d.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "d@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/产品.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "产品@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/场景.imageset/Contents.json
View file @ 6d40a954
......@@ -9,6 +9,10 @@
"idiom" : "universal",
"filename" : "场景@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Lighting/Lighting/Images.xcassets/1.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "1.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "1@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/10-副本-3.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "10-副本-3.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "10-副本-3@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/2.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "2.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "2@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/7.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "7.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "7@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/Cog.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "Cog.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Cog@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/Trash.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "Trash.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Trash@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/View.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "View.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "View@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/View1.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "View1.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "View1@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/ablum-副本.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "ablum-副本.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ablum-副本@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/ablum.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "ablum.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ablum@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/bg.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "bg.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "bg@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/box-副本.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "box-副本.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "box-副本@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/data-1.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "data.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "data@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/dial.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "dial.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "dial@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/icon-1.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "icon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "icon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/icon-2.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "icon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "icon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/icon-副本.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "icon-副本.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "icon-副本@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/icon.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "icon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "icon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/jia.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "jia.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "jia@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/line.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "line.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "line@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/search.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "search.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "search@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/圆角矩形-3.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "圆角矩形-3.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "圆角矩形-3@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/已完成.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "已完成.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "已完成@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/已撤销.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "已撤销.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "已撤销@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/已退货.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "已退货.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "已退货@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/当前.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "当前.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "当前@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/矢量智能对象.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "矢量智能对象.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "矢量智能对象@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/筛选.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "筛选.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "筛选@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/筛选1.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "筛选1.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "筛选1@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/视角.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "视角.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "视角@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/视角1.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "视角1.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "视角1@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/视角3.imageset/Contents.json 0 → 100644
View file @ 6d40a954
{
"images" : [
{
"idiom" : "universal",
"filename" : "视角3.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "视角3@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Info.plist
View file @ 6d40a954
......@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>com.cntaiping.opple</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
......
Lighting/Tools/BaseViewController.m
View file @ 6d40a954
......@@ -45,7 +45,7 @@
#pragma mark -渐隐提示框回调
- (void)SHOWPrompttext:(NSString *)Text ComcpleteBlock:(void(^)())completed
{
MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view.window animated:YES];
hud.labelText = Text;
hud.animationType = MBProgressHUDAnimationZoom;
hud.mode = MBProgressHUDModeText;
......@@ -79,7 +79,7 @@
#pragma mark -显示成功的提示框
- (void)SuccessMBProgressView:(NSString *)successString
{
MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view.window animated:YES];
// Set the custom view mode to show any view.
hud.mode = MBProgressHUDModeCustomView;
// Set an image view with a checkmark.
......@@ -97,7 +97,7 @@
#pragma mark -显示错误的提示框
- (void)ErrorMBProgressView:(NSString *)errorString
{
MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view.window animated:YES];
// Set the custom view mode to show any view.
hud.mode = MBProgressHUDModeCustomView;
// Set an image view with a checkmark.
......
Lighting/Tools/PrefixHeader.pch
View file @ 6d40a954
......@@ -24,6 +24,7 @@
#import "HENLENSONG.h"
#import "JSONModel.h"
#import "Shoppersmanager.h"
#import "UIImageView+WebCache.h"
// Include any system framework and library headers here that should be included in all compilation units.
// You will also need to set the Prefix Header build setting of one or more of your targets to reference this file.
......
Lighting/Tools/opple_objc_json_client.h
View file @ 6d40a954
......@@ -27,30 +27,38 @@ extern NSString * const SORTDIRECTION_DESC;
@class RsResponse;
@class LoginInfo;
@class ModifyPasswordRequest;
@class GoodsCategory;
@class DataDict;
@class GoodsCondition;
@class GoodsFilter;
@class HotTagResponse;
@class OrderBill;
@class SceneCondition;
@class SceneFilter;
@class TOConsumerEntity;
@class TOGoodsBrandEntity;
@class TOGoodsLabelEntity;
@class TOHottagEntity;
@class TOOrderdetailEntity;
@class TOSceneEntity;
@class TOShopcartEntity;
@class IdEntity;
@class TOSceneEntity;
@class TOShippingAddrEntity;
@class TOPositionEntity;
@class TOOrderEntity;
@class TOGoodsLabelCategoryEntity;
@class TOGoodsCategoryEntity;
@class TOGoodsEntity;
@class GoodsCondition;
@class HotTagResponse;
@class GoodsCategory;
@class ResetPasswordRequest;
@class LoginResult;
@class ConsumerQueryCondition;
@class ExceptionCode;
@class DataPage;
@class TSUserOrg;
@class SceneResponse;
@class ShopCartResponse;
@class TSBaseUser;
@class TSDepart;
@class TSUserOrg;
@class ShopCartResponse;
@class OrderResponse;
@class GoodsResponse;
@class ConsumerPageResult;
......@@ -61,36 +69,45 @@ extern NSString * const SORTDIRECTION_DESC;
@protocol RsResponse @end
@protocol LoginInfo @end
@protocol ModifyPasswordRequest @end
@protocol GoodsCategory @end
@protocol DataDict @end
@protocol GoodsCondition @end
@protocol GoodsFilter @end
@protocol HotTagResponse @end
@protocol OrderBill @end
@protocol SceneCondition @end
@protocol SceneFilter @end
@protocol TOConsumerEntity @end
@protocol TOGoodsBrandEntity @end
@protocol TOGoodsLabelEntity @end
@protocol TOHottagEntity @end
@protocol TOOrderdetailEntity @end
@protocol TOSceneEntity @end
@protocol TOShopcartEntity @end
@protocol IdEntity @end
@protocol TOSceneEntity @end
@protocol TOShippingAddrEntity @end
@protocol TOPositionEntity @end
@protocol TOOrderEntity @end
@protocol TOGoodsLabelCategoryEntity @end
@protocol TOGoodsCategoryEntity @end
@protocol TOGoodsEntity @end
@protocol GoodsCondition @end
@protocol HotTagResponse @end
@protocol GoodsCategory @end
@protocol ResetPasswordRequest @end
@protocol LoginResult @end
@protocol ConsumerQueryCondition @end
@protocol ExceptionCode @end
@protocol DataPage @end
@protocol TSUserOrg @end
@protocol SceneResponse @end
@protocol ShopCartResponse @end
@protocol TSBaseUser @end
@protocol TSDepart @end
@protocol TSUserOrg @end
@protocol ShopCartResponse @end
@protocol OrderResponse @end
@protocol GoodsResponse @end
@protocol ConsumerPageResult @end
@protocol TSUser @end
@protocol TOEmployee @end
#ifndef DEF_PageRows_H
#define DEF_PageRows_H
......@@ -221,34 +238,91 @@ extern NSString * const SORTDIRECTION_DESC;
#endif
#ifndef DEF_GoodsCategory_H
#define DEF_GoodsCategory_H
#ifndef DEF_DataDict_H
#define DEF_DataDict_H
/**
* @author Debenson
* @author Administrator
@since 0.1
*/
@interface GoodsCategory : JSONModel
@interface DataDict : JSONModel
/**
* 分类id
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *fid;
@property (nonatomic, copy) NSString *typename;
/**
* 分类名称
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *name;
@property (nonatomic, copy) NSString *typecode;
@end /* interface DataDict */
#endif
#ifndef DEF_GoodsCondition_H
#define DEF_GoodsCondition_H
/**
* 下级分类列表
* @see GoodsCategory
* @author NuoSa
@since 0.1
*/
@interface GoodsCondition : JSONModel
/**
* 查询条件是 商品名称
*
*
*/
@property (nonatomic, strong) NSArray<GoodsCategory> *children;
@end /* interface GoodsCategory */
@property (nonatomic, copy) NSString *nameLike;
/**
* 查询条件是 类型id，取值: GoodsCategory#getId()
*
*
*/
@property (nonatomic, copy) NSString *categoryEquals;
/**
* 查询条件是 风格
*
*
*/
@property (nonatomic, copy) NSString *styleEquals;
/**
* 查询条件是 空间
*
*
*/
@property (nonatomic, copy) NSString *spaceEquals;
/**
* 查询条件是 材质
*
*
*/
@property (nonatomic, copy) NSString *materialEqueals;
/**
* 查询条件是 起始价格
*
*
*/
@property (nonatomic, strong) NSNumber *startprice;
/**
* 查询条件是 起始价格
*
*
*/
@property (nonatomic, strong) NSNumber *endprice;
/**
* 分页
*
*
*/
@property (nonatomic, strong) DataPage *page;
@end /* interface GoodsCondition */
#endif
......@@ -264,59 +338,39 @@ extern NSString * const SORTDIRECTION_DESC;
@interface GoodsFilter : JSONModel
/**
* 风格
* @see NSString
* @see DataDict
*
*/
@property (nonatomic, strong) NSArray *styles;
@property (nonatomic, strong) NSArray<DataDict> *styles;
/**
* 类型
* (no documentation provided)
* @see GoodsCategory
*
*/
@property (nonatomic, strong) NSArray<GoodsCategory> *categories;
/**
* 空间
* @see NSString
* @see DataDict
*
*/
@property (nonatomic, strong) NSArray *space;
@property (nonatomic, strong) NSArray<DataDict> *space;
/**
* 材质
* @see NSString
* @see DataDict
*
*/
@property (nonatomic, strong) NSArray *material;
@property (nonatomic, strong) NSArray<DataDict> *material;
/**
* 价格
* @see NSDecimalNumber
* @see DataDict
*
*/
@property (nonatomic, strong) NSArray *price;
@property (nonatomic, strong) NSArray<DataDict> *price;
@end /* interface GoodsFilter */
#endif
#ifndef DEF_HotTagResponse_H
#define DEF_HotTagResponse_H
/**
* @author Administrator
@since 0.1
*/
@interface HotTagResponse : JSONModel
/**
* (no documentation provided)
* @see TOHottagEntity
*
*/
@property (nonatomic, strong) NSArray<TOHottagEntity> *list;
@end /* interface HotTagResponse */
#endif
#ifndef DEF_OrderBill_H
#define DEF_OrderBill_H
......@@ -344,6 +398,18 @@ extern NSString * const SORTDIRECTION_DESC;
*
*/
@property (nonatomic, strong) NSArray<TOOrderdetailEntity> *orderdetailList;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) TOConsumerEntity *consumer;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) TOEmployee *employee;
@end /* interface OrderBill */
#endif
......@@ -381,6 +447,32 @@ extern NSString * const SORTDIRECTION_DESC;
#endif
#ifndef DEF_SceneFilter_H
#define DEF_SceneFilter_H
/**
* @author Administrator
@since 0.1
*/
@interface SceneFilter : JSONModel
/**
* (no documentation provided)
* @see NSString
*
*/
@property (nonatomic, strong) NSArray *styles;
/**
* (no documentation provided)
* @see NSString
*
*/
@property (nonatomic, strong) NSArray *space;
@end /* interface SceneFilter */
#endif
#ifndef DEF_TOConsumerEntity_H
#define DEF_TOConsumerEntity_H
......@@ -477,12 +569,143 @@ extern NSString * const SORTDIRECTION_DESC;
#endif
#ifndef DEF_TOGoodsBrandEntity_H
#define DEF_TOGoodsBrandEntity_H
/**
* @Title: Entity
@Description: 商品品牌
@author onlineGenerator
@date 2016-05-05 16:14:51
@version V1.0
*/
@interface TOGoodsBrandEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createBy;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, strong) NSDate *createDate;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *sysOrgCode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *sysCompanyCode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *code;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *name;
/**
* 方法: 取得java.lang.Integer
*
*
*/
@property (nonatomic, assign) int state;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *logo;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *fdescription;
@end /* interface TOGoodsBrandEntity */
#endif
#ifndef DEF_TOGoodsLabelEntity_H
#define DEF_TOGoodsLabelEntity_H
/**
* @Title: Entity
@Description: 商品标签
@author onlineGenerator
@date 2016-05-05 17:18:15
@version V1.0
*/
@interface TOGoodsLabelEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *sysOrgCode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *sysCompanyCode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *name;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *categoryId;
@end /* interface TOGoodsLabelEntity */
#endif
#ifndef DEF_TOHottagEntity_H
#define DEF_TOHottagEntity_H
/**
*
@Title: Entity
* @Title: Entity
@Description: 热门推荐
@author onlineGenerator
@date 2016-05-06 16:36:36
......@@ -512,8 +735,7 @@ extern NSString * const SORTDIRECTION_DESC;
#define DEF_TOOrderdetailEntity_H
/**
*
@Title: Entity
* @Title: Entity
@Description: 订单详情
@author onlineGenerator
@date 2016-05-06 12:53:09
......@@ -575,24 +797,90 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *goodsPrice;
@property (nonatomic, strong) NSNumber *goodsPrice;
/**
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *goodsTotalPrice;
@property (nonatomic, strong) NSNumber *goodsTotalPrice;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *orderId;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *remark;
@end /* interface TOOrderdetailEntity */
#endif
#ifndef DEF_TOSceneEntity_H
#define DEF_TOSceneEntity_H
/**
* @Title: Entity
@Description: 场景
@author onlineGenerator
@date 2016-05-05 18:39:39
@version V1.0
*/
@interface TOSceneEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *sceneCode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *name;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *pricure;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *category;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *style;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *space;
@end /* interface TOSceneEntity */
#endif
#ifndef DEF_TOShopcartEntity_H
#define DEF_TOShopcartEntity_H
......@@ -696,7 +984,7 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *goodsSellerPrice;
@property (nonatomic, strong) NSNumber *goodsSellerPrice;
/**
* 方法: 取得java.lang.String
*
......@@ -708,13 +996,13 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *goodsPrice;
@property (nonatomic, strong) NSNumber *goodsPrice;
/**
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *goodsTotalPrice;
@property (nonatomic, strong) NSNumber *goodsTotalPrice;
/**
* 方法: 取得java.lang.String
*
......@@ -744,32 +1032,38 @@ extern NSString * const SORTDIRECTION_DESC;
#endif
#ifndef DEF_TOSceneEntity_H
#define DEF_TOSceneEntity_H
#ifndef DEF_TOShippingAddrEntity_H
#define DEF_TOShippingAddrEntity_H
/**
*
@Title: Entity
@Description: 场景
@Description: 收货地址
@author onlineGenerator
@date 2016-05-05 18:39:39
@date 2016-05-05 14:42:23
@version V1.0
*/
@interface TOSceneEntity : JSONModel
@interface TOShippingAddrEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, strong) NSDate *createDate;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *sceneCode;
@property (nonatomic, copy) NSString *sysOrgCode;
/**
* 方法: 取得java.lang.String
*
......@@ -781,26 +1075,92 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, copy) NSString *pricure;
@property (nonatomic, copy) NSString *miblephone;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *category;
@property (nonatomic, copy) NSString *province;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *style;
@property (nonatomic, copy) NSString *city;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *space;
@end /* interface TOSceneEntity */
@property (nonatomic, copy) NSString *country;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *address;
/**
* 方法: 取得java.lang.Integer
*
*
*/
@property (nonatomic, assign) int state;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *consumerId;
@end /* interface TOShippingAddrEntity */
#endif
#ifndef DEF_TOPositionEntity_H
#define DEF_TOPositionEntity_H
/**
* @Title: Entity
@Description: 经销商员工职位
@author onlineGenerator
@date 2016-05-02 17:39:21
@version V1.0
*/
@interface TOPositionEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *code;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *name;
/**
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, strong) NSNumber *commission;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *resellerCode;
@end /* interface TOPositionEntity */
#endif
......@@ -823,134 +1183,230 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, copy) NSString *fid;
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createBy;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, strong) NSDate *createDate;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *updateName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *updateBy;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, strong) NSDate *updateDate;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *sysOrgCode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *orderNumber;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, strong) NSDate *orderTime;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *guideId;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createName;
@property (nonatomic, copy) NSString *orderState;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createBy;
@property (nonatomic, copy) NSString *consumerId;
/**
* 方法: 取得java.util.Date
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, strong) NSDate *createDate;
@property (nonatomic, copy) NSString *goodsNum;
/**
* 方法: 取得java.lang.String
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, copy) NSString *updateName;
@property (nonatomic, strong) NSNumber *orderPrice;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *updateBy;
@property (nonatomic, copy) NSString *receiverName;
/**
* 方法: 取得java.util.Date
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, strong) NSDate *updateDate;
@property (nonatomic, copy) NSString *receiverMobile;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *sysOrgCode;
@property (nonatomic, copy) NSString *receiverAddress;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *orderNumber;
@property (nonatomic, copy) NSString *isBill;
/**
* 方法: 取得java.util.Date
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, strong) NSDate *orderTime;
@property (nonatomic, copy) NSString *billType;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *guideId;
@property (nonatomic, copy) NSString *billTitle;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *orderState;
@property (nonatomic, copy) NSString *payType;
@end /* interface TOOrderEntity */
#endif
#ifndef DEF_TOGoodsLabelCategoryEntity_H
#define DEF_TOGoodsLabelCategoryEntity_H
/**
* @Title: Entity
@Description: 商品标签分类
@author onlineGenerator
@date 2016-05-05 16:57:27
@version V1.0
*/
@interface TOGoodsLabelCategoryEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *consumerId;
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *goodsNum;
@property (nonatomic, copy) NSString *sysOrgCode;
/**
* 方法: 取得java.math.BigDecimal
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *orderPrice;
@property (nonatomic, copy) NSString *sysCompanyCode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *receiverName;
@property (nonatomic, copy) NSString *code;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *receiverMobile;
@property (nonatomic, copy) NSString *name;
@end /* interface TOGoodsLabelCategoryEntity */
#endif
#ifndef DEF_TOGoodsCategoryEntity_H
#define DEF_TOGoodsCategoryEntity_H
/**
* @Title: Entity
@Description: 商品分类
@author onlineGenerator
@date 2016-05-10 10:17:53
@version V1.0
*/
@interface TOGoodsCategoryEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *receiverAddress;
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *isBill;
@property (nonatomic, copy) NSString *code;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *billType;
@property (nonatomic, copy) NSString *name;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *billTitle;
@property (nonatomic, copy) NSString *upperId;
/**
* 方法: 取得java.lang.String
* 方法: 取得java.lang.Integer
*
*
*/
@property (nonatomic, copy) NSString *payType;
@end /* interface TOOrderEntity */
@property (nonatomic, assign) int level;
@end /* interface TOGoodsCategoryEntity */
#endif
......@@ -959,11 +1415,10 @@ extern NSString * const SORTDIRECTION_DESC;
#define DEF_TOGoodsEntity_H
/**
*
@Title: Entity
* @Title: Entity
@Description: 商品
@author onlineGenerator
@date 2016-05-06 13:47:39
@date 2016-05-09 16:14:26
@version V1.0
......@@ -1034,19 +1489,19 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *guidePrice;
@property (nonatomic, strong) NSNumber *guidePrice;
/**
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *tagPrice;
@property (nonatomic, strong) NSNumber *tagPrice;
/**
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *costPrice;
@property (nonatomic, strong) NSNumber *costPrice;
/**
* 方法: 取得java.lang.String
*
......@@ -1058,7 +1513,7 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *inv;
@property (nonatomic, strong) NSNumber *inv;
/**
* 方法: 取得java.lang.String
*
......@@ -1070,7 +1525,7 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *weight;
@property (nonatomic, strong) NSNumber *weight;
/**
* 方法: 取得java.lang.String
*
......@@ -1090,7 +1545,7 @@ extern NSString * const SORTDIRECTION_DESC;
*/
@property (nonatomic, copy) NSString *power;
/**
* 方法: 取得java.lang.String
* 方法: ���得java.lang.String
*
*
*/
......@@ -1167,70 +1622,65 @@ extern NSString * const SORTDIRECTION_DESC;
*
*/
@property (nonatomic, copy) NSString *pictures;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *barcode;
@end /* interface TOGoodsEntity */
#endif
#ifndef DEF_GoodsCondition_H
#define DEF_GoodsCondition_H
#ifndef DEF_HotTagResponse_H
#define DEF_HotTagResponse_H
/**
* @author NuoSa
* @author Administrator
@since 0.1
*/
@interface GoodsCondition : JSONModel
/**
* 查询条件是 商品名称
*
*
*/
@property (nonatomic, copy) NSString *nameLike;
/**
* 查询条件是 类型id，取值: GoodsCategory#getId()
*
*
*/
@property (nonatomic, copy) NSString *categoryEquals;
/**
* 查询条件是 风格
*
*
*/
@property (nonatomic, copy) NSString *styleEquals;
@interface HotTagResponse : JSONModel
/**
* 查询条件是 空间
*
* (no documentation provided)
* @see TOHottagEntity
*
*/
@property (nonatomic, copy) NSString *spaceEquals;
@property (nonatomic, strong) NSArray<TOHottagEntity> *list;
@end /* interface HotTagResponse */
#endif
#ifndef DEF_GoodsCategory_H
#define DEF_GoodsCategory_H
/**
* 查询条件是 材质
*
*
* @author Debenson
@since 0.1
*/
@property (nonatomic, copy) NSString *materialEqueals;
@interface GoodsCategory : JSONModel
/**
* 查询条件是 起始价格
* 分类id
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *startprice;
@property (nonatomic, copy) NSString *fid;
/**
* 查询条件是 起始价格
* 分类名称
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *endprice;
@property (nonatomic, copy) NSString *name;
/**
* 分页
*
* 下级分类列表
* @see GoodsCategory
*
*/
@property (nonatomic, strong) DataPage *page;
@end /* interface GoodsCondition */
@property (nonatomic, strong) NSArray<GoodsCategory> *children;
@end /* interface GoodsCategory */
#endif
......@@ -1292,7 +1742,7 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *commission;
@property (nonatomic, strong) NSNumber *commission;
@end /* interface LoginResult */
#endif
......@@ -1302,7 +1752,9 @@ extern NSString * const SORTDIRECTION_DESC;
#define DEF_ConsumerQueryCondition_H
/**
* @author Debenson
* 客户查询条件。
@author Debenson
@since 0.1
*/
......@@ -1313,7 +1765,6 @@ extern NSString * const SORTDIRECTION_DESC;
*
*/
@property (nonatomic, copy) NSString *nameEquals;
/**
* 手机号等于
*
......@@ -1405,36 +1856,6 @@ extern NSString * const SORTDIRECTION_DESC;
#endif
#ifndef DEF_TSUserOrg_H
#define DEF_TSUserOrg_H
/**
* 用户-组织机构 实体
<p/>
<p><b>User:</b> zhanggm <a href="mailto:guomingzhang2008@gmail.com">guomingzhang2008@gmail.com</a></p>
<p><b>Date:</b> 2014-08-22 15:39</p>
@author 张国明
*/
@interface TSUserOrg : IdEntity
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) TSUser *tsUser;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) TSDepart *tsDepart;
@end /* interface TSUserOrg */
#endif
#ifndef DEF_SceneResponse_H
#define DEF_SceneResponse_H
......@@ -1455,28 +1876,6 @@ extern NSString * const SORTDIRECTION_DESC;
#endif
#ifndef DEF_ShopCartResponse_H
#define DEF_ShopCartResponse_H
/**
* 购物车返回对象
@author Flash
@since 0.1
*/
@interface ShopCartResponse : PageRows
/**
* (no documentation provided)
* @see TOShopcartEntity
*
*/
@property (nonatomic, strong) NSArray<TOShopcartEntity> *shopcart;
@end /* interface ShopCartResponse */
#endif
#ifndef DEF_TSBaseUser_H
#define DEF_TSBaseUser_H
......@@ -1625,6 +2024,58 @@ extern NSString * const SORTDIRECTION_DESC;
#endif
#ifndef DEF_TSUserOrg_H
#define DEF_TSUserOrg_H
/**
* 用户-组织机构 实体
<p/>
<p><b>User:</b> zhanggm <a href="mailto:guomingzhang2008@gmail.com">guomingzhang2008@gmail.com</a></p>
<p><b>Date:</b> 2014-08-22 15:39</p>
@author 张国明
*/
@interface TSUserOrg : IdEntity
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) TSUser *tsUser;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) TSDepart *tsDepart;
@end /* interface TSUserOrg */
#endif
#ifndef DEF_ShopCartResponse_H
#define DEF_ShopCartResponse_H
/**
* 购物车返回对象
@author Flash
@since 0.1
*/
@interface ShopCartResponse : PageRows
/**
* (no documentation provided)
* @see TOShopcartEntity
*
*/
@property (nonatomic, strong) NSArray<TOShopcartEntity> *shopcart;
@end /* interface ShopCartResponse */
#endif
#ifndef DEF_OrderResponse_H
#define DEF_OrderResponse_H
......
Lighting/Tools/opple_objc_json_client.m
View file @ 6d40a954
......@@ -60,10 +60,9 @@
@end
@implementation GoodsCategory
@synthesize fid;
@synthesize name;
@synthesize children;
@implementation DataDict
@synthesize typename;
@synthesize typecode;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -71,14 +70,26 @@
}
+(JSONKeyMapper*)keyMapper
@end
@implementation GoodsCondition
@synthesize nameLike;
@synthesize categoryEquals;
@synthesize styleEquals;
@synthesize spaceEquals;
@synthesize materialEqueals;
@synthesize startprice;
@synthesize endprice;
@synthesize page;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
return YES;
}
@end
@implementation GoodsFilter
......@@ -96,8 +107,12 @@
@end
@implementation HotTagResponse
@synthesize list;
@implementation OrderBill
@synthesize datapage;
@synthesize order;
@synthesize orderdetailList;
@synthesize consumer;
@synthesize employee;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -107,10 +122,10 @@
@end
@implementation OrderBill
@synthesize datapage;
@synthesize order;
@synthesize orderdetailList;
@implementation SceneCondition
@synthesize styleEquals;
@synthesize spaceEquals;
@synthesize page;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -120,10 +135,9 @@
@end
@implementation SceneCondition
@synthesize styleEquals;
@synthesize spaceEquals;
@synthesize page;
@implementation SceneFilter
@synthesize styles;
@synthesize space;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -162,6 +176,59 @@
}
@end
@implementation TOGoodsBrandEntity
@synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize sysOrgCode;
@synthesize sysCompanyCode;
@synthesize code;
@synthesize name;
@synthesize state;
@synthesize logo;
@synthesize fdescription;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"description": @"fdescription",
@"id": @"fid",
}];
}
@end
@implementation TOGoodsLabelEntity
@synthesize fid;
@synthesize sysOrgCode;
@synthesize sysCompanyCode;
@synthesize name;
@synthesize categoryId;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end
@implementation TOHottagEntity
......@@ -196,6 +263,32 @@
@synthesize goodsPrice;
@synthesize goodsTotalPrice;
@synthesize orderId;
@synthesize remark;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end
@implementation TOSceneEntity
@synthesize fid;
@synthesize sceneCode;
@synthesize name;
@synthesize pricure;
@synthesize category;
@synthesize style;
@synthesize space;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -275,14 +368,41 @@ NSString * const SORTDIRECTION_ASC = @"asc";
NSString * const SORTDIRECTION_DESC = @"desc";
#endif /* DEF_SortDirection_M */
@implementation TOSceneEntity
@implementation TOShippingAddrEntity
@synthesize fid;
@synthesize sceneCode;
@synthesize createDate;
@synthesize sysOrgCode;
@synthesize name;
@synthesize pricure;
@synthesize category;
@synthesize style;
@synthesize space;
@synthesize miblephone;
@synthesize province;
@synthesize city;
@synthesize country;
@synthesize address;
@synthesize state;
@synthesize consumerId;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end
@implementation TOPositionEntity
@synthesize fid;
@synthesize code;
@synthesize name;
@synthesize commission;
@synthesize resellerCode;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -338,6 +458,52 @@ NSString * const SORTDIRECTION_DESC = @"desc";
}
@end
@implementation TOGoodsLabelCategoryEntity
@synthesize fid;
@synthesize sysOrgCode;
@synthesize sysCompanyCode;
@synthesize code;
@synthesize name;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end
@implementation TOGoodsCategoryEntity
@synthesize fid;
@synthesize code;
@synthesize name;
@synthesize upperId;
@synthesize level;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end
@implementation TOGoodsEntity
......@@ -374,6 +540,7 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@synthesize installMethod;
@synthesize lightNumber;
@synthesize pictures;
@synthesize barcode;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -391,15 +558,8 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation GoodsCondition
@synthesize nameLike;
@synthesize categoryEquals;
@synthesize styleEquals;
@synthesize spaceEquals;
@synthesize materialEqueals;
@synthesize startprice;
@synthesize endprice;
@synthesize page;
@implementation HotTagResponse
@synthesize list;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -407,6 +567,27 @@ NSString * const SORTDIRECTION_DESC = @"desc";
}
@end
@implementation GoodsCategory
@synthesize fid;
@synthesize name;
@synthesize children;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end
@implementation ResetPasswordRequest
......@@ -480,18 +661,6 @@ NSString * const SORTDIRECTION_DESC = @"desc";
}
@end
@implementation TSUserOrg
@synthesize tsUser;
@synthesize tsDepart;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation SceneResponse
......@@ -503,17 +672,6 @@ NSString * const SORTDIRECTION_DESC = @"desc";
}
@end
@implementation ShopCartResponse
@synthesize shopcart;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation TSBaseUser
......@@ -562,6 +720,29 @@ NSString * const SORTDIRECTION_DESC = @"desc";
}
@end
@implementation TSUserOrg
@synthesize tsUser;
@synthesize tsDepart;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation ShopCartResponse
@synthesize shopcart;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation OrderResponse
......
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