caoyunxiao

Lighting/Class/AboutViewController.m

@@ -17,7 +17,6 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    self.view.backgroundColor = [UIColor purpleColor];
 }
 
 - (void)didReceiveMemoryWarning {

Lighting/Class/AllCustomerViewController.m

@@ -16,6 +16,16 @@
  *  数据源
  */
 @property (nonatomic,strong) NSMutableArray *CustomerresultArray;
+
+/**
+ *  当前页数
+ */
+@property (nonatomic,assign) int indexPage;
+
+/**
+ *  总页数
+ */
+@property (nonatomic,assign) int totalPages;
 @end
 
 @implementation AllCustomerViewController
@@ -39,18 +49,55 @@
     // Do any additional setup after loading the view.
     
     [self uiConfigAction];
-    [self getShoppersAssociatedCustomer];
     
 }
 
+#pragma mark -视图渲染完成
+- (void)viewDidAppear:(BOOL)animated
+{
+    
+    //下拉刷新
+    MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
+        ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init];
+        DataPage *page = [[DataPage alloc]init];
+        page.page = 1;
+        page.rows = 10;
+        condition.page = page;
+        [self getShoppersAssociatedCustomer:condition isRemove:YES];
+    }];
+    headerRefresh.stateLabel.hidden = YES;
+    headerRefresh.lastUpdatedTimeLabel.hidden = YES;
+    self.allCustomerTableview.mj_header = headerRefresh;
+    [self.allCustomerTableview.mj_header beginRefreshing];
+
+    //上拉加载
+    self.allCustomerTableview.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+        
+        ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init];
+        DataPage *page = [[DataPage alloc]init];
+        page.rows = 10;
+        if (self.indexPage ++ > self.totalPages) {
+            [self.allCustomerTableview.mj_footer endRefreshingWithNoMoreData];
+        }else
+        {
+            page.page = self.indexPage ++;
+            condition.page = page;
+            [self getShoppersAssociatedCustomer:condition isRemove:NO];
+        }
+       
+    }];
+}
+
 
 #pragma mark -UI
 - (void)uiConfigAction
 {
-    
+    self.indexPage = 1;
     self.allCustomerTableview.dataSource = self;
     self.allCustomerTableview.delegate = self;
     self.searchTextfield.delegate = self;
+    self.view.backgroundColor = kMainGrayColor;
+    self.allCustomerTableview.backgroundColor = [UIColor clearColor];
     self.searchTextfield.returnKeyType = UIReturnKeySearch;
     
     //调整布局
@@ -87,20 +134,20 @@
 
 
 #pragma mark -获取导购关联客户
-- (void)getShoppersAssociatedCustomer
+- (void)getShoppersAssociatedCustomer:(ConsumerQueryCondition *)condition isRemove:(BOOL)remove
 {
     
     [self CreateMBProgressHUDLoding];
-    ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init];
-    DataPage *page = [[DataPage alloc]init];
-    page.page = 0;
-    condition.page = page;
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/consumer/query"] WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
         
         [self RemoveMBProgressHUDLoding];
+        [self endRefreshingForTableView:self.allCustomerTableview];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
-            
+            if (remove) {
+                [self.CustomerresultArray removeAllObjects];
+            }
             ConsumerPageResult *Customerresult = [[ConsumerPageResult alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            self.totalPages = (int)returnValue[@"data"][@"totalPages"];
             for (TOConsumerEntity *objc in Customerresult.results) {
                 
                 MyclientEntityModel *myclientModel = [[MyclientEntityModel alloc]init];
@@ -133,6 +180,7 @@
         
     } WithFailureBlock:^(id error) {
         
+        [self endRefreshingForTableView:self.allCustomerTableview];
         [self RemoveMBProgressHUDLoding];
     }];
 }
@@ -156,7 +204,7 @@
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    return 116;
+    return 125;
 }
 
 
@@ -227,7 +275,8 @@
     NSInteger result = [self compareOneDay:date withAnotherDay:date1];
     ConsumerQueryCondition *searchCustomer = [[ConsumerQueryCondition alloc]init];
     DataPage *page = [[DataPage alloc]init];
-    page.page = 0;
+    page.page = 1;
+    page.rows = 10;
     searchCustomer.page = page;
 
     //比较两个NSDate的大小
@@ -293,7 +342,8 @@
     
     ConsumerQueryCondition *searchCustomer = [[ConsumerQueryCondition alloc]init];
     DataPage *page = [[DataPage alloc]init];
-    page.page = 0;
+    page.page = 1;
+    page.rows = 10;
     searchCustomer.page = page;
     searchCustomer.nameEquals = self.searchTextfield.text;
     searchCustomer.mobileEquals = self.searchTextfield.text;
@@ -319,9 +369,28 @@
         [self RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
-            ConsumerPageResult *result = [[ConsumerPageResult alloc]initWithDictionary:returnValue error:nil];
-            NSLog(@"%@",result);
-            [self SuccessMBProgressView:@"成功"];
+            [self.CustomerresultArray removeAllObjects];
+            ConsumerPageResult *result = [[ConsumerPageResult alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            self.totalPages = (int)returnValue[@"data"][@"totalPages"];
+            for (TOConsumerEntity *objc in result.results) {
+                
+                MyclientEntityModel *myclientModel = [[MyclientEntityModel alloc]init];
+                myclientModel.fid = objc.fid;
+                myclientModel.createName = objc.createName;
+                myclientModel.createBy = objc.createBy;
+                myclientModel.createDate = objc.createDate;
+                myclientModel.sysOrgCode = objc.sysOrgCode;
+                myclientModel.name = objc.name;
+                myclientModel.mobile = objc.mobile;
+                myclientModel.province = objc.province;
+                myclientModel.city = objc.city;
+                myclientModel.country = objc.country;
+                myclientModel.address = objc.address;
+                myclientModel.picture = objc.picture;
+                myclientModel.lastVisitedTime = objc.lastVisitedTime;
+                [self.CustomerresultArray addObject:myclientModel];
+            }
+            [self.allCustomerTableview reloadData];
         }
         else
         {

Lighting/Class/AllCutomerTableViewCell.m

@@ -24,6 +24,9 @@
     [self.customerHeader sd_setImageWithURL:[NSURL URLWithString:_Model.picture] placeholderImage:ReplaceImage];
     self.customerName.text = _Model.name;
     self.customerPhoneName.text = _Model.mobile;
+    self.serviceName.text = _Model.createName;
+    self.customerAddress.text = _Model.address;
+    self.cutomerTime.text = _Model.lastVisitedTime;
     
 }
 

Lighting/Class/ClientViewController.m

@@ -23,6 +23,11 @@
  */
 @property (nonatomic,assign) int indexPage;
 
+/**
+ *  总页数
+ */
+@property (nonatomic,assign) int totalPages;
+
 @end
 
 @implementation ClientViewController
@@ -58,6 +63,39 @@
     if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
         self.navigationController.interactivePopGestureRecognizer.enabled = NO;
     }
+    
+    
+    //下拉刷新
+    MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
+        ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init];
+        DataPage *page = [[DataPage alloc]init];
+        page.page = 1;
+        condition.page = page;
+        page.rows = 10;
+        [self.informationTableview.mj_footer resetNoMoreData];
+        [self getShoppersAssociatedCustomer:condition isRemoveArray:YES];
+    }];
+    headerRefresh.stateLabel.hidden = YES;
+    headerRefresh.lastUpdatedTimeLabel.hidden = YES;
+    self.informationTableview.mj_header =headerRefresh;
+    
+    //进入刷新状态
+    [self.informationTableview.mj_header beginRefreshing];
+    //上拉加载
+    self.informationTableview.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+        
+        ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init];
+        DataPage *page = [[DataPage alloc]init];
+        if (self.indexPage ++ > self.totalPages) {
+            [self.informationTableview.mj_footer endRefreshingWithNoMoreData];
+        }else
+        {
+            page.page = self.indexPage ++;
+            page.rows = 10;
+            condition.page = page;
+            [self getShoppersAssociatedCustomer:condition isRemoveArray:NO];
+        }
+    }];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
@@ -87,7 +125,7 @@
     self.addpersonInformationButton.layer.cornerRadius = kCornerRadius;
     self.changePersonInformationButton.layer.masksToBounds = YES;
     self.changePersonInformationButton.layer.cornerRadius = kCornerRadius;
