caoyunxiao

Lighting/Class/AdditionalTableViewCell.h

+//
+//  AdditionalTableViewCell.h
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/16.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface AdditionalTableViewCell : UITableViewCell
+
+@end

Lighting/Class/AttachmentInformationTableViewCell.m → Lighting/Class/AdditionalTableViewCell.m

 //
-//  AttachmentInformationTableViewCell.m
+//  AdditionalTableViewCell.m
 //  Lighting
 //
-//  Created by 曹云霄 on 16/5/4.
+//  Created by 曹云霄 on 16/5/16.
 //  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
 //
 
-#import "AttachmentInformationTableViewCell.h"
+#import "AdditionalTableViewCell.h"
 
-@implementation AttachmentInformationTableViewCell
+@implementation AdditionalTableViewCell
 
 - (void)awakeFromNib {
     [super awakeFromNib];

Lighting/Class/AdditionalTableViewCell.xib

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="259" id="KGk-i7-Jjw" customClass="AdditionalTableViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="768" height="75"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="768" height="74.5"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="是否开票：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="444-pT-XHf">
+                        <rect key="frame" x="21" y="13" width="70" height="17"/>
+                        <autoresizingMask key="autoresizingMask" 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="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"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="发票抬头：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="MoA-e8-03W">
+                        <rect key="frame" x="21" y="45" width="70" height="17"/>
+                        <autoresizingMask key="autoresizingMask" 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="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"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="发票类型：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Zdn-MM-Xad">
+                        <rect key="frame" x="370" y="13" width="70" height="17"/>
+                        <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="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"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="支付方式：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="S5V-nq-hin">
+                        <rect key="frame" x="370" y="43" width="70" height="17"/>
+                        <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="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"/>
+                    </label>
+                </subviews>
+            </tableViewCellContentView>
+            <point key="canvasLocation" x="420" y="242.5"/>
+        </tableViewCell>
+    </objects>
+</document>

Lighting/Class/AllpriceTableViewCell.h

@@ -28,4 +28,10 @@
  */
 @property (nonatomic,strong) NSArray *goodsAllprice;
 
+
+/**
+ *  商品数据源
+ */
+@property (nonatomic,strong) NSArray *goodsArray;
+
 @end

Lighting/Class/AllpriceTableViewCell.m

@@ -34,6 +34,32 @@
 }
 
 
+
+
+
+#pragma mark -数据源赋值
+- (void)setGoodsArray:(NSArray *)goodsArray
+{
+    _goodsArray = goodsArray;
+    
+    NSInteger allNumber = 0;//总数量
+    NSInteger allPrice = 0;//总价格
+    
+    for (TOOrderdetailEntity *model in _goodsArray) {
+        
+        allNumber += [model.goodsPrice integerValue];
+        allPrice += [model.goodsNum integerValue];
+    }
+    self.goodsAllNumber.text = [NSString stringWithFormat:@"%ld",allNumber];
+    self.goodsAllPrice.text = [NSString stringWithFormat:@"￥%ld",allPrice];
+    
+}
+
+
+
+
+
+
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
 

Lighting/Class/AttachmentInformationTableViewCell.h

-//
-//  AttachmentInformationTableViewCell.h
-//  Lighting
-//
-//  Created by 曹云霄 on 16/5/4.
-//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface AttachmentInformationTableViewCell : UITableViewCell
-
-
-
-/**
- *  是否开票
- */
-@property (weak, nonatomic) IBOutlet UILabel *whetherInvoice;
-
-
-/**
- *  发票抬头
- */
-@property (weak, nonatomic) IBOutlet UILabel *InvoiceHeader;
-
-
-/**
- * 发票类型
- */
-@property (weak, nonatomic) IBOutlet UILabel *invoicetype;
-
-
-
-@end

Lighting/Class/ClientViewController.m

@@ -219,7 +219,7 @@
 
 
 
-#pragma mark -添加客户信息
+#pragma mark -添加客户信息、或者退出当前客户
 - (IBAction)addCustomerInformationORExit:(UIButton *)sender {
     
     if ([sender.currentTitle isEqualToString:@"退出当前客户"]) {
@@ -235,6 +235,7 @@
         self.changePersonInformationButton.hidden = YES;
         [Shoppersmanager manager].currentCustomer = NO;
         [Customermanager manager].customerID = nil;
+        [self.changePersonInformationButton setTitle:@"更改客户信息" forState:UIControlStateNormal];
         
         //全部为为选中状态
         for (InformationTableViewCell *cell in self.informationTableview.visibleCells) {
@@ -248,12 +249,12 @@
         [sender setTitle:@"添加客户信息" forState:UIControlStateNormal];
         return;
     }
-    [self addCustomerInformation];
+    [self addCustomerInformation:NO];
 }
 
 
-#pragma mark -添加客户信息请求
-- (void)addCustomerInformation
+#pragma mark -添加客户信息请求 -新增、或者修改
+- (void)addCustomerInformation:(BOOL)isChange
 {
     [self.view endEditing:YES];
     if (self.customerNameField.text.length == 0) {
@@ -280,6 +281,10 @@
     customerEntity.mobile = self.phoneNumberField.text;
     customerEntity.address = self.customerAddress.text;
     customerEntity.name = self.companyNameField.text;
+    //修改
+    if (isChange) {
+       customerEntity.fid = [Customermanager manager].customerID;
+    }
     
     [self CreateMBProgressHUDLoding];
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/consumer/save"] WithRequestType:0 WithParameter:customerEntity WithReturnValueBlock:^(id returnValue) {
@@ -287,15 +292,21 @@
         [self RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
+            //新增保存ID
+            if (!isChange) {
+                [Customermanager manager].customerID = returnValue[@"data"];
+                [self SuccessMBProgressView:@"新增成功"];
+            }else
+            {
+                [self SuccessMBProgressView:@"修改成功"];
+                [self.changePersonInformationButton setTitle:@"更改客户信息" forState:UIControlStateNormal];
+            }
             //保存客户信息
-            [Customermanager manager].customerID = returnValue[@"data"];
             [Customermanager manager].customerName = customerEntity.name;
             [Customermanager manager].customerPhoneNumber = customerEntity.mobile;
             [Customermanager manager].companyAddress = customerEntity.address;
             [Customermanager manager].cutomerAddress = customerEntity.address;
-            
             [Shoppersmanager manager].currentCustomer = YES;
-            [self SuccessMBProgressView:returnValue[@"新增成功"]];
             [self.addpersonInformationButton setTitle:@"退出当前客户" forState:UIControlStateNormal];
             self.changePersonInformationButton.hidden = NO;
             self.customerNameField.enabled = NO;
@@ -324,11 +335,22 @@
 - (IBAction)changeCustomerInformation:(UIButton *)sender {
     
     
+    if ([sender.currentTitle isEqualToString:@"保存"]) {
+        
+        [self.customerNameField resignFirstResponder];
+        [sender setTitle:@"更改客户信息" forState:UIControlStateNormal];
+         [self addCustomerInformation:YES];
+    }else
+    {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self.customerNameField becomeFirstResponder];
+        });
+        [sender setTitle:@"保存" forState:UIControlStateNormal];
+    }
     self.customerNameField.enabled = YES;
     self.customerAddress.enabled = YES;
     self.phoneNumberField.enabled = YES;
     self.companyNameField.enabled = YES;
-    [self.customerNameField becomeFirstResponder];
 }
 
 

Lighting/Class/CommodityListTableViewCell.h

@@ -43,6 +43,10 @@
 @property (nonatomic,strong) ShopcarModel *model;
 
 
+/**
+ *  订单详情商品数据源
+ */
+@property (nonatomic,strong) TOOrderdetailEntity *orderDetailslist;
 
 
 @end

Lighting/Class/CommodityListTableViewCell.m

@@ -32,6 +32,23 @@
 
 
 
+#pragma mark -订单详情页赋值
+- (void)setOrderDetailslist:(TOOrderdetailEntity *)orderDetailslist
+{
+    _orderDetailslist = orderDetailslist;
+    [self.goodsHeader sd_setImageWithURL:[NSURL URLWithString:_orderDetailslist.goodsBrand] placeholderImage:ReplaceImage];
+    self.goodsNumber.text = _orderDetailslist.goodsNum;
+    self.clinchPrice.text = [_orderDetailslist.goodsPrice stringValue];
+    self.totalPrice.text = [_orderDetailslist.goodsTotalPrice stringValue];
+    self.goodsName.text = _orderDetailslist.goodsSpec;
+    
+    
+    
+}
+
+
+
+
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
 

Lighting/Class/GoodsInformationTableViewCell.h

@@ -39,7 +39,10 @@
 
 
 
-
+/**
+ *  收货信息
+ */
+@property (nonatomic,strong) TOOrderEntity *model;
 
 
 

Lighting/Class/GoodsInformationTableViewCell.m

@@ -15,6 +15,23 @@
     // Initialization code
 }
 
+
+
+
+#pragma mark -赋值
+- (void)setModel:(TOOrderEntity *)model
+{
+    _model = model;
+    self.consigneeName.text = _model.receiverName;
+    self.consigneePhoneNumber.text = _model.receiverMobile;
+    self.detailsAddress.text = _model.receiverAddress;
+    
+    
+}
+
+
+
+
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
 

Lighting/Class/HotCollectionViewCell.h

+//
+//  HotCollectionViewCell.h
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/16.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface HotCollectionViewCell : UICollectionViewCell
+
+
+
+/**
+ *  数据源
+ */
+@property (nonatomic,strong) TOHottagEntity *responseDatas;
+
+
+/**
+ *  title
+ */
+@property (nonatomic,strong) UILabel *titleLabe;
+
+@end

Lighting/Class/HotCollectionViewCell.m

+//
+//  HotCollectionViewCell.m
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/16.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "HotCollectionViewCell.h"
+
+@implementation HotCollectionViewCell
+
+
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    if (self = [super initWithFrame:frame]) {
+        
+        [self uiConfigAction];
+    }
+    return self;
+}
+
+
+#pragma mark -UI
+- (void)uiConfigAction
+{
+    self.titleLabe = [[UILabel alloc]initWithFrame:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height)];
+    self.titleLabe.textAlignment = NSTextAlignmentCenter;
+    self.titleLabe.font = [UIFont systemFontOfSize:14];
+    [self.contentView addSubview:self.titleLabe];
+}
+
+
+#pragma mark -赋值
+- (void)setResponseDatas:(TOHottagEntity *)responseDatas
+{
+    _responseDatas = responseDatas;
+    self.titleLabe.text = _responseDatas.name;
+}
+
+
+@end

Lighting/Class/Login/LoginViewController.m

