优化客户详情页，购物袋、订单记录

Class/ClientShoppingCarViewController.h

+//
+//  ClientShoppingCarViewController.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/10/25.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface ClientShoppingCarViewController : BaseViewController
+
+/**
+ *  购物车
+ */
+@property (weak, nonatomic) IBOutlet UITableView *clientShoppingCarTableView;
+
+/**
+ *  用户数据模型
+ */
+@property (nonatomic,strong) MyclientEntityModel *model;
+@end

Class/ClientShoppingCarViewController.m

+//
+//  ClientShoppingCarViewController.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/10/25.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "ClientShoppingCarViewController.h"
+#import "ShopcarModel.h"
+#import "ProductDetailsViewController.h"
+#import "ClientDetailsTableViewCell.h"
+
+@interface ClientShoppingCarViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
+
+/**
+ *  记录总页数
+ */
+@property (nonatomic,assign) NSInteger totalPage;
+
+/**
+ *  购物车数据源
+ */
+@property (nonatomic,strong) NSMutableArray *shopResponseArray;
+
+/**
+ *  购物袋请求
+ */
+@property (nonatomic,strong) ShopCartFilter *shoppingCarModel;
+
+@end
+
+@implementation ClientShoppingCarViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    [self GetdatasAciton];
+}
+
+#pragma mark -获取数据
+- (void)GetdatasAciton
+{
+    WS(weakSelf);
+    //下拉刷新
+    MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
+        //购物袋
+        weakSelf.shoppingCarModel.dp.page = 1;
+        [weakSelf.clientShoppingCarTableView.mj_footer resetNoMoreData];
+        [weakSelf getShoppingCardata:weakSelf.shoppingCarModel isRemove:YES];
+    }];
+    headerRefresh.stateLabel.hidden = YES;
+    headerRefresh.lastUpdatedTimeLabel.hidden = YES;
+    self.clientShoppingCarTableView.mj_header = headerRefresh;
+    //进入刷新状态
+    [self.clientShoppingCarTableView.mj_header beginRefreshing];
+    //上拉加载
+    self.clientShoppingCarTableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+        
+        [weakSelf.clientShoppingCarTableView.mj_footer resetNoMoreData];
+        //购物袋
+        if (++ weakSelf.shoppingCarModel.dp.page > weakSelf.totalPage) {
+            [weakSelf.clientShoppingCarTableView.mj_footer endRefreshingWithNoMoreData];
+        }else
+        {
+            [weakSelf getShoppingCardata:weakSelf.shoppingCarModel isRemove:NO];
+        }
+    }];
+    self.clientShoppingCarTableView.mj_footer.automaticallyHidden = YES;
+    self.clientShoppingCarTableView.tableFooterView = [UIView new];
+}
+
+#pragma mark -获取购物车商品
+- (void)getShoppingCardata:(ShopCartFilter *)shopCar isRemove:(BOOL)remove
+{
+    [self CreateMBProgressHUDLoding];
+    WS(weakSelf);
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SHOPPINGBAG) WithRequestType:0 WithParameter:shopCar WithReturnValueBlock:^(id returnValue) {
+        
+        weakSelf.clientShoppingCarTableView.emptyDataSetSource = weakSelf;
+        weakSelf.clientShoppingCarTableView.emptyDataSetDelegate = weakSelf;
+        [weakSelf endRefreshingForTableView:weakSelf.clientShoppingCarTableView];
+        [weakSelf RemoveMBProgressHUDLoding];
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            if (remove) {
+                [weakSelf.shopResponseArray removeAllObjects];
+            }
+            ShopCartResponse *shopcar = [[ShopCartResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            weakSelf.totalPage = [returnValue[@"data"][@"totalpages"] intValue];
+            //自定义属性
+            for (TOShopcartEntity *objc in shopcar.shopcart) {
+                ShopcarModel *model = [[ShopcarModel alloc]init];
+                model.goods = objc.goods;
+                model.fid = objc.fid;
+                model.createName = objc.createName;
+                model.createBy = objc.createBy;
+                model.createDate = objc.createDate;
+                model.updateName = objc.updateName;
+                model.updateBy = objc.updateBy;
+                model.updateDate = objc.updateDate;
+                model.goodsId = objc.goodsId;
+                model.goodsNum = objc.goodsNum;
+                model.consumerId = objc.consumerId;
+                [weakSelf.shopResponseArray addObject:model];
+            }
+            [weakSelf.clientShoppingCarTableView reloadData];
+            
+        }else
+        {
+            [weakSelf ErrorMBProgressView:returnValue[@"message"]];
+        }
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf ErrorMBProgressView:NETWORK];
+    } WithFailureBlock:^(NSError *error) {
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf ErrorMBProgressView:error.localizedDescription];
+    }];
+}
+
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    ClientDetailsTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ClientDetails" forIndexPath:indexPath];
+    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+    cell.model = [self.shopResponseArray objectAtIndex_opple:indexPath.row];
+    return cell;
+}
+
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return self.shopResponseArray.count;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+   return 100;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    ProductDetailsViewController *productDetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"productdetails"];
+    ShopcarModel *model = [self.shopResponseArray objectAtIndex_opple:indexPath.row];
+    productDetails.goodsID = model.goods.fid;
+    [self.navigationController pushViewController:productDetails animated:YES];
+}
+
+#pragma mark - lazy
+- (NSMutableArray *)shopResponseArray
+{
+    if (_shopResponseArray == nil) {
+        
+        _shopResponseArray = [NSMutableArray array];
+    }
+    return _shopResponseArray;
+}
+
+- (ShopCartFilter *)shoppingCarModel
+{
+    if (!_shoppingCarModel) {
+        _shoppingCarModel = [[ShopCartFilter alloc]init];
+        DataPage *Newpage = [[DataPage alloc]init];
+        Newpage.page = 1;
+        Newpage.rows = KROWS;
+        _shoppingCarModel.dp = Newpage;
+        _shoppingCarModel.consumerId = self.model.fid;
+    }
+    return _shoppingCarModel;
+}
+
+#pragma mark -友好界面
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return kNoDataImage;
+}
+
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];
+}
+
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
+{
+    return YES;
+}
+
+- (CGFloat)verticalOffsetForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return 100;
+}
+
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+}
+
+
+@end

