Skip to content

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

修改项说明：

parent 9844f349
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 989 additions and 805 deletions
Class/AllCustomerViewController.m
View file @ 527575c6
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{ {
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil]; UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
ClientdetailsViewController *clientdetails = [storyboard instantiateViewControllerWithIdentifier:@"clientdetails"]; ClientdetailsViewController *clientdetails = [storyboard instantiateViewControllerWithIdentifier:@"clientdetails"];
clientdetails.model = [self.CustomerresultArray objectAtIndex_opple:indexPath.row]; clientdetails.model = [self.CustomerresultArray objectAtIndex_opple:indexPath.row];
clientdetails.cellindex = indexPath.row; clientdetails.cellindex = indexPath.row;
......
Class/AllpriceTableViewCell.m
View file @ 527575c6
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
for (id object in self.promotionalArray) { for (id object in self.promotionalArray) {
if ([object isKindOfClass:[PromotionalDeductionModel class]]) { if ([object isKindOfClass:[PromotionalDeductionModel class]]) {
PromotionalDeductionModel *model = (PromotionalDeductionModel *)object; PromotionalDeductionModel *model = (PromotionalDeductionModel *)object;
if ([model.type isEqualToString:@"deductionAction"]) { if ([model.type isEqualToString:@"deductionAction"] && model.isSelected) {
deductionPrice = model.total; deductionPrice = model.total;
} }
} }
......
Class/ClientViewController.m
View file @ 527575c6
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{ {
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil]; UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
ClientdetailsViewController *clientdetails = [storyboard instantiateViewControllerWithIdentifier:@"clientdetails"]; ClientdetailsViewController *clientdetails = [storyboard instantiateViewControllerWithIdentifier:@"clientdetails"];
clientdetails.model = [self.CustomerresultArray objectAtIndex_opple:indexPath.row]; clientdetails.model = [self.CustomerresultArray objectAtIndex_opple:indexPath.row];
clientdetails.cellindex = indexPath.row; clientdetails.cellindex = indexPath.row;
......
Class/CustomerOrderTableViewCell.m
View file @ 527575c6
...@@ -52,6 +52,9 @@ ...@@ -52,6 +52,9 @@
/// 商品个数 /// 商品个数
NSInteger goodsAllnum = 0; NSInteger goodsAllnum = 0;
self.orderTotalPrice.text = [NSString stringWithFormat:@"￥%.2f",[_model.order.orderPrice floatValue]]; self.orderTotalPrice.text = [NSString stringWithFormat:@"￥%.2f",[_model.order.orderPrice floatValue]];
for (TOOrderdetailEntity *model in _model.orderdetailList) {
goodsAllnum += [model.goodsNum integerValue];
}
self.styleNumber.text = [NSString stringWithFormat:@"%ld",goodsAllnum]; self.styleNumber.text = [NSString stringWithFormat:@"%ld",goodsAllnum];
//撤销订单、去支付 //撤销订单、去支付
if ([_model.order.orderState isEqualToString:@"001"]) { if ([_model.order.orderState isEqualToString:@"001"]) {
......
Class/CustomerOrderViewController.m
View file @ 527575c6
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{ {
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil]; UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"]; OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"];
TOOrderEntity *model = (TOOrderEntity *)[[self.datasArray objectAtIndex_opple:indexPath.row] order]; TOOrderEntity *model = (TOOrderEntity *)[[self.datasArray objectAtIndex_opple:indexPath.row] order];
orderdetails.orderCode = model.orderNumber; orderdetails.orderCode = model.orderNumber;
...@@ -349,7 +349,7 @@ ...@@ -349,7 +349,7 @@
#pragma mark -去支付 #pragma mark -去支付
- (void)TopayButtonClick:(NSInteger)cellindex - (void)TopayButtonClick:(NSInteger)cellindex
{ {
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil]; UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"]; OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"];
TOOrderEntity *model = (TOOrderEntity *)[[self.datasArray objectAtIndex_opple:cellindex] order]; TOOrderEntity *model = (TOOrderEntity *)[[self.datasArray objectAtIndex_opple:cellindex] order];
orderdetails.orderCode = model.orderNumber; orderdetails.orderCode = model.orderNumber;
......
Class/FullScreenViewController.m
View file @ 527575c6
...@@ -110,7 +110,7 @@ static NSString * const reuseIdentifier = @"Cell"; ...@@ -110,7 +110,7 @@ static NSString * const reuseIdentifier = @"Cell";
#pragma mark -体验中心 #pragma mark -体验中心
- (void)GotoTiYanCenterButtonClick - (void)GotoTiYanCenterButtonClick
{ {
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil]; UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
ExperienceCentreViewController *ExperienceCenter = [storyboard instantiateViewControllerWithIdentifier:@"ExperienceCentre"]; ExperienceCentreViewController *ExperienceCenter = [storyboard instantiateViewControllerWithIdentifier:@"ExperienceCentre"];
TOSceneEntity *sceneModel = [self.datasArray objectAtIndex_opple:self.currentIndex]; TOSceneEntity *sceneModel = [self.datasArray objectAtIndex_opple:self.currentIndex];
SceneListModel *model = [[SceneListModel alloc]init]; SceneListModel *model = [[SceneListModel alloc]init];
......
Class/OrderdetailsViewController.m
View file @ 527575c6
This diff is collapsed.
Class/RightViewController.h
View file @ 527575c6
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
- (void)SelectedControllerWithIndex:(NSString *)Name; - (void)SelectedControllerWithIndex:(NSString *)Name;
@end @end
@interface RightViewController : BaseViewController @interface RightViewController : BaseViewController
......
Class/RightViewController.m
View file @ 527575c6
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
{ {
if (_dataArray == nil) { if (_dataArray == nil) {
_dataArray = @[@"体验中心",@"场景库",@"产品库",@"客户管理",@"学习中心",@"关于"]; _dataArray = @[@"体验中心",@"场景库",@"产品库",@"客户管理",@"关于"];
} }
return _dataArray; return _dataArray;
} }
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
- (NSArray *)subSectionArray - (NSArray *)subSectionArray
{ {
if (!_subSectionArray) { if (!_subSectionArray) {
_subSectionArray = @[@"",@"",@"",@[@"所有客户",@"客户订单"],@[@"视频中心",@"技能考核"],@""]; _subSectionArray = @[@"所有客户",@"客户订单"];
} }
return _subSectionArray; return _subSectionArray;
} }
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
{ {
if (_imageArray == nil) { if (_imageArray == nil) {
_imageArray = [NSArray arrayWithObjects:@"tiyan",@"changjing",@"chanping",@"kehu",@"guanyu",@"guanyu", nil]; _imageArray = [NSArray arrayWithObjects:@"tiyan",@"changjing",@"chanping",@"kehu",@"guanyu", nil];
} }
return _imageArray; return _imageArray;
} }
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{ {
RightControlTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"RightControlTableViewCell" forIndexPath:indexPath]; RightControlTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"RightControlTableViewCell" forIndexPath:indexPath];
cell.sectionTitle.text = self.subSectionArray[indexPath.section][indexPath.row]; cell.sectionTitle.text = self.subSectionArray[indexPath.row];
return cell; return cell;
} }
...@@ -157,9 +157,8 @@ ...@@ -157,9 +157,8 @@
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{ {
BOOL controlClose = [self.sectionClosedArray[section] boolValue]; BOOL controlClose = [self.sectionClosedArray[section] boolValue];
if (section == 3 || section == 4) { if (section == 3) {
NSArray *sectionTitleArray = self.subSectionArray[section]; return controlClose?self.subSectionArray.count:0;
return controlClose?sectionTitleArray.count:0;
} }
return 0; return 0;
} }
...@@ -169,7 +168,7 @@ ...@@ -169,7 +168,7 @@
RightControlTableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath]; RightControlTableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
CGPoint point = [cell convertPoint:cell.sectionTitle.mj_origin toView:self.rightTableview]; CGPoint point = [cell convertPoint:cell.sectionTitle.mj_origin toView:self.rightTableview];
[self addInstructionsLine:point.y]; [self addInstructionsLine:point.y];
[self closeSidebarAndPassEvents:self.subSectionArray[indexPath.section][indexPath.row]]; [self closeSidebarAndPassEvents:self.subSectionArray[indexPath.row]];
} }
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
...@@ -206,17 +205,13 @@ ...@@ -206,17 +205,13 @@
- (void)sectionClickAction:(UITapGestureRecognizer *)sender - (void)sectionClickAction:(UITapGestureRecognizer *)sender
{ {
NSInteger index = sender.view.tag; NSInteger index = sender.view.tag;
if (sender.view.tag == 3 || sender.view.tag == 4) { if (sender.view.tag == 3) {
BOOL controlClose = [self.sectionClosedArray[index] boolValue]; BOOL controlClose = [self.sectionClosedArray[index] boolValue];
self.sectionClosedArray[index] = controlClose?@0:@1; self.sectionClosedArray[index] = controlClose?@0:@1;
[self.rightTableview reloadSections:[NSIndexSet indexSetWithIndex:index] withRowAnimation:UITableViewRowAnimationFade]; [self.rightTableview reloadSections:[NSIndexSet indexSetWithIndex:index] withRowAnimation:UITableViewRowAnimationFade];
}else { }else{
self.sectionClosedArray[3] = @0; self.sectionClosedArray[3] = @0;
self.sectionClosedArray[4] = @0; [self.rightTableview reloadSections:[NSIndexSet indexSetWithIndex:3] withRowAnimation:UITableViewRowAnimationFade];
NSMutableIndexSet *sectionSet = [[NSMutableIndexSet alloc]init];
[sectionSet addIndex:3];
[sectionSet addIndex:4];
[self.rightTableview reloadSections:sectionSet withRowAnimation:UITableViewRowAnimationFade];
[self closeSidebarAndPassEvents:self.dataArray[index]]; [self closeSidebarAndPassEvents:self.dataArray[index]];
} }
RightControlSectionView *sectionView = (RightControlSectionView *)sender.view; RightControlSectionView *sectionView = (RightControlSectionView *)sender.view;
......
Class/SearchViewController.m
View file @ 527575c6
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
[self.localSearchArray addObject:not.object]; [self.localSearchArray addObject:not.object];
} }
//调用商品控制器 //调用商品控制器
ProductLibraryViewController *productVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"productlibrary"]; ProductLibraryViewController *productVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"ProductLibraryViewController"];
productVC.selectedCode = not.object; productVC.selectedCode = not.object;
[self.navigationController pushViewController:productVC animated:YES]; [self.navigationController pushViewController:productVC animated:YES];
} }
......
Class/SettlementViewController.h
View file @ 527575c6
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
@property (nonatomic,strong) NSArray *goodsArray; @property (nonatomic,strong) NSArray *goodsArray;
/** /**
* 促销信息（赠送商品、折扣） * 促销信息（赠送商品、抵扣）
*/ */
@property (nonatomic,strong) NSArray *promotionalArray; @property (nonatomic,strong) NSArray *promotionalArray;
......
Class/SettlementViewController.m
View file @ 527575c6
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
@property (nonatomic,strong) PayViewController *payController; @property (nonatomic,strong) PayViewController *payController;
@end @end
@implementation SettlementViewController @implementation SettlementViewController
...@@ -54,8 +53,6 @@ ...@@ -54,8 +53,6 @@
} }
#pragma mark -布局 #pragma mark -布局
- (void)uiConfigAction - (void)uiConfigAction
{ {
...@@ -93,13 +90,14 @@ ...@@ -93,13 +90,14 @@
goodsAllNumber += [model.goodsNum integerValue]; goodsAllNumber += [model.goodsNum integerValue];
goodAllprice += [model.goodsPrice floatValue]*[model.goodsNum integerValue]; goodAllprice += [model.goodsPrice floatValue]*[model.goodsNum integerValue];
} }
/// 促销金额大于商品金额情况
goodAllprice = (goodAllprice<0)?0:goodAllprice;
/// 抽奖结果<打折> /// 抽奖结果<打折>
NSInteger totalNumber = 0;
if ([self.resultModel.type isEqualToString:@"discount"]) { if ([self.resultModel.type isEqualToString:@"discount"]) {
goodAllprice = goodAllprice*([self.resultModel.number integerValue]/100.0); goodAllprice = goodAllprice*([self.resultModel.number integerValue]/100.0);
} }
//** 促销金额 */ //** 促销金额 */
NSInteger totalNumber = 0;
for (id object in self.promotionalArray) { for (id object in self.promotionalArray) {
if ([object isKindOfClass:[PromotionalDeductionModel class]]) { if ([object isKindOfClass:[PromotionalDeductionModel class]]) {
PromotionalDeductionModel *model = (PromotionalDeductionModel *)object; PromotionalDeductionModel *model = (PromotionalDeductionModel *)object;
...@@ -316,17 +314,30 @@ ...@@ -316,17 +314,30 @@
for (id object in self.promotionalArray) { for (id object in self.promotionalArray) {
if ([object isKindOfClass:[PromotionalGoodsModel class]]) { if ([object isKindOfClass:[PromotionalGoodsModel class]]) {
PromotionalGoodsModel *model = (PromotionalGoodsModel *)object; PromotionalGoodsModel *model = (PromotionalGoodsModel *)object;
PromotionGoods *goods = [[PromotionGoods alloc]init]; if (model.isSelected) {
UCN *goodDetails = [[UCN alloc]init]; PromotionGoods *goods = [[PromotionGoods alloc]init];
goodDetails.code = model.goods.code; UCN *goodDetails = [[UCN alloc]init];
goodDetails.uuid = model.goods.uuid; goodDetails.code = model.goods.code;
goodDetails.name = model.goods.name; goodDetails.uuid = model.goods.uuid;
goods.goods = goodDetails; goodDetails.name = model.goods.name;
goods.promotionNumber = [NSNumber numberWithInteger:model.count]; goods.goods = goodDetails;
[goodsArray addObject:goods]; goods.promotionNumber = [NSNumber numberWithInteger:model.count];
[goodsArray addObject:goods];
}
} }
} }
order.promotionGoods = (NSArray<PromotionGoods> *)goodsArray; order.promotionGoods = (NSArray<PromotionGoods> *)goodsArray;
/// 抵扣金额
CGFloat promotionMoney = 0;
for (id object in self.promotionalArray) {
if ([object isKindOfClass:[PromotionalDeductionModel class]]) {
PromotionalDeductionModel *model = (PromotionalDeductionModel *)object;
if (model.isSelected) {
promotionMoney += model.total;
}
}
}
order.promotionMoney = @(promotionMoney);
/// 查询是否有京东E卡促销 /// 查询是否有京东E卡促销
NSInteger totalNumber = 0;//促销卡面额 NSInteger totalNumber = 0;//促销卡面额
for (id object in self.luckyDrawAndJDECardArray) { for (id object in self.luckyDrawAndJDECardArray) {
......
Class/Shoppingcart/GenerateOrdersViewController.m
View file @ 527575c6
...@@ -351,28 +351,22 @@ ...@@ -351,28 +351,22 @@
#pragma mark -生成订单 #pragma mark -生成订单
- (IBAction)CreateOrderButtonClick:(UIButton *)sender { - (IBAction)CreateOrderButtonClick:(UIButton *)sender {
OrderBill *order = [[OrderBill alloc]init]; OrderBill *order = [[OrderBill alloc]init];
//分页 //分页
DataPage *page = [[DataPage alloc]init]; DataPage *page = [[DataPage alloc]init];
page.page = 1; page.page = ONE;
order.datapage = page; order.datapage = page;
//收货地址 //收货地址
TOOrderEntity *orderReceiver = [[TOOrderEntity alloc]init]; TOOrderEntity *orderReceiver = [[TOOrderEntity alloc]init];
NSArray *Adressarr = [self.datasArray objectAtIndex_opple:1]; NSArray *Adressarr = [self.datasArray objectAtIndex_opple:1];
//总价格 //总价格
CGFloat allPrice = 0; CGFloat allPrice = ZERO;
//总数量 //总数量
NSInteger allNumber = 0; NSInteger allNumber = ZERO;
for (int i=0; i<Adressarr.count; i++) { for (int i=0; i<Adressarr.count; i++) {
if ([[Adressarr objectAtIndex_opple:i] isKindOfClass:[AddressModel class]]) { if ([[Adressarr objectAtIndex_opple:i] isKindOfClass:[AddressModel class]]) {
AddressModel *model = [Adressarr objectAtIndex_opple:i]; AddressModel *model = [Adressarr objectAtIndex_opple:i];
if (model.isSelected) { if (model.isSelected) {
//收货人信息 //收货人信息
orderReceiver.receiverName = model.name; orderReceiver.receiverName = model.name;
orderReceiver.orderTime = [self GetCurrenttime]; orderReceiver.orderTime = [self GetCurrenttime];
...@@ -398,22 +392,22 @@ ...@@ -398,22 +392,22 @@
orderGoods.goodsPrice = model.costPrice; orderGoods.goodsPrice = model.costPrice;
orderGoods.remark = model.goods.spec; orderGoods.remark = model.goods.spec;
orderGoods.goodsUnit = model.goods.unit; orderGoods.goodsUnit = model.goods.unit;
//总价 //总价
allPrice += model.goodsNum *[model.costPrice floatValue]; allPrice += model.goodsNum *[model.costPrice floatValue];
//总数量 //总数量
allNumber += model.goodsNum; allNumber += model.goodsNum;
orderGoods.goodsTotalPrice = (NSDecimalNumber *)[NSDecimalNumber numberWithFloat:model.goodsNum *[model.costPrice floatValue]]; orderGoods.goodsTotalPrice = [NSNumber numberWithFloat:model.goodsNum *[model.costPrice floatValue]];
[goodidArr addObject:orderGoods]; [goodidArr addObject:orderGoods];
} }
//总价 //总价
orderReceiver.orderPrice = (NSDecimalNumber *)[NSDecimalNumber numberWithFloat:allPrice]; orderReceiver.orderPrice = [NSNumber numberWithFloat:allPrice];
orderReceiver.oldPrice = (NSDecimalNumber *)[NSDecimalNumber numberWithFloat:allPrice]; orderReceiver.oldPrice = [NSNumber numberWithFloat:allPrice];
//总数量 //总数量
orderReceiver.goodsNum = [NSString stringWithFormat:@"%ld",allNumber]; orderReceiver.goodsNum = [NSString stringWithFormat:@"%ld",allNumber];
order.orderdetailList = (NSArray<TOOrderdetailEntity> *)goodidArr; order.orderdetailList = (NSArray<TOOrderdetailEntity> *)goodidArr;
[self CreateMBProgressHUDLoding]; [self CreateMBProgressHUDLoding];
WS(weakSelf); WS(weakSelf);
NSLog(@"%@",[order toDictionary]);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CREATEORDER) WithCallClass:weakSelf WithRequestType:0 WithParameter:order WithReturnValueBlock:^(id returnValue) { [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CREATEORDER) WithCallClass:weakSelf WithRequestType:0 WithParameter:order WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding]; [weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) { if ([returnValue[@"code"] isEqualToNumber:@0]) {
...@@ -440,9 +434,10 @@ ...@@ -440,9 +434,10 @@
} }
} WithErrorCodeBlock:^(id errorCodeValue) { } WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding]; [weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:@"无网络"]; [weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(id error) { } WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding]; [weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}]; }];
return; return;
} }
......
Class/Shoppingcart/ShoppingViewController.m
View file @ 527575c6
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
[self.settlementButton setTitle:@"去结算(0)" forState:UIControlStateNormal]; [self.settlementButton setTitle:@"去结算(0)" forState:UIControlStateNormal];
self.allSelectedButton.selected = NO; self.allSelectedButton.selected = NO;
self.totalpriceLabe.text = nil; self.totalpriceLabe.text = nil;
self.discountTextField.text = self.textField.text; self.discountTextField.text = nil;
} }
#pragma mark - UI #pragma mark - UI
......
Class/Tabbar/CustomTabbarController.m
View file @ 527575c6
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
- (void)addViewcontroller - (void)addViewcontroller
{ {
NSMutableArray *controllerArray = [NSMutableArray array]; NSMutableArray *controllerArray = [NSMutableArray array];
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil]; UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
for (int i=0; i<self.identifierArray.count; i++) { for (int i=0; i<self.identifierArray.count; i++) {
BaseViewController *control = [storyboard instantiateViewControllerWithIdentifier:self.identifierArray[i]]; BaseViewController *control = [storyboard instantiateViewControllerWithIdentifier:self.identifierArray[i]];
UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:control]; UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:control];
...@@ -161,16 +161,8 @@ ...@@ -161,16 +161,8 @@
break; break;
//公告
case 101:
// [SHARED_APPDELEGATE.mmdrawer toggleDrawerSide:MMDrawerSideRight animated:YES completion:nil];
NSLog(@"公告");
break;
//某某用户 //某某用户
case 102: case 101:
{ {
UserViewController *userVC = [[UserViewController alloc]init]; UserViewController *userVC = [[UserViewController alloc]init];
...@@ -186,19 +178,19 @@ ...@@ -186,19 +178,19 @@
break; break;
//我的客户 //我的客户
case 103: case 102:
self.selectedIndex = 2; self.selectedIndex = 2;
break; break;
//购物车 //购物车
case 104: case 103:
//必须设置当前客户才能跳转到购物车 //必须设置当前客户才能跳转到购物车
if (![Shoppersmanager manager].currentCustomer) { if (![Shoppersmanager manager].currentCustomer) {
MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:SHARED_APPDELEGATE.window animated:YES]; MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view.window animated:YES];
hud.labelText = @"必须设置当前客户才能访问购物车"; hud.labelText = @"必须设置当前客户才能访问购物车";
hud.margin = 10.f; hud.margin = 10.f;
hud.color = [[UIColor blackColor] colorWithAlphaComponent:0.5]; hud.color = [[UIColor blackColor] colorWithAlphaComponent:0.5];
...@@ -346,7 +338,7 @@ ...@@ -346,7 +338,7 @@
}else }else
{ {
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil]; UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
ExperienceCentreViewController *ExperienceCenter = [storyboard instantiateViewControllerWithIdentifier:@"ExperienceCentre"]; ExperienceCentreViewController *ExperienceCenter = [storyboard instantiateViewControllerWithIdentifier:@"ExperienceCentre"];
ExperienceCenter.modalPresentationStyle = UIModalPresentationOverFullScreen; ExperienceCenter.modalPresentationStyle = UIModalPresentationOverFullScreen;
UIPopoverPresentationController *popover = ExperienceCenter.popoverPresentationController; UIPopoverPresentationController *popover = ExperienceCenter.popoverPresentationController;
......
Class/Tabbar/Toolview.m
View file @ 527575c6
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
imageview.image = TCImage(@"search"); imageview.image = TCImage(@"search");
[backView addSubview:imageview]; [backView addSubview:imageview];
//输入框 //输入框
self.inputField = [[UITextField alloc]initWithFrame:CGRectMake(45, 0, 170, 35)]; self.inputField = [[UITextField alloc]initWithFrame:CGRectMake(45, 0, 170, 35)];
self.inputField.borderStyle = UITextBorderStyleNone; self.inputField.borderStyle = UITextBorderStyleNone;
...@@ -73,10 +74,10 @@ ...@@ -73,10 +74,10 @@
//按钮 //按钮
NSString *realName = [[Shoppersmanager manager].Shoppers.employee.realName length]?[Shoppersmanager manager].Shoppers.employee.realName:@"服务导购"; NSString *realName = [[Shoppersmanager manager].Shoppers.employee.realName length]?[Shoppersmanager manager].Shoppers.employee.realName:@"服务导购";
NSArray *titleArray = [NSArray arrayWithObjects:@"功能菜单",@"公告",realName,@"我的客户",@"购物袋", nil]; NSArray *titleArray = [NSArray arrayWithObjects:@"功能菜单",realName,@"我的客户",@"购物袋", nil];
//图片 //图片
NSArray *imageArray = [NSArray arrayWithObjects:@"dial",@"tips",@"矢量智能对象-1",@"data",@"ablum", nil]; NSArray *imageArray = [NSArray arrayWithObjects:@"dial",@"矢量智能对象-1",@"data",@"ablum", nil];
for (int i=1; i<titleArray.count+1; i++) { for (int i=1; i<5; i++) {
CustomButton *button = [CustomButton buttonWithType:UIButtonTypeCustom]; CustomButton *button = [CustomButton buttonWithType:UIButtonTypeCustom];
button.frame = CGRectMake(ScreenWidth-(i*ButtonWIDTH + Buttoninterval*(i-1)), 10, ButtonWIDTH, ButtonRIGHT); button.frame = CGRectMake(ScreenWidth-(i*ButtonWIDTH + Buttoninterval*(i-1)), 10, ButtonWIDTH, ButtonRIGHT);
...@@ -86,15 +87,16 @@ ...@@ -86,15 +87,16 @@
[button addTarget:self action:@selector(ButtonClick:) forControlEvents:UIControlEventTouchUpInside]; [button addTarget:self action:@selector(ButtonClick:) forControlEvents:UIControlEventTouchUpInside];
[button setImage:TCImage([imageArray objectAtIndex_opple:i-1]) forState:UIControlStateNormal]; [button setImage:TCImage([imageArray objectAtIndex_opple:i-1]) forState:UIControlStateNormal];
[self addSubview:button]; [self addSubview:button];
if (i == 5) { if (i == 4) {
SHARED_APPDELEGATE.shoppingCarPoint = [self convertPoint:CGPointMake(button.center.x, button.center.y) toView:self.window]; SHARED_APPDELEGATE.shoppingCarPoint = [self convertPoint:CGPointMake(button.center.x, button.center.y) toView:self.window];
} }
} }
//创建下划线 //创建下划线
CustomButton *Newbutton = (CustomButton *)[self viewWithTag:103]; CustomButton *Newbutton = (CustomButton *)[self viewWithTag:102];
self.underlineView = [[UIView alloc]initWithFrame:CGRectMake(Newbutton.frame.origin.x+(ButtonWIDTH-50)/2, ButtonRIGHT+8, 50, 2)]; self.underlineView = [[UIView alloc]initWithFrame:CGRectMake(Newbutton.frame.origin.x+(ButtonWIDTH-50)/2, ButtonRIGHT+8, 50, 2)];
SHARED_APPDELEGATE.lineView = self.underlineView; SHARED_APPDELEGATE.lineView = self.underlineView;
self.underlineView.backgroundColor = kMainBlueColor; _underlineView.backgroundColor = kMainBlueColor;
[self addSubview:self.underlineView]; [self addSubview:self.underlineView];
} }
...@@ -116,7 +118,7 @@ ...@@ -116,7 +118,7 @@
#pragma mark -刷新购物车显示数量 #pragma mark -刷新购物车显示数量
- (void)refreshGoodsNumber:(NSNotification *)object - (void)refreshGoodsNumber:(NSNotification *)object
{ {
CustomButton *button = (CustomButton *)[self viewWithTag:104]; CustomButton *button = (CustomButton *)[self viewWithTag:103];
NSInteger number = [object.object integerValue]; NSInteger number = [object.object integerValue];
if (number) { if (number) {
button.instructionsNumber += number; button.instructionsNumber += number;
...@@ -128,7 +130,7 @@ ...@@ -128,7 +130,7 @@
#pragma mark - 重置购物车显示数量 #pragma mark - 重置购物车显示数量
- (void)resetGoodNumber:(NSNotification *)object - (void)resetGoodNumber:(NSNotification *)object
{ {
CustomButton *button = (CustomButton *)[self viewWithTag:104]; CustomButton *button = (CustomButton *)[self viewWithTag:103];
NSInteger number = [object.object integerValue]; NSInteger number = [object.object integerValue];
button.instructionsNumber = number; button.instructionsNumber = number;
} }
...@@ -136,7 +138,7 @@ ...@@ -136,7 +138,7 @@
#pragma mark - 提示抽奖机会 #pragma mark - 提示抽奖机会
- (void)promptDrawInformation:(NSNotification *)object - (void)promptDrawInformation:(NSNotification *)object
{ {
CustomButton *button = (CustomButton *)[self viewWithTag:102]; CustomButton *button = (CustomButton *)[self viewWithTag:101];
NSInteger number = [object.object integerValue]; NSInteger number = [object.object integerValue];
if (number) { if (number) {
button.instructionsNumber += number; button.instructionsNumber += number;
...@@ -179,11 +181,11 @@ ...@@ -179,11 +181,11 @@
#pragma mark -按钮事件响应 #pragma mark -按钮事件响应
- (void)ButtonClick:(UIButton *)button - (void)ButtonClick:(UIButton *)button
{ {
/// 部分按钮不需要指示线 if (button.tag == 102 || button.tag == 103) {
if (button.tag == 101 || button.tag == 103 || button.tag == 104) { if (!(button.tag == 103 && ![Shoppersmanager manager].currentCustomer)) {
if (!(button.tag == 104 && ![Shoppersmanager manager].currentCustomer)) {
self.underlineView.hidden = NO; self.underlineView.hidden = NO;
[UIView animateWithDuration:0.5 delay:0.1f usingSpringWithDamping:0.5f initialSpringVelocity:0.5f options:UIViewAnimationOptionCurveEaseInOut animations:^{ //下划线动画
[UIView animateWithDuration:0.2 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
CGRect frame = self.underlineView.frame; CGRect frame = self.underlineView.frame;
frame.origin.x = button.frame.origin.x+(ButtonWIDTH-50)/2; frame.origin.x = button.frame.origin.x+(ButtonWIDTH-50)/2;
self.underlineView.frame = frame; self.underlineView.frame = frame;
......
Class/UserViewController.m
View file @ 527575c6
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
[Shoppersmanager manager].currentCustomer = NO; [Shoppersmanager manager].currentCustomer = NO;
[Customermanager manager].model = nil; [Customermanager manager].model = nil;
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil]; UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
LoginViewController *loginVC = [storyboard instantiateViewControllerWithIdentifier:@"Login"]; LoginViewController *loginVC = [storyboard instantiateViewControllerWithIdentifier:@"Login"];
[[NSUserDefaults standardUserDefaults] removeObjectForKey:USERNAME]; [[NSUserDefaults standardUserDefaults] removeObjectForKey:USERNAME];
[[NSUserDefaults standardUserDefaults] removeObjectForKey:PASSWORD]; [[NSUserDefaults standardUserDefaults] removeObjectForKey:PASSWORD];
......
Lighting.xcodeproj/project.pbxproj
View file @ 527575c6
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
29498C601D053B7C004FA79B /* ShoppingBagTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29498C5F1D053B7C004FA79B /* ShoppingBagTableViewCell.m */; }; 29498C601D053B7C004FA79B /* ShoppingBagTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29498C5F1D053B7C004FA79B /* ShoppingBagTableViewCell.m */; };
2949BABD1CD2EFA00049385A /* InformationTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2949BABC1CD2EFA00049385A /* InformationTableViewCell.m */; }; 2949BABD1CD2EFA00049385A /* InformationTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2949BABC1CD2EFA00049385A /* InformationTableViewCell.m */; };
2949BAC21CD3055A0049385A /* MMExampleDrawerVisualStateManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2949BAC11CD3055A0049385A /* MMExampleDrawerVisualStateManager.m */; }; 2949BAC21CD3055A0049385A /* MMExampleDrawerVisualStateManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2949BAC11CD3055A0049385A /* MMExampleDrawerVisualStateManager.m */; };
294BFDD11D47225A00BFD53F /* OppleMain.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 294BFDD01D47225A00BFD53F /* OppleMain.storyboard */; }; 294BFDD11D47225A00BFD53F /* StoryboardwithCYX.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 294BFDD01D47225A00BFD53F /* StoryboardwithCYX.storyboard */; };
294BFDD51D47227900BFD53F /* ExperienceCentreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 294BFDD41D47227900BFD53F /* ExperienceCentreViewController.m */; }; 294BFDD51D47227900BFD53F /* ExperienceCentreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 294BFDD41D47227900BFD53F /* ExperienceCentreViewController.m */; };
294CF0EC1CEDCF480055F1D8 /* PromptinformationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 294CF0EB1CEDCF480055F1D8 /* PromptinformationView.m */; }; 294CF0EC1CEDCF480055F1D8 /* PromptinformationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 294CF0EB1CEDCF480055F1D8 /* PromptinformationView.m */; };
294CF0EE1CEDCF540055F1D8 /* PromptinformationView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 294CF0ED1CEDCF540055F1D8 /* PromptinformationView.xib */; }; 294CF0EE1CEDCF540055F1D8 /* PromptinformationView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 294CF0ED1CEDCF540055F1D8 /* PromptinformationView.xib */; };
...@@ -146,7 +146,6 @@ ...@@ -146,7 +146,6 @@
29BFBD8F1CE44BA900C238FB /* goodsDetailsSectionview.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BFBD8E1CE44BA900C238FB /* goodsDetailsSectionview.m */; }; 29BFBD8F1CE44BA900C238FB /* goodsDetailsSectionview.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BFBD8E1CE44BA900C238FB /* goodsDetailsSectionview.m */; };
29BFBD911CE44BC200C238FB /* goodsDetailsSectionview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29BFBD901CE44BC200C238FB /* goodsDetailsSectionview.xib */; }; 29BFBD911CE44BC200C238FB /* goodsDetailsSectionview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29BFBD901CE44BC200C238FB /* goodsDetailsSectionview.xib */; };
29BFBD981CE46FDA00C238FB /* MyclientEntityModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BFBD971CE46FDA00C238FB /* MyclientEntityModel.m */; }; 29BFBD981CE46FDA00C238FB /* MyclientEntityModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BFBD971CE46FDA00C238FB /* MyclientEntityModel.m */; };
29C528FF1DD41A0400644899 /* LearningCenter.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29C528FE1DD41A0400644899 /* LearningCenter.storyboard */; };
29C584E91CDA249300C6F677 /* ProductCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584E81CDA249200C6F677 /* ProductCollectionViewCell.m */; }; 29C584E91CDA249300C6F677 /* ProductCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584E81CDA249200C6F677 /* ProductCollectionViewCell.m */; };
29C584ED1CDA429500C6F677 /* ProductDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584EC1CDA429500C6F677 /* ProductDetailsViewController.m */; }; 29C584ED1CDA429500C6F677 /* ProductDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584EC1CDA429500C6F677 /* ProductDetailsViewController.m */; };
29CB35421CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CB35411CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m */; }; 29CB35421CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CB35411CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m */; };
...@@ -315,7 +314,7 @@ ...@@ -315,7 +314,7 @@
2949BABC1CD2EFA00049385A /* InformationTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InformationTableViewCell.m; sourceTree = "<group>"; }; 2949BABC1CD2EFA00049385A /* InformationTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InformationTableViewCell.m; sourceTree = "<group>"; };
2949BAC01CD3055A0049385A /* MMExampleDrawerVisualStateManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMExampleDrawerVisualStateManager.h; sourceTree = "<group>"; }; 2949BAC01CD3055A0049385A /* MMExampleDrawerVisualStateManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMExampleDrawerVisualStateManager.h; sourceTree = "<group>"; };
2949BAC11CD3055A0049385A /* MMExampleDrawerVisualStateManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMExampleDrawerVisualStateManager.m; sourceTree = "<group>"; }; 2949BAC11CD3055A0049385A /* MMExampleDrawerVisualStateManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMExampleDrawerVisualStateManager.m; sourceTree = "<group>"; };
294BFDD01D47225A00BFD53F /* OppleMain.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = OppleMain.storyboard; sourceTree = "<group>"; }; 294BFDD01D47225A00BFD53F /* StoryboardwithCYX.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = StoryboardwithCYX.storyboard; sourceTree = "<group>"; };
294BFDD41D47227900BFD53F /* ExperienceCentreViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ExperienceCentreViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 294BFDD41D47227900BFD53F /* ExperienceCentreViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ExperienceCentreViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
294CF0EA1CEDCF480055F1D8 /* PromptinformationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromptinformationView.h; sourceTree = "<group>"; }; 294CF0EA1CEDCF480055F1D8 /* PromptinformationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromptinformationView.h; sourceTree = "<group>"; };
294CF0EB1CEDCF480055F1D8 /* PromptinformationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PromptinformationView.m; sourceTree = "<group>"; }; 294CF0EB1CEDCF480055F1D8 /* PromptinformationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PromptinformationView.m; sourceTree = "<group>"; };
...@@ -455,7 +454,6 @@ ...@@ -455,7 +454,6 @@
29BFBD901CE44BC200C238FB /* goodsDetailsSectionview.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = goodsDetailsSectionview.xib; sourceTree = "<group>"; }; 29BFBD901CE44BC200C238FB /* goodsDetailsSectionview.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = goodsDetailsSectionview.xib; sourceTree = "<group>"; };
29BFBD961CE46FDA00C238FB /* MyclientEntityModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyclientEntityModel.h; sourceTree = "<group>"; }; 29BFBD961CE46FDA00C238FB /* MyclientEntityModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyclientEntityModel.h; sourceTree = "<group>"; };
29BFBD971CE46FDA00C238FB /* MyclientEntityModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyclientEntityModel.m; sourceTree = "<group>"; }; 29BFBD971CE46FDA00C238FB /* MyclientEntityModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyclientEntityModel.m; sourceTree = "<group>"; };
29C528FE1DD41A0400644899 /* LearningCenter.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LearningCenter.storyboard; sourceTree = "<group>"; };
29C584E71CDA249200C6F677 /* ProductCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductCollectionViewCell.h; sourceTree = "<group>"; }; 29C584E71CDA249200C6F677 /* ProductCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductCollectionViewCell.h; sourceTree = "<group>"; };
29C584E81CDA249200C6F677 /* ProductCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductCollectionViewCell.m; sourceTree = "<group>"; }; 29C584E81CDA249200C6F677 /* ProductCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductCollectionViewCell.m; sourceTree = "<group>"; };
29C584EB1CDA429500C6F677 /* ProductDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductDetailsViewController.h; sourceTree = "<group>"; }; 29C584EB1CDA429500C6F677 /* ProductDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductDetailsViewController.h; sourceTree = "<group>"; };
...@@ -1114,8 +1112,7 @@ ...@@ -1114,8 +1112,7 @@
children = ( children = (
29706DA71CD082990003C412 /* AppDelegate.h */, 29706DA71CD082990003C412 /* AppDelegate.h */,
29706DA81CD082990003C412 /* AppDelegate.m */, 29706DA81CD082990003C412 /* AppDelegate.m */,
294BFDD01D47225A00BFD53F /* OppleMain.storyboard */, 294BFDD01D47225A00BFD53F /* StoryboardwithCYX.storyboard */,
29C528FE1DD41A0400644899 /* LearningCenter.storyboard */,
29706DA41CD082990003C412 /* Supporting Files */, 29706DA41CD082990003C412 /* Supporting Files */,
); );
path = Lighting; path = Lighting;
...@@ -1764,7 +1761,7 @@ ...@@ -1764,7 +1761,7 @@
29E2D3291DB8918100443170 /* CardOrderInformationReusableView.xib in Resources */, 29E2D3291DB8918100443170 /* CardOrderInformationReusableView.xib in Resources */,
29E2D33D1DB8BE7F00443170 /* CardAmplificationViewController.xib in Resources */, 29E2D33D1DB8BE7F00443170 /* CardAmplificationViewController.xib in Resources */,
29698D621CE2C11500D72CE7 /* SettlementViewController.xib in Resources */, 29698D621CE2C11500D72CE7 /* SettlementViewController.xib in Resources */,
294BFDD11D47225A00BFD53F /* OppleMain.storyboard in Resources */, 294BFDD11D47225A00BFD53F /* StoryboardwithCYX.storyboard in Resources */,
29BFBD911CE44BC200C238FB /* goodsDetailsSectionview.xib in Resources */, 29BFBD911CE44BC200C238FB /* goodsDetailsSectionview.xib in Resources */,
29D260FD1CEED53400A9787D /* goodsDetailsTableViewCell.xib in Resources */, 29D260FD1CEED53400A9787D /* goodsDetailsTableViewCell.xib in Resources */,
29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */, 29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */,
...@@ -1778,7 +1775,6 @@ ...@@ -1778,7 +1775,6 @@
299C7F5B1CE21FA800E7D7CB /* AddressViewController.xib in Resources */, 299C7F5B1CE21FA800E7D7CB /* AddressViewController.xib in Resources */,
29706DB41CD082990003C412 /* Assets.xcassets in Resources */, 29706DB41CD082990003C412 /* Assets.xcassets in Resources */,
291A37791DBA58D700299F0D /* GetJDCardView.xib in Resources */, 291A37791DBA58D700299F0D /* GetJDCardView.xib in Resources */,
29C528FF1DD41A0400644899 /* LearningCenter.storyboard in Resources */,
29EC331B1CE023D5005F0C13 /* ChangePasswordViewController.xib in Resources */, 29EC331B1CE023D5005F0C13 /* ChangePasswordViewController.xib in Resources */,
29360C311CDDC487002A5D89 /* ScreeningView.xib in Resources */, 29360C311CDDC487002A5D89 /* ScreeningView.xib in Resources */,
); );
...@@ -2094,7 +2090,7 @@ ...@@ -2094,7 +2090,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets"; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
CLANG_ENABLE_OBJC_WEAK = YES; CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COMPRESS_PNG_FILES = NO; COMPRESS_PNG_FILES = NO;
DEVELOPMENT_TEAM = W54V2VB863; DEVELOPMENT_TEAM = W54V2VB863;
...@@ -2153,7 +2149,7 @@ ...@@ -2153,7 +2149,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets"; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
CLANG_ENABLE_OBJC_WEAK = YES; CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COMPRESS_PNG_FILES = NO; COMPRESS_PNG_FILES = NO;
DEVELOPMENT_TEAM = W54V2VB863; DEVELOPMENT_TEAM = W54V2VB863;
......
Lighting/AppDelegate.m
View file @ 527575c6
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#import "AppDelegate.h" #import "AppDelegate.h"
#import "LoginViewController.h" #import "LoginViewController.h"
#import "DeviceDirectionManager.h" #import "DeviceDirectionManager.h"
#import <Bugly/Bugly.h>
@interface AppDelegate () @interface AppDelegate ()
...@@ -21,8 +20,6 @@ ...@@ -21,8 +20,6 @@
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
// Override point for customization after application launch. // Override point for customization after application launch.
//bug检测
[Bugly startWithAppId:@"900033734"];
//检测版本更新 //检测版本更新
[self detectionNetwork]; [self detectionNetwork];
[self SetIQKeyboardManager]; [self SetIQKeyboardManager];
...@@ -53,7 +50,7 @@ ...@@ -53,7 +50,7 @@
#pragma mark -设置根视图 #pragma mark -设置根视图
- (void)RootViewcontroller - (void)RootViewcontroller
{ {
UIStoryboard *story = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil]; UIStoryboard *story = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
LoginViewController *login = [story instantiateViewControllerWithIdentifier:@"Login"]; LoginViewController *login = [story instantiateViewControllerWithIdentifier:@"Login"];
self.window.rootViewController = login; self.window.rootViewController = login;
} }
......
Lighting/Images.xcassets/tips.imageset/Contents.json deleted 100644 → 0
View file @ 9844f349
{
"images" : [
{
"idiom" : "universal",
"filename" : "tips.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "tips@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "tips@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Info.plist
View file @ 527575c6
...@@ -71,9 +71,9 @@ ...@@ -71,9 +71,9 @@
<key>UILaunchStoryboardName</key> <key>UILaunchStoryboardName</key>
<string>LaunchScreen</string> <string>LaunchScreen</string>
<key>UIMainStoryboardFile</key> <key>UIMainStoryboardFile</key>
<string>OppleMain</string> <string>StoryboardwithCYX</string>
<key>UIMainStoryboardFile~ipad</key> <key>UIMainStoryboardFile~ipad</key>
<string>OppleMain</string> <string>StoryboardwithCYX</string>
<key>UIRequiredDeviceCapabilities</key> <key>UIRequiredDeviceCapabilities</key>
<array> <array>
<string>armv7</string> <string>armv7</string>
......
Lighting/LearningCenter.storyboard deleted 100644 → 0
View file @ 9844f349
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="DCh-j5-vEB">
<objects>
<viewController id="k1g-EN-ftK" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="7WD-J5-yzU">
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="NIX-mE-QvS" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="3370" y="9293"/>
</scene>
</scenes>
</document>
Lighting/OppleMain.storyboard → Lighting/StoryboardwithCYX.storyboard
View file @ 527575c6
...@@ -448,7 +448,7 @@ ...@@ -448,7 +448,7 @@
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="1" sectionFooterHeight="1" id="Zna-07-otf"> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="1" sectionFooterHeight="1" id="Zna-07-otf">
<rect key="frame" x="0.0" y="64" width="1024" height="1302"/> <rect key="frame" x="0.0" y="64" width="1024" height="1302"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<prototypes> <prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="firstcell" rowHeight="84" id="XgA-9w-ut9" customClass="OrderInformationTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="firstcell" rowHeight="84" id="XgA-9w-ut9" customClass="OrderInformationTableViewCell">
<rect key="frame" x="0.0" y="49.5" width="1024" height="84"/> <rect key="frame" x="0.0" y="49.5" width="1024" height="84"/>
......
Podfile.lock
View file @ 527575c6
...@@ -14,7 +14,7 @@ PODS: ...@@ -14,7 +14,7 @@ PODS:
- AFNetworking/Serialization (3.1.0) - AFNetworking/Serialization (3.1.0)
- AFNetworking/UIKit (3.1.0): - AFNetworking/UIKit (3.1.0):
- AFNetworking/NSURLSession - AFNetworking/NSURLSession
- Bugly (2.4.0) - Bugly (2.4.2)
- DZNEmptyDataSet (1.8.1) - DZNEmptyDataSet (1.8.1)
- FDFullscreenPopGesture (1.1) - FDFullscreenPopGesture (1.1)
- IQKeyboardManager (4.0.6) - IQKeyboardManager (4.0.6)
...@@ -57,7 +57,7 @@ DEPENDENCIES: ...@@ -57,7 +57,7 @@ DEPENDENCIES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67 AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
Bugly: 3b56d8365c5687f74fd6fbb50c5b7ede3cdac96c Bugly: b09cd3c7e54048a0e079be88a7a99610f14eab8f
DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7 DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7
FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0 FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0
IQKeyboardManager: c52debb1967799ae7addb98eab0cf328083a874f IQKeyboardManager: c52debb1967799ae7addb98eab0cf328083a874f
......
Pods/Bugly/Bugly.framework/Headers/Bugly.h
View file @ 527575c6
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Bugly.h // Bugly.h
// Bugly // Bugly
// //
// Version: 2.4(0) // Version: 2.4(2)
// //
// Copyright (c) 2016年 Bugly. All rights reserved. // Copyright (c) 2016年 Bugly. All rights reserved.
// //
...@@ -92,7 +92,7 @@ BLY_START_NONNULL ...@@ -92,7 +92,7 @@ BLY_START_NONNULL
* *
* @return 设备ID * @return 设备ID
*/ */
+ (NSString *)deviceId; + (NSString *)buglyDeviceId;
/** /**
* 上报自定义Objective-C异常 * 上报自定义Objective-C异常
......
Pods/Bugly/Bugly.framework/Headers/BuglyConfig.h
View file @ 527575c6
...@@ -60,7 +60,7 @@ BLY_START_NONNULL ...@@ -60,7 +60,7 @@ BLY_START_NONNULL
/** /**
* 设置自定义设备唯一标识 * 设置自定义设备唯一标识
*/ */
@property (nonatomic, copy) NSString *deviceId; @property (nonatomic, copy) NSString *deviceIdentifier;
/** /**
* 卡顿监控开关，默认关闭 * 卡顿监控开关，默认关闭
...@@ -115,7 +115,7 @@ BLY_START_NONNULL ...@@ -115,7 +115,7 @@ BLY_START_NONNULL
@property (nonatomic, copy) NSArray * excludeModuleFilter; @property (nonatomic, copy) NSArray * excludeModuleFilter;
/** /**
* 控制台日志上报开关，默认关闭 * 控制台日志上报开关，默认开启
*/ */
@property (nonatomic, assign) BOOL consolelogEnable; @property (nonatomic, assign) BOOL consolelogEnable;
......
Pods/Manifest.lock
View file @ 527575c6
...@@ -14,7 +14,7 @@ PODS: ...@@ -14,7 +14,7 @@ PODS:
- AFNetworking/Serialization (3.1.0) - AFNetworking/Serialization (3.1.0)
- AFNetworking/UIKit (3.1.0): - AFNetworking/UIKit (3.1.0):
- AFNetworking/NSURLSession - AFNetworking/NSURLSession
- Bugly (2.4.0) - Bugly (2.4.2)
- DZNEmptyDataSet (1.8.1) - DZNEmptyDataSet (1.8.1)
- FDFullscreenPopGesture (1.1) - FDFullscreenPopGesture (1.1)
- IQKeyboardManager (4.0.6) - IQKeyboardManager (4.0.6)
...@@ -57,7 +57,7 @@ DEPENDENCIES: ...@@ -57,7 +57,7 @@ DEPENDENCIES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67 AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
Bugly: 3b56d8365c5687f74fd6fbb50c5b7ede3cdac96c Bugly: b09cd3c7e54048a0e079be88a7a99610f14eab8f
DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7 DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7
FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0 FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0
IQKeyboardManager: c52debb1967799ae7addb98eab0cf328083a874f IQKeyboardManager: c52debb1967799ae7addb98eab0cf328083a874f
......
Tools/BaseViewController.m
View file @ 527575c6
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
[weakSelf dismissViewControllerAnimated:YES completion:nil]; [weakSelf dismissViewControllerAnimated:YES completion:nil];
[Shoppersmanager manager].currentCustomer = NO; [Shoppersmanager manager].currentCustomer = NO;
[Customermanager manager].model = nil; [Customermanager manager].model = nil;
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil]; UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
LoginViewController *loginVC = [storyboard instantiateViewControllerWithIdentifier:@"Login"]; LoginViewController *loginVC = [storyboard instantiateViewControllerWithIdentifier:@"Login"];
[[NSUserDefaults standardUserDefaults] removeObjectForKey:USERNAME]; [[NSUserDefaults standardUserDefaults] removeObjectForKey:USERNAME];
[[NSUserDefaults standardUserDefaults] removeObjectForKey:PASSWORD]; [[NSUserDefaults standardUserDefaults] removeObjectForKey:PASSWORD];
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
#pragma mark -获得我的storyboard对象 #pragma mark -获得我的storyboard对象
- (UIStoryboard *)getStoryboardWithName - (UIStoryboard *)getStoryboardWithName
{ {
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil]; UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
return storyboard; return storyboard;
} }
......
Tools/PrefixHeader.pch
View file @ 527575c6
...@@ -38,6 +38,9 @@ ...@@ -38,6 +38,9 @@
#import "XLPlainFlowLayout.h" #import "XLPlainFlowLayout.h"
#import "MDScratchImageView.h" #import "MDScratchImageView.h"
#import "WYPopoverController.h" #import "WYPopoverController.h"
// Include any system framework and library headers here that should be included in all compilation units. // 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. // You will also need to set the Prefix Header build setting of one or more of your targets to reference this file.
...@@ -117,6 +120,11 @@ ...@@ -117,6 +120,11 @@
*/ */
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL] #define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
///**
// * 服务器开发地址
// */
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://192.168.199.188:8081/opple-web/app%@",URL]
/** /**
* 服务器测试地址 * 服务器测试地址
*/ */
......
Tools/opple_objc_json_client.h
View file @ 527575c6
This diff is collapsed.
Tools/opple_objc_json_client.m
View file @ 527575c6
...@@ -266,6 +266,7 @@ ...@@ -266,6 +266,7 @@
@synthesize drawId; @synthesize drawId;
@synthesize promotionGoods; @synthesize promotionGoods;
@synthesize jdCardDenomation; @synthesize jdCardDenomation;
@synthesize promotionMoney;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -388,55 +389,21 @@ ...@@ -388,55 +389,21 @@
@end @end
@implementation TOCommissionHistEntity @implementation TOConsumerEntity
@synthesize fid;
@synthesize createName;
@synthesize createDate;
@synthesize updateName;
@synthesize updateBy;
@synthesize updateDate;
@synthesize resellerCode;
@synthesize employeeId;
@synthesize orderId;
@synthesize amount;
@synthesize afteramount;
@synthesize remark;
@synthesize orderNumber;
@synthesize employeeName;
@synthesize state;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end
@implementation TODrawEntity
@synthesize fid; @synthesize fid;
@synthesize createName; @synthesize createName;
@synthesize createBy; @synthesize createBy;
@synthesize createDate; @synthesize createDate;
@synthesize updateName;
@synthesize updateBy;
@synthesize updateDate;
@synthesize sysOrgCode; @synthesize sysOrgCode;
@synthesize drawDate; @synthesize name;
@synthesize winnerId; @synthesize mobile;
@synthesize awardId; @synthesize province;
@synthesize awardDescription; @synthesize city;
@synthesize orderNumber; @synthesize country;
@synthesize state; @synthesize address;
@synthesize lotteryId; @synthesize picture;
@synthesize lastVisitedTime;
@synthesize company;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -561,6 +528,39 @@ ...@@ -561,6 +528,39 @@
} }
@end
@implementation TODrawEntity
@synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize updateName;
@synthesize updateBy;
@synthesize updateDate;
@synthesize sysOrgCode;
@synthesize drawDate;
@synthesize winnerId;
@synthesize awardId;
@synthesize awardDescription;
@synthesize orderNumber;
@synthesize state;
@synthesize lotteryId;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end @end
@implementation TOOrderdetailEntity @implementation TOOrderdetailEntity
...@@ -595,17 +595,13 @@ ...@@ -595,17 +595,13 @@
@end @end
@implementation TOPrizeEntity @implementation TOPositionEntity
@synthesize fid; @synthesize fid;
@synthesize picture;
@synthesize createName;
@synthesize createBy;
@synthesize updateName;
@synthesize updateBy;
@synthesize code; @synthesize code;
@synthesize name; @synthesize name;
@synthesize createDate; @synthesize commission;
@synthesize updateDate; @synthesize lowestDiscount;
@synthesize resellerCode;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -623,14 +619,10 @@ ...@@ -623,14 +619,10 @@
@end @end
@implementation TOSceneEntity @implementation TOPrizeBillDetailsEntity
@synthesize fid; @synthesize fid;
@synthesize sceneCode; @synthesize bill;
@synthesize name; @synthesize prize;
@synthesize pricure;
@synthesize category;
@synthesize style;
@synthesize space;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -648,20 +640,17 @@ ...@@ -648,20 +640,17 @@
@end @end
@implementation TOShopcartEntity @implementation TOShippingAddrEntity
@synthesize goods;
@synthesize fid; @synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate; @synthesize createDate;
@synthesize updateName; @synthesize sysOrgCode;
@synthesize updateBy; @synthesize name;
@synthesize updateDate; @synthesize miblephone;
@synthesize goodsId; @synthesize province;
@synthesize goodsNum; @synthesize city;
@synthesize country;
@synthesize address;
@synthesize consumerId; @synthesize consumerId;
@synthesize resellerId;
@synthesize costPrice;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -677,6 +666,19 @@ ...@@ -677,6 +666,19 @@
} }
@end
@implementation UCN
@synthesize uuid;
@synthesize code;
@synthesize name;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end @end
@implementation Action @implementation Action
...@@ -689,6 +691,10 @@ ...@@ -689,6 +691,10 @@
@end @end
NSString * const SORTDIRECTION_ASC = @"asc";
NSString * const SORTDIRECTION_DESC = @"desc";
@implementation IdEntity @implementation IdEntity
@synthesize fid; @synthesize fid;
...@@ -708,14 +714,20 @@ ...@@ -708,14 +714,20 @@
@end @end
NSString * const SORTDIRECTION_ASC = @"asc"; @implementation TOShopcartEntity
NSString * const SORTDIRECTION_DESC = @"desc"; @synthesize goods;
@synthesize fid;
@synthesize createName;
@implementation UCN @synthesize createBy;
@synthesize uuid; @synthesize createDate;
@synthesize code; @synthesize updateName;
@synthesize name; @synthesize updateBy;
@synthesize updateDate;
@synthesize goodsId;
@synthesize goodsNum;
@synthesize consumerId;
@synthesize resellerId;
@synthesize costPrice;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -723,19 +735,24 @@ NSString * const SORTDIRECTION_DESC = @"desc"; ...@@ -723,19 +735,24 @@ NSString * const SORTDIRECTION_DESC = @"desc";
} }
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end @end
@implementation TOShippingAddrEntity @implementation TOSceneEntity
@synthesize fid; @synthesize fid;
@synthesize createDate; @synthesize sceneCode;
@synthesize sysOrgCode;
@synthesize name; @synthesize name;
@synthesize miblephone; @synthesize pricure;
@synthesize province; @synthesize category;
@synthesize city; @synthesize style;
@synthesize country; @synthesize space;
@synthesize address;
@synthesize consumerId;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -753,10 +770,17 @@ NSString * const SORTDIRECTION_DESC = @"desc"; ...@@ -753,10 +770,17 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end @end
@implementation TOPrizeBillDetailsEntity @implementation TOPrizeEntity
@synthesize fid; @synthesize fid;
@synthesize bill; @synthesize picture;
@synthesize prize; @synthesize createName;
@synthesize createBy;
@synthesize updateName;
@synthesize updateBy;
@synthesize code;
@synthesize name;
@synthesize createDate;
@synthesize updateDate;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -774,13 +798,26 @@ NSString * const SORTDIRECTION_DESC = @"desc"; ...@@ -774,13 +798,26 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end @end
@implementation TOPositionEntity @implementation TOOrderPromotionEntity
@synthesize fid; @synthesize fid;
@synthesize code; @synthesize createName;
@synthesize name; @synthesize createBy;
@synthesize commission; @synthesize createDate;
@synthesize lowestDiscount; @synthesize updateName;
@synthesize resellerCode; @synthesize updateBy;
@synthesize updateDate;
@synthesize sysOrgCode;
@synthesize goodsId;
@synthesize goodsCode;
@synthesize goodsName;
@synthesize promotionNumber;
@synthesize promotionMoney;
@synthesize orderNumber;
@synthesize discountRate;
@synthesize lotteryPackage;
@synthesize wxcardNumber;
@synthesize wxcardDenomation;
@synthesize wxcardRealDeduction;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -840,6 +877,39 @@ NSString * const SORTDIRECTION_DESC = @"desc"; ...@@ -840,6 +877,39 @@ NSString * const SORTDIRECTION_DESC = @"desc";
} }
@end
@implementation TOAwardEntity
@synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize updateName;
@synthesize updateBy;
@synthesize updateDate;
@synthesize sysOrgCode;
@synthesize remainTotal;
@synthesize drawRate;
@synthesize type;
@synthesize number;
@synthesize fdescription;
@synthesize lotteryId;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"description": @"fdescription",
@"id": @"fid",
}];
}
@end @end
@implementation TOGoodsLabelCategoryEntity @implementation TOGoodsLabelCategoryEntity
...@@ -1002,53 +1072,22 @@ NSString * const SORTDIRECTION_DESC = @"desc"; ...@@ -1002,53 +1072,22 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end @end
@implementation TOConsumerEntity @implementation TOCommissionHistEntity
@synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize sysOrgCode;
@synthesize name;
@synthesize mobile;
@synthesize province;
@synthesize city;
@synthesize country;
@synthesize address;
@synthesize picture;
@synthesize lastVisitedTime;
@synthesize company;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end
@implementation TOAwardEntity
@synthesize fid; @synthesize fid;
@synthesize createName; @synthesize createName;
@synthesize createBy;
@synthesize createDate; @synthesize createDate;
@synthesize updateName; @synthesize updateName;
@synthesize updateBy; @synthesize updateBy;
@synthesize updateDate; @synthesize updateDate;
@synthesize sysOrgCode; @synthesize resellerCode;
@synthesize remainTotal; @synthesize employeeId;
@synthesize drawRate; @synthesize orderId;
@synthesize type; @synthesize amount;
@synthesize number; @synthesize afteramount;
@synthesize fdescription; @synthesize remark;
@synthesize lotteryId; @synthesize orderNumber;
@synthesize employeeName;
@synthesize state;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -1059,7 +1098,6 @@ NSString * const SORTDIRECTION_DESC = @"desc"; ...@@ -1059,7 +1098,6 @@ NSString * const SORTDIRECTION_DESC = @"desc";
+(JSONKeyMapper*)keyMapper +(JSONKeyMapper*)keyMapper
{ {
return [[JSONKeyMapper alloc] initWithDictionary:@{ return [[JSONKeyMapper alloc] initWithDictionary:@{
@"description": @"fdescription",
@"id": @"fid", @"id": @"fid",
}]; }];
} }
...@@ -1344,8 +1382,9 @@ NSString * const SORTDIRECTION_DESC = @"desc"; ...@@ -1344,8 +1382,9 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end @end
@implementation RsLotteryResponse @implementation TSUserOrg
@synthesize list; @synthesize tsUser;
@synthesize tsDepart;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -1355,9 +1394,8 @@ NSString * const SORTDIRECTION_DESC = @"desc"; ...@@ -1355,9 +1394,8 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end @end
@implementation TSUserOrg @implementation RsLotteryResponse
@synthesize tsUser; @synthesize list;
@synthesize tsDepart;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
......
podfile
View file @ 527575c6
...@@ -13,5 +13,3 @@ pod 'JSONModel', '~> 1.2.0' ...@@ -13,5 +13,3 @@ pod 'JSONModel', '~> 1.2.0'
pod 'UMengSocial' pod 'UMengSocial'
pod 'DZNEmptyDataSet' pod 'DZNEmptyDataSet'
pod 'Bugly' pod 'Bugly'
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