debug

Lighting/Class/AllCustomerViewController.m

@@ -10,6 +10,8 @@
 #import "AllCutomerTableViewCell.h"
 #import "DateSelectedViewController.h"
 #import "MyclientEntityModel.h"
+#import "ClientdetailsViewController.h"
+
 @interface AllCustomerViewController ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate>
 
 /**
@@ -202,6 +204,15 @@
     return 125;
 }
 
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
+    ClientdetailsViewController *clientdetails = [storyboard instantiateViewControllerWithIdentifier:@"clientdetails"];
+    clientdetails.model = [self.CustomerresultArray objectAtIndex_opple:indexPath.row];
+    clientdetails.cellindex = indexPath.row;
+    [self.navigationController pushViewController:clientdetails animated:YES];
+}
+
 
 
 #pragma mark -开始筛选时间

Lighting/Class/CommodityListTableViewCell.m

@@ -41,7 +41,8 @@
     _orderDetailslist = orderDetailslist;
     self.goodsName.text = _orderDetailslist.goodsName;
     self.goodsCode.text = _orderDetailslist.goodsCode;
-    [self.goodsHeader sd_setImageWithURL:[NSURL URLWithString:_orderDetailslist.goodsBrand] placeholderImage:REPLACEIMAGE];
+    NSArray *goodsHeader = [_orderDetailslist.goodsCover componentsSeparatedByString:@","];
+    [self.goodsHeader sd_setImageWithURL:[NSURL URLWithString:[goodsHeader firstObject]] placeholderImage:REPLACEIMAGE];
     self.goodsNumber.text = [NSString stringWithFormat:@"数量   X%@",_orderDetailslist.goodsNum];
     self.clinchPrice.text = [NSString stringWithFormat:@"成交价  ￥%.2f",[_orderDetailslist.goodsPrice floatValue]];
     //小计

Lighting/Class/CustomerOrderViewController.m

@@ -31,6 +31,11 @@
  */
 @property (nonatomic,assign) int totalPages;
 
+/**
+ *  当前选中的状态值
+ */
+@property (nonatomic,copy) NSString *currentState;
+
 @end
 
 @implementation CustomerOrderViewController
@@ -86,18 +91,21 @@
     
     //下拉刷新
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
+        
+        self.indexPage = 1;
         OrderBill *allOrder = [[OrderBill alloc]init];
         //分页
         DataPage *page = [[DataPage alloc]init];
-        page.page = 1;
+        page.page = self.indexPage;
         page.rows = 10;
         //订单
         TOOrderEntity *Neworder = [[TOOrderEntity alloc]init];
         Neworder.guideId = [Shoppersmanager manager].Shoppers.employee.fid;
         allOrder.datapage = page;
         allOrder.order = Neworder;
+        Neworder.orderState = self.currentState;
         [self.customerOrderTableView.mj_footer resetNoMoreData];
-        self.indexPage = 1;
+        
         [self getGuideAllcustomerOrder:YES WithorderBill:allOrder];
     }];
     headerRefresh.stateLabel.hidden = YES;
@@ -122,6 +130,7 @@
             Neworder.guideId = [Shoppersmanager manager].Shoppers.employee.fid;
             allOrder.datapage = page;
             allOrder.order = Neworder;
+            Neworder.orderState = self.currentState;
             [self getGuideAllcustomerOrder:NO WithorderBill:allOrder];
         }
     }];
@@ -249,12 +258,12 @@
     [self.StyleButton setTitle:title forState:UIControlStateNormal];
     [self dismissViewControllerAnimated:YES completion:nil];
     
-    
+    self.indexPage = 1;
     OrderBill *allOrder = [[OrderBill alloc]init];
     //分页
     DataPage *page = [[DataPage alloc]init];
     page.page = self.indexPage;
-    page.rows = 10;
+    page.rows = KROWS;
     //订单
     TOOrderEntity *Neworder = [[TOOrderEntity alloc]init];
     Neworder.guideId = [Shoppersmanager manager].Shoppers.employee.fid;
@@ -290,46 +299,40 @@
    else if ([title isEqualToString:@"已退货"]) {
         orderState = @"004";
     }
-    
-    self.indexPage = 1;
     Neworder.orderState = orderState;
+    self.currentState = orderState;
     [self getGuideAllcustomerOrder:YES WithorderBill:allOrder];
 }
 
 
 