-    self.indexPage = 0;
+    self.indexPage = 1;
     //隐藏更改客户按钮
     self.changePersonInformationButton.hidden = YES;
     
@@ -98,33 +136,7 @@
     self.searchPersonInformationField.delegate = self;
     //监听键盘落下的通知
     [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(KeyboadrDismiss) name:UIKeyboardWillHideNotification object:nil];
-    
-    
-    //下拉刷新
-    MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
-        ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init];
-        DataPage *page = [[DataPage alloc]init];
-        page.page = 0;
-        condition.page = page;
-        page.rows = 10;
-        [self getShoppersAssociatedCustomer:condition isRemoveArray:YES];
-    }];
-    headerRefresh.stateLabel.hidden = YES;
-    headerRefresh.lastUpdatedTimeLabel.hidden = YES;
-    self.informationTableview.mj_header =headerRefresh;
-    
-    //进入刷新状态
-    [self.informationTableview.mj_header beginRefreshing];
-    //上拉加载
-    self.informationTableview.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
-        
-        ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init];
-        DataPage *page = [[DataPage alloc]init];
-        page.page = self.indexPage ++;
-        page.rows = 10;
-        condition.page = page;
-        [self getShoppersAssociatedCustomer:condition isRemoveArray:NO];
-    }];
+
 }
 
 
@@ -143,11 +155,12 @@
             if (remove) {
                 [self.CustomerresultArray removeAllObjects];
             }
-            ConsumerPageResult *Customerresult = [[ConsumerPageResult alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            NSDictionary *datas = returnValue[@"data"];
+            ConsumerPageResult *Customerresult = [[ConsumerPageResult alloc]initWithDictionary:datas error:nil];
+            self.totalPages = [datas[@"totalpages"] intValue];
             for (TOConsumerEntity *objc in Customerresult.results) {
                 
                  MyclientEntityModel *myclientModel = [[MyclientEntityModel alloc]init];
-                
                  myclientModel.fid = objc.fid;
                  myclientModel.createName = objc.createName;
                  myclientModel.createBy = objc.createBy;
@@ -304,6 +317,7 @@
     
     if ([sender.currentTitle isEqualToString:@"退出当前客户"]) {
       
+        [[NSNotificationCenter defaultCenter]postNotificationName:REFRESHSHOPPINGCAR object:@(0)];
         self.customerNameField.text = nil;
         self.customerAddress.text = nil;
         self.phoneNumberField.text = nil;

Lighting/Class/ClientdetailsViewController.m

@@ -165,9 +165,19 @@
     {
         UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
         OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"];
-        orderdetails.orderCode = [[[self.orderRecordArray objectAtIndex_opple:indexPath.row] order] orderNumber];
+        
+        TOOrderEntity *model = [[self.orderRecordArray objectAtIndex_opple:indexPath.row] order];
+        orderdetails.orderCode = model.orderNumber;
         orderdetails.sectionTitle = @[@"订单信息",@"客户信息",@"收货信息",@"商品信息",@"附件信息"];
         orderdetails.isShowattachment = YES;
+        if ([model.orderState isEqualToString:@"006"]) {
+            orderdetails.isShowPayButton = YES;
+            orderdetails.isShowPrintButton = YES;
+            
+        }else if ([model.orderState isEqualToString:@"001"])
+        {
+            orderdetails.isShowPayButton = YES;
+        }
         [self.navigationController pushViewController:orderdetails animated:YES];
     }
 }

Lighting/Class/CommodityListTableViewCell.m

@@ -21,13 +21,15 @@
     _model = model;
     [self.goodsHeader sd_setImageWithURL:[NSURL URLWithString:_model.goods.pictures] placeholderImage:ReplaceImage];
     self.goodsName.text = _model.goods.name;
-    self.goodsNumber.text = _model.goods.number;
-    self.clinchPrice.text = [_model.goods.costPrice stringValue];
+    self.goodsNumber.text = [NSString stringWithFormat:@"数量  X%@",_model.goods.number];
+    self.clinchPrice.text = [NSString stringWithFormat:@"成交价  ￥%@",[_model.goods.costPrice stringValue]];
     //计算总价格
     NSInteger number = [_model.goods.number integerValue];
     NSInteger price = [_model.goods.costPrice integerValue];
     NSInteger allPrice = number*price;
     self.totalPrice.text = [NSString stringWithFormat:@"%ld",allPrice];
+    
+    
 }
 
 

Lighting/Class/CustomerOrderTableViewCell.m

@@ -29,7 +29,6 @@
         
         make.left.equalTo(self.orderAll.mas_left).offset(13);
         make.top.equalTo(self.orderAll.mas_bottom).offset(10);
-        
     }];
 }
 
@@ -37,7 +36,7 @@
 - (void)setModel:(OrderBill *)model
 {
     _model = model;
-    self.orderDate.text = [self dateAsString:_model.order.orderTime];
+    self.orderDate.text = _model.order.createDate;
     self.orderSerialNumber.text = _model.order.orderNumber;
     self.shoppersName.text = _model.employee.userName;
     self.customerName.text = _model.consumer.name;
@@ -55,6 +54,12 @@
     }
     self.orderTotalPrice.text = [NSString stringWithFormat:@"%ld",goodsAllprice];
     
+    if ([_model.order.orderState isEqualToString:@"002"]) {
+        self.delecteOrder.hidden = NO;
+    }else
+    {
+        self.delecteOrder.hidden = YES;
+    }
     //订单状态图片
     self.orderStateImageView.image = [BaseViewController ReturnOrderStateImageWithStateCode:[_model.order.orderState integerValue]];
     

Lighting/Class/CustomerOrderViewController.m

@@ -60,31 +60,15 @@
    
 }
 
