caoyunxiao

Lighting/Class/AllCustomerViewController.h

@@ -33,9 +33,42 @@
 @property (weak, nonatomic) IBOutlet UIButton *enddateButton;
 
 
+
 /**
  *  所有客户tableview
  */
 @property (weak, nonatomic) IBOutlet UITableView *allCustomerTableview;
+
+
+/**
+ *  至
+ */
+@property (weak, nonatomic) IBOutlet UILabel *redesignLabe;
+
+
+/**
+ *  最近到访时间:
+ */
+@property (weak, nonatomic) IBOutlet UILabel *RecentlydateLabe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 @end

Lighting/Class/AllCustomerViewController.m

@@ -8,19 +8,38 @@
 
 #import "AllCustomerViewController.h"
 #import "AllCutomerTableViewCell.h"
+#import "DateSelectedViewController.h"
+#import "MyclientEntityModel.h"
+@interface AllCustomerViewController ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate>
 
-
-@interface AllCustomerViewController ()<UITableViewDelegate,UITableViewDataSource>
-
+/**
+ *  数据源
+ */
+@property (nonatomic,strong) NSMutableArray *CustomerresultArray;
 @end
 
 @implementation AllCustomerViewController
 
+
+/**
+ *  初始化客户数据源
+ */
+- (NSMutableArray *)CustomerresultArray
+{
+    if (_CustomerresultArray == nil) {
+        
+        _CustomerresultArray = [NSMutableArray array];
+    }
+    return _CustomerresultArray;
+}
+
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     
     [self uiConfigAction];
+    [self getShoppersAssociatedCustomer];
     
 }
 
@@ -28,24 +47,112 @@
 #pragma mark -UI
 - (void)uiConfigAction
 {
+    
     self.allCustomerTableview.dataSource = self;
     self.allCustomerTableview.delegate = self;
+    self.searchTextfield.delegate = self;
+    self.searchTextfield.returnKeyType = UIReturnKeySearch;
+    
+    //调整布局
+    [self.begindateButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.left.equalTo(self.RecentlydateLabe.mas_right).mas_offset(0);
+        make.top.equalTo(self.RecentlydateLabe).mas_offset(-4);
+        make.width.mas_offset(120);
+    }];
+    [self.redesignLabe mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.left.equalTo(self.begindateButton.mas_right).mas_offset(10);
+        make.top.equalTo(self.RecentlydateLabe).mas_offset(2);
+        make.width.mas_offset(20);
+    }];
+    [self.enddateButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.left.equalTo(self.redesignLabe.mas_right).mas_offset(10);
+        make.top.equalTo(self.RecentlydateLabe).mas_offset(-4);
+        make.width.mas_offset(120);
+    }];
+    
+    //设置按钮时间
+    [self.begindateButton setTitle:[self dateAsString:[NSDate date]] forState:UIControlStateNormal];
+    [self.enddateButton setTitle:[self dateAsString:[NSDate date]] forState:UIControlStateNormal];
+    
+    
+    self.begindateButton.layer.masksToBounds = YES;
+    self.begindateButton.layer.cornerRadius = 10;
+    self.enddateButton.layer.masksToBounds = YES;
+    self.enddateButton.layer.cornerRadius = 10;
+}
+
+
+
+#pragma mark -获取导购关联客户
+- (void)getShoppersAssociatedCustomer
+{
+    
+    [self CreateMBProgressHUDLoding];
+    ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init];
+    DataPage *page = [[DataPage alloc]init];
+    page.page = 0;
+    condition.page = page;
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/consumer/query"] WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
+        
+        [self RemoveMBProgressHUDLoding];
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            
+            ConsumerPageResult *Customerresult = [[ConsumerPageResult alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            for (TOConsumerEntity *objc in Customerresult.results) {
+                
+                MyclientEntityModel *myclientModel = [[MyclientEntityModel alloc]init];
+                myclientModel.fid = objc.fid;
+                myclientModel.createName = objc.createName;
+                myclientModel.createBy = objc.createBy;
+                myclientModel.createDate = objc.createDate;
+                myclientModel.sysOrgCode = objc.sysOrgCode;
+                myclientModel.name = objc.name;
+                myclientModel.mobile = objc.mobile;
+                myclientModel.province = objc.province;
+                myclientModel.city = objc.city;
+                myclientModel.country = objc.country;
+                myclientModel.address = objc.address;
+                myclientModel.picture = objc.picture;
+                myclientModel.lastVisitedTime = objc.lastVisitedTime;
+                
+                [self.CustomerresultArray addObject:myclientModel];
+            }
+            
+            [self.allCustomerTableview reloadData];
+        }
+        else
+        {
+            [self ErrorMBProgressView:returnValue[@"message"]];
+        }
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        
+        
+    } WithFailureBlock:^(id error) {
+        
+        [self RemoveMBProgressHUDLoding];
+    }];
 }
 
 
+
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     AllCutomerTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"allcustomercell" forIndexPath:indexPath];
     cell.contentBackView.layer.masksToBounds = YES;
     cell.contentBackView.layer.cornerRadius = kCornerRadius;
     cell.backgroundColor = [UIColor clearColor];
+    cell.Model = [self.CustomerresultArray objectAtIndex_opple:indexPath.row];
     
     return cell;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    return 10;
+    return self.CustomerresultArray.count;
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
 {
@@ -54,7 +161,180 @@
 
 
 
+#pragma mark -开始筛选时间
+- (IBAction)StartscreeningButtonClick:(UIButton *)sender {
+    
+    DateSelectedViewController *datevc = [[DateSelectedViewController alloc]init];
+    //选中时间回调
+    [datevc setSelectedDateBlock:^(NSDate *selectedDate) {
+        
+        [self.begindateButton setTitle:[self dateAsString:selectedDate] forState:UIControlStateNormal];
+        [self CalltimeSearch];
+    }];
+    
+    datevc.preferredContentSize = CGSizeMake(300, 250);
+    datevc.modalPresentationStyle = UIModalPresentationFormSheet;
+    UIPopoverPresentationController *pop = datevc.popoverPresentationController;
+    pop.permittedArrowDirections = UIPopoverArrowDirectionAny;
+    pop.sourceView = datevc.view;
+    [self presentViewController:datevc animated:YES completion:nil];
+}
+
+
+#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;
+    
+}
+
+#pragma mark -结束筛选时间
+- (IBAction)EndscreeningButtonClick:(UIButton *)sender {
+    
+    
+    DateSelectedViewController *datevc = [[DateSelectedViewController alloc]init];
+    //选中时间回调
+    [datevc setSelectedDateBlock:^(NSDate *selectedDate) {
+        
+        [self.enddateButton setTitle:[self dateAsString:selectedDate] forState:UIControlStateNormal];
+        [self CalltimeSearch];
+        
+    }];
+    datevc.preferredContentSize = CGSizeMake(300, 250);
+    datevc.modalPresentationStyle = UIModalPresentationFormSheet;
+    UIPopoverPresentationController *pop = datevc.popoverPresentationController;
+    pop.permittedArrowDirections = UIPopoverArrowDirectionAny;
+    pop.sourceView = datevc.view;
+    [self presentViewController:datevc animated:YES completion:nil];
+}
+
+
+#pragma mark -调用时间段搜索
+- (void)CalltimeSearch
+{
+    NSString *startString = self.begindateButton.currentTitle;
+    NSString *endString = self.enddateButton.currentTitle;
+    NSDateFormatter* formater = [[NSDateFormatter alloc] init];
+    [formater setDateFormat:@"yyyy-MM-dd"];
+    NSDate* date = [formater dateFromString:startString];
+    [formater setDateFormat:@"yyyy-MM-dd"];
+    NSDate* date1 = [formater dateFromString:endString];
+    
+    //比较结果
+    NSInteger result = [self compareOneDay:date withAnotherDay:date1];
+    ConsumerQueryCondition *searchCustomer = [[ConsumerQueryCondition alloc]init];
+    DataPage *page = [[DataPage alloc]init];
+    page.page = 0;
+    searchCustomer.page = page;
+
+    //比较两个NSDate的大小
+    switch (result) {
+        case -1://start < end
+        {
+            [formater setDateFormat:@"yyyy-MM-dd HH:dd:ss"];
+            searchCustomer.createTimeBegin = [formater stringFromDate:date];
+            searchCustomer.createTimeEnd = [formater stringFromDate:date1];
+        }
+            break;
+        case 0://start == end
+        {
+            [formater setDateFormat:@"yyyy-MM-dd HH:dd:ss"];
+            searchCustomer.createTimeBegin = [formater stringFromDate:date];
+            searchCustomer.createTimeEnd = [formater stringFromDate:date1];
+        }
+            break;
+        case 1://start > end
+        {
+            [formater setDateFormat:@"yyyy-MM-dd HH:dd:ss"];
+            searchCustomer.createTimeBegin = [formater stringFromDate:date1];
+            searchCustomer.createTimeEnd = [formater stringFromDate:date];
+        }
+            break;
+            
+        default:
+            break;
+    }
+    
+    [self searchCustomerInforMation:searchCustomer];
+}
+
+
+#pragma mark -比较两个NSDate的大小
+- (int)compareOneDay:(NSDate *)oneDay withAnotherDay:(NSDate *)anotherDay
+{
+    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+    [dateFormatter setDateFormat:@"yyyy-MM-dd"];
+    NSString *oneDayStr = [dateFormatter stringFromDate:oneDay];
+    NSString *anotherDayStr = [dateFormatter stringFromDate:anotherDay];
+    NSDate *dateA = [dateFormatter dateFromString:oneDayStr];
+    NSDate *dateB = [dateFormatter dateFromString:anotherDayStr];
+    NSComparisonResult result = [dateA compare:dateB];
+    NSLog(@"date1 : %@, date2 : %@", oneDay, anotherDay);
+    if (result == NSOrderedDescending) {
+        //NSLog(@"Date1  is in the future");
+        return 1;
+    }
+    else if (result == NSOrderedAscending){
+        //NSLog(@"Date1 is in the past");
+        return -1;
+    }
+    //NSLog(@"Both dates are the same");
+    return 0;
+    
+}
+
+#pragma mark -Return键检测
+- (BOOL)textFieldShouldReturn:(UITextField *)textField
+{
+    [textField resignFirstResponder];
+    
+    ConsumerQueryCondition *searchCustomer = [[ConsumerQueryCondition alloc]init];
+    DataPage *page = [[DataPage alloc]init];
+    page.page = 0;
+    searchCustomer.page = page;
+    searchCustomer.nameEquals = self.searchTextfield.text;
+    searchCustomer.mobileEquals = self.searchTextfield.text;
+    
+    if (self.searchTextfield.text.length == 0) {
+        
+        [self ErrorMBProgressView:@"搜索信息不能为空"];
+        return YES;
+    }
+    [self searchCustomerInforMation:searchCustomer];
+    return YES;
+}
+
+#pragma amrk -搜索客户信息
+- (void)searchCustomerInforMation:(ConsumerQueryCondition *)Condition
+{
+
+    
+    [self CreateMBProgressHUDLoding];
+    //request
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/consumer/query"] WithRequestType:0 WithParameter:Condition WithReturnValueBlock:^(id returnValue) {
+        
+        [self RemoveMBProgressHUDLoding];
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            
+            ConsumerPageResult *result = [[ConsumerPageResult alloc]initWithDictionary:returnValue error:nil];
+            NSLog(@"%@",result);
+            [self SuccessMBProgressView:@"成功"];
+        }
+        else
+        {
+            [self ErrorMBProgressView:returnValue[@"message"]];
+        }
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        
+    } WithFailureBlock:^(id error) {
+        
+        [self RemoveMBProgressHUDLoding];
+    }];
+}
 
 
 

Lighting/Class/AllCutomerTableViewCell.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-
+#import "MyclientEntityModel.h"
 @interface AllCutomerTableViewCell : UITableViewCell
 
 
@@ -54,7 +54,10 @@
 @property (weak, nonatomic) IBOutlet UILabel *customerAddress;
 
 
-
+/**
+ *  数据源model
+ */
+@property (nonatomic,strong) MyclientEntityModel *Model;
 
 
 

Lighting/Class/AllCutomerTableViewCell.m

@@ -15,6 +15,20 @@
     // Initialization code
 }
 
+
+
+#pragma mark - 数据源赋值
+- (void)setModel:(MyclientEntityModel *)Model
+{
+    _Model = Model;
+    [self.customerHeader sd_setImageWithURL:[NSURL URLWithString:_Model.picture] placeholderImage:ReplaceImage];
+    self.customerName.text = _Model.name;
+    self.customerPhoneName.text = _Model.mobile;
+    
+}
+
+
+
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
 

Lighting/Class/ClientViewController.m

@@ -109,7 +109,6 @@
     condition.page = page;
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/consumer/query"] WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
         
-        
         [self RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
@@ -203,6 +202,9 @@
     self.customerNameField.text = model.name;
     self.phoneNumberField.text = model.mobile;
     self.customerAddress.text = model.address;
+    //保存客户ID
+    [Shoppersmanager manager].currentCustomer = YES;
+    [Customermanager manager].customerID = model.fid;
     [self.addpersonInformationButton setTitle:@"退出当前客户" forState:UIControlStateNormal];
     self.changePersonInformationButton.hidden = NO;
 }
@@ -224,6 +226,8 @@
         self.phoneNumberField.enabled = YES;
         self.companyNameField.enabled = YES;
         self.changePersonInformationButton.hidden = YES;