-
 #pragma mark -Search点击
 - (BOOL)textFieldShouldReturn:(UITextField *)textField
 {
     [textField resignFirstResponder];
+    self.indexPage = 1;
     OrderBill *allOrder = [[OrderBill alloc]init];
     //分页
     DataPage *page = [[DataPage alloc]init];
-    page.page = 1;
-    page.rows = 9999;
+    page.page = self.indexPage;
+    page.rows = KROWS;
     //订单
     TOOrderEntity *Neworder = [[TOOrderEntity alloc]init];
     Neworder.guideId = [Shoppersmanager manager].Shoppers.employee.fid;
     allOrder.datapage = page;
     allOrder.order = Neworder;
-    //客户
+    //客户搜索
     TOConsumerEntity *customer = [[TOConsumerEntity alloc]init];
     customer.name = textField.text;
     customer.mobile = textField.text;
     allOrder.consumer = customer;
-    self.indexPage = 1;
     [self getGuideAllcustomerOrder:YES WithorderBill:allOrder];
     return YES;
 }
 
 
 
-/**
- *  撤销订单
- *
- *  @param cellindex cell下标
- */
+#pragma mark -撤销订单
 - (void)undoOrderButtonClick:(NSInteger)cellindex
 {
     __weak typeof(self) weakSelf = self;
@@ -370,9 +373,8 @@
 }
 
 
-/**
- *  去支付
- */
+
+#pragma mark -去支付
 - (void)TopayButtonClick:(NSInteger)cellindex
 {
     UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];

Lighting/Class/FullScreenViewController.m

@@ -18,6 +18,11 @@
  */
 @property (nonatomic,strong) UIView *backView;
 
+/**
+ *  返回按钮
+ */
+@property (nonatomic,strong) UIButton *backButton;
+
 @end
 
 @implementation FullScreenViewController
@@ -63,22 +68,36 @@ static NSString * const reuseIdentifier = @"Cell";
 #pragma amrk 返回View
 - (void)CreateBackView
 {
-    self.backView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 64)];
-    self.backView.backgroundColor = [kMainGrayColor colorWithAlphaComponent:0.8];
-    [self.view addSubview:self.backView];
-    
-    //返回按钮
-    UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom];
-    backButton.frame = CGRectMake(30, 0, 100, 64);
-    [backButton setImage:TCImage(@"1") forState:UIControlStateNormal];
-    [backButton addTarget:self action:@selector(BackButtonClick) forControlEvents:UIControlEventTouchUpInside];
-    [self.backView addSubview:backButton];
     
+    //产品列表调用
     if (self.isProductLibrary) {
+        
+        self.backButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        self.backButton.frame = CGRectMake(30, 10, 100, 64);
+        [self.backButton setImage:TCImage(@"2-副本") forState:UIControlStateNormal];
+        [self.backButton addTarget:self action:@selector(BackButtonClick) forControlEvents:UIControlEventTouchUpInside];
+        [self.view addSubview:self.backButton];
+        
+    }else//场景列表调用
+    {
+        self.backView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 64)];
+        self.backView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5];
+        [self.view addSubview:self.backView];
+        //返回按钮
+        UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        backButton.frame = CGRectMake(30, 0, 100, 64);
+        [backButton setImage:TCImage(@"quanping") forState:UIControlStateNormal];
+        [backButton addTarget:self action:@selector(BackButtonClick) forControlEvents:UIControlEventTouchUpInside];
+        [self.backView addSubview:backButton];
+        
         //体验中心
         UIButton *tiYanCenterButton = [UIButton buttonWithType:UIButtonTypeCustom];
-        tiYanCenterButton.frame = CGRectMake(ScreenWidth-100, 0, 100, 64);
-        [tiYanCenterButton setImage:TCImage(@"1") forState:UIControlStateNormal];
+        tiYanCenterButton.frame = CGRectMake(ScreenWidth-150, 10, 100, 44);
+        tiYanCenterButton.layer.masksToBounds = YES;
+        tiYanCenterButton.layer.cornerRadius = kCornerRadius;
+        tiYanCenterButton.layer.borderWidth = 1;
+        tiYanCenterButton.layer.borderColor = [UIColor whiteColor].CGColor;
+        [tiYanCenterButton setTitle:@"体验中心" forState:UIControlStateNormal];
         [tiYanCenterButton addTarget:self action:@selector(GotoTiYanCenterButtonClick) forControlEvents:UIControlEventTouchUpInside];
         [self.backView addSubview:tiYanCenterButton];
     }