-
-#pragma mark -UI
-- (void)uiConfigAction
+#pragma mark -视图渲染完成
+- (void)viewDidAppear:(BOOL)animated
 {
-    self.searchCustomerOrder.delegate = self;
-    self.view.backgroundColor = kTCColor(238, 238, 238);
-    self.customerOrderTableView.dataSource = self;
-    self.customerOrderTableView.delegate = self;
-    self.customerOrderTableView.backgroundColor = [UIColor clearColor];
-    self.StyleButton = [screeningButton buttonWithType:UIButtonTypeCustom];
-    self.StyleButton.frame = CGRectMake(ScreenWidth-250, 20, 150, 30);
-    self.StyleButton.backgroundColor = kTCColor(131, 131, 131);
-    [self.StyleButton setTitle:@"订单状态" forState:UIControlStateNormal];
-    [self.StyleButton addTarget:self action:@selector(OrderStateButtonClick:) forControlEvents:UIControlEventTouchUpInside];
-    [self.StyleButton setImage:TCImage(@"down_arr") forState:UIControlStateNormal];
-    self.StyleButton.layer.masksToBounds = YES;
-    self.StyleButton.layer.cornerRadius = 10;
-    [self.orderStateBackView addSubview:self.StyleButton];
-
     //下拉刷新
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
         OrderBill *allOrder = [[OrderBill alloc]init];
         //分页
         DataPage *page = [[DataPage alloc]init];
-        page.page = 0;
+        page.page = 1;
         page.rows = 10;
         //订单
         TOOrderEntity *Neworder = [[TOOrderEntity alloc]init];
@@ -120,6 +104,26 @@
 }
 
 
+#pragma mark -UI
+- (void)uiConfigAction
+{
+    self.searchCustomerOrder.delegate = self;
+    self.view.backgroundColor = kTCColor(238, 238, 238);
+    self.customerOrderTableView.dataSource = self;
+    self.customerOrderTableView.delegate = self;
+    self.customerOrderTableView.backgroundColor = [UIColor clearColor];
+    self.StyleButton = [screeningButton buttonWithType:UIButtonTypeCustom];
+    self.StyleButton.frame = CGRectMake(ScreenWidth-250, 20, 150, 30);
+    self.StyleButton.backgroundColor = kTCColor(131, 131, 131);
+    [self.StyleButton setTitle:@"订单状态" forState:UIControlStateNormal];
+    [self.StyleButton addTarget:self action:@selector(OrderStateButtonClick:) forControlEvents:UIControlEventTouchUpInside];
+    [self.StyleButton setImage:TCImage(@"down_arr") forState:UIControlStateNormal];
+    self.StyleButton.layer.masksToBounds = YES;
+    self.StyleButton.layer.cornerRadius = 10;
+    [self.orderStateBackView addSubview:self.StyleButton];
+}
+
+
 #pragma mark -获取导购下客户订单  ----isdelecte 表示是否清空数组
 - (void)getGuideAllcustomerOrder:(BOOL)isdelecte WithorderBill:(OrderBill *)allOrder
 {
@@ -150,16 +154,12 @@
         
         [self endRefreshingForTableView:self.customerOrderTableView];
         [self RemoveMBProgressHUDLoding];
-        
     }];
 }
 
 
 
 
