debug

Lighting/Class/AdditionalTableViewCell.xib

@@ -20,10 +20,9 @@
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Gdg-fx-ziI">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Gdg-fx-ziI">
                         <rect key="frame" x="95" y="13" width="150" height="17"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <color key="backgroundColor" red="1" green="0.7124683436" blue="0.054982668810000003" alpha="1" colorSpace="calibratedRGB"/>
                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                         <nil key="highlightedColor"/>
@@ -35,10 +34,9 @@
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="IhE-VI-oy0">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="IhE-VI-oy0">
                         <rect key="frame" x="95" y="45" width="220" height="17"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <color key="backgroundColor" red="1" green="0.7124683436" blue="0.054982668810000003" alpha="1" colorSpace="calibratedRGB"/>
                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                         <nil key="highlightedColor"/>
@@ -50,10 +48,9 @@
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7ty-c7-Sgn">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7ty-c7-Sgn">
                         <rect key="frame" x="432" y="13" width="170" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <color key="backgroundColor" red="1" green="0.7124683436" blue="0.054982668810000003" alpha="1" colorSpace="calibratedRGB"/>
                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                         <nil key="highlightedColor"/>
@@ -65,10 +62,9 @@
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="MPi-P0-LEg">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="MPi-P0-LEg">
                         <rect key="frame" x="432" y="43" width="170" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <color key="backgroundColor" red="1" green="0.7124683436" blue="0.054982668810000003" alpha="1" colorSpace="calibratedRGB"/>
                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                         <nil key="highlightedColor"/>

Lighting/Class/AllCustomerViewController.m

@@ -100,7 +100,7 @@
         ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init];
         DataPage *page = [[DataPage alloc]init];
         page.page = 1;
-        page.rows = 10;
+        page.rows = KROWS;
         condition.page = page;
         [self getShoppersAssociatedCustomer:condition isRemove:YES];
     }];
@@ -114,7 +114,7 @@
         
         ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init];
         DataPage *page = [[DataPage alloc]init];
-        page.rows = 10;
+        page.rows = KROWS;
         if (self.indexPage ++ > self.totalPages) {
             [self.allCustomerTableview.mj_footer endRefreshingWithNoMoreData];
         }else

Lighting/Class/ClientDetailsTableViewCell.h

@@ -48,4 +48,9 @@
  */
 @property (nonatomic,strong) ShopcarModel *model;
 
+/**
+ *  成交价
+ */
+@property (weak, nonatomic) IBOutlet UILabel *clinchPrice;
+
 @end

Lighting/Class/ClientDetailsTableViewCell.m

@@ -23,10 +23,11 @@
     _model = model;
     [self.goodsImageview sd_setImageWithURL:[NSURL URLWithString:_model.goods.pictures] placeholderImage:REPLACEIMAGE];
     self.goodsName.text = _model.goods.name;
-    self.goodsCraneQuotation.text = [_model.goods.tagPrice stringValue];
-    self.goodsSpecifications.text = _model.goods.spec;
-    self.goodsNumber.text = _model.goods.number;
-    self.goodsPrice.text = [_model.goods.costPrice stringValue];
+    self.goodsCraneQuotation.text = [NSString stringWithFormat:@"￥%.2f",[_model.goods.tagPrice floatValue]];
+    self.goodsSpecifications.text = _model.goods.size;
+    self.clinchPrice.text = [NSString stringWithFormat:@"￥%.2f",[_model.goods.costPrice floatValue]];
+    self.goodsNumber.text = [NSString stringWithFormat:@"%d",_model.goodsNum];
+    self.goodsPrice.text = [NSString stringWithFormat:@"￥%.2f",[_model.goods.costPrice floatValue]*_model.goodsNum];
     
     
 }

Lighting/Class/ClientViewController.m

@@ -104,8 +104,6 @@
     //监听键盘落下的通知
     [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(KeyboadrDismiss) name:UIKeyboardWillHideNotification object:nil];
     
-    
-    
     //下拉刷新
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
         ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init];
@@ -113,7 +111,7 @@
         DataPage *page = [[DataPage alloc]init];
         page.page = 1;
         condition.page = page;
-        page.rows = 10;
+        page.rows = KROWS;
         self.indexPage = 1;
         [self.informationTableview.mj_footer resetNoMoreData];
         [self getShoppersAssociatedCustomer:condition isRemoveArray:YES];
@@ -134,7 +132,7 @@
             ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init];
             DataPage *page = [[DataPage alloc]init];
             page.page = self.indexPage ++;
-            page.rows = 10;
+            page.rows = KROWS;
             condition.page = page;
             [self getShoppersAssociatedCustomer:condition isRemoveArray:NO];
         }

Lighting/Class/ClientdetailsViewController.m

@@ -30,8 +30,25 @@
  */
 @property (nonatomic,strong) NSMutableArray *orderRecordArray;
 