Class/ClientdetailsViewController.h

@@ -77,7 +77,10 @@
 @property (nonatomic,assign) NSInteger cellindex;
 
 
-
+/**
+ *  控制器背景View
+ */
+@property (weak, nonatomic) IBOutlet UIView *controllerBackgroundView;
 
 
 

Class/OrderRecordViewController.h

+//
+//  OrderRecordViewController.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/10/25.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface OrderRecordViewController : BaseViewController
+
+
+
+/**
+ *  订单记录
+ */
+@property (weak, nonatomic) IBOutlet UITableView *orderRecordTableView;
+
+/**
+ *  用户数据模型
+ */
+@property (nonatomic,strong) MyclientEntityModel *model;
+
+@end

Class/OrderRecordViewController.m

+//
+//  OrderRecordViewController.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/10/25.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "OrderRecordViewController.h"
+#import "OrderdetailsViewController.h"
+#import "OrderTableViewCell.h"
+
+@interface OrderRecordViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
+
+/**
+ *  记录总页数
+ */
+@property (nonatomic,assign) NSInteger totalPage;
+
+/**
+ *  订单记录数据
+ */
+@property (nonatomic,strong) NSMutableArray *orderRecordArray;
+
+/**
+ *  请求订单记录
+ */
+@property (nonatomic,strong) OrderFilter *orderRecordModel;
+
+@end
+
+@implementation OrderRecordViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+
+    [self GetdatasAciton];
+}
+
+#pragma mark -获取数据
+- (void)GetdatasAciton
+{
+    WS(weakSelf);
+    //下拉刷新
+    MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
+        //购物袋
+        weakSelf.orderRecordModel.dp.page = 1;
+        [weakSelf.orderRecordTableView.mj_footer resetNoMoreData];
+        [weakSelf getGuideAllcustomerOrder:weakSelf.orderRecordModel isRemove:YES];
+    }];
+    headerRefresh.stateLabel.hidden = YES;
+    headerRefresh.lastUpdatedTimeLabel.hidden = YES;
+    self.orderRecordTableView.mj_header = headerRefresh;
+    //进入刷新状态
+    [self.orderRecordTableView.mj_header beginRefreshing];
+    //上拉加载
+    self.orderRecordTableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+        
+        [weakSelf.orderRecordTableView.mj_footer resetNoMoreData];
+        //购物袋
+        if (++ weakSelf.orderRecordModel.dp.page > weakSelf.totalPage) {
+            [weakSelf.orderRecordTableView.mj_footer endRefreshingWithNoMoreData];
+        }else
+        {
+            [weakSelf getGuideAllcustomerOrder:weakSelf.orderRecordModel isRemove:NO];
+        }
+    }];
+    self.orderRecordTableView.mj_footer.automaticallyHidden = YES;
+    self.orderRecordTableView.tableFooterView = [UIView new];
+}
+
+
+#pragma mark -获取客户订单数据
+- (void)getGuideAllcustomerOrder:(OrderFilter *)allOrder isRemove:(BOOL)remove
+{
+    [self CreateMBProgressHUDLoding];
+    WS(weakSelf);
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(QUERYORDER) WithRequestType:0 WithParameter:allOrder WithReturnValueBlock:^(id returnValue) {
+        
+        weakSelf.orderRecordTableView.emptyDataSetSource = weakSelf;
+        weakSelf.orderRecordTableView.emptyDataSetDelegate = weakSelf;
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf endRefreshingForTableView:weakSelf.orderRecordTableView];
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            if (remove) {
+                [weakSelf.orderRecordArray removeAllObjects];
+            }
+            OrderResponse *Allorder = [[OrderResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            weakSelf.totalPage = [returnValue[@"data"][@"totalpages"] intValue];
+            for (OrderBill *model in Allorder.orderBillList) {
+                [weakSelf.orderRecordArray addObject:model];
+            }
+            [weakSelf.orderRecordTableView reloadData];
+        }else
+        {
+            [weakSelf ErrorMBProgressView:returnValue[@"message"]];
+        }
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf ErrorMBProgressView:NETWORK];
+    } WithFailureBlock:^(NSError *error) {
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf ErrorMBProgressView:error.localizedDescription];
+    }];
+}
+
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    OrderTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ordercell" forIndexPath:indexPath];
+    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+    cell.model = [self.orderRecordArray objectAtIndex_opple:indexPath.row];
+    return  cell;
+}
+
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return self.orderRecordArray.count;
+}
+
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return 200;
+}
+
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    OrderdetailsViewController *orderdetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"orderdetails"];
+    TOOrderEntity *model = (TOOrderEntity *)[[self.orderRecordArray objectAtIndex_opple:indexPath.row] order];
+    orderdetails.orderCode = model.orderNumber;
+    if ([model.orderState isEqualToString:@"006"] || [model.orderState isEqualToString:@"002"] || [model.orderState isEqualToString:@"003"]) {
+        orderdetails.isShowPrintButton = YES;
+        orderdetails.isDelectedButton = NO;
+        orderdetails.isUserInteractionEnabled = NO;
+    }
+    if ([model.orderState isEqualToString:@"001"]) {
+        orderdetails.isShowPayButton = YES;
+        orderdetails.isDelectedButton = YES;
+        orderdetails.isShowPrintButton = YES;
+        orderdetails.isUserInteractionEnabled = YES;
+    }
+    //撤销、支付回调
+    WS(weakSelf);
+    [orderdetails setDelecteAndPayButtonBlock:^(NSInteger cellindex, NSString *orderSate) {
+        OrderBill *model = [weakSelf.orderRecordArray objectAtIndex_opple:cellindex];
+        model.order.orderState = orderSate;
+        NSIndexPath *indexapath = [NSIndexPath indexPathForRow:cellindex inSection:0];
+        [weakSelf.orderRecordTableView reloadRowsAtIndexPaths:@[indexapath] withRowAnimation:UITableViewRowAnimationNone];
+    }];
+    [self.navigationController pushViewController:orderdetails animated:YES];
+}
+
+#pragma mark - lazy
+- (NSMutableArray *)orderRecordArray
+{
+    if (_orderRecordArray == nil) {
+        
+        _orderRecordArray = [NSMutableArray array];
+    }
+    return _orderRecordArray;
+}
+
+- (OrderFilter *)orderRecordModel
+{
+    if (!_orderRecordModel) {
+        _orderRecordModel = [[OrderFilter alloc]init];
+        DataPage *Newpage = [[DataPage alloc]init];
+        Newpage.page = 1;
+        Newpage.rows = KROWS;
+        _orderRecordModel.dp = Newpage;
+        _orderRecordModel.consumerIdEquals = self.model.fid;
+    }
+    return _orderRecordModel;
+}
+
+#pragma mark -友好界面
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return kNoDataImage;
+}
+
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];
+}
+
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
+{
+    return YES;
+}
+
+- (CGFloat)verticalOffsetForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return 100;
+}
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+
+@end