-
-
-
 #pragma mark -订单状态筛选
 - (void)OrderStateButtonClick:(UIButton *)button
 {
@@ -237,43 +237,36 @@
     allOrder.order = Neworder;
     
     NSString *orderState = nil;
-    for (int i=0; i<self.orderStateArray.count; i++) {
-        //全部订单
-        if ([title isEqualToString:[self.orderStateArray objectAtIndex_opple:i]]) {
-            orderState = nil;
-            break;
-        }
-        //待支付
-        if ([title isEqualToString:[self.orderStateArray objectAtIndex_opple:i]]) {
-            orderState = @"001";
-            break;
-        }
-        //已支付
-        if ([title isEqualToString:[self.orderStateArray objectAtIndex_opple:i]]) {
-            orderState = @"002";
-            break;
-        }
-        //已发货
-        if ([title isEqualToString:[self.orderStateArray objectAtIndex_opple:i]]) {
-            orderState = @"003";
-            break;
-        }
-        //已完成
-        if ([title isEqualToString:[self.orderStateArray objectAtIndex_opple:i]]) {
-            orderState = @"006";
-            break;
-        }
-        //已撤销
-        if ([title isEqualToString:[self.orderStateArray objectAtIndex_opple:i]]) {
-            orderState = @"005";
-            break;
-        }
-        //已退货
-        if ([title isEqualToString:[self.orderStateArray objectAtIndex_opple:i]]) {
-            orderState = @"004";
-            break;
-        }
+    //全部订单
+    if ([title isEqualToString:@"全部订单"]) {
+        orderState = nil;
+    }
+    //待支付
+    else if ([title isEqualToString:@"待支付"]) {
+        orderState = @"001";
     }
+    //已支付
+   else if ([title isEqualToString:@"已支付"]) {
+        orderState = @"002";
+    }
+    //已发货
+   else  if ([title isEqualToString:@"已发货"]) {
+        orderState = @"003";
+    }
+    //已完成
+   else if ([title isEqualToString:@"已完成"]) {
+        orderState = @"006";
+    }
+    //已撤销
+   else if ([title isEqualToString:@"已撤销"]) {
+        orderState = @"005";
+    }
+    //已退货
+   else if ([title isEqualToString:@"已退货"]) {
+        orderState = @"004";
+    }
+    
+    self.indexPage = 0;
     Neworder.orderState = orderState;
     [self getGuideAllcustomerOrder:YES WithorderBill:allOrder];
 }
@@ -327,6 +320,9 @@
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
             [self SuccessMBProgressView:@"撤销成功"];
+            model.order.orderState = @"005";
+            NSIndexPath *indexapath = [NSIndexPath indexPathForRow:cellindex inSection:0];
+            [self.customerOrderTableView reloadRowsAtIndexPaths:@[indexapath] withRowAnimation:UITableViewRowAnimationLeft];
         }
         else
         {

Lighting/Class/InformationTableViewCell.m

@@ -21,24 +21,16 @@
 {
     _model = model;
     [self.personHeader sd_setImageWithURL:[NSURL URLWithString:_model.picture] placeholderImage:ReplaceImage];
-    self.personName.text = _model.createName;
+    self.personName.text = _model.name;
     self.personPhoneNumber.text = _model.mobile;
-    self.recentTime.text = [self stringFromDate:_model.lastVisitedTime];
-    self.Guideservices.text = _model.name;
+    self.recentTime.text = _model.lastVisitedTime;
+    self.Guideservices.text = _model.createName;
     self.personLocation.text = _model.address;
     self.setCurrentCustomer.selected = _model.selectedState;
 }
 
 
 
-#pragma mark -NSDate转NSStirng
-- (NSString *)stringFromDate:(NSDate *)date{
-    
-    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-   [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
-    NSString *destDateString = [dateFormatter stringFromDate:date];
-    return destDateString;
-}
 
 
 

Lighting/Class/OrderInformationTableViewCell.m

@@ -21,7 +21,7 @@
 {
     _model = model;
     self.orderNumber.text = _model.order.orderNumber;
-    self.orderTime.text = [self dateAsString:_model.order.orderTime];
+    self.orderTime.text = _model.order.orderTime;
     self.orderStatus.text = [BaseViewController ReturnOrderStateTitleWithStateCode:[_model.order.orderState integerValue] withPoint:CGPointMake(self.orderStatus.frame.origin.x, self.orderStatus.frame.origin.y) WithCode:0];
     self.orderStatus.textColor = [BaseViewController ReturnOrderStateTitleWithStateCode:[_model.order.orderState integerValue] withPoint:CGPointMake(self.orderStatus.frame.origin.x, self.orderStatus.frame.origin.y) WithCode:1];
     self.operatorName.text = _model.employee.realName;

Lighting/Class/OrderdetailsViewController.h

@@ -36,4 +36,14 @@
 @property (nonatomic,strong) NSArray *sectionTitle;
 
 
+/**
+ *  是否显示支付按钮
+ */
+@property (nonatomic,assign) BOOL isShowPayButton;
+
+/**
+ *  是否显示预览、打印按钮
+ */
+@property (nonatomic,assign) BOOL isShowPrintButton;
+
 @end

Lighting/Class/OrderdetailsViewController.m

@@ -54,11 +54,14 @@
 {
     self.orderDetailsTableview.dataSource = self;
     self.orderDetailsTableview.delegate = self;
-//    [self CreateTableviewHeaderView];
-    
+    if (self.isShowPrintButton) {
+       [self CreateTableviewHeaderView];
+    }
     //附加信息cell
     [self.orderDetailsTableview registerNib:[UINib nibWithNibName:@"AdditionalTableViewCell" bundle:nil] forCellReuseIdentifier:@"fifthcell"];
-    [self CreateTableviewFooterView];
+    if (self.isShowPayButton) {
+       [self CreateTableviewFooterView];
+    }
 }
 
 

Lighting/Class/PersonInformationTableViewCell.m

@@ -13,19 +13,18 @@
 - (void)awakeFromNib {
     [super awakeFromNib];
     // Initialization code
+    
+    [self.customerHeader sd_setImageWithURL:[NSURL URLWithString:[Customermanager manager].customerName] placeholderImage:REPLACEIMAGE];
+    self.customerName.text = [Customermanager manager].customerName;
+    self.companyName.text = [Customermanager manager].customerName;
+//    self.emailName.text = [Customermanager manager]
+    self.companyLocation.text = [Customermanager manager].companyAddress;
+    self.customerPhoneNumber.text = [Customermanager manager].customerPhoneNumber;
+    
 }
 
 
 
-#pragma mark -赋值
-- (void)setModel:(TOConsumerEntity *)model
-{
-    _model = model;
-    self.customerName.text = _model.name;
-    [self.customerHeader sd_setImageWithURL:[NSURL URLWithString:_model.picture] placeholderImage:ReplaceImage];
-    self.customerNumbers.text = _model.mobile;
-}
-
 
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {

Lighting/Class/ProductLibraryViewController.m

@@ -62,6 +62,11 @@
  */
 @property (nonatomic,assign) int resultCount;
 
+/**
+ *  总页数
+ */
+@property (nonatomic,assign) int totalPages;
+
 
 
 
@@ -117,6 +122,58 @@
 }
 
 
+#pragma mark 视图渲染完成
+- (void)viewDidAppear:(BOOL)animated
+{
+    
+    //下拉刷新
+    MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
+        //默认数据
+        GoodsCondition *conditon = [[GoodsCondition alloc]init];
+        //分页数据
+        DataPage *Newpage = [[DataPage alloc]init];
+        Newpage.page = 1;
+        Newpage.rows = 10;
+        conditon.page = Newpage;
+        //搜索
+        if (_selectedCode) {
+            conditon.categoryEquals = _selectedCode;
+            conditon.nameLike = _selectedCode;
+        }
+        [self.productCollectionView.mj_footer resetNoMoreData];
+        [self getScreeningdatasisRemoveArray:YES];
+        [self getGoodsListDatasisRemove:YES Withobject:conditon];
+    }];
+    headerRefresh.stateLabel.hidden = YES;
+    headerRefresh.lastUpdatedTimeLabel.hidden = YES;
+    self.productCollectionView.mj_header = headerRefresh;
+    [self.productCollectionView.mj_header beginRefreshing];
+    
+    //上拉加载
+    self.productCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+        
+        //默认数据
+        GoodsCondition *conditon = [[GoodsCondition alloc]init];
+        //分页数据
+        DataPage *Newpage = [[DataPage alloc]init];
+        if (self.indexPage ++ > self.totalPages) {
+            [self.productCollectionView.mj_footer endRefreshingWithNoMoreData];
+        }else
+        {
+            Newpage.page = self.indexPage ++;
+            Newpage.rows = 10;
+            conditon.page = Newpage;
+            //搜索
+            if (_selectedCode) {
+                conditon.categoryEquals = _selectedCode;
+                conditon.nameLike = _selectedCode;
+            }
+            [self getGoodsListDatasisRemove:NO Withobject:conditon];
+        }
+    }];
+}
+
+
 #pragma mark -获取商品列表数据
 - (void)getGoodsListDatasisRemove:(BOOL)remove Withobject:(GoodsCondition *)conditon
 {
@@ -186,6 +243,7 @@
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
             GoodsResponse *sponse = [[GoodsResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            self.totalPages = (int)returnValue[@"data"][@"totalPages"];
             //返回结果
             finish(sponse);
         }
@@ -207,7 +265,7 @@
 #pragma mark -布局
 - (void)uiConfigAction
 {
-    self.indexPage = 0;
+    self.indexPage = 1;
     self.productCollectionLayout.itemSize = CGSizeMake((ScreenWidth-100)/3, (ScreenWidth-100)/3);
     self.productCollectionLayout.sectionInset = UIEdgeInsetsMake(20, 30, 20, 30);
     self.productCollectionLayout.minimumLineSpacing = 20;
@@ -216,89 +274,10 @@
     self.productCollectionView.delegate = self;
     self.productCollectionView.alwaysBounceVertical = YES;
     [self CreatescreeningButton];
-    
-    //搜索关键字
-//    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(searchInputString:) name:SEARCHSTRING object:nil];
-    
-    //返回根视图
-//    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(popTorootviewController:) name:POPROOTCONTROLLER object:nil];
-    
-    //下拉刷新
-    MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
-        //默认数据
-        GoodsCondition *conditon = [[GoodsCondition alloc]init];
-        //分页数据
-        DataPage *Newpage = [[DataPage alloc]init];
-        Newpage.page = self.indexPage;
-        Newpage.rows = 10;
-        conditon.page = Newpage;
-        //搜索
-        if (_selectedCode) {
-            conditon.categoryEquals = _selectedCode;
-            conditon.nameLike = _selectedCode;
-        }
-        [self getScreeningdatasisRemoveArray:YES];
-        [self getGoodsListDatasisRemove:YES Withobject:conditon];
-    }];
-    headerRefresh.stateLabel.hidden = YES;
-    headerRefresh.lastUpdatedTimeLabel.hidden = YES;
-    self.productCollectionView.mj_header = headerRefresh;
 
-    
-    
-    [self.productCollectionView.mj_header beginRefreshing];
-    
-    //上拉加载
-    self.productCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
-        
-        //默认数据
-        GoodsCondition *conditon = [[GoodsCondition alloc]init];
-        //分页数据
-        DataPage *Newpage = [[DataPage alloc]init];
-        Newpage.page = self.indexPage ++;
-        Newpage.rows = 10;
-        conditon.page = Newpage;
-        //搜索
-        if (_selectedCode) {
-            conditon.categoryEquals = _selectedCode;
-            conditon.nameLike = _selectedCode;
-        }
-        [self getGoodsListDatasisRemove:NO Withobject:conditon];
-    }];
-}
-
-#pragma mark -返回根视图
-- (void)popTorootviewController:(NSNotification *)not
-{
-    
-    [self.navigationController popToViewController:[self.navigationController.viewControllers firstObject] animated:NO];
-    
 }
 
 
