no message

Lighting/Class/MyClient/Orderdetails/Controller/OrderdetailsViewController.m

@@ -932,7 +932,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
             break;
         case 4:
         {
-            return 75;
+            return 140;
         }
             break;
         case 5:

Lighting/Class/MyClient/Orderdetails/View/AdditionalTableViewCell.h

@@ -38,9 +38,44 @@
  */
 @property (weak, nonatomic) IBOutlet UILabel *payType;
 
+/**
+ 欧管家导购
+ */
+@property (weak, nonatomic) IBOutlet UILabel *stewardLabel;
+
+/**
+ 安装方式
+ */
+@property (weak, nonatomic) IBOutlet UILabel *installMethodLabel;
+
+/**
+ 送货方式
+ */
+@property (weak, nonatomic) IBOutlet UILabel *shippingMethodLabel;
+
+/**
+ 安装时间
+ */
+@property (weak, nonatomic) IBOutlet UILabel *installDateLabel;
+
 
 
 
 
 
 @end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Lighting/Class/MyClient/Orderdetails/View/AdditionalTableViewCell.m

@@ -25,17 +25,57 @@
     self.invoiceHeader.text = _model.billTitle;
     self.invoiceType.text = _model.billType;
     self.payType.text = _model.payType;
+    self.stewardLabel.text = _model.bulterName;
+    self.shippingMethodLabel.text = [self shippingMethodString:model.deliveryType];
+    self.installDateLabel.text = _model.installationDate;
+    self.installMethodLabel.text = [self installMethodString:model.installationType];
 }
 
+- (NSString *)installMethodString:(NSString *)string {
+    if ([string isEqualToString:@"1"]) {
+        return @"欧普到家";
+    }
+    if ([string isEqualToString:@"2"]) {
+        return @"门店安装";
+    }
+    if ([string isEqualToString:@"3"]) {
+        return @"不含安装";
+    }
+    return @"---";
+}
+
+- (NSString *)shippingMethodString:(NSString *)string {
+    if ([string isEqualToString:@"1"]) {
+        return @"自提";
+    }
+    if ([string isEqualToString:@"2"]) {
+        return @"送货上门";
+    }
+    return @"---";
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
 
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-    [super setSelected:selected animated:animated];
 
-    // Configure the view for the selected state
-}
 
 @end

Lighting/Class/RIghtVC/SceneLibraryVC/Controller/SceneLibraryViewController.m

@@ -211,8 +211,7 @@
 
 
 #pragma mark -弹出popover视图控制器