+        [Shoppersmanager manager].currentCustomer = NO;
+        [Customermanager manager].customerID = nil;
         
         //全部为为选中状态
         for (InformationTableViewCell *cell in self.informationTableview.visibleCells) {
@@ -278,6 +282,7 @@
             
             //保存客户ID
             [Customermanager manager].customerID = returnValue[@"data"];
+            [Shoppersmanager manager].currentCustomer = YES;
             [self SuccessMBProgressView:returnValue[@"新增成功"]];
             [self.addpersonInformationButton setTitle:@"退出当前客户" forState:UIControlStateNormal];
             self.changePersonInformationButton.hidden = NO;

Lighting/Class/DateSelectedViewController.h

+//
+//  DateSelectedViewController.h
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/13.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface DateSelectedViewController : BaseViewController
+
+
+
+/**
+ *  UIDatePickerView
+ */
+@property (weak, nonatomic) IBOutlet UIDatePicker *datePickerView;
+
+
+
+
+/**
+ *  完成选择后回调、传回选中时间
+ */
+@property (nonatomic,copy) void(^selectedDateBlock)(NSDate *date);
+
+
+
+@end

Lighting/Class/DateSelectedViewController.m

+//
+//  DateSelectedViewController.m
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/13.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "DateSelectedViewController.h"
+
+@interface DateSelectedViewController ()
+
+@end
+
+@implementation DateSelectedViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view from its nib.
+    
+    
+    [self uiConfigAction];
+    
+}
+
+#pragma mark -布局
+- (void)uiConfigAction
+{
+    //今天为最大日期
+    self.datePickerView.maximumDate = [NSDate date];
+    [self.datePickerView addTarget:self action:@selector(dateChanged:) forControlEvents:UIControlEventValueChanged];
+}
+
+#pragma mark -选择时间完成回调
+-(void)dateChanged:(id)sender{
+    
+    UIDatePicker* control = (UIDatePicker*)sender;
+    /*添加你自己响应代码*/
+    NSLog(@"%@",control.date);
+}
+
+
+#pragma mark -完成筛选
+- (IBAction)completeScreeningButtonClick:(UIButton *)sender {
+    
+    if (self.selectedDateBlock) {
+        
+        self.selectedDateBlock(self.datePickerView.date);
+    }
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+
+- (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/DateSelectedViewController.xib

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DateSelectedViewController">
+            <connections>
+                <outlet property="datePickerView" destination="mwJ-SC-y3o" id="qpR-lf-rFm"/>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="300" height="250"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="date" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="mwJ-SC-y3o">
+                    <rect key="frame" x="0.0" y="50" width="300" height="200"/>
+                    <date key="date" timeIntervalSinceReferenceDate="484811565.065534">
+                        <!--2016-05-13 05:52:45 +0000-->
+                    </date>
+                </datePicker>
+                <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mvi-lG-F1A">
+                    <rect key="frame" x="233" y="0.0" width="67" height="50"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                    <state key="normal" title="完成">
+                        <color key="titleColor" red="0.34901960780000002" green="0.67450980390000004" blue="0.86274509799999999" alpha="1" colorSpace="calibratedRGB"/>
+                    </state>
+                    <connections>
+                        <action selector="completeScreeningButtonClick:" destination="-1" eventType="touchUpInside" id="kq4-rD-Rra"/>
+                    </connections>
+                </button>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstAttribute="bottom" secondItem="mwJ-SC-y3o" secondAttribute="bottom" id="5Di-Lz-rJb"/>
+                <constraint firstAttribute="trailing" secondItem="mwJ-SC-y3o" secondAttribute="trailing" id="7qh-ZF-57w"/>
+                <constraint firstItem="mwJ-SC-y3o" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="K3X-3G-auT"/>
+                <constraint firstItem="mwJ-SC-y3o" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="50" id="wgw-ou-ZQB"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="298" y="131"/>
+        </view>
+    </objects>
+</document>

Lighting/Class/Login/LoginViewController.m

@@ -70,8 +70,8 @@
     self.userNameLoginView.layer.cornerRadius = 10;
     self.forgotPasswordButton.titleLabel.font = [UIFont boldSystemFontOfSize:16];
     self.followHeartView=[[FollowHeartViewController alloc]init];
-    self.userName.text = @"sh1";
-    self.passWord.text = @"1234567890";
+    self.userName.text = @"demo1";
+    self.passWord.text = @"123456";
     
 }
 

Lighting/Class/ProductDetailsViewController.h

@@ -25,4 +25,6 @@
 @property (nonatomic,copy) NSString *goodsID;
 
 
+
+
 @end

Lighting/Class/ProductDetailsViewController.m

@@ -92,7 +92,6 @@
 #pragma mark -header赋值
 - (void)HeaderViewAssignment
 {
-    self.headerView.inventoryNumber.text = [self.entity.inv stringValue];
     self.headerView.serialNumber.text = self.entity.series;
     self.headerView.nameLabe.text = self.entity.name;
     self.headerView.brandName.text = self.entity.brandId;
@@ -230,23 +229,34 @@
 #pragma mark -添加至购物车
 - (void)addGoodsShoppingbags
 {
-    TOShopcartEntity *shopCar = [[TOShopcartEntity alloc]init];
-    shopCar.goodsId = self.entity.fid;
-    shopCar.goodsCode = self.entity.code;
-    shopCar.goodsName = self.entity.name;
-//    shopCar.good
-    
+    //判断是否有当前客户
+    if (![Shoppersmanager manager].currentCustomer) {
         
+        [self ErrorMBProgressView:@"必须设置当前客户"];
+        return;
+    }
+    [self CreateMBProgressHUDLoding];
+    SaveShoppingCartRequest *shopCar = [[SaveShoppingCartRequest alloc]init];
+    shopCar.consumerId = [[Customermanager manager] customerID];
+    shopCar.goodsId = _goodsID;
+    shopCar.count = [self.headerView.goodsNumber.text intValue];
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/shopcart/save"] WithRequestType:0 WithParameter:shopCar WithReturnValueBlock:^(id returnValue) {
     
-        NSLog(@"%@",returnValue);
+        [self RemoveMBProgressHUDLoding];
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            
+            [self SuccessMBProgressView:@"加入购物车成功"];
+        }else
+        {
+            [self ErrorMBProgressView:returnValue[@"message"]];
+        }
         
     } WithErrorCodeBlock:^(id errorCodeValue) {
         
         
     } WithFailureBlock:^(id error) {
        
-        NSLog(@"%@",error);
+        [self RemoveMBProgressHUDLoding];
     }];
 }
 

Lighting/Class/ProductLibraryViewController.m

@@ -69,13 +69,13 @@
 }
 
 
-- (void)viewWillAppear:(BOOL)animated
-{
-    if (self.productCollectionView != nil) {
-        
-        [self getGoodsListDatas];
-    }
-}
+//- (void)viewWillAppear:(BOOL)animated
+//{
+//    if (self.productCollectionView != nil) {
+//        
+//        [self getGoodsListDatas];
+//    }
+//}
 
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -83,6 +83,7 @@
     self.view.backgroundColor = [UIColor blueColor];
     
     [self uiConfigAction];
+    [self getGoodsListDatas];
     [self getScreeningdatas];
 }
 

Lighting/Class/SceneLibraryViewController.h

@@ -7,7 +7,7 @@
 //
 
 #import "BaseViewController.h"
-
+#import "screeningButton.h"
 @interface SceneLibraryViewController : BaseViewController
 
 
@@ -29,21 +29,39 @@
  */
 @property (weak, nonatomic) IBOutlet UIButton *accordingStyle;
 
+
 /**
- *  数据风格
+ *  背景View
  */
-@property (weak, nonatomic) IBOutlet UIButton *dataStyleButton;
-
+@property (weak, nonatomic) IBOutlet UIView *backView;
 
 /**
- *  房型风格
+ *  风格按钮
  */
-@property (weak, nonatomic) IBOutlet UIButton *houseStyleButton;
+@property (strong, nonatomic) screeningButton *StyleButton;
+
 
 /**
- *  背景View
+ *  房型按钮
  */
-@property (weak, nonatomic) IBOutlet UIView *backView;
+@property (strong, nonatomic) screeningButton *SpaceButton;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 @end

Lighting/Class/SceneLibraryViewController.m

@@ -9,7 +9,7 @@
 #import "SceneLibraryViewController.h"
 #import "SeceneLibraryCollectionViewCell.h"
 
-@interface SceneLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource>
+@interface SceneLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,ReturnTableviewcellIndexpathdelegate>
 
 
 
@@ -22,17 +22,39 @@
  *  列表数据
  */
 @property (nonatomic,strong) SceneResponse *response;
+
+
+/**
+ *  筛选cell个数图片
+ */
+@property (nonatomic,strong) NSArray *imageArray;
+
+
+
 @end
 
 @implementation SceneLibraryViewController
 
+
+#pragma mark -初始化
+- (NSArray *)imageArray
+{
+    if (_imageArray == nil) {
+        
+        _imageArray = [NSArray arrayWithObjects:@"视角1",@"视角",@"视角3", nil];
+    }
+    return _imageArray;
+}
+
+
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     
     [self uiConfigAction];
     [self getdatasAction];
-    [self getSceneLibrarydatas];
+
 }
 
 #pragma mark -UI
@@ -44,6 +66,33 @@
     self.seceneLibraryCollectionLayout.sectionInset = UIEdgeInsetsMake(5, 0, 5, 0);
     self.seceneLibararyCollectionView.dataSource = self;
     self.seceneLibararyCollectionView.delegate = self;
+    
+    //设置按钮
+    self.StyleButton = [screeningButton buttonWithType:UIButtonTypeCustom];
+    self.StyleButton.frame = CGRectMake(ScreenWidth-400, 14, 150, 30);
+    self.StyleButton.backgroundColor = kTCColor(131, 131, 131);
+    [self.StyleButton setTitle:@"风格" forState:UIControlStateNormal];
+    [self.StyleButton addTarget:self action:@selector(screeningStyleButtonClick:) forControlEvents:UIControlEventTouchUpInside];
+    [self.StyleButton setImage:TCImage(@"down_arr") forState:UIControlStateNormal];
+    self.StyleButton.layer.masksToBounds = YES;
+    self.StyleButton.layer.cornerRadius = 10;
+    self.SpaceButton = [screeningButton buttonWithType:UIButtonTypeCustom];
+    self.SpaceButton.frame = CGRectMake(ScreenWidth-200, 14, 150, 30);
+    [self.SpaceButton setTitle:@"房型" forState:UIControlStateNormal];
+    self.SpaceButton.layer.masksToBounds = YES;
+    self.SpaceButton.backgroundColor = kTCColor(131, 131, 131);
+    [self.SpaceButton addTarget:self action:@selector(HouseStyleButtonClick:) forControlEvents:UIControlEventTouchUpInside];
+    [self.SpaceButton setImage:TCImage(@"down_arr") forState:UIControlStateNormal];
+    self.SpaceButton.layer.cornerRadius = 10;
+    [self.backView addSubview:self.StyleButton];
+    [self.backView addSubview:self.SpaceButton];
+    
+    //默认数据
+    SceneCondition *condition = [[SceneCondition alloc]init];
+    DataPage *page = [[DataPage alloc]init];
+    page.page = 0;
+    condition.page = page;
+    [self getSceneLibrarydatas:condition];
 }
 
 
@@ -51,10 +100,8 @@
 - (void)getdatasAction
 {
   
-    [self CreateMBProgressHUDLoding];
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/scene/getSceneFilter"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
         
-        [self RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
           self.filter = [[SceneFilter alloc]initWithDictionary:returnValue[@"data"] error:nil];
@@ -69,27 +116,22 @@
         
     } WithFailureBlock:^(id error) {
         
-        [self RemoveMBProgressHUDLoding];
     }];
 }
 
 
 #pragma mark -获取场景列表数据
-- (void)getSceneLibrarydatas
+- (void)getSceneLibrarydatas:(SceneCondition *)condition
 {
-    
-    SceneCondition *condition = [[SceneCondition alloc]init];
-    DataPage *page = [[DataPage alloc]init];
-    page.page = 0;
-    condition.page = page;
-    
+    [self CreateMBProgressHUDLoding];
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/scene/query"] WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
         
+        
+        [self RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
-            NSLog(@"%@",returnValue);
             self.response = [[SceneResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
-            
+            [self.seceneLibararyCollectionView reloadData];
         }
         else
         {
@@ -100,7 +142,7 @@
         
     } WithFailureBlock:^(id error) {
         
-        
+        [self RemoveMBProgressHUDLoding];
     }];
 }
 
@@ -109,58 +151,118 @@
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
 {
     SeceneLibraryCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"secenelibrary" forIndexPath:indexPath];
-    
+    cell.model = [self.response.list objectAtIndex_opple:indexPath.item];
     return cell;
 }
 
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
-    return 20;
+    return self.response.list.count;
 }
 
 
 #pragma mark -切换显示风格
 - (IBAction)SwitchdisplayStyleClick:(UIButton *)sender {
     
-    self.seceneLibraryCollectionLayout.itemSize = CGSizeMake((ScreenWidth-10)/6, (ScreenWidth-10)/6-50);
-    [self.seceneLibararyCollectionView reloadData];
-    
+    [self ShowPopoverViewController:CGSizeMake(55, 180) Withdatas:self.imageArray ShowButton:sender SelectedIndex:100];
 }
 
 
 #pragma mark -筛选风格