Class/OrderdetailsViewController.m

@@ -264,7 +264,6 @@ NSString *const lotteryAction = @"lotteryAction";
     self.settingsPopoverController.wantsDefaultContentAppearance = NO;
     self.settingsPopoverController.theme.fillBottomColor = [UIColor clearColor];
     self.settingsPopoverController.theme.fillTopColor = [UIColor clearColor];
-    
     [self.settingsPopoverController presentPopoverAsDialogAnimated:YES
                                                            options:WYPopoverAnimationOptionFadeWithScale];
 }

Lighting.xcodeproj/project.pbxproj

@@ -19,6 +19,7 @@
 		04F9EE221CF27B1D00BD729F /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04F9EE211CF27B1D00BD729F /* CoreTelephony.framework */; };
 		04FCB1A41CF60A8F0056093B /* DeviceDirectionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 04FCB1A31CF60A8F0056093B /* DeviceDirectionManager.m */; };
 		2903F93D1DBE57F4003CC6B1 /* JDEcardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2903F93C1DBE57F4003CC6B1 /* JDEcardViewController.m */; };
+		2904BA431DBEF3A200FB473A /* OrderRecordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2904BA421DBEF3A200FB473A /* OrderRecordViewController.m */; };
 		2906B5D71CD89246000849B4 /* ClientDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2906B5D61CD89246000849B4 /* ClientDetailsTableViewCell.m */; };
 		290887061CE58BC2000B7097 /* screeningButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887051CE58BC2000B7097 /* screeningButton.m */; };
 		2908870B1CE5A308000B7097 /* DateSelectedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887091CE5A308000B7097 /* DateSelectedViewController.m */; };
