Skip to content

O
Opple-iOS
Commit 330971f1 authored by 勾芒's avatar 勾芒
Browse files
Options

debug

parent 43d5bdfd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1196 additions and 96 deletions
Lighting/Class/AllCustomerViewController.m
View file @ 330971f1
...@@ -121,6 +121,7 @@ ...@@ -121,6 +121,7 @@
page.page = 1; page.page = 1;
page.rows = KROWS; page.rows = KROWS;
self.conditionModel.page = page; self.conditionModel.page = page;
[self.allCustomerTableview.mj_footer resetNoMoreData];
[self getShoppersAssociatedCustomer:self.conditionModel isRemove:YES]; [self getShoppersAssociatedCustomer:self.conditionModel isRemove:YES];
}]; }];
headerRefresh.stateLabel.hidden = YES; headerRefresh.stateLabel.hidden = YES;
...@@ -131,7 +132,7 @@ ...@@ -131,7 +132,7 @@
//上拉加载 //上拉加载
self.allCustomerTableview.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ self.allCustomerTableview.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
if (self.indexPage ++ > self.totalPages) { if ( ++ self.indexPage > self.totalPages) {
[self.allCustomerTableview.mj_footer endRefreshingWithNoMoreData]; [self.allCustomerTableview.mj_footer endRefreshingWithNoMoreData];
}else }else
{ {
......
Lighting/Class/ClientViewController.m
View file @ 330971f1
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
//上拉加载 //上拉加载
self.informationTableview.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ self.informationTableview.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
if (self.indexPage ++ > self.totalPages) { if (++ self.indexPage > self.totalPages) {
[self.informationTableview.mj_footer endRefreshingWithNoMoreData]; [self.informationTableview.mj_footer endRefreshingWithNoMoreData];
}else }else
{ {
......
Lighting/Class/ClientdetailsViewController.m
View file @ 330971f1
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
[self.ClientdetailsTableview.mj_footer resetNoMoreData]; [self.ClientdetailsTableview.mj_footer resetNoMoreData];
//购物袋 //购物袋
if (self.shoppingBagButton.selected) { if (self.shoppingBagButton.selected) {
if (self.shoppingBagPage ++ > self.shoppingBagTotalPage) { if (++ self.shoppingBagPage > self.shoppingBagTotalPage) {
[self.ClientdetailsTableview.mj_footer endRefreshingWithNoMoreData]; [self.ClientdetailsTableview.mj_footer endRefreshingWithNoMoreData];
}else }else
{ {
......
Lighting/Class/CustomerOrderViewController.m
View file @ 330971f1
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
//上拉加载 //上拉加载
self.customerOrderTableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ self.customerOrderTableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
if (self.indexPage ++ > self.totalPages) { if ( ++ self.indexPage > self.totalPages) {
[self.customerOrderTableView.mj_footer endRefreshingWithNoMoreData]; [self.customerOrderTableView.mj_footer endRefreshingWithNoMoreData];
}else }else
{ {
......
Lighting/Class/ProductLibraryViewController.m
View file @ 330971f1
...@@ -235,13 +235,14 @@ ...@@ -235,13 +235,14 @@
- (void)GetdatasAction - (void)GetdatasAction
{ {
__weak typeof(self) weakSelf = self;
//下拉刷新 //下拉刷新
MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{ MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
//扫描二维码结果 //扫描二维码结果
if (self.barcode) { if (weakSelf.barcode) {
[self barCodeSearchRequest]; [weakSelf barCodeSearchRequest];
}else }else
{ {
...@@ -249,38 +250,38 @@ ...@@ -249,38 +250,38 @@
DataPage *Newpage = [[DataPage alloc]init]; DataPage *Newpage = [[DataPage alloc]init];
Newpage.page = 1; Newpage.page = 1;
Newpage.rows = KROWS; Newpage.rows = KROWS;
self.condtionModel.page = Newpage; weakSelf.condtionModel.page = Newpage;
self.indexPage = 1; weakSelf.indexPage = 1;
//搜索 //搜索
if (_selectedCode) { if (_selectedCode) {
switch (self.selectedIndex) { switch (weakSelf.selectedIndex) {
case 0://风格 case 0://风格
{ {
self.condtionModel.styleEquals = self.selectedCode; weakSelf.condtionModel.styleEquals = weakSelf.selectedCode;
} }
break; break;
case 1://类型 case 1://类型
{ {
self.condtionModel.categoryEquals = self.selectedCode; weakSelf.condtionModel.categoryEquals = weakSelf.selectedCode;
} }
break; break;
case 2://空间 case 2://空间
{ {
self.condtionModel.spaceEquals = self.selectedCode; weakSelf.condtionModel.spaceEquals = weakSelf.selectedCode;
} }
break; break;
case 3://材质 case 3://材质
{ {
self.condtionModel.materialEqueals = self.selectedCode; weakSelf.condtionModel.materialEqueals = weakSelf.selectedCode;
} }
break; break;
case 4://价格 case 4://价格
{ {
//价格字符串切割 //价格字符串切割
NSArray *spacrArray = [self.selectedCode componentsSeparatedByString:@"到"]; NSArray *spacrArray = [weakSelf.selectedCode componentsSeparatedByString:@"到"];
self.condtionModel.startprice = [NSNumber numberWithInteger:[[spacrArray objectAtIndex_opple:0] integerValue]]; weakSelf.condtionModel.startprice = [NSNumber numberWithInteger:[[spacrArray objectAtIndex_opple:0] integerValue]];
self.condtionModel.endprice = [NSNumber numberWithInteger:[[spacrArray objectAtIndex_opple:1] integerValue]]; weakSelf.condtionModel.endprice = [NSNumber numberWithInteger:[[spacrArray objectAtIndex_opple:1] integerValue]];
self.condtionModel.categoryEquals = _selectedCode; weakSelf.condtionModel.categoryEquals = _selectedCode;
} }
break; break;
...@@ -289,9 +290,9 @@ ...@@ -289,9 +290,9 @@
} }
} }
[self.productCollectionView.mj_footer resetNoMoreData]; [weakSelf.productCollectionView.mj_footer resetNoMoreData];
[self getScreeningdatasisRemoveArray:YES]; [weakSelf getScreeningdatasisRemoveArray:YES];
[self getGoodsListDatasisRemove:YES Withobject:self.condtionModel]; [weakSelf getGoodsListDatasisRemove:YES Withobject:self.condtionModel];
} }
}]; }];
headerRefresh.stateLabel.hidden = YES; headerRefresh.stateLabel.hidden = YES;
...@@ -303,27 +304,26 @@ ...@@ -303,27 +304,26 @@
self.productCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ self.productCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
//扫描二维码结果 //扫描二维码结果
if (self.barcode) { if (weakSelf.barcode) {
[self barCodeSearchRequest]; [weakSelf barCodeSearchRequest];
}else }else
{ {
if ( ++ weakSelf.indexPage > weakSelf.totalPages) {
if (self.indexPage ++ > self.totalPages) { [weakSelf.productCollectionView.mj_footer endRefreshingWithNoMoreData];
[self.productCollectionView.mj_footer endRefreshingWithNoMoreData];
}else }else
{ {
//分页数据 //分页数据
DataPage *Newpage = [[DataPage alloc]init]; DataPage *Newpage = [[DataPage alloc]init];
Newpage.page = self.indexPage ++; Newpage.page = weakSelf.indexPage ++;
Newpage.rows = KROWS; Newpage.rows = KROWS;
self.condtionModel.page = Newpage; weakSelf.condtionModel.page = Newpage;
//搜索 //搜索
if (_selectedCode) { if (_selectedCode) {
self.condtionModel.categoryEquals = _selectedCode; weakSelf.condtionModel.categoryEquals = _selectedCode;
} }
[self getGoodsListDatasisRemove:NO Withobject:self.condtionModel]; [weakSelf getGoodsListDatasisRemove:NO Withobject:self.condtionModel];
} }
} }
}]; }];
......
Lighting/Class/SceneLibraryViewController.m
View file @ 330971f1
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
//上拉加载 //上拉加载
self.seceneLibararyCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ self.seceneLibararyCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
if (self.indexPage ++ > self.totalPages) { if ( ++ self.indexPage > self.totalPages) {
[self.seceneLibararyCollectionView.mj_footer endRefreshingWithNoMoreData]; [self.seceneLibararyCollectionView.mj_footer endRefreshingWithNoMoreData];
}else }else
{ {
......
Lighting/Lighting.xcodeproj/project.pbxproj
View file @ 330971f1
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
2908870B1CE5A308000B7097 /* DateSelectedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887091CE5A308000B7097 /* DateSelectedViewController.m */; }; 2908870B1CE5A308000B7097 /* DateSelectedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887091CE5A308000B7097 /* DateSelectedViewController.m */; };
2908870C1CE5A308000B7097 /* DateSelectedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2908870A1CE5A308000B7097 /* DateSelectedViewController.xib */; }; 2908870C1CE5A308000B7097 /* DateSelectedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2908870A1CE5A308000B7097 /* DateSelectedViewController.xib */; };
290887131CE5DF16000B7097 /* ShopcarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887121CE5DF16000B7097 /* ShopcarModel.m */; }; 290887131CE5DF16000B7097 /* ShopcarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887121CE5DF16000B7097 /* ShopcarModel.m */; };
291D6A581CFFD45F007891AE /* SceneSectionHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 291D6A571CFFD45F007891AE /* SceneSectionHeaderView.m */; };
291D6A5C1CFFDCCA007891AE /* SceneListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 291D6A5B1CFFDCCA007891AE /* SceneListModel.m */; };
291D6A621CFFE212007891AE /* DataDictModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 291D6A611CFFE212007891AE /* DataDictModel.m */; };
291D6A651D0002AF007891AE /* TOGoodsEntityModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 291D6A641D0002AF007891AE /* TOGoodsEntityModel.m */; };
291D6A6B1D000A2A007891AE /* ProductScreeningCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 291D6A6A1D000A2A007891AE /* ProductScreeningCollectionViewCell.m */; };
291D6A6E1D0012AB007891AE /* GoodsCategoryModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 291D6A6D1D0012AB007891AE /* GoodsCategoryModel.m */; };
2925D03D1CFEE5D7008879BC /* ScreeningTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2925D03C1CFEE5D7008879BC /* ScreeningTableViewCell.m */; }; 2925D03D1CFEE5D7008879BC /* ScreeningTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2925D03C1CFEE5D7008879BC /* ScreeningTableViewCell.m */; };
2928F7E71CD087FE0036D761 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F7E61CD087FE0036D761 /* BaseViewController.m */; }; 2928F7E71CD087FE0036D761 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F7E61CD087FE0036D761 /* BaseViewController.m */; };
2928F8321CD09E320036D761 /* Toolview.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8311CD09E320036D761 /* Toolview.m */; }; 2928F8321CD09E320036D761 /* Toolview.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8311CD09E320036D761 /* Toolview.m */; };
...@@ -216,6 +222,18 @@ ...@@ -216,6 +222,18 @@
2908870A1CE5A308000B7097 /* DateSelectedViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DateSelectedViewController.xib; sourceTree = "<group>"; }; 2908870A1CE5A308000B7097 /* DateSelectedViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DateSelectedViewController.xib; sourceTree = "<group>"; };
290887111CE5DF16000B7097 /* ShopcarModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopcarModel.h; sourceTree = "<group>"; }; 290887111CE5DF16000B7097 /* ShopcarModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopcarModel.h; sourceTree = "<group>"; };
290887121CE5DF16000B7097 /* ShopcarModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopcarModel.m; sourceTree = "<group>"; }; 290887121CE5DF16000B7097 /* ShopcarModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopcarModel.m; sourceTree = "<group>"; };
291D6A561CFFD45F007891AE /* SceneSectionHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneSectionHeaderView.h; sourceTree = "<group>"; };
291D6A571CFFD45F007891AE /* SceneSectionHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneSectionHeaderView.m; sourceTree = "<group>"; };
291D6A5A1CFFDCCA007891AE /* SceneListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneListModel.h; sourceTree = "<group>"; };
291D6A5B1CFFDCCA007891AE /* SceneListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneListModel.m; sourceTree = "<group>"; };
291D6A601CFFE212007891AE /* DataDictModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataDictModel.h; sourceTree = "<group>"; };
291D6A611CFFE212007891AE /* DataDictModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataDictModel.m; sourceTree = "<group>"; };
291D6A631D0002AF007891AE /* TOGoodsEntityModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TOGoodsEntityModel.h; sourceTree = "<group>"; };
291D6A641D0002AF007891AE /* TOGoodsEntityModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TOGoodsEntityModel.m; sourceTree = "<group>"; };
291D6A691D000A2A007891AE /* ProductScreeningCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductScreeningCollectionViewCell.h; sourceTree = "<group>"; };
291D6A6A1D000A2A007891AE /* ProductScreeningCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductScreeningCollectionViewCell.m; sourceTree = "<group>"; };
291D6A6C1D0012AB007891AE /* GoodsCategoryModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GoodsCategoryModel.h; sourceTree = "<group>"; };
291D6A6D1D0012AB007891AE /* GoodsCategoryModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GoodsCategoryModel.m; sourceTree = "<group>"; };
2925D03B1CFEE5D7008879BC /* ScreeningTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreeningTableViewCell.h; sourceTree = "<group>"; }; 2925D03B1CFEE5D7008879BC /* ScreeningTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreeningTableViewCell.h; sourceTree = "<group>"; };
2925D03C1CFEE5D7008879BC /* ScreeningTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScreeningTableViewCell.m; sourceTree = "<group>"; }; 2925D03C1CFEE5D7008879BC /* ScreeningTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScreeningTableViewCell.m; sourceTree = "<group>"; };
2928F7E21CD085F40036D761 /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; }; 2928F7E21CD085F40036D761 /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
...@@ -613,6 +631,21 @@ ...@@ -613,6 +631,21 @@
name = shopCarmodel; name = shopCarmodel;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
291D6A591CFFDCB3007891AE /* model */ = {
isa = PBXGroup;
children = (
291D6A5A1CFFDCCA007891AE /* SceneListModel.h */,
291D6A5B1CFFDCCA007891AE /* SceneListModel.m */,
291D6A601CFFE212007891AE /* DataDictModel.h */,
291D6A611CFFE212007891AE /* DataDictModel.m */,
291D6A631D0002AF007891AE /* TOGoodsEntityModel.h */,
291D6A641D0002AF007891AE /* TOGoodsEntityModel.m */,
291D6A6C1D0012AB007891AE /* GoodsCategoryModel.h */,
291D6A6D1D0012AB007891AE /* GoodsCategoryModel.m */,
);
name = model;
sourceTree = "<group>";
};
2928F7DD1CD085430036D761 /* Class */ = { 2928F7DD1CD085430036D761 /* Class */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -924,6 +957,7 @@ ...@@ -924,6 +957,7 @@
29808A651CFED6E5001D1020 /* Scene */ = { 29808A651CFED6E5001D1020 /* Scene */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
291D6A591CFFDCB3007891AE /* model */,
29808A671CFED70A001D1020 /* View */, 29808A671CFED70A001D1020 /* View */,
29808A661CFED6FE001D1020 /* Controller */, 29808A661CFED6FE001D1020 /* Controller */,
); );
...@@ -946,6 +980,10 @@ ...@@ -946,6 +980,10 @@
2925D03C1CFEE5D7008879BC /* ScreeningTableViewCell.m */, 2925D03C1CFEE5D7008879BC /* ScreeningTableViewCell.m */,
29CB35401CFF0FB60061A5F3 /* ScreeningCollectionViewCell.h */, 29CB35401CFF0FB60061A5F3 /* ScreeningCollectionViewCell.h */,
29CB35411CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m */, 29CB35411CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m */,
291D6A561CFFD45F007891AE /* SceneSectionHeaderView.h */,
291D6A571CFFD45F007891AE /* SceneSectionHeaderView.m */,
291D6A691D000A2A007891AE /* ProductScreeningCollectionViewCell.h */,
291D6A6A1D000A2A007891AE /* ProductScreeningCollectionViewCell.m */,
); );
name = View; name = View;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1545,6 +1583,7 @@ ...@@ -1545,6 +1583,7 @@
29BFBD871CE428B200C238FB /* Customermanager.m in Sources */, 29BFBD871CE428B200C238FB /* Customermanager.m in Sources */,
299C7F5A1CE21FA800E7D7CB /* AddressViewController.m in Sources */, 299C7F5A1CE21FA800E7D7CB /* AddressViewController.m in Sources */,
29BB276C1CD9DE74009A0813 /* FollowHeartViewController.m in Sources */, 29BB276C1CD9DE74009A0813 /* FollowHeartViewController.m in Sources */,
291D6A651D0002AF007891AE /* TOGoodsEntityModel.m in Sources */,
041636C51CF3986F008CE961 /* CustomUIImagePickerController.m in Sources */, 041636C51CF3986F008CE961 /* CustomUIImagePickerController.m in Sources */,
2928F8381CD09E730036D761 /* CustomButton.m in Sources */, 2928F8381CD09E730036D761 /* CustomButton.m in Sources */,
0470D6111CE2936000647F0F /* SeceneLibraryView.m in Sources */, 0470D6111CE2936000647F0F /* SeceneLibraryView.m in Sources */,
...@@ -1565,6 +1604,7 @@ ...@@ -1565,6 +1604,7 @@
04F662171CFB9F4A00384248 /* HelpViewController.m in Sources */, 04F662171CFB9F4A00384248 /* HelpViewController.m in Sources */,
2928F8421CD0ABAC0036D761 /* ShoppingViewController.m in Sources */, 2928F8421CD0ABAC0036D761 /* ShoppingViewController.m in Sources */,
29698D611CE2C11500D72CE7 /* SettlementViewController.m in Sources */, 29698D611CE2C11500D72CE7 /* SettlementViewController.m in Sources */,
291D6A5C1CFFDCCA007891AE /* SceneListModel.m in Sources */,
299876331CD997DF00C90D0A /* OrderInformationTableViewCell.m in Sources */, 299876331CD997DF00C90D0A /* OrderInformationTableViewCell.m in Sources */,
29CB35421CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m in Sources */, 29CB35421CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m in Sources */,
2994C0151CFBE793005A80AF /* PayViewController.m in Sources */, 2994C0151CFBE793005A80AF /* PayViewController.m in Sources */,
...@@ -1582,6 +1622,7 @@ ...@@ -1582,6 +1622,7 @@
2928F8321CD09E320036D761 /* Toolview.m in Sources */, 2928F8321CD09E320036D761 /* Toolview.m in Sources */,
2942F8A61CDD80C2005B377E /* authenticateView.m in Sources */, 2942F8A61CDD80C2005B377E /* authenticateView.m in Sources */,
041636C21CF395B7008CE961 /* NSObject+UIImagePickerController.m in Sources */, 041636C21CF395B7008CE961 /* NSObject+UIImagePickerController.m in Sources */,
291D6A581CFFD45F007891AE /* SceneSectionHeaderView.m in Sources */,
04F662141CFB700B00384248 /* SecenTableViewCell.m in Sources */, 04F662141CFB700B00384248 /* SecenTableViewCell.m in Sources */,
044CD6F11CEB81350004A715 /* ProductCollectionPictureCell.m in Sources */, 044CD6F11CEB81350004A715 /* ProductCollectionPictureCell.m in Sources */,
29BFBD8F1CE44BA900C238FB /* goodsDetailsSectionview.m in Sources */, 29BFBD8F1CE44BA900C238FB /* goodsDetailsSectionview.m in Sources */,
...@@ -1611,7 +1652,9 @@ ...@@ -1611,7 +1652,9 @@
29834EB41CDF1EAA001A484F /* screeningSecondView.m in Sources */, 29834EB41CDF1EAA001A484F /* screeningSecondView.m in Sources */,
29706DA61CD082990003C412 /* main.m in Sources */, 29706DA61CD082990003C412 /* main.m in Sources */,
044CD6EE1CEB771C0004A715 /* SeceneCollectionPictureCell.m in Sources */, 044CD6EE1CEB771C0004A715 /* SeceneCollectionPictureCell.m in Sources */,
291D6A621CFFE212007891AE /* DataDictModel.m in Sources */,
29A938251CDAE31200F21E54 /* ProductDetailsHeaderView.m in Sources */, 29A938251CDAE31200F21E54 /* ProductDetailsHeaderView.m in Sources */,
291D6A6B1D000A2A007891AE /* ProductScreeningCollectionViewCell.m in Sources */,
299876421CD99E4000C90D0A /* OrderdetailsViewController.m in Sources */, 299876421CD99E4000C90D0A /* OrderdetailsViewController.m in Sources */,
29EC331A1CE023D5005F0C13 /* ChangePasswordViewController.m in Sources */, 29EC331A1CE023D5005F0C13 /* ChangePasswordViewController.m in Sources */,
29D260FB1CEECDFF00A9787D /* goodsDetailsTableViewCell.m in Sources */, 29D260FB1CEECDFF00A9787D /* goodsDetailsTableViewCell.m in Sources */,
...@@ -1628,6 +1671,7 @@ ...@@ -1628,6 +1671,7 @@
2992493A1CDB3E4500786B1E /* GenerateOrdersTableViewCell.m in Sources */, 2992493A1CDB3E4500786B1E /* GenerateOrdersTableViewCell.m in Sources */,
2962D0811CD1E6010058829D /* UIView+Frame.m in Sources */, 2962D0811CD1E6010058829D /* UIView+Frame.m in Sources */,
29C584ED1CDA429500C6F677 /* ProductDetailsViewController.m in Sources */, 29C584ED1CDA429500C6F677 /* ProductDetailsViewController.m in Sources */,
291D6A6E1D0012AB007891AE /* GoodsCategoryModel.m in Sources */,
0447085E1CD7C06B00555827 /* LoginViewController.m in Sources */, 0447085E1CD7C06B00555827 /* LoginViewController.m in Sources */,
2928F83B1CD0A0CE0036D761 /* CustomTabbarController.m in Sources */, 2928F83B1CD0A0CE0036D761 /* CustomTabbarController.m in Sources */,
29808A641CFEC41B001D1020 /* ExperienceCentreViewController.m in Sources */, 29808A641CFEC41B001D1020 /* ExperienceCentreViewController.m in Sources */,
......
Lighting/Lighting/Images.xcassets/圆角矩形-3-副本.imageset/Contents.json 0 → 100644
View file @ 330971f1
{
"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/Podfile.lock
View file @ 330971f1
...@@ -14,6 +14,7 @@ PODS: ...@@ -14,6 +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
- DZNEmptyDataSet (1.8.1)
- IQKeyboardManager (4.0.3) - IQKeyboardManager (4.0.3)
- JSONModel (1.2.0) - JSONModel (1.2.0)
- Masonry (0.6.4) - Masonry (0.6.4)
...@@ -40,6 +41,7 @@ PODS: ...@@ -40,6 +41,7 @@ PODS:
DEPENDENCIES: DEPENDENCIES:
- AFNetworking (~> 3.1.0) - AFNetworking (~> 3.1.0)
- DZNEmptyDataSet (~> 1.8.1)
- IQKeyboardManager (~> 4.0.0) - IQKeyboardManager (~> 4.0.0)
- JSONModel (~> 1.2.0) - JSONModel (~> 1.2.0)
- Masonry (~> 0.6.4) - Masonry (~> 0.6.4)
...@@ -53,6 +55,7 @@ DEPENDENCIES: ...@@ -53,6 +55,7 @@ DEPENDENCIES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67 AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7
IQKeyboardManager: be9695ffc5a52077deb4847608f338771022d6d1 IQKeyboardManager: be9695ffc5a52077deb4847608f338771022d6d1
JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c
Masonry: 281802d04d787ea2973179ee8bcb50500579ede2 Masonry: 281802d04d787ea2973179ee8bcb50500579ede2
......
Lighting/Tools/DataDictModel.h 0 → 100644
View file @ 330971f1
//
// DataDictModel.h
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "opple_objc_json_client.h"
@interface DataDictModel : DataDict
/**
* 保存选中状态
*/
@property (nonatomic,assign) BOOL isSelectedSate;
@end
Lighting/Tools/DataDictModel.m 0 → 100644
View file @ 330971f1
//
// DataDictModel.m
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "DataDictModel.h"
@implementation DataDictModel
@end
Lighting/Tools/ExperienceCentreViewController.m
View file @ 330971f1
...@@ -76,17 +76,33 @@ ...@@ -76,17 +76,33 @@
#pragma mark -场景筛选 #pragma mark -场景筛选
- (IBAction)SceneSelectedButtonClickAction:(UIButton *)sender { - (IBAction)SceneSelectedButtonClickAction:(UIButton *)sender {
[[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"SCENE"];
SceneViewController *sceneVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"SceneController"]; SceneViewController *sceneVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"SceneController"];
sceneVC.view.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.1]; sceneVC.view.backgroundColor = [UIColor clearColor];
sceneVC.searchBackView.hidden = YES;
sceneVC.materialButton.hidden = YES;
sceneVC.priceButton.hidden = YES;
sceneVC.typeButton.hidden = YES;
sceneVC.modalPresentationStyle = UIModalPresentationOverFullScreen; sceneVC.modalPresentationStyle = UIModalPresentationOverFullScreen;
UIPopoverPresentationController *pop = sceneVC.popoverPresentationController; UIPopoverPresentationController *pop = sceneVC.popoverPresentationController;
pop.sourceView = sceneVC.view; pop.sourceView = sceneVC.view;
[self presentViewController:sceneVC animated:YES completion:nil]; [self presentViewController:sceneVC animated:YES completion:nil];
} }
#pragma mark -产品筛选 #pragma mark -产品筛选
- (IBAction)ProductSelectedButtonClickAction:(UIButton *)sender { - (IBAction)ProductSelectedButtonClickAction:(UIButton *)sender {
[[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"SCENE"];
SceneViewController *sceneVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"SceneController"];
sceneVC.view.backgroundColor = [UIColor clearColor];
sceneVC.searchBackView.hidden = NO;
sceneVC.materialButton.hidden = NO;
sceneVC.priceButton.hidden = NO;
sceneVC.typeButton.hidden = NO;
sceneVC.modalPresentationStyle = UIModalPresentationOverFullScreen;
UIPopoverPresentationController *pop = sceneVC.popoverPresentationController;
pop.sourceView = sceneVC.view;
[self presentViewController:sceneVC animated:YES completion:nil];
} }
......
Lighting/Tools/GoodsCategoryModel.h 0 → 100644
View file @ 330971f1
//
// GoodsCategoryModel.h
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "opple_objc_json_client.h"
@interface GoodsCategoryModel : GoodsCategory
/**
* 选中状态
*/
@property (nonatomic,assign) BOOL isSelectedState;
@end
Lighting/Tools/GoodsCategoryModel.m 0 → 100644
View file @ 330971f1
//
// GoodsCategoryModel.m
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "GoodsCategoryModel.h"
@implementation GoodsCategoryModel
@end
Lighting/Tools/PrefixHeader.pch
View file @ 330971f1
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#import "PromptinformationView.h" #import "PromptinformationView.h"
#import "BaseViewController.h" #import "BaseViewController.h"
#import "MjRefreshHeaderCustom.h" #import "MjRefreshHeaderCustom.h"
#import "UIScrollView+EmptyDataSet.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.
...@@ -135,7 +136,7 @@ ...@@ -135,7 +136,7 @@
/** /**
* 服务器地址 * 服务器地址
*/ */
#define ServerAddress @"http://139.196.195.30:8090/opple-web/app" #define ServerAddress @"http://dg-dev.opple.com/opple-web/app"
/** /**
......
Lighting/Tools/ProductScreeningCollectionViewCell.h 0 → 100644
View file @ 330971f1
//
// ProductScreeningCollectionViewCell.h
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface ProductScreeningCollectionViewCell : UICollectionViewCell
/**
* 商品图片
*/
@property (weak, nonatomic) IBOutlet UIImageView *goodsImageView;
/**
* 商品名称
*/
@property (weak, nonatomic) IBOutlet UILabel *goodsName;
/**
* 商品规格
*/
@property (weak, nonatomic) IBOutlet UILabel *goodsSpecifications;
/**
* 商品价格
*/
@property (weak, nonatomic) IBOutlet UILabel *goodsPrice;
@end
Lighting/Tools/ProductScreeningCollectionViewCell.m 0 → 100644
View file @ 330971f1
//
// ProductScreeningCollectionViewCell.m
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "ProductScreeningCollectionViewCell.h"
@implementation ProductScreeningCollectionViewCell
/**
* 商品图片
*/
@end
Lighting/Tools/SceneListModel.h 0 → 100644
View file @ 330971f1
//
// SceneListModel.h
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "opple_objc_json_client.h"
@interface SceneListModel : TOSceneEntity
/**
* 选中状态
*/
@property (nonatomic,assign) BOOL isSelectedSate;
@end
Lighting/Tools/SceneListModel.m 0 → 100644
View file @ 330971f1
//
// SceneListModel.m
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "SceneListModel.h"
@implementation SceneListModel
@end
Lighting/Tools/SceneSectionHeaderView.h 0 → 100644
View file @ 330971f1
//
// SceneSectionHeaderView.h
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface SceneSectionHeaderView : UITableViewHeaderFooterView
/**
* 区头title
*/
@property (nonatomic,strong) UIButton *sectionButton;
@end
Lighting/Tools/SceneSectionHeaderView.m 0 → 100644
View file @ 330971f1
//
// SceneSectionHeaderView.m
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "SceneSectionHeaderView.h"
@implementation SceneSectionHeaderView
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
- (instancetype)initWithReuseIdentifier:(NSString *)reuseIdentifier
{
if (self = [super initWithReuseIdentifier:reuseIdentifier]) {
self.sectionButton = [UIButton buttonWithType:UIButtonTypeCustom];
self.sectionButton.frame = CGRectMake(0, 0, 100, 55);
[self.sectionButton setTitleColor:kTCColor(170, 170, 170) forState:UIControlStateNormal];
self.sectionButton.titleLabel.font = [UIFont systemFontOfSize:13];
[self.sectionButton setTitleColor:kMainBlueColor forState:UIControlStateSelected];
[self addSubview:self.sectionButton];
//横线
UIView *lineView = [[UIView alloc]initWithFrame:CGRectMake(0, 54, 100, 1)];
lineView.backgroundColor = kTCColor(221, 221, 221);
[self addSubview:lineView];
}
return self;
}
@end
Lighting/Tools/SceneViewController.h
View file @ 330971f1
...@@ -70,9 +70,20 @@ ...@@ -70,9 +70,20 @@
@property (weak, nonatomic) IBOutlet UIView *clickEventView; @property (weak, nonatomic) IBOutlet UIView *clickEventView;
/**
* tableview阴影背景
*/
@property (weak, nonatomic) IBOutlet UIView *myTableViewBackView;
/**
* 产品模块搜索框
*/
@property (weak, nonatomic) IBOutlet UITextField *searchProductField;
/**
* 搜索框背景
*/
@property (weak, nonatomic) IBOutlet UIView *searchBackView;
......
Lighting/Tools/SceneViewController.m
View file @ 330971f1
This diff is collapsed.
Lighting/Tools/ScreeningCollectionViewCell.h
View file @ 330971f1
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
// //
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "SceneListModel.h"
@interface ScreeningCollectionViewCell : UICollectionViewCell @interface ScreeningCollectionViewCell : UICollectionViewCell
...@@ -17,6 +18,9 @@ ...@@ -17,6 +18,9 @@
@property (weak, nonatomic) IBOutlet UIImageView *sceneImageView; @property (weak, nonatomic) IBOutlet UIImageView *sceneImageView;
/**
* 数据源
*/
@property (nonatomic,strong) SceneListModel *model;
@end @end
Lighting/Tools/ScreeningCollectionViewCell.m
View file @ 330971f1
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
@implementation ScreeningCollectionViewCell @implementation ScreeningCollectionViewCell
- (void)setModel:(SceneListModel *)model
{
[self.sceneImageView sd_setImageWithURL:[NSURL URLWithString:model.pricure] placeholderImage:REPLACEIMAGE];
}
@end @end
Lighting/Tools/ScreeningTableViewCell.h
View file @ 330971f1
...@@ -16,10 +16,5 @@ ...@@ -16,10 +16,5 @@
*/ */
@property (nonatomic,strong) UILabel *screeningLabe; @property (nonatomic,strong) UILabel *screeningLabe;
/**
* title
*/
@property (nonatomic,copy) NSString *screeningTitle;
@end @end
Lighting/Tools/TOGoodsEntityModel.h 0 → 100644
View file @ 330971f1
//
// TOGoodsEntityModel.h
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "opple_objc_json_client.h"
@interface TOGoodsEntityModel : TOGoodsEntity
/**
* 保存选中状态
*/
@property (nonatomic,assign) BOOL isSelectedState;
@end
Lighting/Tools/TOGoodsEntityModel.m 0 → 100644
View file @ 330971f1
//
// TOGoodsEntityModel.m
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "TOGoodsEntityModel.h"
@implementation TOGoodsEntityModel
@end
Lighting/podfile
View file @ 330971f1
platform:ios,'9.0' platform:ios,'9.0'
pod 'MBProgressHUD', '~> 0.9.2' pod 'MBProgressHUD', '~> 0.9.2'
pod 'SVProgressHUD', '~> 2.0.3' pod 'SVProgressHUD', '~> 2.0.3'
pod 'IQKeyboardManager', '~> 4.0.0’ pod 'IQKeyboardManager', '~> 4.0.0’
pod 'MMDrawerController', '~> 0.6.0' pod 'MMDrawerController', '~> 0.6.0'
pod 'MJExtension', '~> 3.0.10' pod 'MJExtension', '~> 3.0.10'
pod 'Masonry', '~> 0.6.4' pod 'Masonry', '~> 0.6.4'
pod 'MJRefresh', '~> 3.1.0' pod 'MJRefresh', '~> 3.1.0'
pod 'SDWebImage', '~> 3.7.5' pod 'SDWebImage', '~> 3.7.5'
pod 'AFNetworking', '~> 3.1.0' pod 'AFNetworking', '~> 3.1.0'
pod 'JSONModel', '~> 1.2.0' pod 'JSONModel', '~> 1.2.0'
pod 'UMengSocial', '~> 5.0' pod 'UMengSocial', '~> 5.0'
pod 'DZNEmptyDataSet', '~> 1.8.1'
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