-- (void)showPopoverViewController:(CGSize)size Withdatas:(NSArray *)datasArray ShowButton:(UIButton *)button SelectedIndex:(NSInteger)index
-{
+- (void)showPopoverViewController:(CGSize)size Withdatas:(NSArray *)datasArray ShowButton:(UIButton *)button SelectedIndex:(NSInteger)index {
     PopoverViewController *popover = [[PopoverViewController alloc]init];
     popover.datasArray = datasArray;
     popover.delegate = self;
@@ -230,7 +229,6 @@
     [self presentViewController:popover animated:YES completion:nil];
 }
 
-
 #pragma mark -选中筛选条件回传typecode
 - (void)returnCellindexpathwithrow:(NSString *)type withCellTitle:(NSString *)title withSelected:(NSInteger)selected
 {

Lighting/Class/Shoppingcart/Controller/GenerateOrdersViewController.m

@@ -17,6 +17,10 @@
 #import "OrderdetailsViewController.h"
 #import "AddressViewController.h"
 #import "AddressModel.h"
+#import "StewardTableViewController.h"
+#import "StewardTableViewCell.h"
+#import "StewardModel.h"
+
 @interface GenerateOrdersViewController ()<UITableViewDelegate,UITableViewDataSource,delecteDelegate>
 
 
@@ -24,9 +28,15 @@
  *  数据源
  */
 @property (nonatomic,strong) NSMutableArray *datasArray;
+@property (nonatomic,strong) UIView *Tabbarview;
+
+/**
+ 欧管家
+ */
+@property (nonatomic,strong) StewardTableViewController *stewardVc;
 
+@property (nonatomic, strong) StewardModel *resultModel;
 
-@property (nonatomic,strong) UIView *Tabbarview;
 @end
 
 @implementation GenerateOrdersViewController
@@ -39,7 +49,7 @@
     if (_datasArray == nil) {
         
         _datasArray = [NSMutableArray array];
-        for (int i=0; i<3; i++) {
+        for (int i=0; i<4; i++) {
             NSMutableArray *arr = [NSMutableArray array];
             [_datasArray addObject:arr];
         }
@@ -53,6 +63,8 @@
         [[_datasArray objectAtIndex_opple:1] addObject:model];
         //加入商品信息
         [_datasArray replaceObjectAtIndex:2 withObject:_settlementGoodsdatas];
+        //欧管家占位
+        [[_datasArray objectAtIndex_opple:3] addObject:model];
     }
     
     return _datasArray;
@@ -85,6 +97,7 @@
     
     [self uiConfigAction];
     [self getAddressDatasRequest];
+    [self addChildViewVc];
 }
 
 #pragma mark -UI
@@ -99,6 +112,26 @@
     self.createOrderButton.layer.cornerRadius = kCornerRadius;
 }
 
+#pragma mark -添加欧管家控制器
+- (void)addChildViewVc
+{
+    self.stewardVc = [StewardTableViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
+    [self addChildViewController:self.stewardVc];
+    [XBLoadingView showHUDViewWithDefault];;
+    [HTTP networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(GETSTEWARD),[[Shoppersmanager manager] shoppers].employee.currentDepart.fid] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
+        [XBLoadingView hideHUDViewWithDefault];
+        if (RESULT(returnValue)) {
+            StewardModel *model = [[StewardModel alloc] initWithDictionary:returnValue error:nil];
+            self.resultModel = model;
+            [self.generateOrderTableview reloadData];
+        }else {
+            [XBLoadingView showHUDViewWithText:MESSAGE(returnValue)];
+        }
+
+    } withFailureBlock:^(NSError *error) {
+        [XBLoadingView showHUDViewWithText:error.localizedDescription];
+    }];
+}
 
 #pragma mark -获得地址信息
 - (void)getAddressDatasRequest
@@ -138,6 +171,11 @@
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
+    if (indexPath.section == 3) {
+        StewardTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"StewardTableViewCell" forIndexPath:indexPath];
+        [cell.contentView addSubview:self.stewardVc.view];
+        return cell;
+    }
     if (indexPath.section == 0 && indexPath.row == 0) {
         PersonInformationTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"secondcell" forIndexPath:indexPath];
         cell.selectionStyle = UITableViewCellSelectionStyleNone;
@@ -171,7 +209,6 @@
     }
     NSArray *Addressarr = [self.datasArray objectAtIndex_opple:indexPath.section];
     if (indexPath.row == Addressarr.count-1) {
-        
         AllpriceTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"sixthcell" forIndexPath:indexPath];
         cell.selectionStyle = UITableViewCellSelectionStyleNone;
         cell.goodsAllprice = [self.datasArray objectAtIndex_opple:indexPath.section];
@@ -219,6 +256,8 @@
             return 80;
         }
             break;
+        case 3:
+            return 176;
             
         default:
             break;
@@ -233,18 +272,18 @@
         {
             return 0;
         }
-            break;
         case 1:
         {
             return 5;
         }
-            break;
         case 2:
         {
             return 44;
         }
-            break;
-            
+        case 3:
+        {
+            return 5;
+        }
         default:
             break;
     }
@@ -277,6 +316,15 @@
             return view;
         }
             break;
+        case 3:
+        {
+            UIImageView *imageView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 5)];
+            imageView.image = TCImage(@"lineNew");
+            UIView *view = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 44)];
+            [view addSubview:imageView];
+            return view;
+        }
+            break;
             
         default:
             break;
@@ -286,7 +334,10 @@
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
-    return self.datasArray.count;
+    if (self.resultModel.data.count) {
+        return self.datasArray.count;
+    }
+    return self.datasArray.count - 1;
 }
 
 #pragma mark -新增或者修改收货地址