@@ -121,25 +140,52 @@ static NSString * const reuseIdentifier = @"Cell";
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    NSLog(@"%ld",indexPath.item);
-    if (self.backView.frame.size.height == 0) {
-        
-        [UIView animateWithDuration:0.5 animations:^{
+    
+    if (self.isProductLibrary) {
+        if (self.backButton.frame.origin.y == 10) {
+            
+            [UIView animateWithDuration:0.3 animations:^{
+                
+                CGRect frame = self.backButton.frame;
+                frame.origin.y = -64;
+                self.backButton.frame = frame;
+                
+            }];
             
-            CGRect frame = self.backView.frame;
-            frame.size.height = 64;
-            self.backView.frame = frame;
-        }];
+        }else if (self.backButton.frame.origin.y == -64)
+        {
+            [UIView animateWithDuration:0.3 animations:^{
+                
+                CGRect frame = self.backButton.frame;
+                frame.origin.y = 10;
+                self.backButton.frame = frame;
+            }];
+        }
+        
+    }else
         
-    }else if (self.backView.frame.size.height == 64)
     {
-        [UIView animateWithDuration:0.5 animations:^{
+        if (self.backView.frame.origin.y == 0) {
+            
+            [UIView animateWithDuration:0.3 animations:^{
+                
+                CGRect frame = self.backView.frame;
+                frame.origin.y = -64;
+                self.backView.frame = frame;
+                
+            }];
             
-            CGRect frame = self.backView.frame;
-            frame.size.height = 0;
-            self.backView.frame = frame;
-        }];
+        }else if (self.backView.frame.origin.y == -64)
+        {
+            [UIView animateWithDuration:0.3 animations:^{
+                
+                CGRect frame = self.backView.frame;
+                frame.origin.y = 0;
+                self.backView.frame = frame;
+            }];
+        }
     }
+
 }
 
 #pragma mark <UICollectionViewDelegate>

Lighting/Class/ProductDetailsViewController.m

@@ -167,6 +167,7 @@
 {
     FullScreenViewController *fullScreenVC = [[FullScreenViewController alloc]init];
     fullScreenVC.datasArray = self.imagesArray;
+    fullScreenVC.isProductLibrary = YES;
     dispatch_async(dispatch_get_main_queue(), ^{
         
         [self presentViewController:fullScreenVC animated:YES completion:nil];
@@ -324,7 +325,7 @@
     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.tag = 100;
     imageView.image = image;

Lighting/Class/SettlementViewController.m

@@ -215,13 +215,14 @@
 - (void)returnCellindexpathwithrow:(NSString *)Type WithcellTitle:(NSString *)title Withselected:(NSInteger)Selected
 {
     [self dismissViewControllerAnimated:YES completion:nil];
-    self.showPayQrCodeImageView.hidden = YES;
+    
     switch (Selected) {
         case 0://支付方式
         {
             [self.payTypeButton setTitle:title forState:UIControlStateNormal];
             self.payTreasureButton.selected = NO;
             self.WeixiPayButton.selected = NO;
+            self.showPayQrCodeImageView.hidden = YES;
         }
             break;
         case 1://是否开票

Lighting/Class/Shoppingcart/ShoppingViewController.m

@@ -111,7 +111,8 @@
     ShopCartFilter *shopcarNumber = [[ShopCartFilter alloc]init];
     shopcarNumber.consumerId = [Customermanager manager].customerID;
     DataPage *Newpage = [[DataPage alloc]init];
-    Newpage.page = 0;
+    Newpage.page = 1;
+    Newpage.rows = 99999;
     shopcarNumber.dp = Newpage;
     [self CreateMBProgressHUDLoding];
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/shopcart/query"] WithRequestType:0 WithParameter:shopcarNumber WithReturnValueBlock:^(id returnValue) {

Lighting/Class/Tabbar/CustomTabbarController.m

@@ -256,7 +256,6 @@
         pop.sourceView = userVC.view;
         pop.barButtonItem = [[UIBarButtonItem alloc]initWithCustomView:_Newbutton];
         [self presentViewController:userVC animated:YES completion:nil];
-        
     }];
 }
 
@@ -265,7 +264,6 @@
 #pragma mark -二维码扫描
 - (void)QrcodeButtonClick
 {
-    NSLog(@"二维码扫描");
     
     ScannerViewController *scannerVC = [[ScannerViewController alloc]init];
     [scannerVC setReturnScannerResponse:^(id value) {
@@ -276,11 +274,9 @@
             UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
             ProductLibraryViewController *productVC = [storyboard instantiateViewControllerWithIdentifier:@"productlibrary"];
             productVC.barcode = value;
-            //        [self.navigationController pushViewController:productVC animated:YES];
             BaseViewController *baseVC = [self.vcArray objectAtIndex_opple:self.selectedIndex];
             [baseVC.navigationController pushViewController:productVC animated:YES];
         }];
-
     }];
     [self presentViewController:scannerVC animated:YES completion:nil];
 }

Lighting/Lighting/Images.xcassets/2-副本.imageset/Contents.json

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