-//#pragma mark -搜索关键字
-//- (void)searchInputString:(NSNotification *)not
-//{
-//    //默认数据
-//    GoodsCondition *conditon = [[GoodsCondition alloc]init];
-//    //分页数据
-//    DataPage *Newpage = [[DataPage alloc]init];
-//    Newpage.page = 0;
-//    conditon.page = Newpage;
-//    conditon.nameLike = not.object;
-//    
-//    __weak typeof(self)weakSelf = self;
-//    [self getGoodsListdatas:conditon returnResponse:^(GoodsResponse *response) {
-//        
-//        if (response.goodsEntity.count == 0) {
-//            
-//            [self ErrorMBProgressView:@"暂无数据"];
-//            return ;
-//        }
-//        weakSelf.datasArray = [NSMutableArray arrayWithArray:response.goodsEntity];
-//        [weakSelf.productCollectionView reloadData];
-//    }];
-//}
 
 
 #pragma mark -筛选按钮
@@ -339,6 +318,7 @@
     cell.cellindex = indexPath.item;
     //加入购物车
     __weak typeof(self) weakSelf = self;
+    __weak typeof(ProductCollectionViewCell *) weakCell = cell;
     [cell setReturnCellCgpoint:^void(CGPoint centerPoint,NSInteger cellindex) {
         
         //判断是否有当前客户
@@ -351,7 +331,7 @@
         [self addGoodsShoppingbags:model complate:^{
             NSLog(@"加入购物车完成");
         }];
-        [weakSelf StartAddShoppingCarAnimationWithimage:TCImage(@"欧") withStartpoint:centerPoint];
+        [weakSelf StartAddShoppingCarAnimationWithimage:weakCell.productImageView.image withStartpoint:centerPoint];
     }];
     
     return cell;
@@ -369,8 +349,10 @@
     CGPoint controlPoint = CGPointMake(endPoint.x, startPoint.x);
     
     
-    UIImageView *imageView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, 40, 40)];
+    UIImageView *imageView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, 60, 42)];
     imageView.layer.position = point;
+//    imageView.layer.masksToBounds = YES;
+//    imageView.layer.cornerRadius = 50;
     imageView.tag = 100;
     imageView.image = image;
     

Lighting/Class/SceneLibraryViewController.m

@@ -34,6 +34,11 @@
  */
 @property (nonatomic,assign) int indexPage;
 
+/**
+ *  总页数
+ */
+@property (nonatomic,assign) int totalPages;
+
 
 @end
 
@@ -73,6 +78,41 @@
 
 }
 
+#pragma mark -视图渲染完成
+- (void)viewDidAppear:(BOOL)animated
+{
+    //下拉刷新
+    MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
+        //默认数据
+        SceneCondition *condition = [[SceneCondition alloc]init];
+        DataPage *page = [[DataPage alloc]init];
+        page.page = 1;
+        page.rows = 10;
+        condition.page = page;
+        [self.seceneLibararyCollectionView.mj_footer resetNoMoreData];
+        [self getSceneLibrarydatas:condition isRemove:YES];
+    }];
+    headerRefresh.stateLabel.hidden = YES;
+    headerRefresh.lastUpdatedTimeLabel.hidden = YES;
+    self.seceneLibararyCollectionView.mj_header = headerRefresh;
+    [self.seceneLibararyCollectionView.mj_header beginRefreshing];
+    //上拉加载
+    self.seceneLibararyCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+        
+        //默认数据
+        SceneCondition *condition = [[SceneCondition alloc]init];
+        DataPage *page = [[DataPage alloc]init];
+        if (self.indexPage ++ > self.totalPages) {
+            [self.seceneLibararyCollectionView.mj_footer endRefreshingWithNoMoreData];
+        }
+        page.page = self.indexPage ++;
+        page.rows = 10;
+        condition.page = page;
+        [self getSceneLibrarydatas:condition isRemove:NO];
+    }];
+}
+
+
 #pragma mark -UI
 - (void)uiConfigAction
 {
@@ -102,33 +142,7 @@
     self.SpaceButton.layer.cornerRadius = 10;
     [self.backView addSubview:self.StyleButton];
     [self.backView addSubview:self.SpaceButton];
-    self.indexPage = 0;
-    
-    //下拉刷新
-    MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
-        //默认数据
-        SceneCondition *condition = [[SceneCondition alloc]init];
-        DataPage *page = [[DataPage alloc]init];
-        page.page = self.indexPage;
-        page.rows = 10;
-        condition.page = page;
-        [self getSceneLibrarydatas:condition isRemove:YES];
-    }];
-    headerRefresh.stateLabel.hidden = YES;
-    headerRefresh.lastUpdatedTimeLabel.hidden = YES;
-    self.seceneLibararyCollectionView.mj_header = headerRefresh;
-    [self.seceneLibararyCollectionView.mj_header beginRefreshing];
-    //上拉加载
-    self.seceneLibararyCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
-        
-        //默认数据
-        SceneCondition *condition = [[SceneCondition alloc]init];
-        DataPage *page = [[DataPage alloc]init];
-        page.page = self.indexPage ++;
-        page.rows = 10;
-        condition.page = page;
-        [self getSceneLibrarydatas:condition isRemove:NO];
-    }];
+    self.indexPage = 1;
     
 }
 #pragma mark -获取场景筛选数据
@@ -167,6 +181,7 @@
                 [self.responseArray removeAllObjects];
             }
             SceneResponse *response = [[SceneResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            self.indexPage = (int)returnValue[@"data"][@"totalPages"];
             for (TOSceneEntity *model in response.list) {
                 [self.responseArray addObject:model];
             }

Lighting/Class/Shoppingcart/AddressViewController.h

@@ -18,8 +18,13 @@
 //增加地址
 - (void)addAddressCell:(AddressModel *)model;
 
+//修改地址
+- (void)ChangeAddresscell:(AddressModel *)model Withcellindex:(NSInteger)cellindex;
+
+
 @end
 
+
 @interface AddressViewController : BaseViewController
 
 
@@ -119,7 +124,10 @@
 @property (nonatomic,assign) id<delecteDelegate> delegate;
 
 
-
+/**
+ *  选中地址cellindex
+ */
+@property (nonatomic,assign) NSInteger cellindex;
 
 
 

Lighting/Class/Shoppingcart/AddressViewController.m

@@ -138,7 +138,7 @@
     }
     else if ([sender.currentTitle isEqualToString:@"保存"])
     {
-        
+        [self ChangeAddressInformationRequest];
     }
     
 }
@@ -216,6 +216,56 @@
 //}
 
 