@@ -310,6 +361,21 @@
 #pragma mark -生成订单
 - (IBAction)CreateOrderButtonClick:(UIButton *)sender {
     
+    if (self.resultModel) {
+        if ([self.stewardVc.stewardLabel.text isEqualToString:@"请选择欧管家导购"]) {
+            return [XBLoadingView showHUDViewWithText:self.stewardVc.stewardLabel.text];
+        }
+        if ([self.stewardVc.shippingMethodLabel.text isEqualToString:@"请选择送货方式"]) {
+            return [XBLoadingView showHUDViewWithText:self.stewardVc.shippingMethodLabel.text];
+        }
+        if ([self.stewardVc.installMethodLabel.text isEqualToString:@"请选择安装方式"]) {
+            return [XBLoadingView showHUDViewWithText:self.stewardVc.installMethodLabel.text];
+        }
+        if ([self.stewardVc.installDateLabel.text isEqualToString:@"请选择安装日期"]) {
+            return [XBLoadingView showHUDViewWithText:self.stewardVc.installDateLabel.text];
+        }
+    }
+
     OrderBill *order = [[OrderBill alloc]init];
     //分页
     DataPage *page = [[DataPage alloc]init];
@@ -317,6 +383,13 @@
     order.datapage = page;
     //收货地址
     TOOrderEntity *orderReceiver = [[TOOrderEntity alloc]init];
+    if (self.stewardVc.resultModel) {
+        orderReceiver.installationDate = [NSString stringWithFormat:@"%@ 00:00:00",self.stewardVc.installDateLabel.text];
+        orderReceiver.installationType = [self.stewardVc returnType:self.stewardVc.installMethodLabel.text];
+        orderReceiver.deliveryType = [self.stewardVc returnType:self.stewardVc.shippingMethodLabel.text];
+        orderReceiver.bulterName = self.stewardVc.stewardLabel.text;
+        orderReceiver.bulterNumber = [self.stewardVc returnStewardId:self.stewardVc.stewardLabel.text];
+    }
     NSArray *Adressarr = [self.datasArray objectAtIndex_opple:1];
     //总价格
     CGFloat allPrice = ZERO;
@@ -336,7 +409,7 @@
                 orderReceiver.consumerId = [Customermanager manager].model.consumer.fid;
                 orderReceiver.orderState = @"001";
                 //商品ID
-                NSArray *goodArray = [self.datasArray lastObject];
+                NSArray *goodArray = [self.datasArray objectAtIndex:2];
                 NSMutableArray *goodidArr = [NSMutableArray array];
                 for (int i=0; i<goodArray.count-1; i++) {
                     ShopcarModel *model = [goodArray objectAtIndex_opple:i];
@@ -392,7 +465,6 @@
                         orderDetails.isShowShareButton = YES;
                         orderDetails.isSliding = YES;//取消滑动返回
                         [weakSelf pushViewController:orderDetails animated:YES];
-                        
                     }else
                     {
                         [XBLoadingView showHUDViewWithText:MESSAGE(returnValue)];

Lighting/Class/Shoppingcart/Controller/StewardTableViewController.h

+//
+//  StewardTableViewController.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2018/1/4.
+//  Copyright © 2018年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "StewardModel.h"
+
+@interface StewardTableViewController : UITableViewController
+
+
+/**
+ 欧管家导购
+ */
+@property (weak, nonatomic) IBOutlet UILabel *stewardLabel;
+
+/**
+ 送货方式
+ */
+@property (weak, nonatomic) IBOutlet UILabel *shippingMethodLabel;
+
+/**
+ 安装方式
+ */
+@property (weak, nonatomic) IBOutlet UILabel *installMethodLabel;
+
+/**
+ 安装日期
+ */
+@property (weak, nonatomic) IBOutlet UILabel *installDateLabel;
+
+/**
+ 欧管家导购
+ */
+@property (nonatomic, strong) StewardModel *resultModel;
+
+/**
+ 通过中文返回int类型
+ */
+- (NSString *)returnType:(NSString *)string;
+/**
+ 通过欧管家导购名返回对应id
+ */
+- (NSString *)returnStewardId:(NSString *)string;
+@end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Lighting/Class/Shoppingcart/Controller/StewardTableViewController.m

+//
+//  StewardTableViewController.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2018/1/4.
+//  Copyright © 2018年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "StewardTableViewController.h"
+#import "YXPickerManager.h"
+
+@interface StewardTableViewController ()
+
+@end
+
+@implementation StewardTableViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+
+}
+
+/**
+ 通过中文返回int类型
+ */
+- (NSString *)returnType:(NSString *)string
+{
+    if ([string isEqualToString:@"自提"]) {
+        return @"1";
+    }
+    if ([string isEqualToString:@"送货上门"]) {
+        return @"2";
+    }
+    if ([string isEqualToString:@"欧普到家"]) {
+        return @"1";
+    }
+    if ([string isEqualToString:@"门店安装"]) {
+        return @"2";
+    }
+    if ([string isEqualToString:@"不含安装"]) {
+        return @"3";
+    }
+    return nil;
+}
+
+/**
+ 通过欧管家导购名返回对应id
+ */
+- (NSString *)returnStewardId:(NSString *)string
+{
+    NSPredicate *pred = [NSPredicate predicateWithFormat:@"empName = %@", string];
+    NSArray *arr = [self.resultModel.data filteredArrayUsingPredicate:pred];
+    StewardModel_data *model = arr.firstObject;
+    return model.empCode;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    WS(weakSelf);
+    switch (indexPath.row) {
+        case 0:
+        {
+            [XBLoadingView showHUDViewWithDefault];;
+            [HTTP networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(GETSTEWARD),[[Shoppersmanager manager] shoppers].employee.currentDepart.fid] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
+                [XBLoadingView hideHUDViewWithDefault];
+                if (RESULT(returnValue)) {
+                    StewardModel *model = [[StewardModel alloc] initWithDictionary:returnValue error:nil];
+                    weakSelf.resultModel = model;
+                    NSMutableArray *stewardArray = [NSMutableArray array];
+                    for (StewardModel_data *data in model.data) {
+                        [stewardArray addObject:data.empName];
+                    }
+                    NSString *defaultString = [self.stewardLabel.text isEqualToString:@"请选择欧管家导购"] ? nil : self.stewardLabel.text;
+                    [[YXPickerManager shareManager] showGeneralPickerView:kMainBlueColor dataArray:stewardArray defaultString:defaultString commitBlock:^(NSString *selectedItem, NSInteger index) {
+                        weakSelf.stewardLabel.text = selectedItem;
+                    } cancelBlock:^{
+                        
+                    }];
+                }else {
+                    [XBLoadingView showHUDViewWithText:MESSAGE(returnValue)];
+                }
+                
+            } withFailureBlock:^(NSError *error) {
+                [XBLoadingView showHUDViewWithText:error.localizedDescription];
+            }];
+        }
+            break;
+        case 1:
+        {
+            NSString *defaultString = [self.shippingMethodLabel.text isEqualToString:@"请选择送货方式"] ? @"送货上门" : self.shippingMethodLabel.text;
+            [[YXPickerManager shareManager] showGeneralPickerView:kMainBlueColor dataArray:@[@"自提",@"送货上门"] defaultString:defaultString commitBlock:^(NSString *selectedItem, NSInteger index) {
+                weakSelf.shippingMethodLabel.text = selectedItem;
+            } cancelBlock:^{
+                
+            }];
+        }
+            break;
+        case 2:
+        {
+            NSString *defaultString = [self.installMethodLabel.text isEqualToString:@"请选择安装方式"] ? @"欧普到家" : self.installMethodLabel.text;
+            [[YXPickerManager shareManager] showGeneralPickerView:kMainBlueColor dataArray:@[@"欧普到家",@"门店安装",@"不含安装"] defaultString:defaultString commitBlock:^(NSString *selectedItem, NSInteger index) {
+                weakSelf.installMethodLabel.text = selectedItem;
+            } cancelBlock:^{
+                
+            }];
+        }
+            break;
+        case 3:
+        {
+            NSString *defaultString = [self.installDateLabel.text isEqualToString:@"请选择安装日期"] ?  [[NSDate date] httpParameterString] : [NSString stringWithFormat:@"%@ 00:00:00",self.installDateLabel.text];
+            [[YXPickerManager shareManager] showDatePickerView:kMainBlueColor datePickerModel:UIDatePickerModeDate minimumDate:[NSDate date] maximumDate:nil defaultDate:defaultString commitBlock:^(NSString *date) {
+                weakSelf.installDateLabel.text = [[date componentsSeparatedByString:@" "] firstObject];
+            } cancelBlock:^{
+                
+            }];
+        }
+
+            break;
+        default:
+            break;
+    }
+}
+
+
+
+@end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Lighting/Class/Shoppingcart/ShopCarmodel/StewardModel.h