@@ -79,7 +79,8 @@
 #pragma mark -登陆
 - (IBAction)LoginButtonClick:(UIButton *)sender {
 
-
+//    [self SetTheRootViewController];
+//    return;
     
     if (self.userName.text.length == 0) {
 
@@ -130,8 +131,6 @@
             [Shoppersmanager manager].passWordString = self.passWord.text;
             
             [self SetTheRootViewController];
-            
-            NSLog(@"成功");
         }else
         {
             [self ErrorMBProgressView:returnValue[@"message"]];

Lighting/Class/OrderInformationTableViewCell.h

@@ -30,6 +30,9 @@
  */
 @property (weak, nonatomic) IBOutlet UILabel *operatorName;
 
-
+/**
+ *  订单数据
+ */
+@property (nonatomic,strong) OrderBill *model;
 
 @end

Lighting/Class/OrderInformationTableViewCell.m

@@ -15,6 +15,32 @@
     // Initialization code
 }
 
+
+#pragma mark -订单赋值
+- (void)setModel:(OrderBill *)model
+{
+    _model = model;
+    self.orderNumber.text = _model.order.orderNumber;
+    self.orderTime.text = [self dateAsString:_model.order.orderTime];
+    self.orderStatus.text = _model.order.orderState;
+    self.operatorName.text = _model.employee.userName;
+}
+
+
+
+#pragma mark -时间转换NSDate转NSString
+- (NSString*)dateAsString:(NSDate*)date {
+    
+    NSDateFormatter *formatter=[[NSDateFormatter alloc] init];
+    [formatter setDateFormat:@"yyyy-MM-dd"];
+    NSString * timeString = [formatter stringFromDate:date];
+    return timeString;
+    
+}
+
+
+
+
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
 

Lighting/Class/OrderdetailsViewController.h

@@ -18,7 +18,22 @@
 
 
 /**
- *  订单详情
+ *  订单ID
  */
 @property (nonatomic,copy) NSString *orderCode;
+
+
+/**
+ *  是否显示附件信息
+ */
+@property (nonatomic,assign) BOOL isShowattachment;
+
+
+
+/**
+ *  区头显示title
+ */
+@property (nonatomic,strong) NSArray *sectionTitle;
+
+
 @end

Lighting/Class/OrderdetailsViewController.m

@@ -12,15 +12,27 @@
 #import "GoodsInformationTableViewCell.h"
 #import "CommodityListTableViewCell.h"
 #import "AllpriceTableViewCell.h"
-#import "AttachmentInformationTableViewCell.h"
 #import "SettlementViewController.h"
+#import "AdditionalTableViewCell.h"
 
 @interface OrderdetailsViewController ()<UITableViewDelegate,UITableViewDataSource>
 
+
+/**
+ *  订单详情数据
+ */
+@property (nonatomic,strong) OrderBill *orderDetails;
+
+
+
 @end
 
 @implementation OrderdetailsViewController
 
+
+
+
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     
@@ -35,21 +47,22 @@
 {
     self.orderDetailsTableview.dataSource = self;
     self.orderDetailsTableview.delegate = self;
-//    self.orderDetailsTableview.tableFooterView = [UIView new];
     [self CreateTableviewHeaderView];
     [self CreateTableviewFooterView];
 }
 
+
 #pragma mark -获取订单详情
 - (void)getOrderDetailsData
 {
+    [self CreateMBProgressHUDLoding];
     [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@%@",ServerAddress,@"/order/findOrder/",_orderCode] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
         
-        NSLog(@"%@",returnValue);
+        [self RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
-            OrderBill *orderDetails = [[OrderBill alloc]initWithDictionary:returnValue[@"data"] error:nil];
-            NSLog(@"%@",orderDetails);
+            self.orderDetails = [[OrderBill alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            [self.orderDetailsTableview reloadData];
         }
         else
         {
@@ -61,6 +74,7 @@
         
     } WithFailureBlock:^(id error) {
         
+        [self RemoveMBProgressHUDLoding];
     }];
 }
 
@@ -102,6 +116,11 @@
     lineView.backgroundColor = kTCColor(193, 193, 193);
     [headerView addSubview:lineView];
     
+    //附加信息cell
+    [self.orderDetailsTableview registerNib:[UINib nibWithNibName:@"AdditionalTableViewCell" bundle:nil] forCellReuseIdentifier:@"fifthcell"];
+    
+    
+    
     self.orderDetailsTableview.tableHeaderView = headerView;
 }
 
@@ -130,8 +149,10 @@
 #pragma mark -调出支付框
 - (void)PayButtonClick
 {
+    
     SettlementViewController *settlement = [[SettlementViewController alloc]init];
     settlement.preferredContentSize = CGSizeMake(380, 500);
+    settlement.goodsArray = self.orderDetails.orderdetailList;
     settlement.modalPresentationStyle = UIModalPresentationFormSheet;
     UIPopoverPresentationController *pop = settlement.popoverPresentationController;
     pop.sourceView = settlement.view;
@@ -161,7 +182,7 @@
             break;
         case 3:
         {
-            return 3;
+            return self.orderDetails.orderdetailList.count+1;
         }
             break;
         case 4:
@@ -183,44 +204,52 @@
         case 0://订单信息
         {
             OrderInformationTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"firstcell" forIndexPath:indexPath];
+            cell.model = self.orderDetails;
             return cell;
         }
             break;
         case 1://客户信息
         {
             PersonInformationTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"secondcell" forIndexPath:indexPath];
+            cell.model = self.orderDetails.consumer;
             return cell;
         }
             break;
         case 2://收货信息
         {
             GoodsInformationTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"thirdcell" forIndexPath:indexPath];
+            cell.model = self.orderDetails.order;
             return cell;
         }
             break;
         case 3://商品清单
         {
-            if (indexPath.row == 2) {
+            if (indexPath.row == self.orderDetails.orderdetailList.count) {
                 
                 //商品总计
                 AllpriceTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"sixthcell" forIndexPath:indexPath];
+                cell.goodsArray = self.orderDetails.orderdetailList;
                 return cell;
                 
             }else
             {
                 //单个商品
                 CommodityListTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"fourthcell" forIndexPath:indexPath];
+                cell.orderDetailslist = [self.orderDetails.orderdetailList objectAtIndex_opple:indexPath.row];
                 return cell;
             }
         }
             break;
         case 4://附件信息
         {
-            AttachmentInformationTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"fifthcell" forIndexPath:indexPath];
-            return cell;
+            //是否显示
+            if (_isShowattachment) {
+             
+                AdditionalTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"fifthcell" forIndexPath:indexPath];
+                return cell;
+            }
         }
             break;
-            
         default:
             break;
     }
@@ -237,18 +266,18 @@
             break;
         case 1:
         {
-            return 160;
+            return 135;
         }
             break;
         case 2:
         {
-            return 110;
+            return 90;
         }
             break;
         case 3:
         {
             //商品总计
-            if (indexPath.row == 2) {
+            if (indexPath.row == self.orderDetails.orderdetailList.count) {
                 
                 return 50;
             }
@@ -261,6 +290,11 @@
             break;
         case 4:
         {
+            //是否显示附件信息
+            if (!_isShowattachment) {
+                
+                return 0;
+            }
             return 75;
         }
             break;
@@ -276,12 +310,9 @@
     
         
     UIView *view = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 44)];
-    view.backgroundColor = kMainGrayColor;
-    
     //区头文字
-    UILabel *Titlelabe = [[UILabel alloc]initWithFrame:CGRectMake(0, 10, ScreenWidth, 34)];
-    Titlelabe.backgroundColor = [UIColor whiteColor];
-    Titlelabe.text = @"    订单详情";
+    UILabel *Titlelabe = [[UILabel alloc]initWithFrame:CGRectMake(30, 0, 100, 44)];
+    Titlelabe.text = [self.sectionTitle objectAtIndex_opple:section];
     Titlelabe.font = [UIFont systemFontOfSize:13];
     [view addSubview:Titlelabe];
     return view;
@@ -298,7 +329,7 @@
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
-    return 5;
+    return self.sectionTitle.count;
 }
 
 
@@ -309,7 +340,19 @@
 #pragma mark -打印订单
 - (void)AirprintButtonClick:(UIButton *)button
 {
-    [self callAirprintWithdata:nil];
+    
+//  [self callAirprintWithdata:nil];
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@%@",ServerAddress,@"/order/UrlOfprintPDF/",_orderCode] WithRequestType:0 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+        
+        NSLog(@"%@",returnValue);
+        
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        
+    } WithFailureBlock:^(id error) {
+        
+        NSLog(@"%@",error);
+    }];
 }
 
 
@@ -329,15 +372,16 @@
 
 
 
-/*
+
 #pragma mark - Navigation
 
 // In a storyboard-based application, you will often want to do a little preparation before navigation
 - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
     // Get the new view controller using [segue destinationViewController].
     // Pass the selected object to the new view controller.
+    
 }
-*/
+
 
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];

Lighting/Class/PersonInformationTableViewCell.h

@@ -52,6 +52,10 @@
 @property (weak, nonatomic) IBOutlet UILabel *customerQQNumber;
 
 
+/**
+ *  订单数据
+ */
+@property (nonatomic,strong) TOConsumerEntity *model;
 
 
 

Lighting/Class/PersonInformationTableViewCell.m

@@ -15,6 +15,20 @@
     // Initialization code
 }
 
+
+
+#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 {
     [super setSelected:selected animated:animated];
 

Lighting/Class/ProductLibraryViewController.m

@@ -69,13 +69,13 @@
 }
 
 
-//- (void)viewWillAppear:(BOOL)animated
-//{
-//    if (self.productCollectionView != nil) {
-//        
-//        [self getGoodsListDatas];
-//    }
-//}
+- (void)viewWillAppear:(BOOL)animated
+{
+    if (_screeningDatas != nil) {
+        
+        [self getGoodsListDatas];
+    }
+}
 
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -116,7 +116,6 @@
 - (void)getScreeningdatas
 {
     
-    
   [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/goods/getGoodsFilter"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
       
       if ([returnValue[@"code"] isEqualToNumber:@0]) {
@@ -127,9 +126,7 @@
           [self.screeningDatas addObject:goodsStyle.space];
           [self.screeningDatas addObject:goodsStyle.material];
           [self.screeningDatas addObject:goodsStyle.price];
-    
-//          NSLog(@"%@",self.screeningDatas);
-      }
+    }
       else
       {
           [self ErrorMBProgressView:returnValue[@"message"]];
@@ -144,101 +141,6 @@
   }];
 }
 
-/*
-
-{
-    code = 0;
-    data =     {
-        categories =         (
-                              {
-                                  children =                 (
-                                                              {
-                                                                  children =                         (
-                                                                  );
-                                                                  id = 0b44439e54997ce201549986e02c0003;
-                                                                  name = "\U5927\U706f";
-                                                              },
-                                                              {
-                                                                  children =                         (
-                                                                  );
-                                                                  id = 0b44439e54997ce201549987c8550004;
-                                                                  name = "\U5eca\U706f";
-                                                              }
-                                                              );
-                                  id = 0b44439e54997ce20154998630210002;
-                                  name = "\U73b0\U4ee3\U706f";
-                              },
-                              {
-                                  children =                 (
-                                                              {
-                                                                  children =                         (
-                                                                  );
-                                                                  id = 0b44439e54997ce20154998a59450006;
-                                                                  name = "\U53a8\U623f\U706f";
-                                                              }
-                                                              );
-                                  id = 0b44439e54997ce201549989c8b10005;
-                                  name = "\U7167\U660e\U706f";
-                              }
-                              );
-        material =         (
-                            {
-                                typecode = 001;
-                                typename = "\U91d1";
-                            },
-                            {
-                                typecode = 002;
-                                typename = "\U94f6";
-                            },
-                            {
-                                typecode = 003;
-                                typename = "\U6728\U8d28";
-                            }
-                            );
-        price =         (
-                         {
-                             typecode = 001;
-                             typename = "500\U4ee5\U4e0b";
-                         },
-                         {
-                             typecode = 002;
-                             typename = "500\U52301000";
-                         },
-                         {
-                             typecode = 003;
-                             typename = "1000\U52302000";
-                         }
-                         );
-        space =         (
-                         {
-                             typecode = 001;
-                             typename = "15\U5e73\U7c73";
-                         },
-                         {
-                             typecode = 002;
-                             typename = "20\U5e73\U7c73";
-                         },
-                         {
-                             typecode = 003;
-                             typename = "35\U5e73\U7c73";
-                         }
-                         );
-        styles =         (
-                          {
-                              typecode = 001;
-                              typename = "\U4e2d\U56fd\U98ce";
-                          },
-                          {
-                              typecode = 002;
-                              typename = "\U82f1\U56fd\U98ce";
-                          }
-                          );
-    };
-    message = "\U64cd\U4f5c\U6210\U529f";
-}
-
-*/
-
 
 #pragma mark -获取商品列表数据
 - (void)getGoodsListdatas:(GoodsCondition *)conditon returnResponse:(void(^)(GoodsResponse *))finish