+
+
+#pragma mark -更改地址
+- (void)ChangeAddressInformationRequest
+{
+    
+    TOShippingAddrEntity *address = [[TOShippingAddrEntity alloc]init];
+    address.consumerId = [Customermanager manager].customerID;
+    address.name = self.recipientPerson.text;
+    address.miblephone = self.PhoneNumber.text;
+    address.city = [self.citySelected currentTitle];
+    address.address = self.detailsAddress.text;
+    address.fid = _model.fid;
+    
+    [self CreateMBProgressHUDLoding];
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/shippingAddress/save"] WithRequestType:0 WithParameter:address WithReturnValueBlock:^(id returnValue) {
+        
+        [self RemoveMBProgressHUDLoding];
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            
+            AddressModel *model = [[AddressModel alloc]init];
+            model.name = self.recipientPerson.text;
+            model.miblephone = self.PhoneNumber.text;
+            model.city = self.citySelected.currentTitle;
+            model.address = self.detailsAddress.text;
+            model.consumerId = [Customermanager manager].customerID;
+            model.fid = returnValue[@"data"];
+            model.isSelected = NO;
+            //修改地址
+            if ([self.delegate respondsToSelector:@selector(ChangeAddresscell:Withcellindex:)]) {
+                
+                [self.delegate ChangeAddresscell:model Withcellindex:_cellindex];
+            }
+        }
+        else
+        {
+            [self ErrorMBProgressView:returnValue[@"message"]];
+        }
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        
+        
+    } WithFailureBlock:^(id error) {
+        
+        NSLog(@"%@",error);
+        [self RemoveMBProgressHUDLoding];
+    }];
+}
+
+
 #pragma mark -取消新增地址，或者删除
 - (IBAction)cancelButtonClick:(UIButton *)sender {
     

Lighting/Class/Shoppingcart/AddressViewController.xib

@@ -78,8 +78,10 @@
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="51b-5f-c5c">
                             <rect key="frame" x="19" y="271" width="120" height="35"/>
-                            <color key="backgroundColor" red="1" green="0.70412693910000002" blue="0.69044467629999995" alpha="1" colorSpace="calibratedRGB"/>
-                            <state key="normal" title="取消"/>
+                            <color key="backgroundColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
+                            <state key="normal" title="取消">
+                                <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            </state>
                             <connections>
                                 <action selector="cancelButtonClick:" destination="-1" eventType="touchUpInside" id="N17-5d-yqF"/>
                             </connections>
@@ -97,7 +99,9 @@
                         <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QSY-YC-rrl">
                             <rect key="frame" x="98" y="162" width="160" height="30"/>
                             <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/>
-                            <state key="normal" title="城市选择"/>
+                            <state key="normal" title="城市选择">
+                                <color key="titleColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
+                            </state>
                         </button>
                         <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UeJ-Cx-EfL">
                             <rect key="frame" x="98" y="73" width="160" height="30"/>

Lighting/Class/Shoppingcart/GenerateOrdersViewController.m

@@ -304,7 +304,7 @@
 
 
 #pragma mark -新增或者修改收货地址
-- (void)CreateModifyShippingView:(AddressModel *)model
+- (void)CreateModifyShippingView:(AddressModel *)model Withindex:(NSInteger)cellindex
 {
     
     AddressViewController *address = [[AddressViewController alloc]init];
@@ -314,6 +314,7 @@
         address.model = model;
         address.isChange = YES;
     }
+    address.cellindex = cellindex;
     address.preferredContentSize = CGSizeMake(315, 320);
     address.modalPresentationStyle = UIModalPresentationFormSheet;
     UIPopoverPresentationController *pop = address.popoverPresentationController;
@@ -395,6 +396,7 @@
                         orderDetails.orderCode = returnValue[@"data"];
                         orderDetails.sectionTitle = @[@"订单信息",@"客户信息",@"收货信息",@"商品清单"];
                         orderDetails.isShowattachment = NO;
+                        orderDetails.isShowPayButton = YES;
                         [self.navigationController pushViewController:orderDetails animated:YES];
                         
                     }else
@@ -463,7 +465,7 @@
             //判断是否为选中
             if (model.isSelected) {
                 
-                [self CreateModifyShippingView:[arr objectAtIndex_opple:i]];
+                [self CreateModifyShippingView:[arr objectAtIndex_opple:i] Withindex:i];
             }
         }
     }
@@ -473,7 +475,7 @@
 #pragma mark -新增地址
 - (void)AddAddressButtonClick
 {
-    [self CreateModifyShippingView:nil];
+    [self CreateModifyShippingView:nil Withindex:0];
 }
 
 
@@ -486,6 +488,15 @@
     [self.generateOrderTableview insertRowsAtIndexPaths:@[indexpath] withRowAnimation:UITableViewRowAnimationLeft];
 }
 
+#pragma mark -修改地址回调
+- (void)ChangeAddresscell:(AddressModel *)model Withcellindex:(NSInteger)cellindex
+{
+    [self dismissViewControllerAnimated:YES completion:nil];
+    [[self.datasArray objectAtIndex_opple:1]replaceObjectAtIndex:cellindex withObject:model];
+    NSIndexPath *indexpath = [NSIndexPath indexPathForRow:cellindex inSection:1];
+    [self.generateOrderTableview reloadRowsAtIndexPaths:@[indexpath] withRowAnimation:UITableViewRowAnimationLeft];
+}
+
 #pragma mark -删除地址
 - (void)delecteCell:(NSString *)addressid
 {

Lighting/Class/Shoppingcart/ShoppingTableViewCell.h

@@ -15,7 +15,7 @@
 /**
  *  当前商品数量、成交价
  */
-- (void)ChangeGoodsNumber:(int)goodsNumber WithcostPrice:(NSInteger)costprice Withcellindex:(NSInteger)cellindex;
+- (void)ChangeGoodsNumber:(int)goodsNumber WithcostPrice:(int)costprice Withcellindex:(NSInteger)cellindex;
 
 
 @end
@@ -25,7 +25,7 @@
 
 
 
-@interface ShoppingTableViewCell : UITableViewCell
+@interface ShoppingTableViewCell : UITableViewCell<UITextFieldDelegate>
 
 /**
  *  选中
@@ -95,6 +95,9 @@
  */
 @property (nonatomic,assign) id<ChangeGoodsNumberDelegate>delegate;
 
-
+/**
+ *  提示框回调
+ */
+@property (nonatomic,copy) void(^promptStringBlock)(NSString *string);
 
 @end

Lighting/Class/Shoppingcart/ShoppingTableViewCell.m

@@ -23,6 +23,7 @@
 {
     self.ClinchPriceBackView.layer.masksToBounds = YES;
     self.ClinchPriceBackView.layer.cornerRadius = kCornerRadius;
+    self.clinchTextfield.delegate = self;
 }
 
 #pragma mark -赋值
@@ -36,9 +37,6 @@
     self.clinchTextfield.text = [_model.goods.costPrice stringValue];
     self.goodsNumbersLabe.text = [NSString stringWithFormat:@"%d",_model.goodsNum];
     self.productPriceLabe.text = [_model.goods.costPrice stringValue];
-    
-    
-    
 }
 
 #pragma mark -增加或者减少商品