+@protocol StewardModel_data 
+
+@end 
+
+
+
+@interface StewardModel_data : JSONModel
+
+@property (nonatomic, strong)  NSString <Optional>  * empCode;
+
+@property (nonatomic, strong)  NSString <Optional>  * empName;
+
+@end 
+
+
+
+@interface StewardModel : JSONModel
+
+@property (nonatomic, strong)  NSString <Optional>  * message;
+
+@property (nonatomic, strong)  NSNumber <Optional>  * code;
+
+@property (nonatomic, strong)  NSMutableArray <StewardModel_data,Optional> * data;
+
+@end 
+

Lighting/Class/Shoppingcart/ShopCarmodel/StewardModel.m

+#import "StewardModel.h"
+
+@implementation StewardModel
+
+@end 
+
+
+
+@implementation StewardModel_data
+
+@end 
+

Lighting/Class/Shoppingcart/View/StewardTableViewCell.h

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

Lighting/Class/Shoppingcart/View/StewardTableViewCell.m

+//
+//  StewardTableViewCell.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2018/1/4.
+//  Copyright © 2018年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "StewardTableViewCell.h"
+
+@implementation StewardTableViewCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+    // Configure the view for the selected state
+}
+
+@end

Lighting/Main/Info.plist

@@ -74,6 +74,8 @@
 	<string>欧立方需要您的同意,才能访问数据</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>欧立方需要您的同意,才能访问相册</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>欧立方需要您的同意,才能访问相册</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>fetch</string>