-- (IBAction)screeningStyleButtonClick:(UIButton *)sender {
+- (void)screeningStyleButtonClick:(UIButton *)sender {
 
-    PopoverViewController *popover = [[PopoverViewController alloc]init];
-    popover.datasArray = @[@"你好",@"你好"];
-    popover.contentSize = CGSizeMake(150, 300);
-    popover.preferredContentSize = CGSizeMake(150, 300);
-    popover.modalPresentationStyle = UIModalPresentationPopover;
-    UIPopoverPresentationController *pop = popover.popoverPresentationController;
-    pop.permittedArrowDirections = UIPopoverArrowDirectionAny;
-    pop.sourceView = popover.view;
-    pop.barButtonItem = [[UIBarButtonItem alloc]initWithCustomView:sender];
-    [self presentViewController:popover animated:YES completion:nil];
+    
+    [self ShowPopoverViewController:CGSizeMake(200, 300) Withdatas:self.filter.styles ShowButton:sender SelectedIndex:0];
     
 }
 
 
 #pragma mark -房型风格
-- (IBAction)HouseStyleButtonClick:(UIButton *)sender {
+- (void)HouseStyleButtonClick:(UIButton *)sender {
+    
+    [self ShowPopoverViewController:CGSizeMake(200, 300) Withdatas:self.filter.space ShowButton:sender SelectedIndex:1];
+}
+
+
+#pragma mark -弹出popover视图控制器
+- (void)ShowPopoverViewController:(CGSize)size Withdatas:(NSArray *)datasArray ShowButton:(UIButton *)button SelectedIndex:(NSInteger)index
+{
  
     PopoverViewController *popover = [[PopoverViewController alloc]init];
-    popover.datasArray = @[@"你好",@"你好"];
-    popover.contentSize = CGSizeMake(150, 300);
-    popover.preferredContentSize = CGSizeMake(150, 300);
+    popover.datasArray = datasArray;
+    popover.delegate = self;
+    popover.Selectedindex = index;
+    if (size.width == 55) {
+        
+        popover.isPictures = YES;
+    }
+    popover.contentSize = size;
+    popover.preferredContentSize = size;
     popover.modalPresentationStyle = UIModalPresentationPopover;
     UIPopoverPresentationController *pop = popover.popoverPresentationController;
     pop.permittedArrowDirections = UIPopoverArrowDirectionAny;
     pop.sourceView = popover.view;
-    pop.barButtonItem = [[UIBarButtonItem alloc]initWithCustomView:sender];
+    pop.barButtonItem = [[UIBarButtonItem alloc]initWithCustomView:button];
     [self presentViewController:popover animated:YES completion:nil];
 }
 
 
+#pragma mark -选中筛选条件回传typecode
+- (void)returnCellindexpathwithrow:(NSString *)Type WithcellTitle:(NSString *)title Withselected:(NSInteger)Selected
+{
+    [self dismissViewControllerAnimated:YES completion:nil];
+    SceneCondition *condition = [[SceneCondition alloc]init];
+    DataPage *page = [[DataPage alloc]init];
+    page.page = 0;
+    condition.page = page;
+    
+    //房型code
+    if (Selected) {
+        
+        condition.spaceEquals = Type;
+        [self.SpaceButton setTitle:title forState:UIControlStateNormal];
+    }else
+    {//风格code
+        condition.styleEquals = Type;
+        [self.StyleButton setTitle:title forState:UIControlStateNormal];
+    }
+    
+    [self getSceneLibrarydatas:condition];
+}
+
+
+#pragma mark -筛选条件回传cellindex
+- (void)returnWithIndexSelected:(NSInteger)selectedIndex
+{
+
+    NSInteger showcellNumber;
+    switch (selectedIndex) {
+        case 0:
+        {
+            showcellNumber = 2;
+        }
+            break;
+        case 1:
+        {
+            showcellNumber = 3;
+        }
+            break;
+        case 2:
+        {
+            showcellNumber = 4;
+        }
+            break;
+            
+        default:
+            break;
+    }
+    
+    [self.accordingStyle setBackgroundImage:TCImage([self.imageArray objectAtIndex_opple:selectedIndex]) forState:UIControlStateNormal];
+    [self dismissViewControllerAnimated:YES completion:nil];
+    self.seceneLibraryCollectionLayout.itemSize = CGSizeMake((ScreenWidth-showcellNumber*2)/showcellNumber, (ScreenWidth-showcellNumber*2)/showcellNumber-50);
+    [self.seceneLibararyCollectionView reloadData];
+    
+}
 
 
 - (void)didReceiveMemoryWarning {

Lighting/Class/SeceneLibraryCollectionViewCell.h

@@ -10,4 +10,19 @@
 
 @interface SeceneLibraryCollectionViewCell : UICollectionViewCell
 
+
+
+/**
+ *  数据源
+ */
+@property (nonatomic,strong) TOSceneEntity *model;
+
+
+/**
+ *  场景图片
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *scenarioImageView;
+
+
+
 @end

Lighting/Class/SeceneLibraryCollectionViewCell.m

@@ -10,4 +10,15 @@
 
 @implementation SeceneLibraryCollectionViewCell
 
+
+#pragma mark -赋值
+- (void)setModel:(TOSceneEntity *)model
+{
+    _model = model;
+    
+    [self.scenarioImageView sd_setImageWithURL:[NSURL URLWithString:_model.pricure] placeholderImage:ReplaceImage];
+}
+
+
+
 @end

Lighting/Class/Shoppingcart/ShopcarModel.h

+//
+//  ShopcarModel.h
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/13.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "opple_objc_json_client.h"
+
+@interface ShopcarModel : TOShopcartEntity
+
+
+
+/**
+ *  保存选中状态
+ */
+@property (nonatomic,assign) BOOL isSelected;
+
+/**
+ *  修改后的价格
+ */
+@property (nonatomic,copy) NSString *ChangeSprice;
+
+/**
+ *  选中的商品个数
+ */
+@property (nonatomic,copy) NSString *SelectedGoodsNumber;
+
+@end

Lighting/Class/Shoppingcart/ShopcarModel.m

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

Lighting/Class/Shoppingcart/ShoppingTableViewCell.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-
+#import "ShopcarModel.h"
 @interface ShoppingTableViewCell : UITableViewCell
 
 /**
@@ -49,8 +49,10 @@
 
 
 
-
-
+/**
+ *  数据源model
+ */
+@property (nonatomic,strong) ShopcarModel *model;
 
 
 

Lighting/Class/Shoppingcart/ShoppingTableViewCell.m

@@ -16,9 +16,21 @@
 }
 
 
+#pragma mark -赋值
+- (void)setModel:(ShopcarModel *)model
+{
+    _model = model;
+    [self.goodsImageView sd_setImageWithURL:[NSURL URLWithString:_model.goods.pictures] placeholderImage:ReplaceImage];
+    self.goodsInformationLabe.text = _model.goods.name;
+    self.tagsPriceLabe.text = [_model.goods.tagPrice stringValue];
+    self.clinchTextfield.text = [_model.goods.costPrice stringValue];
+    self.goodsNumbersLabe.text = [NSString stringWithFormat:@"%d",_model.goodsNum];
+    self.productPriceLabe.text = [_model.goods.costPrice stringValue];
     
     
     
+}
+
 #pragma mark -增加或者减少商品
 - (IBAction)reduceAndaddButtonClick:(UIButton *)sender {
     
@@ -30,7 +42,7 @@
 #pragma mark -商品选中
 - (IBAction)selectedButtonClick:(UIButton *)sender {
     
-    
+    sender.selected = YES;
 }
 
 

Lighting/Class/Shoppingcart/ShoppingViewController.m

@@ -10,14 +10,20 @@
 #import "ShoppingTableViewCell.h"
 #import "AppDelegate.h"
 #import "GenerateOrdersViewController.h"
-
+#import "ShopcarModel.h"
 
 @interface ShoppingViewController ()<UITableViewDelegate,UITableViewDataSource>
 
 
 @property (weak, nonatomic) IBOutlet UITableView *shoppingTableview;
-@property (nonatomic,strong) NSMutableArray *datasArray;
 
+
+
+
+/**
+ *  购物车数据源
+ */
+@property (nonatomic,strong) NSMutableArray *shopResponseArray;
 @end
 
 @implementation ShoppingViewController
@@ -28,11 +34,11 @@
  */
 - (NSMutableArray *)datasArray
 {
-    if (_datasArray == nil) {
+    if (_shopResponseArray == nil) {
         
-        _datasArray = [NSMutableArray array];
+        _shopResponseArray = [NSMutableArray array];
     }
-    return _datasArray;
+    return _shopResponseArray;
 }
 
 
@@ -41,6 +47,7 @@
     // Do any additional setup after loading the view.
     
     [self uiConfigAction];
+    [self getShoppingCardata];
 }
 
 
@@ -73,17 +80,78 @@
     self.shoppingTableview.tableFooterView = [UIView new];
 }
 
+#pragma mark -获取购物车商品
+- (void)getShoppingCardata
+{
+    //判断是否需要请求数据-通过当前客户ID
+    if (![Shoppersmanager manager].currentCustomer) {
+        
+        return;
+    }
+    ShopCartFilter *shopcarNumber = [[ShopCartFilter alloc]init];
+    shopcarNumber.consumerId = [Customermanager manager].customerID;
+    DataPage *Newpage = [[DataPage alloc]init];
+    Newpage.page = 0;
+    shopcarNumber.dp = Newpage;
+    [self CreateMBProgressHUDLoding];
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/shopcart/query"] WithRequestType:0 WithParameter:shopcarNumber WithReturnValueBlock:^(id returnValue) {
+        
+        [self RemoveMBProgressHUDLoding];
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            
+            NSLog(@"%@",returnValue);
+            ShopCartResponse *shopcar = [[ShopCartResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            
+            //自定义属性
+            for (TOShopcartEntity *objc in shopcar.shopcart) {
+                
+                ShopcarModel *model = [[ShopcarModel alloc]init];
+                model.goods = objc.goods;
+                model.fid = objc.fid;
+                model.createName = objc.createName;
+                model.createBy = objc.createBy;
+                model.createDate = objc.createDate;
+                model.updateName = objc.updateName;
+                model.updateBy = objc.updateBy;
+                model.updateDate = objc.updateDate;
+                model.goodsId = objc.goodsId;
+                model.goodsNum = objc.goodsNum;
+                model.consumerId = objc.consumerId;
+                model.sysOrgCode = objc.sysOrgCode;
+                
+                [self.shopResponseArray addObject:model];
+                
+            }
+            
+        }else
+        {
+            [self ErrorMBProgressView:returnValue[@"message"]];
+        }
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        
+        
+    } WithFailureBlock:^(id error) {
+        
+        [self RemoveMBProgressHUDLoding];
+    }];
+    
+}
+
+
 
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     ShoppingTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Shopping" forIndexPath:indexPath];
+    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+    cell.model = [self.shopResponseArray objectAtIndex_opple:indexPath.row];
     return  cell;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    return 20;
+    return self.shopResponseArray.count;
 }
 
 

Lighting/Class/screeningButton.h

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

Lighting/Class/screeningButton.m

+//
+//  screeningButton.m
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/13.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "screeningButton.h"
+
+@implementation screeningButton
+
+
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.titleLabel.font = [UIFont systemFontOfSize:13];
+        self.titleLabel.textAlignment = NSTextAlignmentCenter;
+    }
+    return self;
+}
+
+
+
+- (CGRect)titleRectForContentRect:(CGRect)contentRect
+{
+    return CGRectMake((self.frame.size.width-[self ReturnCGsize:self.currentTitle].width)/2, -2, [self ReturnCGsize:self.currentTitle].width, 35);
+}
+
+
+- (CGRect)imageRectForContentRect:(CGRect)contentRect
+{
+    return CGRectMake((self.frame.size.width-[self ReturnCGsize:self.currentTitle].width)/2+[self ReturnCGsize:self.currentTitle].width, (self.frame.size.height-6)/2, 11, 6);
+}
+
+
+- (CGSize)ReturnCGsize:(NSString *)string
+{
+    CGSize S = [string boundingRectWithSize:CGSizeMake(999, 35) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:18]} context:nil].size;
+    return S;
+}
+
+
+@end

Lighting/Lighting.xcodeproj/project.pbxproj

@@ -17,6 +17,10 @@
 		060D397C1CE45CFE0082AECD /* ImageCropperView.m in Sources */ = {isa = PBXBuildFile; fileRef = 060D39791CE45CFE0082AECD /* ImageCropperView.m */; };
 		060D397D1CE45CFE0082AECD /* UIImage+Rotation.m in Sources */ = {isa = PBXBuildFile; fileRef = 060D397B1CE45CFE0082AECD /* UIImage+Rotation.m */; };
 		2906B5D71CD89246000849B4 /* ClientDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2906B5D61CD89246000849B4 /* ClientDetailsTableViewCell.m */; };