+/**
+ *  购物袋当前页数
+ */
+@property (nonatomic,assign) int shoppingBagPage;
 
+/**
+ *  购物袋总页数
+ */
+@property (nonatomic,assign) int shoppingBagTotalPage;
 
+/**
+ *  订单记录当前页数
+ */
+@property (nonatomic,assign) int orderRecordPage;
+
+/**
+ *  订单记录总页数
+ */
+@property (nonatomic,assign) int orderRecordTotalPage;
 @end
 
 @implementation ClientdetailsViewController
@@ -69,8 +86,9 @@
     // Do any additional setup after loading the view.
     
     [self uiConfigAction];
-    [self getShoppingCardata];
-    [self getGuideAllcustomerOrder];
+    [self GetdatasAciton];
+//    [self getShoppingCardata];
+//    [self getGuideAllcustomerOrder];
 }
 
 
@@ -105,6 +123,94 @@
 }
 
 
+#pragma mark -获取数据
+- (void)GetdatasAciton
+{
+    //下拉刷新
+    MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
+        //购物袋
+        if (self.shoppingBagButton.selected) {
+            self.shoppingBagPage = 1;
+            ShopCartFilter *shopcarNumber = [[ShopCartFilter alloc]init];
+            shopcarNumber.consumerId = _model.fid;
+            DataPage *Newpage = [[DataPage alloc]init];
+            Newpage.page = self.shoppingBagPage;
+            Newpage.rows = KROWS;
+            shopcarNumber.dp = Newpage;
+            [self.ClientdetailsTableview.mj_footer resetNoMoreData];
+            [self getShoppingCardata:shopcarNumber isRemove:YES];
+        }
+        else if (self.orderRecordButton.selected)//订单记录
+        {
+            self.orderRecordPage = 1;
+            OrderBill *allOrder = [[OrderBill alloc]init];
+            //分页
+            DataPage *page = [[DataPage alloc]init];
+            page.page = self.orderRecordPage;
+            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.fid = _model.fid;
+            allOrder.consumer = customer;
+            [self getGuideAllcustomerOrder:allOrder isRemove:YES];
+        }
+    }];
+    headerRefresh.stateLabel.hidden = YES;
+    headerRefresh.lastUpdatedTimeLabel.hidden = YES;
+    self.ClientdetailsTableview.mj_header =headerRefresh;
+    
+    //进入刷新状态
+    [self.ClientdetailsTableview.mj_header beginRefreshing];
+    //上拉加载
+    self.ClientdetailsTableview.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+        
+        [self.ClientdetailsTableview.mj_footer resetNoMoreData];
+        //购物袋
+        if (self.shoppingBagButton.selected) {
+            if (self.shoppingBagPage ++ > self.shoppingBagTotalPage) {
+                [self.ClientdetailsTableview.mj_footer endRefreshingWithNoMoreData];
+            }else
+            {
+                ShopCartFilter *shopcarNumber = [[ShopCartFilter alloc]init];
+                shopcarNumber.consumerId = _model.fid;
+                DataPage *Newpage = [[DataPage alloc]init];
+                Newpage.page = self.shoppingBagPage++;
+                Newpage.rows = KROWS;
+                shopcarNumber.dp = Newpage;
+                [self getShoppingCardata:shopcarNumber isRemove:NO];
+            }
+        }
+        else if (self.orderRecordButton.selected)//订单记录
+        {
+            self.orderRecordPage = 1;
+            if (self.orderRecordPage ++ > self.orderRecordTotalPage) {
+                [self.ClientdetailsTableview.mj_footer endRefreshingWithNoMoreData];
+            }else
+            {
+                OrderBill *allOrder = [[OrderBill alloc]init];
+                //分页
+                DataPage *page = [[DataPage alloc]init];
+                page.page = self.orderRecordPage++;
+                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.fid = _model.fid;
+                allOrder.consumer = customer;
+                [self getGuideAllcustomerOrder:allOrder isRemove:NO];
+            }
+        }
+    }];
+}
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
@@ -170,12 +276,13 @@
         orderdetails.sectionTitle = @[@"订单信息",@"客户信息",@"收货信息",@"商品信息",@"附件信息"];
         orderdetails.isShowattachment = YES;
         if ([model.orderState isEqualToString:@"006"]) {
-            orderdetails.isShowPayButton = YES;
             orderdetails.isShowPrintButton = YES;
-            
-        }else if ([model.orderState isEqualToString:@"001"])
-        {
+            orderdetails.isDelectedButton = NO;
+        }
+        if ([model.orderState isEqualToString:@"001"]) {
             orderdetails.isShowPayButton = YES;
+            orderdetails.isDelectedButton = YES;
+            orderdetails.isShowPrintButton = YES;
         }
         [self.navigationController pushViewController:orderdetails animated:YES];
     }
@@ -184,21 +291,21 @@
 
 
 #pragma mark -获取购物车商品