Lighting/Supporting Files/LightingDev-Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundleName</key>
 	<string>欧立方</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.9</string>
+	<string>2.2.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -47,6 +47,8 @@
 			</array>
 		</dict>
 	</array>
+	<key>CFBundleVersion</key>
+	<string>2.2.1</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>wechat</string>
@@ -70,6 +72,8 @@
 	<string>欧立方需要您的同意,才能访问相机</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>欧立方需要您的同意,才能访问数据</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>欧立方需要您的同意,才能访问相册</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>欧立方需要您的同意,才能访问相册</string>
 	<key>UIBackgroundModes</key>

Lighting/Supporting Files/LightingDis-Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundleName</key>
 	<string>欧立方</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.3</string>
+	<string>2.2.4</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -48,7 +48,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.2.3</string>
+	<string>2.2.4</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>wechat</string>
@@ -72,6 +72,8 @@
 	<string>欧立方需要您的同意,才能访问相机</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>欧立方需要您的同意,才能访问数据</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>欧立方需要您的同意,才能访问相册</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>欧立方需要您的同意,才能访问相册</string>
 	<key>UIBackgroundModes</key>

Lighting/Tools/CYConst/CYConstManager.h

@@ -99,7 +99,7 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
 /**
  *  服务器开发地址
  */
-#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://gomoredev.local:8082/opple-web/app%@",URL]
+#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://192.168.1.176:8082/opple-web/app%@",URL]
 
 
 #elif LightingDev
@@ -195,7 +195,10 @@ extern NSString *const CONFIRMPAY;
  *  获取购物袋商品
  */
 extern NSString *const SHOPPINGBAG;
-
+/**
+ *  获取欧管家导购
+ */
+extern NSString *const GETSTEWARD;
 /**
  *  删除购物袋
  */

Lighting/Tools/CYConst/CYConstManager.m

@@ -304,7 +304,10 @@ NSString *const LOTTERYED = @"/lottery/query";
  *  使用微信卡劵
  */
 NSString *const USEWECHATCARD = @"http://wxcard.opple.com/api/Pay?voucherNo=%@&orderNum=%@&orderTotal=%@";