@@ -283,9 +185,36 @@
     self.productCollectionView.alwaysBounceVertical = YES;
     [self CreatescreeningButton];
     
+    //搜索关键字
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(searchInputString:) name:@"SEARCHINPUTSTRING" object:nil];
+    
 }
 
 
+#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 = response;
+        [weakSelf.productCollectionView reloadData];
+    }];
+}
+
 
 #pragma mark -筛选按钮
 - (void)CreatescreeningButton
@@ -559,6 +488,16 @@
 }
 
 
+#pragma mark -释放
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter]removeObserver:self];
+}
+
+
+
+
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.

Lighting/Class/SearchCollectionViewCell.h

+//
+//  SearchCollectionViewCell.h
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/16.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface SearchCollectionViewCell : UICollectionViewCell
+
+
+
+
+/**
+ *  显示历史记录，或者热门搜索
+ */
+@property (weak, nonatomic) IBOutlet UILabel *searchLabe;
+
+
+
+
+@end

Lighting/Class/SearchCollectionViewCell.m

+//
+//  SearchCollectionViewCell.m
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/16.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "SearchCollectionViewCell.h"
+
+@implementation SearchCollectionViewCell
+
+@end

Lighting/Class/SearchViewController.h

+//
+//  SearchViewController.h
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/16.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface SearchViewController : BaseViewController
+
+
+
+
+
+/**
+ *  历史记录collectionView
+ */
+@property (weak, nonatomic) IBOutlet UICollectionView *historyCollectionView;
+
+
+/**
+ *  历史记录layout
+ */
+@property (weak, nonatomic) IBOutlet UICollectionViewFlowLayout *historyLayout;
+
+
+/**
+ *  热门搜索collectionView
+ */
+@property (weak, nonatomic) IBOutlet UICollectionView *hotCollectionView;
+
+
+/**
+ *  热门搜索layout
+ */
+@property (weak, nonatomic) IBOutlet UICollectionViewFlowLayout *hotCollectionviewLayout;
+
+
+
+
+@end

Lighting/Class/SearchViewController.m

+//
+//  SearchViewController.m
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/16.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "SearchViewController.h"
+#import "SearchCollectionViewCell.h"
+#import "HotCollectionViewCell.h"
+
+@interface SearchViewController ()<UICollectionViewDelegate,UICollectionViewDataSource>
+
+/**
+ * 数据源
+ */
+@property (nonatomic,strong) HotTagResponse *response;
+
+/**
+ *  本地搜索历史
+ */
+@property (nonatomic,strong) NSMutableArray *localSearchArray;
+
+@end
+
+@implementation SearchViewController
+
+
+
+/**
+ *  本地搜索历史初始化
+ */
+- (NSMutableArray *)localSearchArray
+{
+    if (_localSearchArray == nil) {
+        
+        _localSearchArray = [NSMutableArray array];
+    }
+    return _localSearchArray;
+}
+
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    
+    [self uiConfigAction];
+    [self getHotSearchdatas];
+}
+
+
+#pragma mark -布局
+- (void)uiConfigAction
+{
+    self.hotCollectionviewLayout.itemSize = CGSizeMake(120, 44);
+    self.hotCollectionviewLayout.minimumLineSpacing = 10;
+    self.hotCollectionviewLayout.minimumInteritemSpacing = 10;
+    self.hotCollectionviewLayout.sectionInset = UIEdgeInsetsMake(10, 10, 10, 10);
+    
+    self.historyLayout.itemSize = CGSizeMake(120, 44);
+    self.historyLayout.minimumLineSpacing = 10;
+    self.historyLayout.minimumInteritemSpacing = 10;
+    self.historyLayout.sectionInset = UIEdgeInsetsMake(10, 10, 10, 10);
+    
+    self.historyCollectionView.delegate = self;
+    self.historyCollectionView.dataSource = self;
+    self.hotCollectionView.dataSource = self;
+    self.hotCollectionView.delegate = self;
+    self.hotCollectionView.backgroundColor = [UIColor redColor];
+    self.historyCollectionView.backgroundColor = [UIColor greenColor];
+    
+    
+}
+
+
+
+#pragma mark -获取本地存储搜索历史
+- (void)getlocalsaveDatas
+{
+    NSString *homeDictionary = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex: 0];
+    NSString *homepath = [homeDictionary stringByAppendingPathComponent:@"LOCALSAVE"];//添加储存的文件名
+    self.localSearchArray = [NSKeyedUnarchiver unarchiveObjectWithFile:homepath];
+}
+
+
+
+#pragma mark -归档搜索历史
+- (void)SaveSearchDatas
+{
+    NSString *homeDictionary = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex: 0];
+    NSString *homepath = [homeDictionary stringByAppendingPathComponent:@"LOCALSAVE"];//添加储存的文件名
+    BOOL flag = [NSKeyedArchiver archiveRootObject:self.localSearchArray toFile:homepath];//归档一个字符串
+}
+
+
+
+#pragma mark -获取热门搜索数据
+- (void)getHotSearchdatas
+{
+    [self CreateMBProgressHUDLoding];
+    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/hottag/getHotTag"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+        
+        [self RemoveMBProgressHUDLoding];
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            
+             self.response = [[HotTagResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            [self.hotCollectionView reloadData];
+            
+        }else
+        {
+            [self ErrorMBProgressView:returnValue[@"message"]];
+        }
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        
+    } WithFailureBlock:^(id error) {
+        [self RemoveMBProgressHUDLoding];
+    }];
+}
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    if ([collectionView isEqual:self.historyCollectionView]) {
+        
+         SearchCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"firstcell" forIndexPath:indexPath];
+        
+        return cell;
+    }
+    if ([collectionView isEqual:self.hotCollectionView]) {
+        
+        HotCollectionViewCell  *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"secondcell" forIndexPath:indexPath];
+        cell.responseDatas = [self.response.list objectAtIndex_opple:indexPath.item];
+        return cell;
+    }
+    
+    return nil;
+}
+
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
+{
+    
+    if ([collectionView isEqual:self.hotCollectionView]) {
+        
+        return self.response.list.count;
+    }
+    
+    return 20;
+}
+
+
+#pragma mark -释放
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter]removeObserver:self];
+}
+
+
+
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

Lighting/Class/SettlementViewController.h

@@ -14,8 +14,101 @@
 
 
 /**
- *  
+ *  商品信息
  */
+@property (nonatomic,strong) NSArray *goodsArray;
+
+
+
+/**
+ *  商品总数量
+ */
+@property (weak, nonatomic) IBOutlet UITextField *goodsAllNumber;
+
+/**
+ *  商品总数量背景View
+ */
+@property (weak, nonatomic) IBOutlet UIView *goodsAllNumberBackvie;
+
+/**
+ *  商品总金额
+ */
+@property (weak, nonatomic) IBOutlet UITextField *goodsAllPrice;
+
+
+/**
+ *  商品总金额背景View
+ */
+@property (weak, nonatomic) IBOutlet UIView *goodsAllpriceBackView;
+
+
+/**
+ *  支付方式
+ */
+@property (weak, nonatomic) IBOutlet UIButton *payTypeButton;
+
+
+/**
+ *  微信支付
+ */
+@property (weak, nonatomic) IBOutlet UIButton *WeixiPayButton;
+
+
+/**
+ *  支付宝支付
+ */
+@property (weak, nonatomic) IBOutlet UIButton *payTreasureButton;
+
+/**
+ *  显示支付二维码
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *showPayQrCodeImageView;
+
+
+
+/**
+ *  是否开票
+ */
+@property (weak, nonatomic) IBOutlet UIButton *ISinvoiceButton;
+
+
+/**
+ *  发票类型
+ */
+@property (weak, nonatomic) IBOutlet UIButton *invoiceType;
+
+
+/**
+ *  发票抬头
+ */
+@property (weak, nonatomic) IBOutlet UITextField *invoiceHeader;
+
+
+/**
+ *  发票抬头背景
+ */
+@property (weak, nonatomic) IBOutlet UIView *invoiceBackView;
+
+
+
+/**
+ *  取消
+ */
+@property (weak, nonatomic) IBOutlet UIButton *cancelButton;
+
+
+/**
+ *  确认
+ */
+@property (weak, nonatomic) IBOutlet UIButton *sureButton;
+
+
+
+
+
+
+
+
 
 
 @end

Lighting/Class/SettlementViewController.m

@@ -8,7 +8,7 @@
 
 #import "SettlementViewController.h"
 
-@interface SettlementViewController ()
+@interface SettlementViewController ()<ReturnTableviewcellIndexpathdelegate>
 
 @end
 
@@ -16,16 +16,145 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view from its nib.
+    
+    [self uiConfigAction];
 }
 
 
+
+
+#pragma mark -布局
+- (void)uiConfigAction
+{
+    self.goodsAllNumberBackvie.layer.masksToBounds = YES;
+    self.goodsAllNumberBackvie.layer.cornerRadius = kCornerRadius;
+    self.goodsAllpriceBackView.layer.masksToBounds = YES;
+    self.goodsAllpriceBackView.layer.cornerRadius = kCornerRadius;
+    self.payTypeButton.layer.masksToBounds = YES;
+    self.payTypeButton.layer.cornerRadius = kCornerRadius;
+    self.WeixiPayButton.layer.masksToBounds = YES;
+    self.WeixiPayButton.layer.cornerRadius = kCornerRadius;
+    self.payTreasureButton.layer.masksToBounds = YES;
+    self.payTreasureButton.layer.cornerRadius = kCornerRadius;
+    self.ISinvoiceButton.layer.masksToBounds = YES;
+    self.ISinvoiceButton.layer.cornerRadius = kCornerRadius;
+    self.invoiceType.layer.masksToBounds = YES;
+    self.invoiceType.layer.cornerRadius = kCornerRadius;
+    self.invoiceBackView.layer.masksToBounds = YES;
+    self.invoiceBackView.layer.cornerRadius = kCornerRadius;
+    
+}
+
+
+
+#pragma mark -支付总金额，商品总数量
+- (void)setGoodsArray:(NSArray *)goodsArray
+{
+    _goodsArray = goodsArray;
+    
+    NSInteger goodsAllNumber = 0;//总数量
+    NSInteger goodAllprice = 0;//总价格
+    for (TOOrderdetailEntity *model in _goodsArray) {
+        goodsAllNumber += [model.goodsNum integerValue];
+        goodAllprice += [model.goodsPrice integerValue];
+    }
+    self.goodsAllNumber.text = [NSString stringWithFormat:@"%ld",goodsAllNumber];
+    self.goodsAllPrice.text = [NSString stringWithFormat:@"%ld元",goodAllprice];
+}
+
+
+
+
 - (void)viewWillAppear:(BOOL)animated
 {
     self.view.superview.layer.cornerRadius = 0;
 }
 
 