@@ -55,6 +53,9 @@
         {
             if (goodsNumber <= 1) {
                 
+                if (self.promptStringBlock) {
+                    self.promptStringBlock(@"个数不能小于1");
+                }
                 //不能小于1
                 return;
             }
@@ -68,7 +69,9 @@
             if (goodsNumber >= [_model.goods.number integerValue]) {
                 
                 //不能大于库存
-                
+                if (self.promptStringBlock) {
+                    self.promptStringBlock(@"个数不能大于库存");
+                }
                 return;
             }
             goodsNumber ++;
@@ -84,7 +87,7 @@
     self.productPriceLabe.text = [NSString stringWithFormat:@"￥%ld",[self.goodsNumbersLabe.text integerValue]*[_model.goods.costPrice integerValue]];
     
     if ([self.delegate respondsToSelector:@selector(ChangeGoodsNumber:WithcostPrice:Withcellindex:)]) {
-        [self.delegate ChangeGoodsNumber:[self.goodsNumbersLabe.text intValue] WithcostPrice:[self.clinchTextfield.text integerValue]Withcellindex:_cellindex];
+        [self.delegate ChangeGoodsNumber:[self.goodsNumbersLabe.text intValue] WithcostPrice:[self.clinchTextfield.text intValue]Withcellindex:_cellindex];
     }
 }
 
@@ -100,6 +103,33 @@
 }
 
 
+#pragma mark -成交价完成修改
+- (BOOL)textFieldShouldEndEditing:(UITextField *)textField
+{
+    if (![self isPureInt:textField.text]) {
+        if (self.promptStringBlock) {
+            self.promptStringBlock(@"输入格式错误");
+            return NO;
+        }
+    }
+    //改变价格
+    self.productPriceLabe.text = [NSString stringWithFormat:@"￥%ld",[self.goodsNumbersLabe.text integerValue]*[textField.text integerValue]];
+    
+    if ([self.delegate respondsToSelector:@selector(ChangeGoodsNumber:WithcostPrice:Withcellindex:)]) {
+        [self.delegate ChangeGoodsNumber:[self.goodsNumbersLabe.text intValue] WithcostPrice:[self.clinchTextfield.text intValue]Withcellindex:_cellindex];
+    }
+    return YES;
+}
+
+
+#pragma mark - 判断是否是纯数字
+- (BOOL)isPureInt:(NSString*)string{
+    NSScanner* scan = [NSScanner scannerWithString:string];
+    int val;
+    return[scan scanInt:&val] && [scan isAtEnd];
+}
+
+
 
 
 

Lighting/Class/Shoppingcart/ShoppingViewController.m

@@ -153,7 +153,6 @@
 
 
 
-
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     ShoppingTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Shopping" forIndexPath:indexPath];
@@ -166,6 +165,10 @@
         
         [self setSelectedButton:index];
     }];
+    //提示框回调
+    [cell setPromptStringBlock:^(NSString *string) {
+        [self ErrorMBProgressView:string];
+    }];
     return  cell;
 }
 
@@ -377,7 +380,7 @@
 
 
 #pragma mark -改变商品数量
-- (void)ChangeGoodsNumber:(int)goodsNumber WithcostPrice:(NSInteger)costprice Withcellindex:(NSInteger)cellindex
+- (void)ChangeGoodsNumber:(int)goodsNumber WithcostPrice:(int)costprice Withcellindex:(NSInteger)cellindex
 {
     //保存商品数量
     ShopcarModel *model = [self.shopResponseArray objectAtIndex_opple:cellindex];
@@ -390,14 +393,34 @@
 //    [self.shopResponseArray replaceObjectAtIndex:cellindex withObject:Newmodel];
     
     [self CalculateSelectedGoodsAllprice];
+    
+    ////在服务器保存数量、成交价
+    //购物车ID
+    NSString *carid = [[self.shopResponseArray objectAtIndex_opple:cellindex] fid];
+    //商品id
+    NSString *goodsis = [[[self.shopResponseArray objectAtIndex_opple:cellindex] goods] fid];
+    //成交价
+    NSString *costpriceString = [NSString stringWithFormat:@"%d",costprice];
+    //商品数量
+    NSString *goodsNumberString = [NSString stringWithFormat:@"%d",goodsNumber];
+    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@%@/%@/%@/%@",ServerAddress,@"/shopcart/updateCostPrice/",carid,goodsis,costpriceString,goodsNumberString] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+        
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            NSLog(@"写入服务器成功");
+        }
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        
+        
+    } WithFailureBlock:^(id error) {
+       
+        NSLog(@"%@",error);
+        NSLog(@"写入服务器失败");
+    }];
 }
 
 
-#pragma mark -在服务器保存更改后的成交价和数量
-- (void)ServerRequestForChangePriceAndNumber
-{
-    
-}
+
 
 
 - (void)didReceiveMemoryWarning {

Lighting/Class/Tabbar/CustomTabbarController.h

@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface CustomTabbarController : UITabBarController
+@interface CustomTabbarController : UITabBarController<UITabBarControllerDelegate>
 
 
 

Lighting/Class/Tabbar/CustomTabbarController.m

@@ -32,6 +32,11 @@
  */
 @property (nonatomic,strong) UIButton *Newbutton;
 
+/**
+ *  控制器数组
+ */
+@property (nonatomic,strong) NSArray *vcArray;
+
 @end
 
 @implementation CustomTabbarController
@@ -92,6 +97,7 @@
     Toolview *toolview = [[Toolview alloc]initWithFrame:CGRectMake(Zero, Zero, ScreenWidth, NavigationHeight)];
     toolview.delegate = self;
     toolview.inputField.delegate = self;
+    self.delegate = self;
     [self.tabBar addSubview:toolview];
 }
 
@@ -124,8 +130,8 @@
     UINavigationController *cutomerorderNav = [[UINavigationController alloc]initWithRootViewController:customerOrderVC];
     UINavigationController *aboutNav = [[UINavigationController alloc]initWithRootViewController:aboutVC];
     
-    NSArray *vcArray = [NSArray arrayWithObjects:aboutNav,cutomerorderNav,allcustomerNav,customerNav,productNav,sceneNav,followNav,clientNav,shoppingNav,searchNav, nil];
-    self.viewControllers = vcArray;
+    self.vcArray = [NSArray arrayWithObjects:aboutNav,cutomerorderNav,allcustomerNav,customerNav,productNav,sceneNav,followNav,clientNav,shoppingNav,searchNav, nil];
+    self.viewControllers = self.vcArray;
     self.selectedIndex = 7;
 }
 
@@ -275,6 +281,25 @@
     return YES;
 }
 