-
+/**
+ *  获取欧管家导购
+ */
+NSString *const GETSTEWARD = @"/order/getOButlerEmps/%@";
 /**
  *  查询积分
  */

Lighting/Tools/Jastor/opple_objc_json_client.h

@@ -3059,7 +3059,14 @@ extern NSString * const GRADEMETHOD_MANUL;
  *
  *
  */
-@property (nonatomic, copy) NSString *storeNumber;
+@property (nonatomic, copy) NSString *storeNumber;
+
+
+@property (nonatomic, copy) NSString *installationType;
+@property (nonatomic, copy) NSString *installationDate;
+@property (nonatomic, copy) NSString *bulterNumber;
+@property (nonatomic, copy) NSString *bulterName;
+@property (nonatomic, copy) NSString *deliveryType;
 @end /* interface TOOrderEntity */
 
 

Lighting/Tools/NetworkRequest/NetworkRequestClassManager.m

@@ -173,13 +173,16 @@ static NetworkRequestClassManager *manager = nil;
                         [self networkWithDictionaryRequestWithURL:requestURLString withRequestType:requestType withParameter:parameter withReturnValueBlock:^(id returnValue) {
                             successBlock(returnValue);
                         } withFailureBlock:^(NSError *error) {
+                            NSLog(@"%@", responseObject);
                             failureBlock(error);
                         }];
                         
                     } withFailureBlock:^(NSError *error) {
+                        NSLog(@"%@", responseObject);
                         failureBlock(error);
                     }];
                 }else{
+                    NSLog(@"%@", responseObject);
                     successBlock(responseObject);
                 }
             } @catch (NSException *exception) {
@@ -207,9 +210,11 @@ static NetworkRequestClassManager *manager = nil;
                         }];
                         
                     } withFailureBlock:^(NSError *error) {
+                        NSLog(@"error");
                         failureBlock(error);
                     }];
                 }else{
+                    NSLog(@"%@", responseObject);
                     successBlock(responseObject);
                 }
             } @catch (NSException *exception) {
@@ -237,9 +242,11 @@ static NetworkRequestClassManager *manager = nil;
                         }];
                         
                     } withFailureBlock:^(NSError *error) {
+                        NSLog(@"%@", error);
                         failureBlock(error);
                     }];
                 }else{
+                    NSLog(@"%@", responseObject);
                     successBlock(responseObject);
                 }
             } @catch (NSException *exception) {

Pods/YXKit/YXKit/Category/NSString+Category.m

@@ -40,22 +40,9 @@
  *  @return YES 成功 NO 失败
  */
 - (BOOL)isTelephone {
-    NSString * MOBILE = @"^1(3[0-9]|47|5[0-35-9]|8[025-9])\\d{8}$";
-    NSString * CM = @"^((13[4-9])|(147)|(15[0-2,7-9])|(178)|(18[2-4,7-8]))\\d{8}|(1705)\\d{7}$";;
-    NSString * CU = @"^((13[0-2])|(145)|(15[5-6])|(176)|(18[5,6]))\\d{8}|(1709)\\d{7}$";
-    NSString * CT = @"^((133)|(153)|(177)|(173)|(18[0,1,9]))\\d{8}$";
-    NSString * PHS = @"^0(10|2[0-5789]|\\d{3})\\d{7,8}$";
+    NSString * MOBILE = @"^0?(13[0-9]|14[5-9]|15[012356789]|166|17[0-8]|18[0-9]|19[8-9])[0-9]{8}$";
     NSPredicate *regextestmobile = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", MOBILE];
-    NSPredicate *regextestcm = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", CM];
-    NSPredicate *regextestcu = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", CU];
-    NSPredicate *regextestct = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", CT];
-    NSPredicate *regextestphs = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", PHS];
-    
-    return  [regextestmobile evaluateWithObject:self]   ||
-    [regextestphs evaluateWithObject:self]      ||
-    [regextestct evaluateWithObject:self]       ||
-    [regextestcu evaluateWithObject:self]       ||
-    [regextestcm evaluateWithObject:self];
+    return  [regextestmobile evaluateWithObject:self];
 }
 
 - (BOOL)isValidZipcode {