+		290887061CE58BC2000B7097 /* screeningButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887051CE58BC2000B7097 /* screeningButton.m */; };
+		2908870B1CE5A308000B7097 /* DateSelectedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887091CE5A308000B7097 /* DateSelectedViewController.m */; };
+		2908870C1CE5A308000B7097 /* DateSelectedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2908870A1CE5A308000B7097 /* DateSelectedViewController.xib */; };
+		290887131CE5DF16000B7097 /* ShopcarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887121CE5DF16000B7097 /* ShopcarModel.m */; };
 		2928F7E71CD087FE0036D761 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F7E61CD087FE0036D761 /* BaseViewController.m */; };
 		2928F8321CD09E320036D761 /* Toolview.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8311CD09E320036D761 /* Toolview.m */; };
 		2928F8381CD09E730036D761 /* CustomButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8371CD09E730036D761 /* CustomButton.m */; };
@@ -126,6 +130,13 @@
 		060D397B1CE45CFE0082AECD /* UIImage+Rotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Rotation.m"; sourceTree = "<group>"; };
 		2906B5D51CD89246000849B4 /* ClientDetailsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientDetailsTableViewCell.h; sourceTree = "<group>"; };
 		2906B5D61CD89246000849B4 /* ClientDetailsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClientDetailsTableViewCell.m; sourceTree = "<group>"; };
+		290887041CE58BC2000B7097 /* screeningButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screeningButton.h; sourceTree = "<group>"; };
+		290887051CE58BC2000B7097 /* screeningButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = screeningButton.m; sourceTree = "<group>"; };
+		290887081CE5A308000B7097 /* DateSelectedViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateSelectedViewController.h; sourceTree = "<group>"; };
+		290887091CE5A308000B7097 /* DateSelectedViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DateSelectedViewController.m; sourceTree = "<group>"; };
+		2908870A1CE5A308000B7097 /* DateSelectedViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DateSelectedViewController.xib; sourceTree = "<group>"; };
+		290887111CE5DF16000B7097 /* ShopcarModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopcarModel.h; sourceTree = "<group>"; };
+		290887121CE5DF16000B7097 /* ShopcarModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopcarModel.m; sourceTree = "<group>"; };
 		2928F7E21CD085F40036D761 /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
 		2928F7E51CD087FE0036D761 /* BaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseViewController.h; sourceTree = "<group>"; };
 		2928F7E61CD087FE0036D761 /* BaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseViewController.m; sourceTree = "<group>"; };
@@ -393,6 +404,25 @@
 			name = view;
 			sourceTree = "<group>";
 		};
+		290887071CE5A2BE000B7097 /* dateSelectedVC */ = {
+			isa = PBXGroup;
+			children = (
+				290887081CE5A308000B7097 /* DateSelectedViewController.h */,
+				290887091CE5A308000B7097 /* DateSelectedViewController.m */,
+				2908870A1CE5A308000B7097 /* DateSelectedViewController.xib */,
+			);
+			name = dateSelectedVC;
+			sourceTree = "<group>";
+		};
+		2908870D1CE5D900000B7097 /* shopCarmodel */ = {
+			isa = PBXGroup;
+			children = (
+				290887111CE5DF16000B7097 /* ShopcarModel.h */,
+				290887121CE5DF16000B7097 /* ShopcarModel.m */,
+			);
+			name = shopCarmodel;
+			sourceTree = "<group>";
+		};
 		2928F7DD1CD085430036D761 /* Class */ = {
 			isa = PBXGroup;
 			children = (
@@ -479,6 +509,7 @@
 		2928F83F1CD0AB830036D761 /* Shoppingcart */ = {
 			isa = PBXGroup;
 			children = (
+				2908870D1CE5D900000B7097 /* shopCarmodel */,
 				293393521CD3377E000D997B /* view */,
 				293393501CD329EC000D997B /* controller */,
 			);
@@ -889,6 +920,8 @@
 			children = (
 				29EAAE931CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.h */,
 				29EAAE941CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m */,
+				290887041CE58BC2000B7097 /* screeningButton.h */,
+				290887051CE58BC2000B7097 /* screeningButton.m */,
 			);
 			name = view;
 			sourceTree = "<group>";
@@ -905,6 +938,7 @@
 		29EAAE991CDC74A700C4DBA2 /* AllCustomer */ = {
 			isa = PBXGroup;
 			children = (
+				290887071CE5A2BE000B7097 /* dateSelectedVC */,
 				29EAAEA71CDC7FCF00C4DBA2 /* view */,
 				29EAAEA61CDC7FC500C4DBA2 /* controller */,
 			);
@@ -1062,6 +1096,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				29A938271CDAE31B00F21E54 /* ProductDetailsHeaderView.xib in Resources */,
+				2908870C1CE5A308000B7097 /* DateSelectedViewController.xib in Resources */,
 				2942F8A81CDD80CE005B377E /* authenticateView.xib in Resources */,
 				29807C651CD20F0F00F111B8 /* StoryboardwithCYX.storyboard in Resources */,
 				29EAAE901CDC3E9700C4DBA2 /* BillingInfoView.xib in Resources */,
@@ -1161,6 +1196,7 @@
 				29698D611CE2C11500D72CE7 /* SettlementViewController.m in Sources */,
 				299876331CD997DF00C90D0A /* OrderInformationTableViewCell.m in Sources */,
 				2928F7E71CD087FE0036D761 /* BaseViewController.m in Sources */,
+				2908870B1CE5A308000B7097 /* DateSelectedViewController.m in Sources */,
 				299876271CD9837C00C90D0A /* OrderTableViewCell.m in Sources */,
 				2998763C1CD9983A00C90D0A /* CommodityListTableViewCell.m in Sources */,
 				2962D0791CD1CBC60058829D /* NetworkRequestClassManager.m in Sources */,
@@ -1169,6 +1205,7 @@
 				2928F8321CD09E320036D761 /* Toolview.m in Sources */,
 				2942F8A61CDD80C2005B377E /* authenticateView.m in Sources */,
 				29BFBD8F1CE44BA900C238FB /* goodsDetailsSectionview.m in Sources */,
+				290887131CE5DF16000B7097 /* ShopcarModel.m in Sources */,
 				29BB27681CD9D38E009A0813 /* AllpriceTableViewCell.m in Sources */,
 				29BB27771CD9DFBA009A0813 /* ProductLibraryViewController.m in Sources */,
 				29EAAEAA1CDC7FE800C4DBA2 /* AllCutomerTableViewCell.m in Sources */,
@@ -1203,6 +1240,7 @@
 				2928F83B1CD0A0CE0036D761 /* CustomTabbarController.m in Sources */,
 				29EAAE8E1CDC3E8E00C4DBA2 /* BillingInfoView.m in Sources */,
 				0470D6141CE2938000647F0F /* ProductLibraryView.m in Sources */,
+				290887061CE58BC2000B7097 /* screeningButton.m in Sources */,
 				044708611CD7C1E800555827 /* MainSetViewController.m in Sources */,
 				29E28CE81CE0B91B00812A55 /* HENLENSONG.m in Sources */,
 				299249441CDB51B100786B1E /* ModifyShippingAddressView.m in Sources */,

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

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

Lighting/Lighting/StoryboardwithCYX.storyboard

@@ -734,7 +734,7 @@
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="firstcell" rowHeight="84" id="XgA-9w-ut9" customClass="OrderInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="49.5" width="768" height="84"/>
+                                        <rect key="frame" x="0.0" y="113.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.5"/>
@@ -811,7 +811,7 @@
                                         </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="133.5" width="768" height="160"/>
+                                        <rect key="frame" x="0.0" y="197.5" width="768" height="160"/>
                                         <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.5"/>
@@ -940,7 +940,7 @@
                                         </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="293.5" width="768" height="110"/>
+                                        <rect key="frame" x="0.0" y="357.5" width="768" height="110"/>
                                         <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.5"/>
@@ -1032,7 +1032,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="47T-H0-tG7" customClass="CommodityListTableViewCell">
-                                        <rect key="frame" x="0.0" y="403.5" width="768" height="80"/>
+                                        <rect key="frame" x="0.0" y="467.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.5"/>
@@ -1093,7 +1093,7 @@
                                         </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="483.5" width="768" height="75"/>
+                                        <rect key="frame" x="0.0" y="547.5" 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.5"/>
@@ -1153,7 +1153,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="PNT-Fy-4Hi" customClass="AllpriceTableViewCell">
-                                        <rect key="frame" x="0.0" y="558.5" width="768" height="50"/>
+                                        <rect key="frame" x="0.0" y="622.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.5"/>
@@ -1236,33 +1236,15 @@
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="BF5-8S-7Vt">
-                                        <rect key="frame" x="30" y="10" width="46" height="30"/>
+                                        <rect key="frame" x="35" y="19" width="25" height="25"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <state key="normal" title="Button"/>
+                                        <state key="normal" backgroundImage="视角"/>
                                         <connections>
                                             <action selector="SwitchdisplayStyleClick:" destination="5yY-jf-6jd" eventType="touchUpInside" id="14p-2m-exG"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="W4z-A8-7qz">
-                                        <rect key="frame" x="503" y="10" width="90" height="30"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                                        <color key="backgroundColor" red="1" green="0.80664989730000003" blue="0.42312353260000002" alpha="1" colorSpace="calibratedRGB"/>
-                                        <state key="normal" title="风格"/>
-                                        <connections>
-                                            <action selector="screeningStyleButtonClick:" destination="5yY-jf-6jd" eventType="touchUpInside" id="Jt6-bm-Z3e"/>
-                                        </connections>
-                                    </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="qXa-uB-46D">
-                                        <rect key="frame" x="628" y="10" width="90" height="30"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                                        <color key="backgroundColor" red="1" green="0.80664989730000003" blue="0.42312353260000002" alpha="1" colorSpace="calibratedRGB"/>
-                                        <state key="normal" title="房型"/>
-                                        <connections>
-                                            <action selector="HouseStyleButtonClick:" destination="5yY-jf-6jd" eventType="touchUpInside" id="RW6-wy-Kfk"/>
-                                        </connections>
-                                    </button>
                                 </subviews>
-                                <color key="backgroundColor" red="1" green="0.70412693910000002" blue="0.69044467629999995" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="backgroundColor" red="0.96470588235294119" green="0.96470588235294119" blue="0.96470588235294119" alpha="1" colorSpace="calibratedRGB"/>
                             </view>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="plO-JS-1cR">
                                 <rect key="frame" x="0.0" y="114" width="768" height="910"/>
@@ -1290,6 +1272,9 @@
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </view>
                                         <size key="customSize" width="280" height="220"/>
+                                        <connections>
+                                            <outlet property="scenarioImageView" destination="VGf-6K-aY0" id="MoB-cj-hMy"/>
+                                        </connections>
                                     </collectionViewCell>
                                 </cells>
                             </collectionView>
@@ -1300,8 +1285,6 @@
                     <connections>
                         <outlet property="accordingStyle" destination="BF5-8S-7Vt" id="ZxO-PS-gTh"/>
                         <outlet property="backView" destination="dXn-DO-sRi" id="o9x-gB-OIb"/>
-                        <outlet property="dataStyleButton" destination="W4z-A8-7qz" id="5B0-KD-s7V"/>
-                        <outlet property="houseStyleButton" destination="qXa-uB-46D" id="fq9-Sx-8DE"/>
                         <outlet property="seceneLibararyCollectionView" destination="plO-JS-1cR" id="rs3-PK-hTr"/>
                         <outlet property="seceneLibraryCollectionLayout" destination="tt4-xx-j4O" id="5gy-wl-h7O"/>
                     </connections>
@@ -1330,7 +1313,7 @@
                                 </collectionViewFlowLayout>
                                 <cells>
                                     <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="productcell" id="J5m-0M-uqb" customClass="ProductCollectionViewCell">
-                                        <rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
+                                        <rect key="frame" x="0.0" y="64" width="300" height="300"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                             <rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
@@ -1403,7 +1386,7 @@
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="productDetailscell" rowHeight="170" id="Sye-2R-IQf" customClass="ProductDetailsTableViewCell">
-                                        <rect key="frame" x="0.0" y="28" width="768" height="170"/>
+                                        <rect key="frame" x="0.0" y="92" width="768" height="170"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sye-2R-IQf" id="CXs-SR-gHP">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="169.5"/>
@@ -1802,9 +1785,10 @@
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="PkJ-eJ-ksY">
-                                                            <rect key="frame" x="10" y="25" width="46" height="30"/>
+                                                            <rect key="frame" x="20" y="29" width="20" height="20"/>
                                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                            <state key="normal" title="Button"/>
+                                                            <state key="normal" backgroundImage="box-副本"/>
+                                                            <state key="selected" backgroundImage="bg"/>
                                                             <connections>
                                                                 <action selector="selectedButtonClick:" destination="ZT1-XJ-ObI" eventType="touchUpInside" id="g4l-VU-RF4"/>
                                                             </connections>
@@ -1928,11 +1912,12 @@
                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="va8-YD-eVD">
-                                        <rect key="frame" x="6" y="16" width="46" height="30"/>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="va8-YD-eVD">
+                                        <rect key="frame" x="31" y="22" width="20" height="20"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" alpha="1" colorSpace="calibratedRGB"/>
-                                        <state key="normal" title="Button"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        <state key="normal" backgroundImage="box-副本"/>
+                                        <state key="selected" backgroundImage="bg"/>
                                         <connections>
                                             <action selector="allSelectedButtonClick:" destination="4Ho-ZE-RT8" eventType="touchUpInside" id="aU8-Kr-NzZ"/>
                                         </connections>
@@ -1975,7 +1960,7 @@
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="160" id="LsY-i0-h5H" customClass="PersonInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="28" width="768" height="160"/>
+                                        <rect key="frame" x="0.0" y="92" width="768" height="160"/>
                                         <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="159.5"/>
@@ -2104,7 +2089,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="consigneecell" rowHeight="56" id="gfQ-UE-mXV" customClass="GenerateOrdersTableViewCell">
-                                        <rect key="frame" x="0.0" y="188" width="768" height="56"/>
+                                        <rect key="frame" x="0.0" y="252" 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.5"/>
@@ -2165,7 +2150,7 @@
                                         <color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" alpha="1" colorSpace="calibratedRGB"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Modifycell" rowHeight="56" id="Kk4-Fh-HhL" customClass="GenerateOrdersModifyTableViewCell">
-                                        <rect key="frame" x="0.0" y="244" width="768" height="56"/>
+                                        <rect key="frame" x="0.0" y="308" 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.5"/>
@@ -2187,7 +2172,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="G7o-xS-1mB" customClass="CommodityListTableViewCell">
-                                        <rect key="frame" x="0.0" y="300" width="768" height="80"/>
+                                        <rect key="frame" x="0.0" y="364" 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.5"/>
@@ -2248,7 +2233,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="6K9-mc-7RW" customClass="AllpriceTableViewCell">
-                                        <rect key="frame" x="0.0" y="380" width="768" height="50"/>
+                                        <rect key="frame" x="0.0" y="444" 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.5"/>
@@ -2618,48 +2603,59 @@
                                 <rect key="frame" x="0.0" y="64" width="768" height="64"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 <subviews>
-                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入客户的名称或者手机号" textAlignment="natural" minimumFontSize="17" id="9l8-tl-Kl6">
-                                        <rect key="frame" x="30" y="18" width="257" height="30"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.93725490199999995" alpha="1" colorSpace="calibratedRGB"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                        <textInputTraits key="textInputTraits"/>
-                                    </textField>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="时间:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="vtg-a5-Yir">
-                                        <rect key="frame" x="366" y="23" width="35" height="21"/>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="line" id="M0Q-3y-43g">
+                                        <rect key="frame" x="31" y="18" width="257" height="30"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    </imageView>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="最近到访时间:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="vtg-a5-Yir">
+                                        <rect key="frame" x="305" y="23" width="96" height="21"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <color key="backgroundColor" red="0.56470588239999997" green="0.75686274509999996" blue="0.1960784314" alpha="1" colorSpace="calibratedRGB"/>
                                         <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="d2G-qB-lRk">
-                                        <rect key="frame" x="503" y="23" width="20" height="21"/>
+                                        <rect key="frame" x="522" y="23" width="20" height="21"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <color key="backgroundColor" red="0.56470588239999997" green="0.75686274509999996" blue="0.1960784314" alpha="1" colorSpace="calibratedRGB"/>
                                         <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>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="7cQ-TK-1bE">
-                                        <rect key="frame" x="400" y="18" width="100" height="30"/>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="7cQ-TK-1bE">
+                                        <rect key="frame" x="400" y="18" width="120" height="30"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                                        <state key="normal" title="2016-05-05"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                        <state key="normal" title="2016-05-05">
+                                            <color key="titleColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
+                                        </state>
+                                        <connections>
+                                            <action selector="StartscreeningButtonClick:" destination="jZG-OJ-q8e" eventType="touchUpInside" id="qXO-ES-6G7"/>
+                                        </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="mqb-mG-1lo">
-                                        <rect key="frame" x="523" y="18" width="100" height="30"/>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="mqb-mG-1lo">
+                                        <rect key="frame" x="542" y="18" width="120" height="30"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                                        <state key="normal" title="2016-05-05"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                        <state key="normal" title="2016-05-05">
+                                            <color key="titleColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
+                                        </state>
+                                        <connections>
+                                            <action selector="EndscreeningButtonClick:" destination="jZG-OJ-q8e" eventType="touchUpInside" id="xva-Ag-zyK"/>
+                                        </connections>
                                     </button>
                                     <view contentMode="scaleToFill" id="nHB-vo-NsP">
                                         <rect key="frame" x="0.0" y="64" width="768" height="0.0"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                         <color key="backgroundColor" red="0.75686274509803919" green="0.75686274509803919" blue="0.75686274509803919" alpha="1" colorSpace="calibratedRGB"/>
                                     </view>
+                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入客户的名称或者手机号" textAlignment="natural" minimumFontSize="17" id="9l8-tl-Kl6">
+                                        <rect key="frame" x="77" y="17" width="200" height="30"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                        <textInputTraits key="textInputTraits"/>
+                                    </textField>
                                 </subviews>
                                 <color key="backgroundColor" red="0.96470588235294119" green="0.96470588235294119" blue="0.96470588235294119" alpha="1" colorSpace="calibratedRGB"/>
                             </view>
@@ -2782,9 +2778,11 @@
                     </view>
                     <navigationItem key="navigationItem" id="947-gc-Liu"/>
                     <connections>
+                        <outlet property="RecentlydateLabe" destination="vtg-a5-Yir" id="2LG-sX-ZOR"/>
                         <outlet property="allCustomerTableview" destination="Zqw-SR-cRg" id="SKM-ws-L8S"/>
                         <outlet property="begindateButton" destination="7cQ-TK-1bE" id="tU8-KF-xIq"/>
                         <outlet property="enddateButton" destination="mqb-mG-1lo" id="Xkc-Cd-oIt"/>
+                        <outlet property="redesignLabe" destination="d2G-qB-lRk" id="Nui-KB-GUX"/>
                         <outlet property="searchBackview" destination="Kfl-gU-ffA" id="GUm-io-rXt"/>
                         <outlet property="searchTextfield" destination="9l8-tl-Kl6" id="zST-AZ-JgR"/>
                     </connections>
@@ -3186,5 +3184,6 @@
         <image name="box-副本" width="26" height="26"/>
         <image name="line" width="301" height="30"/>
         <image name="当前" width="110" height="110"/>
+        <image name="视角" width="27" height="28"/>
     </resources>
 </document>

Lighting/Tools/PopoverViewController.h

@@ -14,8 +14,21 @@
  */
 @protocol ReturnTableviewcellIndexpathdelegate <NSObject>
 
-- (void)returnCellindexpathwithrow:(NSInteger)index;
 
+/**
+ *  选中筛选条件对象typecode
+ *
+ *  @param index NSString
+ */
+- (void)returnCellindexpathwithrow:(NSString *)Type WithcellTitle:(NSString *)title Withselected:(NSInteger)Selected;
+
+
+/**
+ *  选中筛选对象的index
+ *
+ *  @param selectedIndex NSInteger
+ */
+- (void)returnWithIndexSelected:(NSInteger)selectedIndex;
 
 @end
 
@@ -39,4 +52,16 @@
  */
 @property (nonatomic,assign) CGSize contentSize;
 
+/**
+ *  判断显示图片还是文字
+ */
+@property (nonatomic,assign) BOOL isPictures;
+
+/**
+ *  传入身份iD表示当前是风格还是房型
+ */
+@property (nonatomic,assign) NSInteger Selectedindex;
+
+
+
 @end

Lighting/Tools/PopoverViewController.m

@@ -31,16 +31,32 @@
     self.popoverTableView.delegate = self;
     self.popoverTableView.tableFooterView = [UIView new];
     [self.view addSubview:self.popoverTableView];
+    self.popoverTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     [self.popoverTableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"popovercell"];
 }
 
 
+#pragma mark -填充数据
+- (void)setDatasArray:(NSArray *)datasArray
+{
+    _datasArray = datasArray;
+    [self.popoverTableView reloadData];
+}
+
+
 #pragma mark - UITableViewDataSource
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"popovercell" forIndexPath:indexPath];
-    cell.textLabel.text = [self.datasArray objectAtIndex_opple:indexPath.row];
+    
+    //显示纯图片
+    if (self.isPictures) {
+        cell.imageView.image = TCImage([self.datasArray objectAtIndex_opple:indexPath.row]);
+        return cell;
+    }
+    cell.textLabel.text = [[self.datasArray objectAtIndex_opple:indexPath.row] typename];
     cell.textLabel.textAlignment = NSTextAlignmentCenter;
+    cell.textLabel.font = [UIFont systemFontOfSize:12];
     return cell;
 }
 
@@ -54,10 +70,28 @@
 {
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
     
-    if ([self.delegate respondsToSelector:@selector(returnCellindexpathwithrow:)]) {
+    if (self.isPictures)
+    {
+        if ([self.delegate respondsToSelector:@selector(returnWithIndexSelected:)]) {
+            
+            
             
-        [self.delegate returnCellindexpathwithrow:indexPath.row];
+            [self.delegate returnWithIndexSelected:indexPath.row];
         }
+    }else
+    {
+        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];
+        }
+    }    
+}
+
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return 60;
 }
 
 