+
+#pragma mark -取消支付
+- (IBAction)CancelButtonClick:(UIButton *)sender {
+    
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+
+#pragma mark -确认支付
+- (IBAction)SureButtonClick:(UIButton *)sender {
+    
+    
+    
+}
+
+#pragma amrk -支付方式选择
+- (IBAction)payTypeButtonClick:(UIButton *)sender {
+    
+    NSArray *arr = @[@"现金",@"支票",@"转账"];
+    [self ShowPopoverViewController:CGSizeMake(100, 200) Withdatas:arr ShowButton:sender SelectedIndex:0 GetTitle:YES];
+}
+
+
+#pragma mark -是否开票
+- (IBAction)isinvoiceButtonClick:(UIButton *)sender {
+}
+
+
+#pragma mark -发票类型
+- (IBAction)invoiceTypeButtonClick:(UIButton *)sender {
+}
+
+
+
+#pragma mark -弹出popover视图控制器
+- (void)ShowPopoverViewController:(CGSize)size Withdatas:(NSArray *)datasArray ShowButton:(UIButton *)button SelectedIndex:(NSInteger)index GetTitle:(BOOL )istitle
+{
+    
+    PopoverViewController *popover = [[PopoverViewController alloc]init];
+    popover.datasArray = datasArray;
+    popover.delegate = self;
+    popover.Selectedindex = index;
+    popover.isString = YES;
+    popover.contentSize = size;
+    popover.preferredContentSize = size;
+    popover.modalPresentationStyle = UIModalPresentationPopover;
+    UIPopoverPresentationController *pop = popover.popoverPresentationController;
+    pop.permittedArrowDirections = UIPopoverArrowDirectionUp;
+    pop.sourceView = popover.view;
+    pop.barButtonItem = [[UIBarButtonItem alloc]initWithCustomView:button];
+    [self presentViewController:popover animated:YES completion:nil];
+}
+
+
+
+/**
+ *  选中筛选条件对象typecode
+ *
+ *  @param index NSString
+ */
+- (void)returnCellindexpathwithrow:(NSString *)Type WithcellTitle:(NSString *)title Withselected:(NSInteger)Selected
+{
+    switch (Selected) {
+        case 0://支付方式
+        {
+            [self.payTypeButton setTitle:title forState:UIControlStateNormal];
+        }
+            break;
+        case 1://是否开票
+        {
+            [self.ISinvoiceButton setTitle:title forState:UIControlStateNormal];
+        }
+            break;
+        case 2://发票类型
+        {
+            [self.invoiceType setTitle:title forState:UIControlStateNormal];
+        }
+            break;
+            
+        default:
+            break;
+    }
+}
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.

Lighting/Class/SettlementViewController.xib

@@ -6,6 +6,20 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SettlementViewController">
             <connections>
+                <outlet property="ISinvoiceButton" destination="RrC-9S-Ofh" id="xzu-wn-Wnz"/>
+                <outlet property="WeixiPayButton" destination="pfa-IW-8J9" id="bGR-8e-N0l"/>
+                <outlet property="cancelButton" destination="vDt-el-S5r" id="rBe-XW-s66"/>
+                <outlet property="goodsAllNumber" destination="kfb-PC-RSU" id="m0D-dL-ZaN"/>
+                <outlet property="goodsAllNumberBackvie" destination="V10-sC-tjf" id="jSw-zj-8YH"/>
+                <outlet property="goodsAllPrice" destination="Wku-Nz-Jvr" id="ncf-Zm-FqP"/>
+                <outlet property="goodsAllpriceBackView" destination="kRj-KI-B8x" id="JIV-fg-UZL"/>
+                <outlet property="invoiceBackView" destination="beF-Oa-HVo" id="m2o-SG-Fwk"/>
+                <outlet property="invoiceHeader" destination="nrc-w9-AuC" id="bst-2e-Eeb"/>
+                <outlet property="invoiceType" destination="h52-sh-k1p" id="JeZ-ug-MEv"/>
+                <outlet property="payTreasureButton" destination="u1Q-iA-oUv" id="kTp-v5-rTM"/>
+                <outlet property="payTypeButton" destination="BtK-gu-0KG" id="kZG-tn-0Xt"/>
+                <outlet property="showPayQrCodeImageView" destination="evA-uJ-YEb" id="nJS-kx-aPc"/>
+                <outlet property="sureButton" destination="wNR-jl-cxy" id="Qj2-ks-l6e"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
         </placeholder>
@@ -26,7 +40,7 @@
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
                         <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="kfb-PC-RSU">
-                            <rect key="frame" x="10" y="0.0" width="150" height="30"/>
+                            <rect key="frame" x="10" y="1" width="150" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -77,21 +91,12 @@
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="BtK-gu-0KG">
-                    <rect key="frame" x="83" y="140" width="160" height="30"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                    <state key="normal" title="刷卡、支票、转账">
-                        <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                    </state>
-                </button>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="pfa-IW-8J9">
                     <rect key="frame" x="83" y="180" width="160" height="30"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                    <state key="normal" title="刷卡、支票、转账">
+                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                    <state key="normal" title="微信支付">
                         <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                     </state>
                 </button>
@@ -99,8 +104,8 @@
                     <rect key="frame" x="83" y="219" width="160" height="30"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                    <state key="normal" title="刷卡、支票、转账">
+                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                    <state key="normal" title="支付宝支付">
                         <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                     </state>
                 </button>
@@ -132,14 +137,19 @@
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="RrC-9S-Ofh">
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="RrC-9S-Ofh">
                     <rect key="frame" x="83" y="283" width="160" height="30"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                    <state key="normal" title="刷卡、支票、转账">
+                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                    <inset key="titleEdgeInsets" minX="-50" minY="0.0" maxX="86" maxY="0.0"/>
+                    <inset key="imageEdgeInsets" minX="120" minY="6" maxX="0.0" maxY="5"/>
+                    <state key="normal" title="是" image="down_arr">
                         <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                     </state>
+                    <connections>
+                        <action selector="isinvoiceButtonClick:" destination="-1" eventType="touchUpInside" id="6wf-TG-crT"/>
+                    </connections>
                 </button>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="发票类型:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="IOP-zc-e6A">
                     <rect key="frame" x="25" y="331" width="58" height="21"/>
@@ -148,14 +158,19 @@
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="h52-sh-k1p">
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="h52-sh-k1p">
                     <rect key="frame" x="83" y="327" width="160" height="30"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                    <state key="normal" title="刷卡、支票、转账">
+                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                    <inset key="titleEdgeInsets" minX="-50" minY="0.0" maxX="50" maxY="0.0"/>
+                    <inset key="imageEdgeInsets" minX="120" minY="6" maxX="0.0" maxY="5"/>
+                    <state key="normal" title="普通发票" image="down_arr">
                         <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                     </state>
+                    <connections>
+                        <action selector="invoiceTypeButtonClick:" destination="-1" eventType="touchUpInside" id="glI-Tn-twP"/>
+                    </connections>
                 </button>
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="evA-uJ-YEb">
                     <rect key="frame" x="255" y="143.5" width="100" height="100"/>
@@ -169,6 +184,9 @@
                     <state key="normal" title="确认">
                         <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </state>
+                    <connections>
+                        <action selector="SureButtonClick:" destination="-1" eventType="touchUpInside" id="tue-Vx-ZkB"/>
+                    </connections>
                 </button>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="vDt-el-S5r">
                     <rect key="frame" x="25" y="445" width="130" height="35"/>
@@ -178,6 +196,23 @@
                     <state key="normal" title="取消">
                         <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </state>
+                    <connections>
+                        <action selector="CancelButtonClick:" destination="-1" eventType="touchUpInside" id="6As-mE-5Ro"/>
+                    </connections>
+                </button>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="BtK-gu-0KG">
+                    <rect key="frame" x="83" y="140" width="160" height="30"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                    <inset key="titleEdgeInsets" minX="-50" minY="0.0" maxX="0.0" maxY="0.0"/>
+                    <inset key="imageEdgeInsets" minX="120" minY="6" maxX="0.0" maxY="5"/>
+                    <state key="normal" title="现金、支票、转账" image="down_arr">
+                        <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                    </state>
+                    <connections>
+                        <action selector="payTypeButtonClick:" destination="-1" eventType="touchUpInside" id="i6M-fm-Kha"/>
+                    </connections>
                 </button>
             </subviews>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
@@ -187,5 +222,6 @@
     </objects>
     <resources>
         <image name="05产品库-详情_03" width="500" height="375"/>
+        <image name="down_arr" width="22" height="12"/>
     </resources>
 </document>

Lighting/Class/Shoppingcart/GenerateOrdersViewController.m

@@ -346,19 +346,33 @@
     
     //收货地址
     TOOrderEntity *orderReceiver = [[TOOrderEntity alloc]init];
-    orderReceiver.receiverName = @"caoyunxiao";
-    orderReceiver.receiverMobile = @"15121161964";
-    orderReceiver.receiverAddress = @"dasdsssssssssss";
+    NSArray *Adressarr = [self.datasArray objectAtIndex_opple:1];
+    for (int i=0; i<Adressarr.count; i++) {
+        
+        if ([[Adressarr objectAtIndex_opple:i] isKindOfClass:[AddressModel class]]) {
+            
+            AddressModel *model = [Adressarr objectAtIndex_opple:i];
+            if (model.isSelected) {
+                
+                orderReceiver.receiverName = model.name;
+                orderReceiver.receiverMobile = model.miblephone;
+                orderReceiver.receiverAddress = model.address;
+                break;
+            }
+            if (i == Adressarr.count -1) {
+                
+                [self ErrorMBProgressView:@"未选中地址"];
+                return;
+            }
+        }
+    }
     order.order = orderReceiver;
     orderReceiver.guideId = [[Shoppersmanager manager] Shoppers].employee.fid;
     orderReceiver.consumerId = [[Customermanager manager] customerID];
-    
-    
     //商品ID
     NSArray *goodArray = [self.datasArray lastObject];
     NSMutableArray *goodidArr = [NSMutableArray array];
     for (int i=0; i<goodArray.count-1; i++) {
-        
         ShopcarModel *model = [goodArray objectAtIndex_opple:i];
         TOOrderdetailEntity *orderGoods = [[TOOrderdetailEntity alloc]init];
         orderGoods.goodsId = model.fid;
@@ -367,25 +381,20 @@
     order.orderdetailList = goodidArr;
     [self CreateMBProgressHUDLoding];
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/order/save"] WithRequestType:0 WithParameter:order WithReturnValueBlock:^(id returnValue) {
-        
         [self RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
-         
             OrderdetailsViewController *orderDetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"orderdetails"];
             orderDetails.orderCode = returnValue[@"data"];
+            orderDetails.sectionTitle = @[@"订单信息",@"客户信息",@"收货信息",@"商品清单"];
+            orderDetails.isShowattachment = NO;
             [self.navigationController pushViewController:orderDetails animated:YES];
-            
         }else
         {
             [self ErrorMBProgressView:returnValue[@"message"]];
         }
-        
     } WithErrorCodeBlock:^(id errorCodeValue) {
         
-        
     } WithFailureBlock:^(id error) {
-        
-        NSLog(@"%@",error);
         [self RemoveMBProgressHUDLoding];
     }];
 }
@@ -399,7 +408,6 @@
 }
 
 
-
 #pragma mark -设置为当前地址回调
 - (void)SetCustomerButtonClick:(NSInteger)index;
 {

Lighting/Class/Shoppingcart/ShoppingTableViewCell.m

@@ -85,7 +85,7 @@
         
         self.returnCellblock(_cellindex);
     }