+#pragma mark -自定义选中
+- (void)setSelectedIndex:(NSUInteger)selectedIndex
+{
+    [super setSelectedIndex:selectedIndex];
+    [self tabBarController:self didSelectViewController:[self.vcArray objectAtIndex_opple:selectedIndex]];
+}
+
+
+#pragma mark -回到最上层
+- (void)tabBarController:(UITabBarController *)tabBarController didSelectViewController:(UIViewController *)viewController
+{
+    if ([viewController isKindOfClass:[UINavigationController class]]) {
+        
+        UINavigationController *navVC = (UINavigationController *)viewController;
+        [navVC popToRootViewControllerAnimated:NO];
+    }
+    
+}
+
 
 
 - (void)didReceiveMemoryWarning {

Lighting/Lighting.xcodeproj/project.pbxproj

@@ -129,6 +129,7 @@
 		29F725FE1CE1928F0072FE0E /* opple_objc_json_client.m in Sources */ = {isa = PBXBuildFile; fileRef = 29F725FD1CE1928F0072FE0E /* opple_objc_json_client.m */; };
 		29F726011CE1D05D0072FE0E /* ScreeningCollectionReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29F726001CE1D05D0072FE0E /* ScreeningCollectionReusableView.m */; };
 		29F726041CE1E96E0072FE0E /* ScreeningSecondCollectionReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29F726031CE1E96E0072FE0E /* ScreeningSecondCollectionReusableView.m */; };
+		BF53D4B7E2EE4CFF549FF699 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DB768A1F2B4AFFF8B89F1D1 /* libPods.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -363,6 +364,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				04F9EE221CF27B1D00BD729F /* CoreTelephony.framework in Frameworks */,
+				BF53D4B7E2EE4CFF549FF699 /* libPods.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -470,6 +472,15 @@
 			path = tools;
 			sourceTree = "<group>";
 		};
+		2902E1301CF2907200268161 /* RefreshHeader */ = {
+			isa = PBXGroup;
+			children = (
+				29D260FE1CEEF16D00A9787D /* MjRefreshHeaderCustom.h */,
+				29D260FF1CEEF16D00A9787D /* MjRefreshHeaderCustom.m */,
+			);
+			name = RefreshHeader;
+			sourceTree = "<group>";
+		};
 		2906B5D31CD8920F000849B4 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
@@ -532,6 +543,7 @@
 		2928F7DE1CD085430036D761 /* Tools */ = {
 			isa = PBXGroup;
 			children = (
+				2902E1301CF2907200268161 /* RefreshHeader */,
 				294CF0E91CEDCF250055F1D8 /* PromptinformationView */,
 				29A9DCAA1CEB63BD00A7567A /* PreviewPDF */,
 				2985AE9A1CE72F1500704C91 /* ZXPUnicode */,
@@ -548,8 +560,6 @@
 				2928F8351CD09E500036D761 /* CustomButton */,
 				2928F7E41CD087C20036D761 /* parentclass */,
 				2928F7E31CD087B60036D761 /* pch */,
-				29D260FE1CEEF16D00A9787D /* MjRefreshHeaderCustom.h */,
-				29D260FF1CEEF16D00A9787D /* MjRefreshHeaderCustom.m */,
 			);
 			path = Tools;
 			sourceTree = "<group>";

Lighting/Lighting/Images.xcassets/aboutus.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "aboutus.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Podfile.lock

@@ -14,7 +14,7 @@ PODS:
   - AFNetworking/Serialization (3.1.0)
   - AFNetworking/UIKit (3.1.0):
     - AFNetworking/NSURLSession
-  - IQKeyboardManager (4.0.2)
+  - IQKeyboardManager (4.0.3)
   - JSONModel (1.2.0)
   - Masonry (0.6.4)
   - MBProgressHUD (0.9.2)
@@ -32,9 +32,9 @@ PODS:
     - MMDrawerController/Core
   - MMDrawerController/Subclass (0.6.0):
     - MMDrawerController/Core
-  - SDWebImage (3.7.5):
-    - SDWebImage/Core (= 3.7.5)
-  - SDWebImage/Core (3.7.5)
+  - SDWebImage (3.7.6):
+    - SDWebImage/Core (= 3.7.6)
+  - SDWebImage/Core (3.7.6)
   - SVProgressHUD (2.0.3)
 
 DEPENDENCIES:
@@ -51,14 +51,14 @@ DEPENDENCIES:
 
 SPEC CHECKSUMS:
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
-  IQKeyboardManager: 2341089c4ae25fa2fa82ce356a259fcd267dc6b6
+  IQKeyboardManager: be9695ffc5a52077deb4847608f338771022d6d1
   JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c
   Masonry: 281802d04d787ea2973179ee8bcb50500579ede2
   MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
   MJExtension: d86aacb740c87519d20e3cca55b6fa4be6cc7548
   MJRefresh: 743e6404967d1c2c688472ea3ecfde247d872db4
   MMDrawerController: e3a54a5570388463ad3b36975251575b50c4e1a0
-  SDWebImage: 69c6303e3348fba97e03f65d65d4fbc26740f461
+  SDWebImage: c325cf02c30337336b95beff20a13df489ec0ec9
   SVProgressHUD: b0830714205bea1317ea1a2ebc71e5633af334d4
 
 COCOAPODS: 0.39.0

Lighting/Tools/opple_objc_json_client.h

@@ -613,13 +613,13 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, strong) NSDate *createDate;
+@property (nonatomic, copy) NSString *createDate;
 /**
  * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, strong) NSDate *onlineTime;
+@property (nonatomic, copy) NSString *onlineTime;
 /**
  * 方法: 取得java.lang.String
  *
@@ -949,7 +949,7 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, strong) NSDate *createDate;
+@property (nonatomic, copy) NSString *createDate;
 /**
  * 方法: 取得java.lang.String
  *
@@ -967,7 +967,7 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, strong) NSDate *updateDate;
+@property (nonatomic, copy) NSString *updateDate;
 /**
  * 方法: 取得java.lang.String
  *
@@ -985,7 +985,7 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, strong) NSDate *orderTime;
+@property (nonatomic, copy) NSString *orderTime;
 /**
  * 方法: 取得java.lang.String
  *
@@ -1135,7 +1135,7 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, strong) NSDate *createDate;
+@property (nonatomic, copy) NSString *createDate;
 /**
  * 方法: 取得java.lang.String
  *
@@ -1231,7 +1231,7 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, strong) NSDate *createDate;
+@property (nonatomic, copy) NSString *createDate;
 /**
  * 方法: 取得java.lang.String
  *
@@ -1249,7 +1249,7 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, strong) NSDate *updateDate;
+@property (nonatomic, copy) NSString *updateDate;
 /**
  * 方法: 取得java.lang.String
  *
@@ -1573,7 +1573,7 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, strong) NSDate *createDate;
+@property (nonatomic, copy) NSString *createDate;
 /**
  * 方法: 取得java.lang.String
  *
@@ -1657,7 +1657,7 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, strong) NSDate *createDate;
+@property (nonatomic, copy) NSString *createDate;
 /**
  * 方法: 取得java.lang.String
  *
@@ -1711,7 +1711,7 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, strong) NSDate *lastVisitedTime;
+@property (nonatomic, copy) NSString *lastVisitedTime;
 @end /* interface TOConsumerEntity */
 
 #endif
@@ -2334,7 +2334,7 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, strong) NSDate *createDate;
+@property (nonatomic, copy) NSString *createDate;
 /**
  * 方法: 取得java.lang.String
  *
@@ -2352,7 +2352,7 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, strong) NSDate *updateDate;
+@property (nonatomic, copy) NSString *updateDate;
 /**
  * 方法: 取得java.lang.String
  *