Lighting/Tools/PrefixHeader.pch

@@ -131,7 +131,7 @@
 /**
  *  服务器地址
  */
-#define ServerAddress @"http://service.bloem.cn/opple-web/app"
+#define ServerAddress @"http://139.196.195.30:8090/opple-web/app"
 
 
 

Lighting/Tools/Shoppersmanager.h

@@ -40,8 +40,10 @@
  */
 @property (nonatomic,copy) NSString *passWordString;
 
-
-
+/**
+ *  是否设置了当前客户
+ */
+@property (nonatomic,assign) BOOL currentCustomer;
 
 
 @end

Lighting/Tools/opple_objc_json_client.h

@@ -33,20 +33,23 @@ extern NSString * const SORTDIRECTION_DESC;
 @class OrderBill;
 @class SceneCondition;
 @class SceneFilter;
-@class TOConsumerEntity;
-@class TOGoodsBrandEntity;
-@class TOGoodsLabelEntity;
-@class TOHottagEntity;
-@class TOOrderdetailEntity;
-@class TOSceneEntity;
+@class SaveShoppingCartRequest;
+@class ShopCartFilter;
+@class TOGoodsEntity;
+@class TOGoodsCategoryEntity;
+@class TOGoodsLabelCategoryEntity;
+@class TOOrderEntity;
+@class TOPositionEntity;
+@class TOShippingAddrEntity;
 @class TOShopcartEntity;
 @class IdEntity;
-@class TOShippingAddrEntity;
-@class TOPositionEntity;
-@class TOOrderEntity;
-@class TOGoodsLabelCategoryEntity;
-@class TOGoodsCategoryEntity;
-@class TOGoodsEntity;
+@class TOSceneEntity;
+@class TOOrderdetailEntity;
+@class TOHottagEntity;
+@class TOGoodsLabelEntity;
+@class TOGoodsBrandEntity;
+@class TOConsumerEntity;
+@class DeleteCartRequest;
 @class HotTagResponse;
 @class GoodsCategory;
 @class ResetPasswordRequest;
@@ -54,11 +57,11 @@ extern NSString * const SORTDIRECTION_DESC;
 @class ConsumerQueryCondition;
 @class ExceptionCode;
 @class DataPage;
-@class SceneResponse;
 @class TSBaseUser;
 @class TSDepart;
-@class TSUserOrg;
 @class ShopCartResponse;
+@class TSUserOrg;
+@class SceneResponse;
 @class OrderResponse;
 @class GoodsResponse;
 @class ConsumerPageResult;
@@ -75,20 +78,23 @@ extern NSString * const SORTDIRECTION_DESC;
 @protocol OrderBill @end
 @protocol SceneCondition @end
 @protocol SceneFilter @end
-@protocol TOConsumerEntity @end
-@protocol TOGoodsBrandEntity @end
-@protocol TOGoodsLabelEntity @end
-@protocol TOHottagEntity @end
-@protocol TOOrderdetailEntity @end
-@protocol TOSceneEntity @end
+@protocol SaveShoppingCartRequest @end
+@protocol ShopCartFilter @end
+@protocol TOGoodsEntity @end
+@protocol TOGoodsCategoryEntity @end
+@protocol TOGoodsLabelCategoryEntity @end
+@protocol TOOrderEntity @end
+@protocol TOPositionEntity @end
+@protocol TOShippingAddrEntity @end
 @protocol TOShopcartEntity @end
 @protocol IdEntity @end
-@protocol TOShippingAddrEntity @end
-@protocol TOPositionEntity @end
-@protocol TOOrderEntity @end
-@protocol TOGoodsLabelCategoryEntity @end
-@protocol TOGoodsCategoryEntity @end
-@protocol TOGoodsEntity @end
+@protocol TOSceneEntity @end
+@protocol TOOrderdetailEntity @end
+@protocol TOHottagEntity @end
+@protocol TOGoodsLabelEntity @end
+@protocol TOGoodsBrandEntity @end
+@protocol TOConsumerEntity @end
+@protocol DeleteCartRequest @end
 @protocol HotTagResponse @end
 @protocol GoodsCategory @end
 @protocol ResetPasswordRequest @end
@@ -96,11 +102,11 @@ extern NSString * const SORTDIRECTION_DESC;
 @protocol ConsumerQueryCondition @end
 @protocol ExceptionCode @end
 @protocol DataPage @end
-@protocol SceneResponse @end
 @protocol TSBaseUser @end
 @protocol TSDepart @end
-@protocol TSUserOrg @end
 @protocol ShopCartResponse @end
+@protocol TSUserOrg @end
+@protocol SceneResponse @end
 @protocol OrderResponse @end
 @protocol GoodsResponse @end
 @protocol ConsumerPageResult @end