-    sender.selected = YES;
+    sender.selected = !sender.selected;
 }
 
 

Lighting/Class/Shoppingcart/ShoppingViewController.m

@@ -64,6 +64,8 @@
 - (void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
+    
+    [self.shopResponseArray removeAllObjects];
     [self getShoppingCardata];
     // 开启
     if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
@@ -115,19 +117,15 @@
                 model.goodsId = objc.goodsId;
                 model.goodsNum = objc.goodsNum;
                 model.consumerId = objc.consumerId;
-                
                 [self.shopResponseArray addObject:model];
             }
             [self.shoppingTableview reloadData];
-            
         }else
         {
             [self ErrorMBProgressView:returnValue[@"message"]];
         }
-        
     } WithErrorCodeBlock:^(id errorCodeValue) {
         
-        
     } WithFailureBlock:^(id error) {
         
         [self RemoveMBProgressHUDLoding];
@@ -136,7 +134,6 @@
 
 
 
-
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     ShoppingTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Shopping" forIndexPath:indexPath];
@@ -147,7 +144,6 @@
     [cell setReturnCellblock:^(NSInteger index) {
         
         [self setSelectedButton:index];
-        
     }];
     return  cell;
 }
@@ -170,33 +166,20 @@
 }
 
 
-
 #pragma mark -设置为当前客户回调
 - (void)setSelectedButton:(NSInteger)index;
 {
-    
-    for (ShoppingTableViewCell *cell in self.shoppingTableview.visibleCells) {
-        
-        cell.selectedButton.selected = NO;
-    }
-    for (ShopcarModel *model in self.shopResponseArray) {
-        
-        model.isSelected = NO;
-    }
     ShopcarModel *model = [self.shopResponseArray objectAtIndex_opple:index];
-    model.isSelected = YES;
+    model.isSelected = !model.isSelected;
 }
 
 
 #pragma mark -结算
 - (IBAction)settlementButtonClick:(UIButton *)sender {
     
-    
     NSMutableArray *array = [NSMutableArray array];
     for (ShopcarModel *model in self.shopResponseArray) {
-        
         if (model.isSelected) {
-            
             [array addObject:model];
         }
     }
@@ -214,12 +197,52 @@
 }
 
 #pragma mark -全选
-- (IBAction)allSelectedButtonClick:(id)sender {
+- (IBAction)allSelectedButtonClick:(UIButton *)sender {
     
     
+    sender.selected = !sender.selected;
+    if (sender.selected) {
+        
+        //全部选中
+        for (ShoppingTableViewCell *cell in self.shoppingTableview.visibleCells) {
+            
+            cell.selectedButton.selected = YES;
+        }
+        for (ShopcarModel *model in self.shopResponseArray) {
+            
+            model.isSelected = YES;
+        }
+    }else
+    {
+        //取消全部选中
+        for (ShoppingTableViewCell *cell in self.shoppingTableview.visibleCells) {
+            
+            cell.selectedButton.selected = NO;
+        }
+        for (ShopcarModel *model in self.shopResponseArray) {
+            
+            model.isSelected = NO;
+        }
+    }
 }
 
 
+#pragma mark -删除选中商品
+- (IBAction)delecteSelectedGoods:(UIButton *)sender {
+
+    //需要删除的cell数组
+    NSMutableArray *delecteArray = [NSMutableArray array];
+    for (int i=0; i<self.shopResponseArray.count; i++) {
+        
+        ShopcarModel *model = [self.shopResponseArray objectAtIndex_opple:i];
+        if (model.isSelected) {
+            [self.shopResponseArray removeObject:model];
+            NSIndexPath *indexpath = [NSIndexPath indexPathForRow:i inSection:0];
+            [delecteArray addObject:indexpath];
+        }
+    }
+    [self.shoppingTableview deleteRowsAtIndexPaths:delecteArray withRowAnimation:UITableViewRowAnimationLeft];
+}
 
 
 

Lighting/Class/Tabbar/CustomTabbarController.m

@@ -19,11 +19,13 @@
 #import "CustomerOrderViewController.h"
 #import "UserViewController.h"
 #import "ChangePasswordViewController.h"
+#import "SearchViewController.h"
 
-@interface CustomTabbarController ()<TabbarButtonClickdelegate,ChangpasswordDelegate,CancelButtondelegate>
+
+
+@interface CustomTabbarController ()<TabbarButtonClickdelegate,ChangpasswordDelegate,CancelButtondelegate,UITextFieldDelegate>
 
 @property (nonatomic,strong) NSArray *identifierArray;
-@property (nonatomic,strong) NSArray *controllerArray;
 
 /**
  *  保存按钮引用
@@ -43,21 +45,13 @@
 {
     if (_identifierArray == nil) {
         
-        _identifierArray = [NSArray arrayWithObjects:@"shopping",@"Client",@"followheart",@"scenelibrary",@"productlibrary",@"customermanager",@"allcustomer",@"customerorder",@"about", nil];
+        _identifierArray = [NSArray arrayWithObjects:@"searchvc",@"shopping",@"Client",@"followheart",@"scenelibrary",@"productlibrary",@"customermanager",@"allcustomer",@"customerorder",@"about", nil];
     }
-    return _identifierArray
-    ;
+    return _identifierArray;
 }
 
 
-- (NSArray *)controllerArray
-{
-    if (_controllerArray == nil) {
-        
-        _controllerArray = [NSArray arrayWithObjects:@"ShoppingViewController",@"ClientViewController", nil];
-    }
-    return _controllerArray;
-}
+
 
 
 - (void)viewDidLoad {
@@ -75,6 +69,7 @@
     self.tabBar.frame = CGRectMake(Zero, Zero, ScreenWidth, NavigationHeight);
     Toolview *toolview = [[Toolview alloc]initWithFrame:CGRectMake(Zero, Zero, ScreenWidth, NavigationHeight)];
     toolview.delegate = self;
+    toolview.inputField.delegate = self;
     [self.tabBar addSubview:toolview];
     SHARED_APPDELEGATE.tabbar = self.tabBar;
 }
@@ -85,17 +80,19 @@
 {
     
     UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
-    ShoppingViewController *shoppingVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:0]];
-    ClientViewController *clientVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:1]];
-    FollowHeartViewController *followVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:2]];
-    SceneLibraryViewController *sceneVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:3]];
-    ProductLibraryViewController *productVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:4]];
-    CustomerManagementViewController *customerVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:5]];
-    AllCustomerViewController *allcustomerVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:6]];
-    CustomerOrderViewController *customerOrderVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:7]];
-    AboutViewController *aboutVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:8]];
+    SearchViewController *searchVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:0]];
+    ShoppingViewController *shoppingVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:1]];
+    ClientViewController *clientVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:2]];
+    FollowHeartViewController *followVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:3]];
+    SceneLibraryViewController *sceneVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:4]];
+    ProductLibraryViewController *productVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:5]];
+    CustomerManagementViewController *customerVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:6]];
+    AllCustomerViewController *allcustomerVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:7]];
+    CustomerOrderViewController *customerOrderVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:8]];
+    AboutViewController *aboutVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:9]];
     
     
+    UINavigationController *searchNav = [[UINavigationController alloc]initWithRootViewController:searchVC];
     UINavigationController *shoppingNav = [[UINavigationController alloc]initWithRootViewController:shoppingVC];
     UINavigationController *clientNav = [[UINavigationController alloc]initWithRootViewController:clientVC];
     UINavigationController *followNav = [[UINavigationController alloc]initWithRootViewController:followVC];
@@ -106,7 +103,7 @@
     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, nil];
+    NSArray *vcArray = [NSArray arrayWithObjects:aboutNav,cutomerorderNav,allcustomerNav,customerNav,productNav,sceneNav,followNav,clientNav,shoppingNav,searchNav, nil];
     self.viewControllers = vcArray;
     self.selectedIndex = 7;
 }
@@ -218,12 +215,34 @@
 - (void)QrcodeButtonClick
 {
     NSLog(@"二维码扫描");
-    
-    
+}
+
 
+
+#pragma mark -搜索框代理方法
+- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField
+{
+  self.selectedIndex = 9;
+    return YES;
+}
+
+
+#pragma mark -Search按钮
+- (BOOL)textFieldShouldReturn:(UITextField *)textField
+{
+    
+    //搜索
+    if (textField.text != nil) {
+        
+        [textField resignFirstResponder];
+        self.selectedIndex = 4;
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"SEARCHINPUTSTRING" object:textField.text];
+    }
+    return YES;
 }
 
 
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.

Lighting/Class/Tabbar/Toolview.h

@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
-@protocol TabbarButtonClickdelegate <NSObject>
+@protocol TabbarButtonClickdelegate <NSObject,UITextFieldDelegate>
 
 @required
 
@@ -34,4 +34,10 @@
  */
 @property (nonatomic,strong) UIView *underlineView;
 
+
+/**
+ *  搜索框
+ */
+@property (nonatomic,strong) UITextField *inputField;
+
 @end

Lighting/Class/Tabbar/Toolview.m

@@ -67,12 +67,12 @@
     
     
     //输入框
-    UITextField *inputField = [[UITextField alloc]initWithFrame:CGRectMake(45, 0, 170, 35)];
-    inputField.borderStyle = UITextBorderStyleNone;
-    inputField.placeholder = @"请输入关键字";
-    inputField.font = [UIFont systemFontOfSize:12];
-    [backView addSubview:inputField];
-    
+    self.inputField = [[UITextField alloc]initWithFrame:CGRectMake(45, 0, 170, 35)];
+    self.inputField.borderStyle = UITextBorderStyleNone;
+    self.inputField.placeholder = @"请输入关键字";
+    self.inputField.font = [UIFont systemFontOfSize:12];
+    self.inputField.returnKeyType = UIReturnKeySearch;
+    [backView addSubview:self.inputField];
     
     //扫描二维码
     UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -148,4 +148,10 @@
 
 
 
+
+
+
+
+
+
 @end

Lighting/Lighting.xcodeproj/project.pbxproj

@@ -74,7 +74,6 @@
 		299876361CD997F100C90D0A /* PersonInformationTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 299876351CD997F100C90D0A /* PersonInformationTableViewCell.m */; };
 		299876391CD9981800C90D0A /* GoodsInformationTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 299876381CD9981800C90D0A /* GoodsInformationTableViewCell.m */; };
 		2998763C1CD9983A00C90D0A /* CommodityListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2998763B1CD9983A00C90D0A /* CommodityListTableViewCell.m */; };
-		2998763F1CD9985B00C90D0A /* AttachmentInformationTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2998763E1CD9985B00C90D0A /* AttachmentInformationTableViewCell.m */; };
 		299876421CD99E4000C90D0A /* OrderdetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 299876411CD99E4000C90D0A /* OrderdetailsViewController.m */; };
 		299C7F5A1CE21FA800E7D7CB /* AddressViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 299C7F581CE21FA800E7D7CB /* AddressViewController.m */; };
 		299C7F5B1CE21FA800E7D7CB /* AddressViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 299C7F591CE21FA800E7D7CB /* AddressViewController.xib */; };
@@ -95,6 +94,11 @@
 		29C584E91CDA249300C6F677 /* ProductCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584E81CDA249200C6F677 /* ProductCollectionViewCell.m */; };
 		29C584ED1CDA429500C6F677 /* ProductDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584EC1CDA429500C6F677 /* ProductDetailsViewController.m */; };
 		29E28CE81CE0B91B00812A55 /* HENLENSONG.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E28CE71CE0B91B00812A55 /* HENLENSONG.m */; };