@@ -94,6 +95,7 @@
 		29706DB21CD082990003C412 /* Lighting.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 29706DB01CD082990003C412 /* Lighting.xcdatamodeld */; };
 		29706DB41CD082990003C412 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29706DB31CD082990003C412 /* Assets.xcassets */; };
 		29706DB71CD082990003C412 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29706DB51CD082990003C412 /* LaunchScreen.storyboard */; };
+		2973C33B1DBEF2EC00FAC995 /* ClientShoppingCarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2973C33A1DBEF2EC00FAC995 /* ClientShoppingCarViewController.m */; };
 		29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29807C611CD20C2A00F111B8 /* Images.xcassets */; };
 		29808A6B1CFED730001D1020 /* SceneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29808A6A1CFED730001D1020 /* SceneViewController.m */; };
 		2980AEC41D0D09B2001AA4A3 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2980AEC31D0D09B2001AA4A3 /* AssetsLibrary.framework */; };
@@ -200,6 +202,8 @@
 		075FDF6809C755AD73136F27 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
 		2903F93B1DBE57F4003CC6B1 /* JDEcardViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JDEcardViewController.h; sourceTree = "<group>"; };
 		2903F93C1DBE57F4003CC6B1 /* JDEcardViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JDEcardViewController.m; sourceTree = "<group>"; };
+		2904BA411DBEF3A200FB473A /* OrderRecordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderRecordViewController.h; sourceTree = "<group>"; };
+		2904BA421DBEF3A200FB473A /* OrderRecordViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderRecordViewController.m; sourceTree = "<group>"; };
 		2906B5D51CD89246000849B4 /* ClientDetailsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientDetailsTableViewCell.h; sourceTree = "<group>"; };
 		2906B5D61CD89246000849B4 /* ClientDetailsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClientDetailsTableViewCell.m; sourceTree = "<group>"; };
 		290887041CE58BC2000B7097 /* screeningButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screeningButton.h; sourceTree = "<group>"; };
@@ -352,6 +356,8 @@
 		29706DB31CD082990003C412 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		29706DB61CD082990003C412 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		29706DB81CD082990003C412 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		2973C3391DBEF2EC00FAC995 /* ClientShoppingCarViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientShoppingCarViewController.h; sourceTree = "<group>"; };
+		2973C33A1DBEF2EC00FAC995 /* ClientShoppingCarViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClientShoppingCarViewController.m; sourceTree = "<group>"; };
 		29807C611CD20C2A00F111B8 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		29808A621CFEC41B001D1020 /* ExperienceCentreViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExperienceCentreViewController.h; sourceTree = "<group>"; };
 		29808A691CFED730001D1020 /* SceneViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneViewController.h; sourceTree = "<group>"; };
@@ -590,6 +596,10 @@
 			children = (
 				29A8D3961CD85A58004D558F /* ClientdetailsViewController.h */,
 				29A8D3971CD85A58004D558F /* ClientdetailsViewController.m */,