@@ -274,6 +280,12 @@ extern NSString * const SORTDIRECTION_DESC;
  
  */
 @interface GoodsCondition : JSONModel
+/**
+ * 经销者标识
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *reseller_id;
 /**
  * 查询条件是 商品名称
  *
@@ -458,34 +470,95 @@ extern NSString * const SORTDIRECTION_DESC;
 @interface SceneFilter : JSONModel
 /**
  * (no documentation provided)
- * @see NSString
+ * @see DataDict
  *
  */
-@property (nonatomic, strong) NSArray *styles;
+@property (nonatomic, strong) NSArray<DataDict> *styles;
 /**
  * (no documentation provided)
- * @see NSString
+ * @see DataDict
  *
  */
-@property (nonatomic, strong) NSArray *space;
+@property (nonatomic, strong) NSArray<DataDict> *space;
 @end /* interface SceneFilter */
 
 #endif
 
 
-#ifndef DEF_TOConsumerEntity_H
-#define DEF_TOConsumerEntity_H
+#ifndef DEF_SaveShoppingCartRequest_H
+#define DEF_SaveShoppingCartRequest_H
 
 /**
- *  @Title: Entity
- @Description: 客户
+ *  @author Debenson
+ @since 0.1
+ 
+ */
+@interface SaveShoppingCartRequest : JSONModel
+/**
+ * 消费者标识
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *consumerId;
+/**
+ * 商品标识
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *goodsId;
+/**
+ * 商品数量，>0表示添加, <0表示减少
+ *
+ *
+ */
+@property (nonatomic, assign) int count;
+@end /* interface SaveShoppingCartRequest */
+
+#endif
+
+
+#ifndef DEF_ShopCartFilter_H
+#define DEF_ShopCartFilter_H
+
+/**
+ *  购物车查询条件。
+ 
+ @author Debenson
+ @since 0.1
+ 
+ */
+@interface ShopCartFilter : JSONModel
+/**
+ * 消费者标识
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *consumerId;
+/**
+ * 分页数据
+ *
+ *
+ */
+@property (nonatomic, strong) DataPage *dp;
+@end /* interface ShopCartFilter */
+
+#endif
+
+
+#ifndef DEF_TOGoodsEntity_H
+#define DEF_TOGoodsEntity_H
+
+/**
+ *
+ @Title: Entity
+ @Description: t_o_goods
  @author onlineGenerator
- @date 2016-05-08 18:08:58
+ @date 2016-05-12 15:44:01
  @version V1.0
  
  
  */
-@interface TOConsumerEntity : JSONModel
+@interface TOGoodsEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
@@ -493,29 +566,29 @@ extern NSString * const SORTDIRECTION_DESC;
  */
 @property (nonatomic, copy) NSString *fid;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, copy) NSString *createName;
+@property (nonatomic, strong) NSDate *createDate;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, copy) NSString *createBy;
+@property (nonatomic, strong) NSDate *onlineTime;
 /**
- * 方法: 取得java.util.Date
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSDate *createDate;
+@property (nonatomic, copy) NSString *company;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *sysOrgCode;
+@property (nonatomic, copy) NSString *code;
 /**
  * 方法: 取得java.lang.String
  *
@@ -527,193 +600,187 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, copy) NSString *mobile;
+@property (nonatomic, copy) NSString *number;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *province;
+@property (nonatomic, copy) NSString *categoryId;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *city;
+@property (nonatomic, copy) NSString *brandId;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *country;
+@property (nonatomic, copy) NSString *keyword;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.math.BigDecimal
  *
  *
  */
-@property (nonatomic, copy) NSString *address;
+@property (nonatomic, strong) NSNumber *guidePrice;
+/**
+ * 方法: 取得java.math.BigDecimal
+ *
+ *
+ */
+@property (nonatomic, strong) NSNumber *tagPrice;
+/**
+ * 方法: 取得java.math.BigDecimal
+ *
+ *
+ */
+@property (nonatomic, strong) NSNumber *costPrice;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *picture;
+@property (nonatomic, copy) NSString *state;
 /**
- * 方法: 取得java.util.Date
+ * 方法: 取得java.lang.Integer
  *
  *
  */
-@property (nonatomic, strong) NSDate *lastVisitedTime;
-@end /* interface TOConsumerEntity */
-
-#endif
-
-
-#ifndef DEF_TOGoodsBrandEntity_H
-#define DEF_TOGoodsBrandEntity_H
-
+@property (nonatomic, assign) int inv;
 /**
- *  @Title: Entity
- @Description: 商品品牌
- @author onlineGenerator
- @date 2016-05-05 16:14:51
- @version V1.0
- 
- 
+ * 方法: 取得java.lang.String
+ *
+ *
  */
-@interface TOGoodsBrandEntity : JSONModel
+@property (nonatomic, copy) NSString *detailedIntro;
+/**
+ * 方法: 取得java.lang.Double
+ *
+ *
+ */
+@property (nonatomic, assign) double weight;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *fid;
+@property (nonatomic, copy) NSString *unit;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *createName;
+@property (nonatomic, copy) NSString *productProfile;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *createBy;
+@property (nonatomic, copy) NSString *power;
 /**
- * 方法: 取得java.util.Date
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSDate *createDate;
+@property (nonatomic, copy) NSString *colorTemperature;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *sysOrgCode;
+@property (nonatomic, copy) NSString *spec;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *sysCompanyCode;
+@property (nonatomic, copy) NSString *function;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *code;
+@property (nonatomic, copy) NSString *material;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *name;
+@property (nonatomic, copy) NSString *lightSource;
 /**
- * 方法: 取得java.lang.Integer
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, assign) int state;
+@property (nonatomic, copy) NSString *goodsStyle;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *logo;
+@property (nonatomic, copy) NSString *series;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *fdescription;
-@end /* interface TOGoodsBrandEntity */
-
-#endif
-
-
-#ifndef DEF_TOGoodsLabelEntity_H
-#define DEF_TOGoodsLabelEntity_H
-
+@property (nonatomic, copy) NSString *area;
 /**
- *  @Title: Entity
- @Description: 商品标签
- @author onlineGenerator
- @date 2016-05-05 17:18:15
- @version V1.0
- 
- 
+ * 方法: 取得java.lang.String
+ *
+ *
  */
-@interface TOGoodsLabelEntity : JSONModel
+@property (nonatomic, copy) NSString *size;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *fid;
+@property (nonatomic, copy) NSString *space;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *sysOrgCode;
+@property (nonatomic, copy) NSString *installMethod;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *sysCompanyCode;
+@property (nonatomic, copy) NSString *lightNumber;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *name;
+@property (nonatomic, copy) NSString *pictures;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *categoryId;
-@end /* interface TOGoodsLabelEntity */
+@property (nonatomic, copy) NSString *barcode;
+@end /* interface TOGoodsEntity */
 
 #endif
 
 
-#ifndef DEF_TOHottagEntity_H
-#define DEF_TOHottagEntity_H
+#ifndef DEF_TOGoodsCategoryEntity_H
+#define DEF_TOGoodsCategoryEntity_H
 
 /**
  *  @Title: Entity
- @Description: 热门推荐
+ @Description: 商品分类
  @author onlineGenerator
- @date 2016-05-06 16:36:36
+ @date 2016-05-10 10:17:53
  @version V1.0
  
  
  */
-@interface TOHottagEntity : JSONModel
+@interface TOGoodsCategoryEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
@@ -725,115 +792,91 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, copy) NSString *name;
-@end /* interface TOHottagEntity */
-
-#endif
-
-
-#ifndef DEF_TOOrderdetailEntity_H
-#define DEF_TOOrderdetailEntity_H
-
-/**
- *  @Title: Entity
- @Description: 订单详情
- @author onlineGenerator
- @date 2016-05-06 12:53:09
- @version V1.0
- 
- 
- */
-@interface TOOrderdetailEntity : JSONModel
-/**
- * 方法: 取得java.lang.String
- *
- *
- */
-@property (nonatomic, copy) NSString *fid;
+@property (nonatomic, copy) NSString *code;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsId;
+@property (nonatomic, copy) NSString *name;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsCode;
+@property (nonatomic, copy) NSString *upperId;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.lang.Integer
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsName;
+@property (nonatomic, assign) int level;
+@end /* interface TOGoodsCategoryEntity */
+
+#endif
+
+
+#ifndef DEF_TOGoodsLabelCategoryEntity_H
+#define DEF_TOGoodsLabelCategoryEntity_H
+
 /**
- * 方法: 取得java.lang.String
- *
- *
+ *  @Title: Entity
+ @Description: 商品标签分类
+ @author onlineGenerator
+ @date 2016-05-05 16:57:27
+ @version V1.0
+ 
+ 
  */
-@property (nonatomic, copy) NSString *goodsCover;
+@interface TOGoodsLabelCategoryEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsSpec;
+@property (nonatomic, copy) NSString *fid;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsBrand;
+@property (nonatomic, copy) NSString *sysOrgCode;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsNum;
-/**
- * 方法: 取得java.math.BigDecimal
- *
- *
- */
-@property (nonatomic, strong) NSNumber *goodsPrice;
-/**
- * 方法: 取得java.math.BigDecimal
- *
- *
- */
-@property (nonatomic, strong) NSNumber *goodsTotalPrice;
+@property (nonatomic, copy) NSString *sysCompanyCode;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *orderId;
+@property (nonatomic, copy) NSString *code;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *remark;
-@end /* interface TOOrderdetailEntity */
+@property (nonatomic, copy) NSString *name;
+@end /* interface TOGoodsLabelCategoryEntity */
 
 #endif
 
 
-#ifndef DEF_TOSceneEntity_H
-#define DEF_TOSceneEntity_H
+#ifndef DEF_TOOrderEntity_H
+#define DEF_TOOrderEntity_H
 
 /**
  *  @Title: Entity
- @Description: 场景
+ @Description: 订单
  @author onlineGenerator
- @date 2016-05-05 18:39:39
+ @date 2016-05-06 12:53:09
  @version V1.0
  
  
  */
-@interface TOSceneEntity : JSONModel
+@interface TOOrderEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
@@ -845,189 +888,176 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, copy) NSString *sceneCode;
+@property (nonatomic, copy) NSString *createName;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *name;
+@property (nonatomic, copy) NSString *createBy;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, copy) NSString *pricure;
+@property (nonatomic, strong) NSDate *createDate;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *category;
+@property (nonatomic, copy) NSString *updateName;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *style;
+@property (nonatomic, copy) NSString *updateBy;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, copy) NSString *space;
-@end /* interface TOSceneEntity */
-
-#endif
-
-
-#ifndef DEF_TOShopcartEntity_H
-#define DEF_TOShopcartEntity_H
-
+@property (nonatomic, strong) NSDate *updateDate;
 /**
+ * 方法: 取得java.lang.String
+ *
  *
- @Title: Entity
- @Description: 购物车
- @author onlineGenerator
- @date 2016-05-05 16:13:38
- @version V1.0
- 
- 
  */
-@interface TOShopcartEntity : JSONModel
+@property (nonatomic, copy) NSString *sysOrgCode;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *fid;
+@property (nonatomic, copy) NSString *orderNumber;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, copy) NSString *createName;
+@property (nonatomic, strong) NSDate *orderTime;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *createBy;
+@property (nonatomic, copy) NSString *guideId;
 /**
- * 方法: 取得java.util.Date
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSDate *createDate;
+@property (nonatomic, copy) NSString *orderState;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *updateName;
+@property (nonatomic, copy) NSString *consumerId;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *updateBy;
+@property (nonatomic, copy) NSString *goodsNum;
 /**
- * 方法: 取得java.util.Date
+ * 方法: 取得java.math.BigDecimal
  *
  *
  */
-@property (nonatomic, strong) NSDate *updateDate;
+@property (nonatomic, strong) NSNumber *orderPrice;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *sysOrgCode;
+@property (nonatomic, copy) NSString *receiverName;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsId;
+@property (nonatomic, copy) NSString *receiverMobile;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsCode;
+@property (nonatomic, copy) NSString *receiverAddress;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsName;
+@property (nonatomic, copy) NSString *isBill;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsCover;
+@property (nonatomic, copy) NSString *billType;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsSpec;
+@property (nonatomic, copy) NSString *billTitle;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsBrand;
+@property (nonatomic, copy) NSString *payType;
+@end /* interface TOOrderEntity */
+
+#endif
+
+
+#ifndef DEF_TOPositionEntity_H
+#define DEF_TOPositionEntity_H
+
 /**
- * 方法: 取得java.math.BigDecimal
- *
- *
+ *  @Title: Entity
+ @Description: 经销商员工职位
+ @author onlineGenerator
+ @date 2016-05-02 17:39:21
+ @version V1.0
+ 
+ 
  */
-@property (nonatomic, strong) NSNumber *goodsSellerPrice;
+@interface TOPositionEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsNum;
+@property (nonatomic, copy) NSString *fid;
 /**
- * 方法: 取得java.math.BigDecimal
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSNumber *goodsPrice;
+@property (nonatomic, copy) NSString *code;
 /**
- * 方法: 取得java.math.BigDecimal
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSNumber *goodsTotalPrice;
+@property (nonatomic, copy) NSString *name;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.math.BigDecimal
  *
  *
  */