+		29E384BE1CE9933300888199 /* AdditionalTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E384BC1CE9933300888199 /* AdditionalTableViewCell.m */; };
+		29E384BF1CE9933300888199 /* AdditionalTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29E384BD1CE9933300888199 /* AdditionalTableViewCell.xib */; };
+		29E384C81CE9A8BF00888199 /* SearchCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E384C71CE9A8BF00888199 /* SearchCollectionViewCell.m */; };
+		29E384CB1CE9B0BB00888199 /* HotCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E384CA1CE9B0BB00888199 /* HotCollectionViewCell.m */; };
+		29E384D11CE9C65700888199 /* SearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E384D01CE9C65700888199 /* SearchViewController.m */; };
 		29EAAE8E1CDC3E8E00C4DBA2 /* BillingInfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29EAAE8D1CDC3E8E00C4DBA2 /* BillingInfoView.m */; };
 		29EAAE901CDC3E9700C4DBA2 /* BillingInfoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29EAAE8F1CDC3E9700C4DBA2 /* BillingInfoView.xib */; };
 		29EAAE951CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29EAAE941CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m */; };
@@ -235,8 +239,6 @@
 		299876381CD9981800C90D0A /* GoodsInformationTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GoodsInformationTableViewCell.m; sourceTree = "<group>"; };
 		2998763A1CD9983A00C90D0A /* CommodityListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommodityListTableViewCell.h; sourceTree = "<group>"; };
 		2998763B1CD9983A00C90D0A /* CommodityListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommodityListTableViewCell.m; sourceTree = "<group>"; };
-		2998763D1CD9985B00C90D0A /* AttachmentInformationTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AttachmentInformationTableViewCell.h; sourceTree = "<group>"; };
-		2998763E1CD9985B00C90D0A /* AttachmentInformationTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AttachmentInformationTableViewCell.m; sourceTree = "<group>"; };
 		299876401CD99E4000C90D0A /* OrderdetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderdetailsViewController.h; sourceTree = "<group>"; };
 		299876411CD99E4000C90D0A /* OrderdetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderdetailsViewController.m; sourceTree = "<group>"; };
 		299C7F571CE21FA800E7D7CB /* AddressViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddressViewController.h; sourceTree = "<group>"; };
@@ -274,6 +276,15 @@
 		29C584EC1CDA429500C6F677 /* ProductDetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductDetailsViewController.m; sourceTree = "<group>"; };
 		29E28CE61CE0B91B00812A55 /* HENLENSONG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HENLENSONG.h; sourceTree = "<group>"; };
 		29E28CE71CE0B91B00812A55 /* HENLENSONG.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HENLENSONG.m; sourceTree = "<group>"; };
+		29E384BB1CE9933300888199 /* AdditionalTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdditionalTableViewCell.h; sourceTree = "<group>"; };
+		29E384BC1CE9933300888199 /* AdditionalTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdditionalTableViewCell.m; sourceTree = "<group>"; };
+		29E384BD1CE9933300888199 /* AdditionalTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AdditionalTableViewCell.xib; sourceTree = "<group>"; };
+		29E384C61CE9A8BF00888199 /* SearchCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchCollectionViewCell.h; sourceTree = "<group>"; };
+		29E384C71CE9A8BF00888199 /* SearchCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchCollectionViewCell.m; sourceTree = "<group>"; };
+		29E384C91CE9B0BB00888199 /* HotCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HotCollectionViewCell.h; sourceTree = "<group>"; };
+		29E384CA1CE9B0BB00888199 /* HotCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotCollectionViewCell.m; sourceTree = "<group>"; };
+		29E384CF1CE9C65700888199 /* SearchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchViewController.h; sourceTree = "<group>"; };
+		29E384D01CE9C65700888199 /* SearchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchViewController.m; sourceTree = "<group>"; };
 		29EAAE8C1CDC3E8E00C4DBA2 /* BillingInfoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BillingInfoView.h; sourceTree = "<group>"; };
 		29EAAE8D1CDC3E8E00C4DBA2 /* BillingInfoView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BillingInfoView.m; sourceTree = "<group>"; };
 		29EAAE8F1CDC3E9700C4DBA2 /* BillingInfoView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BillingInfoView.xib; sourceTree = "<group>"; };
@@ -457,6 +468,7 @@
 		2928F7DD1CD085430036D761 /* Class */ = {
 			isa = PBXGroup;
 			children = (
+				29E384C01CE9A68F00888199 /* SearchController */,
 				29834EC11CDF768C001A484F /* XXuserController */,
 				2962D06E1CD1A56B0058829D /* RIghtVC */,
 				2962D06A1CD1A3FE0058829D /* MyClient */,
@@ -833,10 +845,11 @@
 				299876381CD9981800C90D0A /* GoodsInformationTableViewCell.m */,
 				2998763A1CD9983A00C90D0A /* CommodityListTableViewCell.h */,
 				2998763B1CD9983A00C90D0A /* CommodityListTableViewCell.m */,
-				2998763D1CD9985B00C90D0A /* AttachmentInformationTableViewCell.h */,
-				2998763E1CD9985B00C90D0A /* AttachmentInformationTableViewCell.m */,
 				29BB27661CD9D38E009A0813 /* AllpriceTableViewCell.h */,
 				29BB27671CD9D38E009A0813 /* AllpriceTableViewCell.m */,
+				29E384BB1CE9933300888199 /* AdditionalTableViewCell.h */,
+				29E384BC1CE9933300888199 /* AdditionalTableViewCell.m */,
+				29E384BD1CE9933300888199 /* AdditionalTableViewCell.xib */,
 			);
 			name = view;
 			sourceTree = "<group>";
@@ -963,6 +976,35 @@
 			name = Regularexpressions;
 			sourceTree = "<group>";
 		};
+		29E384C01CE9A68F00888199 /* SearchController */ = {
+			isa = PBXGroup;
+			children = (
+				29E384C51CE9A89F00888199 /* view */,
+				29E384C41CE9A89500888199 /* controller */,
+			);
+			name = SearchController;
+			sourceTree = "<group>";
+		};
+		29E384C41CE9A89500888199 /* controller */ = {
+			isa = PBXGroup;
+			children = (
+				29E384CF1CE9C65700888199 /* SearchViewController.h */,
+				29E384D01CE9C65700888199 /* SearchViewController.m */,
+			);
+			name = controller;
+			sourceTree = "<group>";
+		};
+		29E384C51CE9A89F00888199 /* view */ = {
+			isa = PBXGroup;
+			children = (
+				29E384C61CE9A8BF00888199 /* SearchCollectionViewCell.h */,
+				29E384C71CE9A8BF00888199 /* SearchCollectionViewCell.m */,
+				29E384C91CE9B0BB00888199 /* HotCollectionViewCell.h */,
+				29E384CA1CE9B0BB00888199 /* HotCollectionViewCell.m */,
+			);
+			name = view;
+			sourceTree = "<group>";
+		};
 		29EAAE911CDC412100C4DBA2 /* controller */ = {
 			isa = PBXGroup;
 			children = (
@@ -1155,6 +1197,7 @@
 				29A938271CDAE31B00F21E54 /* ProductDetailsHeaderView.xib in Resources */,
 				2908870C1CE5A308000B7097 /* DateSelectedViewController.xib in Resources */,
 				2942F8A81CDD80CE005B377E /* authenticateView.xib in Resources */,
+				29E384BF1CE9933300888199 /* AdditionalTableViewCell.xib in Resources */,
 				29807C651CD20F0F00F111B8 /* StoryboardwithCYX.storyboard in Resources */,
 				29EAAE901CDC3E9700C4DBA2 /* BillingInfoView.xib in Resources */,
 				29706DB71CD082990003C412 /* LaunchScreen.storyboard in Resources */,
@@ -1242,7 +1285,6 @@
 				29BB276C1CD9DE74009A0813 /* FollowHeartViewController.m in Sources */,
 				2928F8381CD09E730036D761 /* CustomButton.m in Sources */,
 				0470D6111CE2936000647F0F /* SeceneLibraryView.m in Sources */,
-				2998763F1CD9985B00C90D0A /* AttachmentInformationTableViewCell.m in Sources */,
 				293393551CD3379E000D997B /* ShoppingTableViewCell.m in Sources */,
 				2985AEA31CE72F1500704C91 /* NSObject+ZXPUnicode.m in Sources */,
 				29EAAE951CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m in Sources */,
@@ -1250,9 +1292,12 @@
 				2949BAC21CD3055A0049385A /* MMExampleDrawerVisualStateManager.m in Sources */,
 				292A14311CE81D1D00EB4430 /* AddressModel.m in Sources */,
 				29A938221CDADE4700F21E54 /* ProductDetailsTableViewCell.m in Sources */,
+				29E384BE1CE9933300888199 /* AdditionalTableViewCell.m in Sources */,
+				29E384C81CE9A8BF00888199 /* SearchCollectionViewCell.m in Sources */,
 				04A520411CE9365D001D4520 /* CustomPictureShowCell.m in Sources */,
 				2992493D1CDB3E8900786B1E /* GenerateOrdersModifyTableViewCell.m in Sources */,
 				29BB27741CD9DFAC009A0813 /* SceneLibraryViewController.m in Sources */,
+				29E384D11CE9C65700888199 /* SearchViewController.m in Sources */,
 				2928F8421CD0ABAC0036D761 /* ShoppingViewController.m in Sources */,
 				29698D611CE2C11500D72CE7 /* SettlementViewController.m in Sources */,
 				299876331CD997DF00C90D0A /* OrderInformationTableViewCell.m in Sources */,
@@ -1291,6 +1336,7 @@
 				299876391CD9981800C90D0A /* GoodsInformationTableViewCell.m in Sources */,
 				2949BABD1CD2EFA00049385A /* InformationTableViewCell.m in Sources */,
 				29706DB21CD082990003C412 /* Lighting.xcdatamodeld in Sources */,
+				29E384CB1CE9B0BB00888199 /* HotCollectionViewCell.m in Sources */,
 				29834EB91CDF1FB3001A484F /* screeningFirstView.m in Sources */,
 				299249401CDB4D1D00786B1E /* AddaddressViewController.m in Sources */,
 				060D397D1CE45CFE0082AECD /* UIImage+Rotation.m in Sources */,
@@ -1471,7 +1517,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "1984600d-9582-4f80-b666-2975a03aee8f";
+				PROVISIONING_PROFILE = "f89bebf5-81e2-4c61-9052-8c7bb0f9ddd6";
 				STRIP_PNG_TEXT = NO;
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
 			};
@@ -1523,7 +1569,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "1984600d-9582-4f80-b666-2975a03aee8f";
+				PROVISIONING_PROFILE = "f89bebf5-81e2-4c61-9052-8c7bb0f9ddd6";
 				STRIP_PNG_TEXT = NO;
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
 			};

Lighting/Lighting/StoryboardwithCYX.storyboard

@@ -16,7 +16,7 @@
                                 <rect key="frame" x="24" y="88" width="721" height="176"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 <subviews>
-                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="当前" id="3z6-rk-Y7U">
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="now" id="3z6-rk-Y7U">
                                         <rect key="frame" x="19" y="14" width="100" height="100"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     </imageView>
@@ -153,7 +153,7 @@
                                                 <rect key="frame" x="0.0" y="28" width="721" height="100"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NV8-I4-ig4" id="E0m-wU-1b5">
-                                                    <rect key="frame" x="0.0" y="0.0" width="721" height="99"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="721" height="99.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="F66-vh-va3">
@@ -424,7 +424,7 @@
                                                 <rect key="frame" x="0.0" y="28" width="717" height="100"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1Sl-4a-xI0" id="Kls-Lg-VEy">
-                                                    <rect key="frame" x="0.0" y="0.0" width="717" height="99"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="717" height="99.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="mhA-C1-oB5">
@@ -522,7 +522,7 @@
                                                 <rect key="frame" x="0.0" y="128" width="717" height="200"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1pL-BK-mae" id="zJa-bo-n5G">
-                                                    <rect key="frame" x="0.0" y="0.0" width="717" height="199"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="717" height="199.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="下单时间：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="DqG-UR-Q08">
@@ -734,10 +734,10 @@
                                 <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="50" width="768" height="84"/>
+                                        <rect key="frame" x="0.0" y="49.5" width="768" 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="768" height="83"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="83.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单编号：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="KGm-XJ-NyV">
@@ -755,21 +755,21 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单状态：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="LJH-My-fYu">
-                                                    <rect key="frame" x="438" y="16" width="72" height="21"/>
+                                                    <rect key="frame" x="356" y="16" width="72" 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="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wKm-gk-gw9">
-                                                    <rect key="frame" x="438" y="45" width="72" height="21"/>
+                                                    <rect key="frame" x="356" y="45" width="72" 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="KRu-MV-9ja">
-                                                    <rect key="frame" x="85" y="16" width="220" height="21"/>
+                                                    <rect key="frame" x="85" y="16" width="200" height="21"/>
                                                     <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"/>
@@ -777,7 +777,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9E7-7Q-pDg">
-                                                    <rect key="frame" x="85" y="45" width="220" height="21"/>
+                                                    <rect key="frame" x="85" y="45" width="200" height="21"/>
                                                     <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"/>
@@ -785,7 +785,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="P0Z-vW-TbV">
-                                                    <rect key="frame" x="507" y="45" width="220" height="21"/>
+                                                    <rect key="frame" x="423" y="45" width="200" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" 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"/>
@@ -793,7 +793,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="02b-vz-geR">
-                                                    <rect key="frame" x="507" y="16" width="220" height="21"/>
+                                                    <rect key="frame" x="423" y="16" width="200" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" 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"/>
@@ -810,116 +810,86 @@
                                             <outlet property="orderTime" destination="9E7-7Q-pDg" id="QXm-nI-FOa"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="160" id="rIO-yd-hh7" customClass="PersonInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="134" width="768" height="160"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="135" id="rIO-yd-hh7" customClass="PersonInformationTableViewCell">
+                                        <rect key="frame" x="0.0" y="133.5" width="768" height="135"/>
                                         <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="768" height="159"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="134.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="Zdg-s0-xfD">
-                                                    <rect key="frame" x="10" y="22" width="100" height="100"/>
+                                                    <rect key="frame" x="10" y="21" width="100" height="100"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="客服姓名：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Tzd-LN-3hN">
-                                                    <rect key="frame" x="128" y="20" width="72" height="21"/>
+                                                    <rect key="frame" x="128" y="19" width="72" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" 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="86V-EZ-5eX">
-                                                    <rect key="frame" x="202" y="20" width="220" height="21"/>
+                                                    <rect key="frame" x="202" y="19" width="150" height="21"/>
                                                     <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"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公司名称：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="vaK-nC-edT">
-                                                    <rect key="frame" x="128" y="54" width="72" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公司名称：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="vaK-nC-edT">
+                                                    <rect key="frame" x="392" y="53" width="72" 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="oql-Lw-B2F">
-                                                    <rect key="frame" x="202" y="54" width="220" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <rect key="frame" x="456" y="53" width="150" height="21"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" 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"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="电子邮箱：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9Fh-M7-bsX">
-                                                    <rect key="frame" x="128" y="87" width="72" height="21"/>
+                                                    <rect key="frame" x="128" y="53" width="72" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" 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="UjT-mZ-vKF">
-                                                    <rect key="frame" x="202" y="87" width="220" height="21"/>
+                                                    <rect key="frame" x="202" y="53" width="150" height="21"/>
                                                     <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"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公司地址：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6Oc-nC-sbX">
-                                                    <rect key="frame" x="128" y="119" width="72" height="21"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="客户地址：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dlJ-QJ-ggP">
+                                                    <rect key="frame" x="128" y="87.5" width="72" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" 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="PWQ-7c-cLv">
-                                                    <rect key="frame" x="202" y="119" width="220" height="21"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="TDA-d4-cxP">
+                                                    <rect key="frame" x="202" y="87.5" width="150" height="21"/>
                                                     <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"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机号码：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="KzM-cH-slK">
-                                                    <rect key="frame" x="458" y="20" width="72" height="21"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机号码：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="KzM-cH-slK">
+                                                    <rect key="frame" x="392" y="19" width="72" 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="A8m-f4-VJE">
-                                                    <rect key="frame" x="522" y="20" width="220" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" 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"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="电话号码：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="TFi-o1-EQZ">
-                                                    <rect key="frame" x="458" y="54" width="72" 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="o27-yq-173">
-                                                    <rect key="frame" x="522" y="54" width="220" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" 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"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="QQ：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="zjc-aH-s2N">
-                                                    <rect key="frame" x="458" y="87" width="72" 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="gp2-tJ-E6d">
-                                                    <rect key="frame" x="522" y="87" width="220" height="21"/>
+                                                    <rect key="frame" x="456" y="19" width="150" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" 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"/>
@@ -929,47 +899,29 @@
                                             </subviews>
                                         </tableViewCellContentView>
                                         <connections>
-                                            <outlet property="companyLocation" destination="PWQ-7c-cLv" id="Pmv-wv-0c2"/>
                                             <outlet property="companyName" destination="oql-Lw-B2F" id="BuX-in-oFM"/>
                                             <outlet property="customerHeader" destination="Zdg-s0-xfD" id="Q2Q-ff-q8T"/>
                                             <outlet property="customerName" destination="86V-EZ-5eX" id="Paa-1D-l0z"/>
-                                            <outlet property="customerNumbers" destination="o27-yq-173" id="PFg-A7-TyE"/>
                                             <outlet property="customerPhoneNumber" destination="A8m-f4-VJE" id="2iI-No-miD"/>
-                                            <outlet property="customerQQNumber" destination="gp2-tJ-E6d" id="Ksk-k4-SdV"/>
                                             <outlet property="emailName" destination="UjT-mZ-vKF" id="sFM-31-WAC"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="thirdcell" rowHeight="110" id="PfN-24-v5t" customClass="GoodsInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="294" width="768" height="110"/>
+                                    <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="268.5" width="768" 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="768" height="109"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="89.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货人：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="tiK-JC-Jy4">
-                                                    <rect key="frame" x="10" y="13" width="72" height="21"/>
+                                                    <rect key="frame" x="10" y="15" width="72" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" 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="986-lZ-CBG">
-                                                    <rect key="frame" x="84" y="13" width="220" height="21"/>
-                                                    <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"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="电子邮箱：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dwN-Ub-Hvl">
-                                                    <rect key="frame" x="10" y="45" width="72" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" 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="OV3-et-lKC">
-                                                    <rect key="frame" x="84" y="45" width="220" height="21"/>
+                                                    <rect key="frame" x="84" y="15" width="150" height="21"/>
                                                     <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"/>
@@ -977,14 +929,14 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="详细地址：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="w2h-gH-VzA">
-                                                    <rect key="frame" x="10" y="75" width="72" height="21"/>
+                                                    <rect key="frame" x="10" y="52" width="72" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" 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="Dse-ts-588">
-                                                    <rect key="frame" x="84" y="75" width="220" height="21"/>
+                                                    <rect key="frame" x="84" y="52" width="150" height="21"/>
                                                     <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"/>
@@ -992,29 +944,14 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机号码：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="GVz-ai-sbo">
-                                                    <rect key="frame" x="435" y="13" width="72" height="21"/>
+                                                    <rect key="frame" x="349" y="15" width="72" 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="QN6-xa-fnt">
-                                                    <rect key="frame" x="501" y="13" width="220" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" 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"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="物流公司：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="HnV-1G-5rb">
-                                                    <rect key="frame" x="435" y="45" width="72" 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="T6k-Gc-WOR">
-                                                    <rect key="frame" x="501" y="45" width="220" height="21"/>
+                                                    <rect key="frame" x="413" y="15" width="150" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" 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"/>
@@ -1027,15 +964,13 @@
                                             <outlet property="consigneeName" destination="986-lZ-CBG" id="83a-Ph-kzk"/>
                                             <outlet property="consigneePhoneNumber" destination="QN6-xa-fnt" id="eSt-0s-rLB"/>
                                             <outlet property="detailsAddress" destination="Dse-ts-588" id="bZr-mK-aIR"/>
-                                            <outlet property="emailName" destination="OV3-et-lKC" id="3iU-Uu-zeC"/>
-                                            <outlet property="logisticsCompany" destination="T6k-Gc-WOR" id="TCd-lh-9T0"/>
                                         </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="404" width="768" height="80"/>
+                                        <rect key="frame" x="0.0" y="358.5" width="768" 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="768" height="79"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="79.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="6MS-gq-TMk">
@@ -1092,71 +1027,11 @@
                                             <outlet property="totalPrice" destination="lQS-PG-Dws" id="NuP-hS-GiX"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fifthcell" rowHeight="75" id="9Yp-o4-Cqr" customClass="AttachmentInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="484" width="768" height="75"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9Yp-o4-Cqr" id="ySo-v9-ySh">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="74"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="是否开票：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6DE-cf-UgR">
-                                                    <rect key="frame" x="14" y="13" width="72" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" 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="cWF-kD-nZB">
-                                                    <rect key="frame" x="88" y="13" width="220" height="21"/>
-                                                    <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"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="发票抬头：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Vqr-rQ-bnY">
-                                                    <rect key="frame" x="14" y="45" width="72" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" 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="We2-8n-YH5">
-                                                    <rect key="frame" x="88" y="45" width="220" height="21"/>
-                                                    <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"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="发票类型：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="pkT-Kj-Zi3">
-                                                    <rect key="frame" x="430" y="13" 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="PVm-t1-O0N">
-                                                    <rect key="frame" x="492" y="13" width="220" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" 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"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                        <connections>
-                                            <outlet property="InvoiceHeader" destination="We2-8n-YH5" id="oxq-hh-qIQ"/>
-                                            <outlet property="invoicetype" destination="PVm-t1-O0N" id="y5q-Lq-qg9"/>
-                                            <outlet property="whetherInvoice" destination="cWF-kD-nZB" id="y0u-Iv-jGd"/>
-                                        </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="559" width="768" height="50"/>
+                                        <rect key="frame" x="0.0" y="438.5" width="768" 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="768" height="49"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="49.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总数量：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="rbZ-Pg-7Uu">
@@ -1313,7 +1188,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="64" width="300" height="300"/>
+                                        <rect key="frame" x="0.0" y="0.0" 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"/>
@@ -1389,7 +1264,7 @@
                                         <rect key="frame" x="0.0" y="28" 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"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="169.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" id="2bG-Ip-ptr">
@@ -1781,7 +1656,7 @@
                                                 <rect key="frame" x="0.0" y="28" width="717" height="80"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZT1-XJ-ObI" id="GWp-Jl-7br">
-                                                    <rect key="frame" x="0.0" y="0.0" width="717" height="79"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="717" height="79.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="PkJ-eJ-ksY">
@@ -1933,6 +1808,7 @@
                                         <state key="selected" backgroundImage="bg"/>
                                         <connections>
                                             <action selector="allSelectedButtonClick:" destination="4Ho-ZE-RT8" eventType="touchUpInside" id="MEh-UA-hfY"/>
+                                            <action selector="delecteSelectedGoods:" destination="4Ho-ZE-RT8" eventType="touchUpInside" id="Ylw-dW-E2P"/>
                                         </connections>
                                     </button>
                                 </subviews>
@@ -1970,7 +1846,7 @@
                                         <rect key="frame" x="0.0" y="28" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LsY-i0-h5H" id="dPG-p9-V2i">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="139.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="qWT-p0-Gta">
@@ -2067,7 +1943,7 @@
                                         <rect key="frame" x="0.0" y="168" width="768" height="56"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gfQ-UE-mXV" id="za6-HU-VEw">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="55"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="55.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机号码：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="X0Z-8j-BdI">
@@ -2138,7 +2014,7 @@
                                         <rect key="frame" x="0.0" y="224" width="768" height="56"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kk4-Fh-HhL" id="oRX-7p-HkY">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="55"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="55.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="m0f-EW-LM5">
@@ -2169,7 +2045,7 @@
                                         <rect key="frame" x="0.0" y="280" width="768" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="G7o-xS-1mB" id="l3e-TL-GCT">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="79"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="79.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="Un4-g0-sG6">
@@ -2230,7 +2106,7 @@
                                         <rect key="frame" x="0.0" y="360" width="768" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6K9-mc-7RW" id="Vc7-f6-wGb">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="49"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="49.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总数量：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ULe-0J-pCd">
@@ -3151,7 +3027,137 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="8E8-73-1D6" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1802" y="10781"/>
+            <point key="canvasLocation" x="1824" y="10773"/>
+        </scene>
+        <!--Search View Controller-->
+        <scene sceneID="SAN-zD-zdn">
+            <objects>
+                <viewController storyboardIdentifier="searchvc" id="O7j-UZ-n6W" customClass="SearchViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="v3k-z6-eR6">
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="fmC-jg-sSJ">
+                                <rect key="frame" x="434" y="170" width="260" height="720"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/>
+                                <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="qxJ-mL-6DU">
+                                    <size key="itemSize" width="100" height="47"/>
+                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                </collectionViewFlowLayout>
+                                <cells>
+                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="secondcell" id="OVG-fE-V0o" customClass="HotCollectionViewCell">
+                                        <rect key="frame" x="0.0" y="64" width="100" height="44"/>
+                                        <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="100" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="历史记录1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SUW-Fc-3HB">
+                                                    <rect key="frame" x="0.0" y="0.0" width="100" height="44"/>
+                                                    <autoresizingMask key="autoresizingMask" 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>
+                                            </subviews>
+                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        </view>
+                                        <size key="customSize" width="100" height="44"/>
+                                    </collectionViewCell>
+                                </cells>
+                            </collectionView>
+                            <view contentMode="scaleToFill" id="uLp-CP-X3K">
+                                <rect key="frame" x="73" y="109" width="260" height="56"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="历史记录" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="YVx-DV-62P">
+                                        <rect key="frame" x="17" y="17" width="93" height="21"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                        <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="9SH-x3-JKz">
+                                        <rect key="frame" x="215" y="12" width="30" height="30"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES"/>
+                                        <state key="normal" backgroundImage="Trash"/>
+                                    </button>
+                                    <view contentMode="scaleToFill" id="3Pe-8k-bNM">
+                                        <rect key="frame" x="0.0" y="55" width="260" height="1"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                        <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                            </view>
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="dkI-Sw-rjp">
+                                <rect key="frame" x="73" y="170" width="260" height="720"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
+                                <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="w9P-dR-D2U">
+                                    <size key="itemSize" width="100" height="45"/>
+                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                </collectionViewFlowLayout>
+                                <cells>
+                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="firstcell" id="TyQ-BP-sej" customClass="SearchCollectionViewCell">
+                                        <rect key="frame" x="0.0" y="0.0" width="100" height="44"/>
+                                        <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="100" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="历史记录1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yra-Bz-UVB">
+                                                    <rect key="frame" x="0.0" y="0.0" width="100" height="44"/>
+                                                    <autoresizingMask key="autoresizingMask" 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>
+                                            </subviews>
+                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        </view>
+                                        <size key="customSize" width="100" height="44"/>
+                                    </collectionViewCell>
+                                </cells>
+                            </collectionView>
+                            <view contentMode="scaleToFill" id="EZT-Z4-kEm">
+                                <rect key="frame" x="434" y="109" width="260" height="56"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxY="YES"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门推荐" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="eml-2P-FJH">
+                                        <rect key="frame" x="8" y="17" width="93" height="21"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                        <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <view contentMode="scaleToFill" id="795-wl-DBK">
+                                        <rect key="frame" x="0.0" y="55" width="260" height="1"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                        <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" red="0.95686274509803915" green="0.95686274509803915" blue="0.95686274509803915" alpha="1" colorSpace="calibratedRGB"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="mM9-x7-9tC"/>
+                    <connections>
+                        <outlet property="historyCollectionView" destination="dkI-Sw-rjp" id="szM-LJ-jg4"/>
+                        <outlet property="historyLayout" destination="w9P-dR-D2U" id="q4z-VS-6q1"/>
+                        <outlet property="hotCollectionView" destination="fmC-jg-sSJ" id="X0D-jG-7QN"/>
+                        <outlet property="hotCollectionviewLayout" destination="qxJ-mL-6DU" id="p1S-aO-pfn"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="kbn-xT-vMd" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1824" y="11931"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="mef-so-Hgk">
@@ -3171,6 +3177,24 @@
             </objects>
             <point key="canvasLocation" x="822" y="10781"/>
         </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="fM8-Mo-DKe">
+            <objects>
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="CNH-ve-5Ur" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="me5-6f-x6e">
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="O7j-UZ-n6W" kind="relationship" relationship="rootViewController" id="EDd-h0-Ffg"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="ZWx-jL-qrI" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="832" y="11891"/>
+        </scene>
     </scenes>
     <resources>
         <image name="05产品库-详情_03" width="500" height="375"/>
@@ -3178,7 +3202,7 @@
         <image name="bg" width="26" height="26"/>
         <image name="box-副本" width="26" height="26"/>
         <image name="line" width="301" height="30"/>
-        <image name="当前" width="29" height="30"/>
+        <image name="now" width="110" height="110"/>
         <image name="视角" width="27" height="28"/>
     </resources>
 </document>

Lighting/Tools/BaseViewController.m

@@ -11,6 +11,7 @@
 @interface BaseViewController ()<UIPrintInteractionControllerDelegate>
 
 @property (nonatomic,strong) MBProgressHUD*TCHud;
+@property (nonatomic,strong) UIWebView *webView;
 
 @end
 
@@ -31,10 +32,22 @@
     return _TCHud;
 }
 
+
+- (UIWebView *)webView
+{
+    if (_webView == nil) {
+        
+        _webView = [[UIWebView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, ScreenHeight)];
+    }
+    return _webView;
+}
+
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    self.automaticallyAdjustsScrollViewInsets = NO; 
+    self.automaticallyAdjustsScrollViewInsets = NO;
+    self.view.backgroundColor = [UIColor whiteColor];
 }
 
 - (void)didReceiveMemoryWarning {
@@ -181,4 +194,59 @@
 }
 
 
+
+
+
+#pragma mark 调用airPrint无线打印机
+- (void)callAirprintWithURL:(NSURL *)datasurl
+{
+//    NSData *mypdfdata = [NSData dataWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"The Swift Programming Language 中文版 - v1.2" ofType:@"pdf"]];
+    
+    
+    UIPrintInteractionController *pic = [UIPrintInteractionController sharedPrintController];
+
+        pic.delegate = self;
+        [self.webView loadRequest:[NSURLRequest requestWithURL:datasurl]];//网页
+        pic.printFormatter = [self.webView viewPrintFormatter];//布局打印视图绘制的内容。
+        
+        UIPrintInfo *printInfo = [UIPrintInfo printInfo];
+        printInfo.outputType = UIPrintInfoOutputGeneral;
+        printInfo.jobName = @"订单明细";
+        printInfo.duplex = UIPrintInfoDuplexLongEdge;
+        pic.printInfo = printInfo;
+        pic.showsPageRange = YES;
+//        pic.printingItem = mypdfdata;
+    
+    
+        void (^completionHandler)(UIPrintInteractionController *, BOOL, NSError *) =
+        ^(UIPrintInteractionController *pic, BOOL completed, NSError *error) {
+            if (!completed && error)
+                NSLog(@"FAILED! due to error in domain %@ with error code %ld",
+                      error.domain, error.code);
+        };
+        if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+            
+            [pic presentAnimated:YES completionHandler:completionHandler];
+        } else {
+            [pic presentAnimated:YES completionHandler:completionHandler];
+        }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 @end

Lighting/Tools/PopoverViewController.h

@@ -15,6 +15,8 @@
 @protocol ReturnTableviewcellIndexpathdelegate <NSObject>
 
 
+@optional
+
 /**
  *  选中筛选条件对象typecode
  *
@@ -63,5 +65,10 @@
 @property (nonatomic,assign) NSInteger Selectedindex;
 
 
+/**
+ *  是否传入数据源，结构为内嵌字符串
+ */
+@property (nonatomic,assign) BOOL isString;
+
 
 @end

Lighting/Tools/PopoverViewController.m

@@ -54,7 +54,12 @@
         cell.imageView.image = TCImage([self.datasArray objectAtIndex_opple:indexPath.row]);
         return cell;
     }
-    cell.textLabel.text = [[self.datasArray objectAtIndex_opple:indexPath.row] typename];
+    if (self.isString) {
+        cell.textLabel.text = [self.datasArray objectAtIndex_opple:indexPath.row];
+    }else
+    {
+       cell.textLabel.text = [[self.datasArray objectAtIndex_opple:indexPath.row] typename];
+    }
     cell.textLabel.textAlignment = NSTextAlignmentCenter;
     cell.textLabel.font = [UIFont systemFontOfSize:12];
     return cell;
@@ -75,7 +80,6 @@
         if ([self.delegate respondsToSelector:@selector(returnWithIndexSelected:)]) {
             
             
-            
             [self.delegate returnWithIndexSelected:indexPath.row];
         }
     }else
@@ -83,7 +87,15 @@
         if ([self.delegate respondsToSelector:@selector(returnCellindexpathwithrow:WithcellTitle:Withselected:)]) {
             
             
-            [self.delegate returnCellindexpathwithrow:[[self.datasArray objectAtIndex_opple:indexPath.row] typecode] WithcellTitle:[[self.datasArray objectAtIndex_opple:indexPath.row] typename] Withselected:_Selectedindex];
+            //判断是为纯字符串选中
+            if (self.isString) {
+                [self.delegate returnCellindexpathwithrow:[self.datasArray objectAtIndex_opple:indexPath.row] WithcellTitle:[self.datasArray objectAtIndex_opple:indexPath.row] Withselected:_Selectedindex];
+                
+            }else
+                
+            {
+              [self.delegate returnCellindexpathwithrow:[[self.datasArray objectAtIndex_opple:indexPath.row] typecode] WithcellTitle:[[self.datasArray objectAtIndex_opple:indexPath.row] typename] Withselected:_Selectedindex];
+            }
         }
     }    
 }