+				2973C3391DBEF2EC00FAC995 /* ClientShoppingCarViewController.h */,
+				2973C33A1DBEF2EC00FAC995 /* ClientShoppingCarViewController.m */,
+				2904BA411DBEF3A200FB473A /* OrderRecordViewController.h */,
+				2904BA421DBEF3A200FB473A /* OrderRecordViewController.m */,
 			);
 			name = Controller;
 			sourceTree = "<group>";
@@ -1833,9 +1843,11 @@
 				29E2D32F1DB8AFD500443170 /* MDMatrix.m in Sources */,
 				29F725FB1CE17B0D0072FE0E /* Shoppersmanager.m in Sources */,
 				2921F3061DB5F27A00D6439B /* PromotionalTableViewCell.m in Sources */,
+				2973C33B1DBEF2EC00FAC995 /* ClientShoppingCarViewController.m in Sources */,
 				2916A7481D703A1700644C8C /* UIView+cornerRadius.m in Sources */,
 				29F14BA91CF6B60D0005D3E5 /* QRUtil.m in Sources */,
 				29EAAEA01CDC79DC00C4DBA2 /* CustomerOrderViewController.m in Sources */,
+				2904BA431DBEF3A200FB473A /* OrderRecordViewController.m in Sources */,
 				2928F8321CD09E320036D761 /* Toolview.m in Sources */,
 				2936F28C1D014147007CA67C /* sceneScreeningCollectionViewCell.m in Sources */,
 				2942F8A61CDD80C2005B377E /* authenticateView.m in Sources */,

Tools/BaseViewController.m

@@ -333,9 +333,6 @@
 }
 
 
-
-
-
 #pragma mark -删除提示文本、图片
 - (void)RemovePromptinformationView
 {
@@ -343,9 +340,6 @@
     self.promptView = nil;
 }
 
-
-
-
 #pragma mark -传入订单状态，返回当前状态图片
 + (UIImage *)ReturnOrderStateImageWithStateCode:(NSInteger)ordercode
 {