-@property (nonatomic, copy) NSString *consumerId;
-@end /* interface TOShopcartEntity */
-
-#endif
-
-
-#ifndef DEF_IdEntity_H
-#define DEF_IdEntity_H
-
-/**
- * (no documentation provided)
- */
-@interface IdEntity : JSONModel
+@property (nonatomic, strong) NSNumber *commission;
 /**
- * (no documentation provided)
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *fid;
-@end /* interface IdEntity */
+@property (nonatomic, copy) NSString *resellerCode;
+@end /* interface TOPositionEntity */
 
 #endif
 
@@ -1117,19 +1147,25 @@ extern NSString * const SORTDIRECTION_DESC;
 #endif
 
 
-#ifndef DEF_TOPositionEntity_H
-#define DEF_TOPositionEntity_H
+#ifndef DEF_TOShopcartEntity_H
+#define DEF_TOShopcartEntity_H
 
 /**
  *  @Title: Entity
- @Description: 经销商员工职位
+ @Description: t_o_shopcart
  @author onlineGenerator
- @date 2016-05-02 17:39:21
+ @date 2016-05-12 23:44:55
  @version V1.0
  
  
  */
-@interface TOPositionEntity : JSONModel
+@interface TOShopcartEntity : JSONModel
+/**
+ * 商品详情。
+ *
+ *
+ */
+@property (nonatomic, strong) TOGoodsEntity *goods;
 /**
  * 方法: 取得java.lang.String
  *
@@ -1141,319 +1177,295 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, copy) NSString *code;
+@property (nonatomic, copy) NSString *createName;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *name;
+@property (nonatomic, copy) NSString *createBy;
 /**
- * 方法: 取得java.math.BigDecimal
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, strong) NSNumber *commission;
+@property (nonatomic, strong) NSDate *createDate;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *resellerCode;
-@end /* interface TOPositionEntity */
-
-#endif
-
-
-#ifndef DEF_TOOrderEntity_H
-#define DEF_TOOrderEntity_H
-
-/**
- *  @Title: Entity
- @Description: 订单
- @author onlineGenerator
- @date 2016-05-06 12:53:09
- @version V1.0
- 
- 
- */
-@interface TOOrderEntity : JSONModel
+@property (nonatomic, copy) NSString *updateName;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *fid;
+@property (nonatomic, copy) NSString *updateBy;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, copy) NSString *createName;
+@property (nonatomic, strong) NSDate *updateDate;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *createBy;
+@property (nonatomic, copy) NSString *goodsId;
 /**
- * 方法: 取得java.util.Date
+ * 方法: 取得java.lang.Integer
  *
  *
  */
-@property (nonatomic, strong) NSDate *createDate;
+@property (nonatomic, assign) int goodsNum;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *updateName;
+@property (nonatomic, copy) NSString *consumerId;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *updateBy;
+@property (nonatomic, copy) NSString *sysOrgCode;
+@end /* interface TOShopcartEntity */
+
+#endif
+
+
+#ifndef DEF_IdEntity_H
+#define DEF_IdEntity_H
+
 /**
- * 方法: 取得java.util.Date
+ * (no documentation provided)
+ */
+@interface IdEntity : JSONModel
+/**
+ * (no documentation provided)
  *
  *
  */
-@property (nonatomic, strong) NSDate *updateDate;
+@property (nonatomic, copy) NSString *fid;
+@end /* interface IdEntity */
+
+#endif
+
+
+#ifndef DEF_TOSceneEntity_H
+#define DEF_TOSceneEntity_H
+
+/**
+ *  @Title: Entity
+ @Description: 场景
+ @author onlineGenerator
+ @date 2016-05-05 18:39:39
+ @version V1.0
+ 
+ 
+ */
+@interface TOSceneEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *sysOrgCode;
+@property (nonatomic, copy) NSString *fid;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *orderNumber;
+@property (nonatomic, copy) NSString *sceneCode;
 /**
- * 方法: 取得java.util.Date
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSDate *orderTime;
+@property (nonatomic, copy) NSString *name;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *guideId;
+@property (nonatomic, copy) NSString *pricure;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *orderState;
+@property (nonatomic, copy) NSString *category;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *consumerId;
+@property (nonatomic, copy) NSString *style;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsNum;
+@property (nonatomic, copy) NSString *space;
+@end /* interface TOSceneEntity */
+
+#endif
+
+
+#ifndef DEF_TOOrderdetailEntity_H
+#define DEF_TOOrderdetailEntity_H
+
 /**
- * 方法: 取得java.math.BigDecimal
- *
- *
+ *  @Title: Entity
+ @Description: 订单详情
+ @author onlineGenerator
+ @date 2016-05-06 12:53:09
+ @version V1.0
+ 
+ 
  */
-@property (nonatomic, strong) NSNumber *orderPrice;
+@interface TOOrderdetailEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *receiverName;
+@property (nonatomic, copy) NSString *fid;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *receiverMobile;
+@property (nonatomic, copy) NSString *goodsId;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *receiverAddress;
+@property (nonatomic, copy) NSString *goodsCode;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *isBill;
+@property (nonatomic, copy) NSString *goodsName;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *billType;
+@property (nonatomic, copy) NSString *goodsCover;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *billTitle;
+@property (nonatomic, copy) NSString *goodsSpec;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *payType;
-@end /* interface TOOrderEntity */
-
-#endif
-
-
-#ifndef DEF_TOGoodsLabelCategoryEntity_H
-#define DEF_TOGoodsLabelCategoryEntity_H
-
-/**
- *  @Title: Entity
- @Description: 商品标签分类
- @author onlineGenerator
- @date 2016-05-05 16:57:27
- @version V1.0
- 
- 
- */
-@interface TOGoodsLabelCategoryEntity : JSONModel
+@property (nonatomic, copy) NSString *goodsBrand;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *fid;
+@property (nonatomic, copy) NSString *goodsNum;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.math.BigDecimal
  *
  *
  */
-@property (nonatomic, copy) NSString *sysOrgCode;
+@property (nonatomic, strong) NSNumber *goodsPrice;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.math.BigDecimal
  *
  *
  */
-@property (nonatomic, copy) NSString *sysCompanyCode;
+@property (nonatomic, strong) NSNumber *goodsTotalPrice;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *code;
+@property (nonatomic, copy) NSString *orderId;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *name;
-@end /* interface TOGoodsLabelCategoryEntity */
+@property (nonatomic, copy) NSString *remark;
+@end /* interface TOOrderdetailEntity */
 
 #endif
 
 
-#ifndef DEF_TOGoodsCategoryEntity_H
-#define DEF_TOGoodsCategoryEntity_H
+#ifndef DEF_TOHottagEntity_H
+#define DEF_TOHottagEntity_H
 
 /**
  *  @Title: Entity
- @Description: 商品分类
+ @Description: 热门推荐
  @author onlineGenerator
- @date 2016-05-10 10:17:53
+ @date 2016-05-06 16:36:36
  @version V1.0
  
  
  */
-@interface TOGoodsCategoryEntity : JSONModel
+@interface TOHottagEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
 @property (nonatomic, copy) NSString *fid;
-/**
- * 方法: 取得java.lang.String
- *
- *
- */
-@property (nonatomic, copy) NSString *code;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
 @property (nonatomic, copy) NSString *name;
-/**
- * 方法: 取得java.lang.String
- *
- *
- */
-@property (nonatomic, copy) NSString *upperId;
-/**
- * 方法: 取得java.lang.Integer
- *
- *
- */
-@property (nonatomic, assign) int level;
-@end /* interface TOGoodsCategoryEntity */
+@end /* interface TOHottagEntity */
 
 #endif
 
 
-#ifndef DEF_TOGoodsEntity_H
-#define DEF_TOGoodsEntity_H
+#ifndef DEF_TOGoodsLabelEntity_H
+#define DEF_TOGoodsLabelEntity_H
 
 /**
  *  @Title: Entity
- @Description: 商品
+ @Description: 商品标签
  @author onlineGenerator
- @date 2016-05-09 16:14:26
+ @date 2016-05-05 17:18:15
  @version V1.0
  
  
  */
-@interface TOGoodsEntity : JSONModel
+@interface TOGoodsLabelEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
 @property (nonatomic, copy) NSString *fid;
-/**
- * 方法: 取得java.util.Date
- *
- *
- */
-@property (nonatomic, strong) NSDate *createDate;
-/**
- * 方法: 取得java.util.Date
- *
- *
- */
-@property (nonatomic, strong) NSDate *onlineTime;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *company;
+@property (nonatomic, copy) NSString *sysOrgCode;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *code;
+@property (nonatomic, copy) NSString *sysCompanyCode;
 /**
  * 方法: 取得java.lang.String
  *
@@ -1465,170 +1477,208 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, copy) NSString *number;
+@property (nonatomic, copy) NSString *categoryId;
+@end /* interface TOGoodsLabelEntity */
+
+#endif
+
+
+#ifndef DEF_TOGoodsBrandEntity_H
+#define DEF_TOGoodsBrandEntity_H
+
 /**
- * 方法: 取得java.lang.String
- *
- *
+ *  @Title: Entity
+ @Description: 商品品牌
+ @author onlineGenerator
+ @date 2016-05-05 16:14:51
+ @version V1.0
+ 
+ 
  */
-@property (nonatomic, copy) NSString *categoryId;
+@interface TOGoodsBrandEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *brandId;
+@property (nonatomic, copy) NSString *fid;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *keyword;
+@property (nonatomic, copy) NSString *createName;
 /**
- * 方法: 取得java.math.BigDecimal
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSNumber *guidePrice;
+@property (nonatomic, copy) NSString *createBy;
 /**
- * 方法: 取得java.math.BigDecimal
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, strong) NSNumber *tagPrice;
+@property (nonatomic, strong) NSDate *createDate;
 /**
- * 方法: 取得java.math.BigDecimal
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSNumber *costPrice;
+@property (nonatomic, copy) NSString *sysOrgCode;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *state;
+@property (nonatomic, copy) NSString *sysCompanyCode;
 /**
- * 方法: 取得java.math.BigDecimal
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSNumber *inv;
+@property (nonatomic, copy) NSString *code;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *detailedIntro;
+@property (nonatomic, copy) NSString *name;
 /**
- * 方法: 取得java.math.BigDecimal
+ * 方法: 取得java.lang.Integer
  *
  *
  */
-@property (nonatomic, strong) NSNumber *weight;
+@property (nonatomic, assign) int state;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *unit;
+@property (nonatomic, copy) NSString *logo;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *productProfile;
+@property (nonatomic, copy) NSString *fdescription;
+@end /* interface TOGoodsBrandEntity */
+
+#endif
+
+
+#ifndef DEF_TOConsumerEntity_H
+#define DEF_TOConsumerEntity_H
+
 /**
- * 方法: 取得java.lang.String
- *
- *
+ *  @Title: Entity
+ @Description: 客户
+ @author onlineGenerator
+ @date 2016-05-08 18:08:58
+ @version V1.0
+ 
+ 
  */
-@property (nonatomic, copy) NSString *power;
+@interface TOConsumerEntity : JSONModel
 /**
- * 方法: ���得java.lang.String
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *colorTemperature;
+@property (nonatomic, copy) NSString *fid;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *spec;
+@property (nonatomic, copy) NSString *createName;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *function;
+@property (nonatomic, copy) NSString *createBy;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, copy) NSString *material;
+@property (nonatomic, strong) NSDate *createDate;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *lightSource;
+@property (nonatomic, copy) NSString *sysOrgCode;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsStyle;
+@property (nonatomic, copy) NSString *name;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *series;
+@property (nonatomic, copy) NSString *mobile;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *area;
+@property (nonatomic, copy) NSString *province;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *size;
+@property (nonatomic, copy) NSString *city;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *space;
+@property (nonatomic, copy) NSString *country;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *installMethod;
+@property (nonatomic, copy) NSString *address;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *lightNumber;
+@property (nonatomic, copy) NSString *picture;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, copy) NSString *pictures;
+@property (nonatomic, strong) NSDate *lastVisitedTime;
+@end /* interface TOConsumerEntity */
+
+#endif
+
+
+#ifndef DEF_DeleteCartRequest_H
+#define DEF_DeleteCartRequest_H
+
 /**
- * 方法: 取得java.lang.String
- *
+ *  @author Debenson
+ @since 0.1
+ 
+ */
+@interface DeleteCartRequest : JSONModel
+/**
+ * 购物车标识列表
+ * @see NSString
  *
  */
-@property (nonatomic, copy) NSString *barcode;
-@end /* interface TOGoodsEntity */
+@property (nonatomic, strong) NSArray *cartIds;
+@end /* interface DeleteCartRequest */
 
 #endif
 
@@ -1771,6 +1821,18 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  */
 @property (nonatomic, copy) NSString *mobileEquals;
+/**
+ * 创建时间起始于，格式: yyyy-MM-dd HH:mm:ss
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *createTimeBegin;
+/**
+ * 创建时间截止于，格式: yyyy-MM-dd HH:mm:ss
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *createTimeEnd;
 /**
  * 分布查询条件， 可空
  *
@@ -1856,26 +1918,6 @@ extern NSString * const SORTDIRECTION_DESC;
 #endif
 
 
-#ifndef DEF_SceneResponse_H
-#define DEF_SceneResponse_H
-
-/**
- *  @author Administrator
- @since 0.1
- 
- */
-@interface SceneResponse : PageRows
-/**
- * (no documentation provided)
- * @see TOSceneEntity
- *
- */
-@property (nonatomic, strong) NSArray<TOSceneEntity> *list;
-@end /* interface SceneResponse */
-
-#endif
-
-
 #ifndef DEF_TSBaseUser_H
 #define DEF_TSBaseUser_H
 