-- (void)getShoppingCardata
+- (void)getShoppingCardata:(ShopCartFilter *)shopCar isRemove:(BOOL)remove
 {
-    ShopCartFilter *shopcarNumber = [[ShopCartFilter alloc]init];
-    shopcarNumber.consumerId = _model.fid;
-    DataPage *Newpage = [[DataPage alloc]init];
-    Newpage.page = 0;
-    shopcarNumber.dp = Newpage;
     [self CreateMBProgressHUDLoding];
-    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/shopcart/query"] WithRequestType:0 WithParameter:shopcarNumber WithReturnValueBlock:^(id returnValue) {
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/shopcart/query"] WithRequestType:0 WithParameter:shopCar WithReturnValueBlock:^(id returnValue) {
         
-//        [self RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            if (remove) {
+                [self.shopResponseArray removeAllObjects];
+            }
             ShopCartResponse *shopcar = [[ShopCartResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            self.shoppingBagTotalPage = (int)returnValue[@"data"][@"totalPages"];
             if (shopcar.shopcart.count == 0) {
                 [self PromptinformationViewWithimage:TCImage(@"ablum-副本") withTitle:@"暂无购物袋信息~" withpoint:CGPointMake(ScreenHeight/2, ScreenWidth/2)];
+                [self RemoveMBProgressHUDLoding];
+                [self endRefreshingForTableView:self.ClientdetailsTableview];
             }
             //自定义属性
             for (TOShopcartEntity *objc in shopcar.shopcart) {
@@ -229,37 +336,26 @@
         
     } WithFailureBlock:^(id error) {
         
-//        [self RemoveMBProgressHUDLoding];
+        [self RemoveMBProgressHUDLoding];
     }];
 }
 
 
 
 #pragma mark -获取客户订单数据
-- (void)getGuideAllcustomerOrder
+- (void)getGuideAllcustomerOrder:(OrderBill *)allOrder isRemove:(BOOL)remove
 {
-    
-    OrderBill *allOrder = [[OrderBill alloc]init];
-    //分页
-    DataPage *page = [[DataPage alloc]init];
-    page.page = 1;
-    page.rows = 99999;
-    //订单
-    TOOrderEntity *Neworder = [[TOOrderEntity alloc]init];
-    Neworder.guideId = [Shoppersmanager manager].Shoppers.employee.fid;
-    allOrder.datapage = page;
-    allOrder.order = Neworder;
-    //客户
-    TOConsumerEntity *customer = [[TOConsumerEntity alloc]init];
-    customer.fid = _model.fid;
-    allOrder.consumer = customer;
-    
+    [self CreateMBProgressHUDLoding];
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/order/query"] WithRequestType:0 WithParameter:allOrder WithReturnValueBlock:^(id returnValue) {
         
         [self RemoveMBProgressHUDLoding];
+        [self endRefreshingForTableView:self.ClientdetailsTableview];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
-
+            if (remove) {
+                [self.orderRecordArray removeAllObjects];
+            }
             OrderResponse *Allorder = [[OrderResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            self.orderRecordTotalPage = (int)returnValue[@"data"][@"totalPages"];
             for (OrderBill *model in Allorder.orderBillList) {
                 [self.orderRecordArray addObject:model];
             }
@@ -303,14 +399,14 @@
     sender.selected = YES;
     self.orderRecordButton.selected = NO;
     self.orderRecordButton.backgroundColor = kMainBlueColor;
-    if (self.shopResponseArray.count == 0) {
-        [self PromptinformationViewWithimage:TCImage(@"ablum-副本") withTitle:@"暂无购物袋信息~" withpoint:CGPointMake(ScreenHeight/2, ScreenWidth/2)];
-    }else
-    {
-        [self RemovePromptinformationView];
-    }
-
-    [self.ClientdetailsTableview reloadData];
+//    if (self.shopResponseArray.count == 0) {
+//        [self PromptinformationViewWithimage:TCImage(@"ablum-副本") withTitle:@"暂无购物袋信息~" withpoint:CGPointMake(ScreenHeight/2, ScreenWidth/2)];
+//    }else
+//    {
+//        [self RemovePromptinformationView];
+//    }
+    [self RemovePromptinformationView];
+    [self.ClientdetailsTableview.mj_header beginRefreshing];
 }
 
 #pragma mark -订单记录
@@ -321,14 +417,14 @@
     sender.selected = YES;
     self.shoppingBagButton.selected = NO;
     self.shoppingBagButton.backgroundColor = kMainBlueColor;
-    if (self.orderRecordArray.count == 0) {
-        [self PromptinformationViewWithimage:TCImage(@"changjingtubiao") withTitle:@"暂无购单订单~" withpoint:CGPointMake(ScreenHeight/2, ScreenWidth/2)];
-    }else
-    {
-        [self RemovePromptinformationView];
-    }
-    [self.ClientdetailsTableview reloadData];
-    
+//    if (self.orderRecordArray.count == 0) {
+//        [self PromptinformationViewWithimage:TCImage(@"changjingtubiao") withTitle:@"暂无购单订单~" withpoint:CGPointMake(ScreenHeight/2, ScreenWidth/2)];
+//    }else
+//    {
+//        [self RemovePromptinformationView];
+//    }
+    [self RemovePromptinformationView];
+    [self.ClientdetailsTableview.mj_header beginRefreshing];
 }
 
 

Lighting/Class/CustomerOrderTableViewCell.m

@@ -51,14 +51,14 @@
     self.phoneNumber.text = _model.consumer.mobile;
     self.consigneeAddress.text = _model.order.receiverAddress;
     
-    NSInteger goodsAllprice = 0;
+    CGFloat goodsAllprice = 0;
     NSInteger goodsAllnum = 0;
     for (TOOrderdetailEntity *goodslist in _model.orderdetailList) {
-        goodsAllprice += [goodslist.goodsTotalPrice integerValue];
+        goodsAllprice += [goodslist.goodsTotalPrice floatValue];
         goodsAllnum += [goodslist.goodsNum integerValue];
         
     }
-    self.orderTotalPrice.text = [NSString stringWithFormat:@"%ld",goodsAllprice];
+    self.orderTotalPrice.text = [NSString stringWithFormat:@"￥%.2f",goodsAllprice];
     
     self.styleNumber.text = [NSString stringWithFormat:@"%ld",goodsAllnum];
     

Lighting/Class/CustomerOrderViewController.m

@@ -291,7 +291,7 @@
         orderState = @"004";
     }
     
-    self.indexPage = 0;
+    self.indexPage = 1;
     Neworder.orderState = orderState;
     [self getGuideAllcustomerOrder:YES WithorderBill:allOrder];
 }
@@ -325,8 +325,6 @@
 
 
 
-
-
 /**
  *  撤销订单
  *

Lighting/Class/FullScreenViewController.h

@@ -17,4 +17,8 @@
 @property (nonatomic,copy) NSArray *datasArray;
 
 
+/**
+ *  身份ID/判断是场景库调用还是产品库调用
+ */
+@property (nonatomic,assign) BOOL isProductLibrary;
 @end

Lighting/Class/FullScreenViewController.m

@@ -63,8 +63,8 @@ static NSString * const reuseIdentifier = @"Cell";
 #pragma amrk 返回View
 - (void)CreateBackView
 {
-    self.backView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 0)];
-    self.backView.backgroundColor = [kMainGrayColor colorWithAlphaComponent:0.5];
+    self.backView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 64)];
+    self.backView.backgroundColor = [kMainGrayColor colorWithAlphaComponent:0.8];
     [self.view addSubview:self.backView];
     
     //返回按钮
@@ -73,13 +73,15 @@ static NSString * const reuseIdentifier = @"Cell";
     [backButton setImage:TCImage(@"1") 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 addTarget:self action:@selector(GotoTiYanCenterButtonClick) forControlEvents:UIControlEventTouchUpInside];
-    [self.backView addSubview:tiYanCenterButton];
     
+    if (self.isProductLibrary) {
+        //体验中心
+        UIButton *tiYanCenterButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        tiYanCenterButton.frame = CGRectMake(ScreenWidth-100, 0, 100, 64);
+        [tiYanCenterButton setImage:TCImage(@"1") forState:UIControlStateNormal];
+        [tiYanCenterButton addTarget:self action:@selector(GotoTiYanCenterButtonClick) forControlEvents:UIControlEventTouchUpInside];
+        [self.backView addSubview:tiYanCenterButton];
+    }
 }
 
 #pragma mark -返回

Lighting/Class/Login/LoginViewController.m

@@ -74,6 +74,7 @@
 }
 
 
+
 #pragma mark - 布局
 - (void)uiConfigAction
 {

Lighting/Class/OrderTableViewCell.m

@@ -33,16 +33,16 @@
     self.consigneeName.text = _model.order.receiverName;
     self.consigneePhoneNumber.text = _model.order.receiverMobile;
     self.orderSerialNumber.text =  _model.order.orderNumber;
-    self.shopperName.text = _model.employee.userName;
+    self.shopperName.text = _model.employee.realName;
     self.phoneNumber.text = _model.consumer.mobile;
-    //价格
-    NSInteger allprice = 0;
+    //总价格
+    CGFloat allprice = 0;
     for (TOOrderdetailEntity *objc in _model.orderdetailList) {
         
-        allprice += [objc.goodsPrice integerValue];
+        allprice += [objc.goodsPrice floatValue]*[objc.goodsNum integerValue];
     }
-    self.orderAllprice.text = [NSString stringWithFormat:@"%ld",allprice];
-    self.customerAddress.text = _model.consumer.address;
+    self.orderAllprice.text = [NSString stringWithFormat:@"￥%.2f",allprice];
+    self.customerAddress.text = _model.order.receiverAddress;
     
     //订单状态图片
     self.orderStateShowImageView.image = [BaseViewController ReturnOrderStateImageWithStateCode:[_model.order.orderState integerValue]];

Lighting/Class/OrderdetailsViewController.m

@@ -334,12 +334,14 @@
 
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
 {
-    
+
         
-    UIView *view = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 44)];
+    UIView *view = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 60)];
     //区头文字
-    UILabel *Titlelabe = [[UILabel alloc]initWithFrame:CGRectMake(30, 0, 100, 44)];
-    Titlelabe.text = [self.sectionTitle objectAtIndex_opple:section];
+    UILabel *Titlelabe = [[UILabel alloc]initWithFrame:CGRectMake(0, 10, ScreenWidth, 50)];
+    Titlelabe.text = [NSString stringWithFormat:@"       %@",[self.sectionTitle objectAtIndex_opple:section]];
+    view.backgroundColor = kTCColor(236, 236, 236);
+    Titlelabe.backgroundColor = [UIColor whiteColor];
     Titlelabe.font = [UIFont systemFontOfSize:13];
     [view addSubview:Titlelabe];
     return view;
@@ -349,7 +351,7 @@
 
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
 {
-    return 44;
+    return 60;
 }
 
 
@@ -414,36 +416,45 @@
         
     }else if ([button.currentTitle isEqualToString:@"撤销订单"])
     {
-        [self CreateMBProgressHUDLoding];
-        [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@%@/%@/%@",ServerAddress,@"/order/updateOrderState/",_orderCode,@"001",@"005"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
-            
-            [self RemoveMBProgressHUDLoding];
-            if ([returnValue[@"code"] isEqualToNumber:@0]) {
-                
-                [self SuccessMBProgressView:@"撤销成功"];
-                UIView *view = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 0)];
-                self.orderDetailsTableview.tableHeaderView = view;
-                self.orderDetailsTableview.tableFooterView = nil;
-                self.orderDetails.order.orderState = @"005";
-                [self.orderDetailsTableview reloadData];
+        __weak typeof(self) weakSelf = self;
+        UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"提示" message:@"请确认是否撤销订单" preferredStyle:UIAlertControllerStyleAlert];
+        [alertVC addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
+            [weakSelf dismissViewControllerAnimated:YES completion:nil];
+        }]];
+        
+        [alertVC addAction:[UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action)
+        {
+            [self CreateMBProgressHUDLoding];
+            [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@%@/%@/%@",ServerAddress,@"/order/updateOrderState/",_orderCode,@"001",@"005"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
                 
-                if (self.DelecteAndPayButtonBlock) {
-                    self.DelecteAndPayButtonBlock(_cellindex,@"005");
+                [self RemoveMBProgressHUDLoding];
+                if ([returnValue[@"code"] isEqualToNumber:@0]) {
+                    
+                    [self SuccessMBProgressView:@"撤销成功"];
+                    UIView *view = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 0)];
+                    self.orderDetailsTableview.tableHeaderView = view;
+                    self.orderDetailsTableview.tableFooterView = nil;
+                    self.orderDetails.order.orderState = @"005";
+                    [self.orderDetailsTableview reloadData];
+                    
+                    if (self.DelecteAndPayButtonBlock) {
+                        self.DelecteAndPayButtonBlock(_cellindex,@"005");
+                    }
                 }
-            }
-            else
-            {
-                [self ErrorMBProgressView:returnValue[@"message"]];
-            }
-            
-        } WithErrorCodeBlock:^(id errorCodeValue) {
-            
-        } WithFailureBlock:^(id error) {
-            
-            [self RemoveMBProgressHUDLoding];
-        }];
+                else
+                {
+                    [self ErrorMBProgressView:returnValue[@"message"]];
+                }
+                
+            } WithErrorCodeBlock:^(id errorCodeValue) {
+                
+            } WithFailureBlock:^(id error) {
+                
+                [self RemoveMBProgressHUDLoding];
+            }];
+        }]];
+        [self presentViewController:alertVC animated:YES completion:nil];
     }
-
 }
 
 

Lighting/Class/ProductDetailsViewController.m

@@ -130,7 +130,7 @@
     self.headerView.serialNumber.text = self.entity.code;
     self.headerView.nameLabe.text = self.entity.name;
     self.headerView.brandName.text = self.entity.company;
-    self.headerView.dorpPriceLabe.text = [NSString stringWithFormat:@"￥%.2f",[self.entity.guidePrice floatValue]];
+    self.headerView.dorpPriceLabe.text = [NSString stringWithFormat:@"￥%.2f",[self.entity.tagPrice floatValue]];
     self.imagesArray = [NSMutableArray arrayWithArray:[self.entity.pictures componentsSeparatedByString:@","]];
     [self.headerView.goodsImageview sd_setImageWithURL:[self.imagesArray firstObject] placeholderImage:REPLACEIMAGE];
     //商品小图

Lighting/Class/ProductLibraryViewController.m

@@ -110,7 +110,16 @@
     self.view.backgroundColor = [UIColor blueColor];
     
     [self uiConfigAction];
-    [self GetdatasAction];
+    //扫描二维码结果
+    if (self.barcode) {
+        
+        [self barCodeSearchRequest];
+        
+    }else
+    {
+       [self GetdatasAction];
+    }
+    
 }
 
 
@@ -228,7 +237,7 @@
         //分页数据
         DataPage *Newpage = [[DataPage alloc]init];
         Newpage.page = 1;
-        Newpage.rows = 10;
+        Newpage.rows = KROWS;
         conditon.page = Newpage;
         self.indexPage = 1;
         //搜索
@@ -257,7 +266,7 @@
         }else
         {
             Newpage.page = self.indexPage ++;
-            Newpage.rows = 10;
+            Newpage.rows = KROWS;
             conditon.page = Newpage;
             //搜索
             if (_selectedCode) {
@@ -273,22 +282,26 @@
 #pragma mark 填条形码搜索
 - (void)barCodeSearchRequest
 {
-    if (self.barcode) {
+    
+    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@%@",ServerAddress,@"/goods/getGoodsByCode/",_barcode] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
         
-        [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/goods/getGoodsByCode/"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
-            
-            
-            
-        } WithErrorCodeBlock:^(id errorCodeValue) {
-            
-            
-            
-        } WithFailureBlock:^(id error) {
-            
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
+            TOGoodsEntity *goods = [[TOGoodsEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            NSLog(@"%@",goods);
             
-        }];
-    }
+        }else
+        {
+            [self promptCustomerWithString:@"查询失败"];
+        }
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        
+        
+    } WithFailureBlock:^(id error) {
+        
+        [self promptCustomerWithString:@"查询失败"];
+    }];
 }
 
 

Lighting/Class/ScannerViewController.m

@@ -113,7 +113,7 @@
 //    CGRect cropRect = self.scanRectView.frame;
 //    CGFloat p1 = size.height/size.width;
 //    CGFloat p2 = 1920./1080.;  //使用1080p的图像输出
-    output.rectOfInterest = CGRectMake(self.scanRectView.frame.origin.y/ScreenHeight,((ScreenWidth-self.scanRectView.frame.size.width)/2)/ScreenWidth, self.scanRectView.frame.size.height/ScreenHeight, self.scanRectView.frame.size.width/ScreenWidth);
+    output.rectOfInterest = CGRectMake(self.scanRectView.frame.origin.y/ScreenHeight,((ScreenWidth-self.scanRectView.frame.size.width)/2)/ScreenWidth+0.1, self.scanRectView.frame.size.height/ScreenHeight, self.scanRectView.frame.size.width/ScreenWidth);
 
 //    
 //    CGFloat fixHeight = [UIScreen mainScreen].bounds.size.width * 1920. / 1080.;

Lighting/Class/SceneLibraryViewController.m

@@ -109,20 +109,22 @@
     self.SpaceButton.layer.cornerRadius = 10;
     [self.backView addSubview:self.StyleButton];
     [self.backView addSubview:self.SpaceButton];
-    self.indexPage = 1;
     
     
     //下拉刷新
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
         //默认数据
+        self.indexPage = 1;
         SceneCondition *condition = [[SceneCondition alloc]init];
         DataPage *page = [[DataPage alloc]init];
-        page.page = 1;
-        page.rows = 10;
+        page.page = self.indexPage;
+        page.rows = KROWS;
         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;
@@ -130,15 +132,15 @@
     //上拉加载
     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];
         }else
         {
+            //默认数据
+            SceneCondition *condition = [[SceneCondition alloc]init];
+            DataPage *page = [[DataPage alloc]init];
             page.page = self.indexPage ++;
-            page.rows = 10;
+            page.rows = KROWS;
             condition.page = page;
             [self getSceneLibrarydatas:condition isRemove:NO];
         }

Lighting/Class/SettlementViewController.m

@@ -74,10 +74,10 @@
     CGFloat goodAllprice = 0;//总价格
     for (TOOrderdetailEntity *model in _goodsArray) {
         goodsAllNumber += [model.goodsNum integerValue];
-        goodAllprice += [model.goodsPrice floatValue];
+        goodAllprice += [model.goodsPrice floatValue]*[model.goodsNum integerValue];
     }
     self.goodsAllNumber.text = [NSString stringWithFormat:@"%ld",goodsAllNumber];
-    self.goodsAllPrice.text = [NSString stringWithFormat:@"%.2f元",(goodAllprice*goodsAllNumber)];
+    self.goodsAllPrice.text = [NSString stringWithFormat:@"￥%.2f",goodAllprice];
 }
 
 
@@ -89,8 +89,8 @@
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
             NSLog(@"获取二维码成功");
-            self.zhiFubaoLabe = returnValue[@"data"][@"weixin"];
-            self.weiXinLabe = returnValue[@"data"][@"zhifubao"];
+            self.zhiFubaoLabe = returnValue[@"data"][@"zhifubao"];
+            self.weiXinLabe = returnValue[@"data"][@"weixin"];
             
         }else
         {
@@ -144,6 +144,7 @@
 #pragma mark -微信支付
 - (IBAction)WechatButtonClick:(UIButton *)sender {
     
+    self.showPayQrCodeImageView.hidden = NO;
     sender.selected = !sender.selected;
     if (sender.selected) {
         
@@ -157,6 +158,7 @@
 #pragma mark -支付宝支付
 - (IBAction)ZhifubaoPayButtonClick:(UIButton *)sender {
     
+    self.showPayQrCodeImageView.hidden = NO;
     sender.selected = !sender.selected;
     if (sender.selected) {
         
@@ -213,6 +215,7 @@
 - (void)returnCellindexpathwithrow:(NSString *)Type WithcellTitle:(NSString *)title Withselected:(NSInteger)Selected
 {
     [self dismissViewControllerAnimated:YES completion:nil];
+    self.showPayQrCodeImageView.hidden = YES;
     switch (Selected) {
         case 0://支付方式
         {

Lighting/Class/SettlementViewController.xib

@@ -72,7 +72,7 @@
                             </connections>
                         </button>
                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="evA-uJ-YEb">
-                            <rect key="frame" x="255" y="143" width="100" height="100"/>
+                            <rect key="frame" x="253" y="120" width="120" height="187"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="发票类型:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="IOP-zc-e6A">
@@ -230,7 +230,7 @@
             </subviews>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="521" y="319.5"/>
+            <point key="canvasLocation" x="521" y="319"/>
         </view>
     </objects>
     <resources>

Lighting/Class/Shoppingcart/AddressViewController.m

@@ -170,7 +170,9 @@
     address.name = self.recipientPerson.text;
     address.miblephone = self.PhoneNumber.text;
     address.city = [self.citySelected currentTitle];
-    address.province = self.provincesString;
+    if (![self.provincesString isEqualToString:[self.citySelected currentTitle]]) {
+      address.province = self.provincesString;
+    }
     address.address = self.detailsAddress.text;
     
     [self CreateMBProgressHUDLoding];
@@ -244,6 +246,9 @@
     address.miblephone = self.PhoneNumber.text;
     address.city = [self.citySelected currentTitle];
     address.address = self.detailsAddress.text;
+    if (![self.provincesString isEqualToString:[self.citySelected currentTitle]]) {
+        address.province = self.provincesString;
+    }
     address.fid = _model.fid;
     
     [self CreateMBProgressHUDLoding];

Lighting/Class/Tabbar/CustomTabbarController.m

@@ -21,6 +21,7 @@
 #import "ChangePasswordViewController.h"
 #import "SearchViewController.h"
 #import "ScannerViewController.h"
+#import "BaseViewController.h"
 
 
 @interface CustomTabbarController ()<TabbarButtonClickdelegate,ChangpasswordDelegate,CancelButtondelegate,UITextFieldDelegate>
@@ -269,12 +270,17 @@
     ScannerViewController *scannerVC = [[ScannerViewController alloc]init];
     [scannerVC setReturnScannerResponse:^(id value) {
       
-        [self dismissViewControllerAnimated:YES completion:nil];
-        //调用商品控制器
-        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
-        ProductLibraryViewController *productVC = [storyboard instantiateViewControllerWithIdentifier:@"productlibrary"];
-        productVC.selectedCode = value;
-        [self.navigationController pushViewController:productVC animated:YES];
+        [self dismissViewControllerAnimated:YES completion:^{
+            
+            //调用商品控制器
+            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/StoryboardwithCYX.storyboard

@@ -449,49 +449,63 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小计：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="t4H-Zo-HhM">
-                                                            <rect key="frame" x="570" y="56" width="46" height="21"/>
+                                                            <rect key="frame" x="571" y="56" width="58" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="产品规格:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="EDF-WF-syh">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="产品尺寸:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="EDF-WF-syh">
                                                             <rect key="frame" x="356" y="22" width="70" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ssg-dl-sxk">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ssg-dl-sxk">
                                                             <rect key="frame" x="184" y="22" width="143" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                             <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0Ww-BX-90J">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0Ww-BX-90J">
                                                             <rect key="frame" x="198" y="56" width="143" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                             <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bhI-Ns-YHq">
-                                                            <rect key="frame" x="420" y="22" width="215" height="21"/>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bhI-Ns-YHq">
+                                                            <rect key="frame" x="420" y="22" width="129" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                             <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hLZ-vb-nAK">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hLZ-vb-nAK">
                                                             <rect key="frame" x="420" y="56" width="143" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                             <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="mLm-o2-IUg">
-                                                            <rect key="frame" x="613" y="56" width="86" height="21"/>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="mLm-o2-IUg">
+                                                            <rect key="frame" x="620" y="56" width="86" height="21"/>
+                                                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                            <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="成交价：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="DbT-ha-7xx">
+                                                            <rect key="frame" x="571" y="18" width="58" height="21"/>
+                                                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="jiW-wc-Bck">
+                                                            <rect key="frame" x="624" y="18" width="86" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                             <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
@@ -501,6 +515,7 @@
                                                 </tableViewCellContentView>
                                                 <color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" alpha="1" colorSpace="calibratedRGB"/>
                                                 <connections>
+                                                    <outlet property="clinchPrice" destination="jiW-wc-Bck" id="FIG-VB-rmP"/>
                                                     <outlet property="goodsCraneQuotation" destination="0Ww-BX-90J" id="s9l-Wk-8Id"/>
                                                     <outlet property="goodsImageview" destination="mhA-C1-oB5" id="tGR-6N-phk"/>
                                                     <outlet property="goodsName" destination="ssg-dl-sxk" id="Eek-82-oqM"/>
@@ -586,7 +601,7 @@
                                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="客户地址：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="rbq-pW-vP2">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货地址：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="rbq-pW-vP2">
                                                             <rect key="frame" x="336" y="136" width="72" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -732,7 +747,7 @@
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="firstcell" rowHeight="84" id="XgA-9w-ut9" customClass="OrderInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="49.5" width="1024" height="84"/>
+                                        <rect key="frame" x="0.0" y="113.5" width="1024" height="84"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XgA-9w-ut9" id="BWi-jv-OOH">
                                             <rect key="frame" x="0.0" y="0.0" width="1024" height="83.5"/>
@@ -805,7 +820,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="110" id="rIO-yd-hh7" customClass="PersonInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="133.5" width="1024" height="110"/>
+                                        <rect key="frame" x="0.0" y="197.5" width="1024" height="110"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rIO-yd-hh7" id="mn8-g0-Zqo">
                                             <rect key="frame" x="0.0" y="0.0" width="1024" height="109.5"/>
@@ -882,7 +897,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="thirdcell" rowHeight="90" id="PfN-24-v5t" customClass="GoodsInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="243.5" width="1024" height="90"/>
+                                        <rect key="frame" x="0.0" y="307.5" width="1024" height="90"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PfN-24-v5t" id="2Je-94-WVY">
                                             <rect key="frame" x="0.0" y="0.0" width="1024" height="89.5"/>
@@ -939,7 +954,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="47T-H0-tG7" customClass="CommodityListTableViewCell">
-                                        <rect key="frame" x="0.0" y="333.5" width="1024" height="80"/>
+                                        <rect key="frame" x="0.0" y="397.5" width="1024" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="47T-H0-tG7" id="zXR-bC-Wdh">
                                             <rect key="frame" x="0.0" y="0.0" width="1024" height="79.5"/>
@@ -1003,7 +1018,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="PNT-Fy-4Hi" customClass="AllpriceTableViewCell">
-                                        <rect key="frame" x="0.0" y="413.5" width="1024" height="50"/>
+                                        <rect key="frame" x="0.0" y="477.5" width="1024" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PNT-Fy-4Hi" id="PxE-0c-Zdt">
                                             <rect key="frame" x="0.0" y="0.0" width="1024" height="49.5"/>
@@ -1164,7 +1179,7 @@
                                 </collectionViewFlowLayout>
                                 <cells>
                                     <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="productcell" id="J5m-0M-uqb" customClass="ProductCollectionViewCell">
-                                        <rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
+                                        <rect key="frame" x="0.0" y="64" width="300" height="300"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                             <rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
@@ -1246,7 +1261,7 @@
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="productDetailscell" rowHeight="170" id="Sye-2R-IQf" customClass="ProductDetailsTableViewCell">
-                                        <rect key="frame" x="0.0" y="49.5" width="768" height="170"/>
+                                        <rect key="frame" x="0.0" y="113.5" width="768" height="170"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sye-2R-IQf" id="CXs-SR-gHP">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="169.5"/>
@@ -2805,15 +2820,15 @@
                                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="操作员：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7od-1Z-yjM">
-                                                            <rect key="frame" x="458" y="22" width="65" height="21"/>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="服务导购：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7od-1Z-yjM">
+                                                            <rect key="frame" x="458" y="22" width="82" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="某某某" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2tu-Jm-J34">
-                                                            <rect key="frame" x="521" y="22" width="120" height="21"/>
+                                                            <rect key="frame" x="533" y="22" width="120" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>

Lighting/Tools/PrefixHeader.pch

@@ -184,7 +184,10 @@
 #define PASSWORD @"password"
 
 
-
+/**
+ *  网络请求返回个数
+ */
+#define KROWS 10