@@ -2024,6 +2066,28 @@ extern NSString * const SORTDIRECTION_DESC;
 #endif
 
 
+#ifndef DEF_ShopCartResponse_H
+#define DEF_ShopCartResponse_H
+
+/**
+ *  购物车返回对象
+ 
+ @author Flash
+ @since 0.1
+ 
+ */
+@interface ShopCartResponse : PageRows
+/**
+ * (no documentation provided)
+ * @see TOShopcartEntity
+ *
+ */
+@property (nonatomic, strong) NSArray<TOShopcartEntity> *shopcart;
+@end /* interface ShopCartResponse */
+
+#endif
+
+
 #ifndef DEF_TSUserOrg_H
 #define DEF_TSUserOrg_H
 
@@ -2054,24 +2118,22 @@ extern NSString * const SORTDIRECTION_DESC;
 #endif
 
 
-#ifndef DEF_ShopCartResponse_H
-#define DEF_ShopCartResponse_H
+#ifndef DEF_SceneResponse_H
+#define DEF_SceneResponse_H
 
 /**
- *  购物车返回对象
- 
- @author Flash
+ *  @author Administrator
  @since 0.1
  
  */
-@interface ShopCartResponse : PageRows
+@interface SceneResponse : PageRows
 /**
  * (no documentation provided)
- * @see TOShopcartEntity
+ * @see TOSceneEntity
  *
  */
-@property (nonatomic, strong) NSArray<TOShopcartEntity> *shopcart;
-@end /* interface ShopCartResponse */
+@property (nonatomic, strong) NSArray<TOSceneEntity> *list;
+@end /* interface SceneResponse */
 
 #endif
 

Lighting/Tools/opple_objc_json_client.m

@@ -73,6 +73,7 @@
 @end
 
 @implementation GoodsCondition
+@synthesize reseller_id;
 @synthesize nameLike;
 @synthesize categoryEquals;
 @synthesize styleEquals;
@@ -88,8 +89,6 @@
 }
 
 
-
-
 @end
 
 @implementation GoodsFilter
@@ -147,20 +146,66 @@
 
 @end
 
-@implementation TOConsumerEntity
+@implementation SaveShoppingCartRequest
+@synthesize consumerId;
+@synthesize goodsId;
+@synthesize count;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
+@end
+
+@implementation ShopCartFilter
+@synthesize consumerId;
+@synthesize dp;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
+@end
+
+@implementation TOGoodsEntity
 @synthesize fid;
-@synthesize createName;
-@synthesize createBy;
 @synthesize createDate;
-@synthesize sysOrgCode;
+@synthesize onlineTime;
+@synthesize company;
+@synthesize code;
 @synthesize name;
-@synthesize mobile;
-@synthesize province;
-@synthesize city;
-@synthesize country;
-@synthesize address;
-@synthesize picture;
-@synthesize lastVisitedTime;
+@synthesize number;
+@synthesize categoryId;
+@synthesize brandId;
+@synthesize keyword;
+@synthesize guidePrice;
+@synthesize tagPrice;
+@synthesize costPrice;
+@synthesize state;
+@synthesize inv;
+@synthesize detailedIntro;
+@synthesize weight;
+@synthesize unit;
+@synthesize productProfile;
+@synthesize power;
+@synthesize colorTemperature;
+@synthesize spec;
+@synthesize function;
+@synthesize material;
+@synthesize lightSource;
+@synthesize goodsStyle;
+@synthesize series;
+@synthesize area;
+@synthesize size;
+@synthesize space;
+@synthesize installMethod;
+@synthesize lightNumber;
+@synthesize pictures;
+@synthesize barcode;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -178,18 +223,12 @@
 
 @end
 
-@implementation TOGoodsBrandEntity
+@implementation TOGoodsCategoryEntity
 @synthesize fid;
-@synthesize createName;
-@synthesize createBy;
-@synthesize createDate;
-@synthesize sysOrgCode;
-@synthesize sysCompanyCode;
 @synthesize code;
 @synthesize name;
-@synthesize state;
-@synthesize logo;
-@synthesize fdescription;
+@synthesize upperId;
+@synthesize level;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -200,7 +239,6 @@
 +(JSONKeyMapper*)keyMapper
 {
     return [[JSONKeyMapper alloc] initWithDictionary:@{
-                                                       @"description": @"fdescription",
                                                        @"id": @"fid",
                                                        }];
 }
@@ -208,12 +246,12 @@
 
 @end
 
-@implementation TOGoodsLabelEntity
+@implementation TOGoodsLabelCategoryEntity
 @synthesize fid;
 @synthesize sysOrgCode;
 @synthesize sysCompanyCode;
+@synthesize code;
 @synthesize name;
-@synthesize categoryId;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -231,9 +269,29 @@
 
 @end
 
-@implementation TOHottagEntity
+@implementation TOOrderEntity
 @synthesize fid;
-@synthesize name;
+@synthesize createName;
+@synthesize createBy;
+@synthesize createDate;
+@synthesize updateName;
+@synthesize updateBy;
+@synthesize updateDate;
+@synthesize sysOrgCode;
+@synthesize orderNumber;
+@synthesize orderTime;
+@synthesize guideId;
+@synthesize orderState;
+@synthesize consumerId;
+@synthesize goodsNum;
+@synthesize orderPrice;
+@synthesize receiverName;
+@synthesize receiverMobile;
+@synthesize receiverAddress;
+@synthesize isBill;
+@synthesize billType;
+@synthesize billTitle;
+@synthesize payType;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -251,19 +309,12 @@
 
 @end
 
-@implementation TOOrderdetailEntity
+@implementation TOPositionEntity
 @synthesize fid;
-@synthesize goodsId;
-@synthesize goodsCode;
-@synthesize goodsName;
-@synthesize goodsCover;
-@synthesize goodsSpec;
-@synthesize goodsBrand;
-@synthesize goodsNum;
-@synthesize goodsPrice;
-@synthesize goodsTotalPrice;
-@synthesize orderId;
-@synthesize remark;
+@synthesize code;
+@synthesize name;
+@synthesize commission;
+@synthesize resellerCode;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -281,14 +332,18 @@
 
 @end
 
-@implementation TOSceneEntity
+@implementation TOShippingAddrEntity
 @synthesize fid;
-@synthesize sceneCode;
+@synthesize createDate;
+@synthesize sysOrgCode;
 @synthesize name;
-@synthesize pricure;
-@synthesize category;
-@synthesize style;
-@synthesize space;
+@synthesize miblephone;
+@synthesize province;
+@synthesize city;
+@synthesize country;
+@synthesize address;
+@synthesize state;
+@synthesize consumerId;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -307,6 +362,7 @@
 @end
 
 @implementation TOShopcartEntity
+@synthesize goods;
 @synthesize fid;
 @synthesize createName;
 @synthesize createBy;
@@ -314,18 +370,10 @@
 @synthesize updateName;
 @synthesize updateBy;
 @synthesize updateDate;
-@synthesize sysOrgCode;
 @synthesize goodsId;
-@synthesize goodsCode;
-@synthesize goodsName;
-@synthesize goodsCover;
-@synthesize goodsSpec;
-@synthesize goodsBrand;
-@synthesize goodsSellerPrice;
 @synthesize goodsNum;
-@synthesize goodsPrice;
-@synthesize goodsTotalPrice;
 @synthesize consumerId;
+@synthesize sysOrgCode;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -343,6 +391,12 @@
 
 @end
 
+#ifndef DEF_SortDirection_M
+#define DEF_SortDirection_M
+NSString * const SORTDIRECTION_ASC = @"asc";
+NSString * const SORTDIRECTION_DESC = @"desc";
+#endif /* DEF_SortDirection_M */
+
 @implementation IdEntity
 @synthesize fid;
 
@@ -362,24 +416,14 @@
 
 @end
 
-#ifndef DEF_SortDirection_M
-#define DEF_SortDirection_M
-NSString * const SORTDIRECTION_ASC = @"asc";
-NSString * const SORTDIRECTION_DESC = @"desc";
-#endif /* DEF_SortDirection_M */
-
-@implementation TOShippingAddrEntity
+@implementation TOSceneEntity
 @synthesize fid;
-@synthesize createDate;
-@synthesize sysOrgCode;
+@synthesize sceneCode;
 @synthesize name;
-@synthesize miblephone;
-@synthesize province;
-@synthesize city;
-@synthesize country;
-@synthesize address;
-@synthesize state;
-@synthesize consumerId;
+@synthesize pricure;
+@synthesize category;
+@synthesize style;
+@synthesize space;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -397,12 +441,19 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation TOPositionEntity
+@implementation TOOrderdetailEntity
 @synthesize fid;
-@synthesize code;
-@synthesize name;
-@synthesize commission;
-@synthesize resellerCode;
+@synthesize goodsId;
+@synthesize goodsCode;
+@synthesize goodsName;
+@synthesize goodsCover;
+@synthesize goodsSpec;
+@synthesize goodsBrand;
+@synthesize goodsNum;
+@synthesize goodsPrice;
+@synthesize goodsTotalPrice;
+@synthesize orderId;
+@synthesize remark;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -420,29 +471,9 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation TOOrderEntity
+@implementation TOHottagEntity
 @synthesize fid;
-@synthesize createName;
-@synthesize createBy;
-@synthesize createDate;
-@synthesize updateName;
-@synthesize updateBy;
-@synthesize updateDate;
-@synthesize sysOrgCode;
-@synthesize orderNumber;
-@synthesize orderTime;
-@synthesize guideId;
-@synthesize orderState;
-@synthesize consumerId;
-@synthesize goodsNum;
-@synthesize orderPrice;
-@synthesize receiverName;
-@synthesize receiverMobile;
-@synthesize receiverAddress;
-@synthesize isBill;
-@synthesize billType;
-@synthesize billTitle;
-@synthesize payType;
+@synthesize name;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -460,12 +491,12 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation TOGoodsLabelCategoryEntity
+@implementation TOGoodsLabelEntity
 @synthesize fid;
 @synthesize sysOrgCode;
 @synthesize sysCompanyCode;
-@synthesize code;
 @synthesize name;
+@synthesize categoryId;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -483,12 +514,18 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation TOGoodsCategoryEntity
+@implementation TOGoodsBrandEntity
 @synthesize fid;
+@synthesize createName;
+@synthesize createBy;
+@synthesize createDate;
+@synthesize sysOrgCode;
+@synthesize sysCompanyCode;
 @synthesize code;
 @synthesize name;
-@synthesize upperId;
-@synthesize level;
+@synthesize state;
+@synthesize logo;
+@synthesize fdescription;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -499,6 +536,7 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 +(JSONKeyMapper*)keyMapper
 {
     return [[JSONKeyMapper alloc] initWithDictionary:@{
+                                                       @"description": @"fdescription",
                                                        @"id": @"fid",
                                                        }];
 }
@@ -506,41 +544,20 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation TOGoodsEntity
+@implementation TOConsumerEntity
 @synthesize fid;
+@synthesize createName;
+@synthesize createBy;
 @synthesize createDate;
-@synthesize onlineTime;
-@synthesize company;
-@synthesize code;
+@synthesize sysOrgCode;
 @synthesize name;
-@synthesize number;
-@synthesize categoryId;
-@synthesize brandId;
-@synthesize keyword;
-@synthesize guidePrice;
-@synthesize tagPrice;
-@synthesize costPrice;
-@synthesize state;
-@synthesize inv;
-@synthesize detailedIntro;
-@synthesize weight;
-@synthesize unit;
-@synthesize productProfile;
-@synthesize power;
-@synthesize colorTemperature;
-@synthesize spec;
-@synthesize function;
-@synthesize material;
-@synthesize lightSource;
-@synthesize goodsStyle;
-@synthesize series;
-@synthesize area;
-@synthesize size;
-@synthesize space;
-@synthesize installMethod;
-@synthesize lightNumber;
-@synthesize pictures;
-@synthesize barcode;
+@synthesize mobile;
+@synthesize province;
+@synthesize city;
+@synthesize country;
+@synthesize address;
+@synthesize picture;
+@synthesize lastVisitedTime;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -556,6 +573,17 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 }
 
 
+@end
+
+@implementation DeleteCartRequest
+@synthesize cartIds;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
 @end
 
 @implementation HotTagResponse
@@ -626,6 +654,8 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 @implementation ConsumerQueryCondition
 @synthesize nameEquals;
 @synthesize mobileEquals;
+@synthesize createTimeBegin;
+@synthesize createTimeEnd;
 @synthesize page;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
@@ -661,17 +691,6 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 }
 
 
-@end
-
-@implementation SceneResponse
-@synthesize list;
-
-+(BOOL)propertyIsOptional:(NSString*)propertyName
-{
-    return YES;
-}
-
-
 @end
 
 @implementation TSBaseUser
@@ -720,6 +739,17 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 }
 
 
+@end
+
+@implementation ShopCartResponse
+@synthesize shopcart;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
 @end
 
 @implementation TSUserOrg
@@ -734,8 +764,8 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation ShopCartResponse
-@synthesize shopcart;
+@implementation SceneResponse
+@synthesize list;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {