diff --git a/Podfile b/Podfile index 2f6600d898b4de68a9412654932a9bed993a1f55..d03e735daad3a777a4566c69fee31e5f27e9a270 100644 --- a/Podfile +++ b/Podfile @@ -6,3 +6,4 @@ pod 'MBProgressHUD','~>0.9.1' pod 'FMDB', '~> 2.6.2' pod ‘MJRefresh’,’~>3.1.0’ pod ‘ZBarSDK‘,‘~>1.3.1‘ +pod ‘Pingpp’,’~>2.2.4’ diff --git a/Podfile.lock b/Podfile.lock index 2aacba0d879ed67bf84ead6c4b9ae46f72653491..a9d7a8c195fa8d9d7a42362d5ad9f8a0bb5243cf 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -26,6 +26,17 @@ PODS: - Masonry (1.0.0) - MBProgressHUD (0.9.2) - MJRefresh (3.1.0) + - Pingpp (2.2.4): + - Pingpp/Alipay (= 2.2.4) + - Pingpp/Core (= 2.2.4) + - Pingpp/UnionPay (= 2.2.4) + - Pingpp/Alipay (2.2.4): + - Pingpp/Core + - Pingpp/Core (2.2.4): + - Pingpp/Network + - Pingpp/Network (2.2.4) + - Pingpp/UnionPay (2.2.4): + - Pingpp/Core - SDWebImage (3.7.5): - SDWebImage/Core (= 3.7.5) - SDWebImage/Core (3.7.5) @@ -37,6 +48,7 @@ DEPENDENCIES: - Masonry (~> 1.0.0) - MBProgressHUD (~> 0.9.1) - MJRefresh (~> 3.1.0) + - Pingpp (~> 2.2.4) - SDWebImage (~> 3.7.5) - ZBarSDK (~> 1.3.1) @@ -46,6 +58,7 @@ SPEC CHECKSUMS: Masonry: b529bb169217897b6354d4b56b1fada6d475b13d MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1 MJRefresh: 743e6404967d1c2c688472ea3ecfde247d872db4 + Pingpp: 89c262bc06cd559b318595c43af3926f1d851334 SDWebImage: 69c6303e3348fba97e03f65d65d4fbc26740f461 ZBarSDK: 4c1b5daeb7d6cc67dc9355e690af0230a661f6ec diff --git a/zhiche--delivery.xcodeproj/project.pbxproj b/zhiche--delivery.xcodeproj/project.pbxproj index b4766cd5f6a6caec8ff850a3fc79cd315dabc3d9..4b2107e1f89c6a47df1d69758b74703637036f2f 100644 --- a/zhiche--delivery.xcodeproj/project.pbxproj +++ b/zhiche--delivery.xcodeproj/project.pbxproj @@ -112,8 +112,6 @@ 82B365931CDDF670009302BA /* Common.m in Sources */ = {isa = PBXBuildFile; fileRef = 82B365921CDDF670009302BA /* Common.m */; }; 82C9DB651CE0390D00A0B8C8 /* ManagerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 82C9DB641CE0390D00A0B8C8 /* ManagerCell.m */; }; 82C9DB6E1CE06DC000A0B8C8 /* MineCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 82C9DB6D1CE06DC000A0B8C8 /* MineCell.m */; }; - 82C9DC321CE1BE0500A0B8C8 /* MineOrderDetailCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 82C9DC301CE1BE0500A0B8C8 /* MineOrderDetailCell.m */; }; - 82C9DC331CE1BE0500A0B8C8 /* MineOrderDetailCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 82C9DC311CE1BE0500A0B8C8 /* MineOrderDetailCell.xib */; }; 82CE2DE71CF97351000D0749 /* CollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 82CE2DE51CF97351000D0749 /* CollectionViewCell.m */; }; 82CE2DE81CF97351000D0749 /* CollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 82CE2DE61CF97351000D0749 /* CollectionViewCell.xib */; }; 82CFFABE1CF43C2900581A33 /* InvoiceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 82CFFABD1CF43C2900581A33 /* InvoiceViewController.m */; }; @@ -387,9 +385,6 @@ 82C9DB641CE0390D00A0B8C8 /* ManagerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ManagerCell.m; sourceTree = ""; }; 82C9DB6C1CE06DC000A0B8C8 /* MineCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MineCell.h; sourceTree = ""; }; 82C9DB6D1CE06DC000A0B8C8 /* MineCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MineCell.m; sourceTree = ""; }; - 82C9DC2F1CE1BE0500A0B8C8 /* MineOrderDetailCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MineOrderDetailCell.h; sourceTree = ""; }; - 82C9DC301CE1BE0500A0B8C8 /* MineOrderDetailCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MineOrderDetailCell.m; sourceTree = ""; }; - 82C9DC311CE1BE0500A0B8C8 /* MineOrderDetailCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MineOrderDetailCell.xib; sourceTree = ""; }; 82CE2DE41CF97351000D0749 /* CollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollectionViewCell.h; sourceTree = ""; }; 82CE2DE51CF97351000D0749 /* CollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CollectionViewCell.m; sourceTree = ""; }; 82CE2DE61CF97351000D0749 /* CollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CollectionViewCell.xib; sourceTree = ""; }; @@ -1166,9 +1161,6 @@ children = ( 82C9DB6C1CE06DC000A0B8C8 /* MineCell.h */, 82C9DB6D1CE06DC000A0B8C8 /* MineCell.m */, - 82C9DC2F1CE1BE0500A0B8C8 /* MineOrderDetailCell.h */, - 82C9DC301CE1BE0500A0B8C8 /* MineOrderDetailCell.m */, - 82C9DC311CE1BE0500A0B8C8 /* MineOrderDetailCell.xib */, 828682721CE2DEA900C03447 /* GetCarTimeCell.h */, 828682731CE2DEA900C03447 /* GetCarTimeCell.m */, C2E96F951CE2D20700DB0E51 /* AddressCell.h */, @@ -1438,7 +1430,6 @@ 823CDAFE1D000B040090BDE8 /* pay_balance_check_unpress@2x.png in Resources */, 82CE2DE81CF97351000D0749 /* CollectionViewCell.xib in Resources */, C2FAA08A1CF2D26000BA4AB6 /* area.txt in Resources */, - 82C9DC331CE1BE0500A0B8C8 /* MineOrderDetailCell.xib in Resources */, C2AF267D1CDDD36700745A6B /* common_list_line1@3x.png in Resources */, C2AF267C1CDDD36700745A6B /* common_list_line1@2x.png in Resources */, 823CDAFC1D000B040090BDE8 /* pay_balance_check_press@2x.png in Resources */, @@ -1588,7 +1579,6 @@ C2E96FA31CE2D4A900DB0E51 /* ChooseAddressCell.m in Sources */, 823E9CFE1D0153D700750F58 /* ServeViewController.m in Sources */, 823E9D011D01597300750F58 /* AboutViewController.m in Sources */, - 82C9DC321CE1BE0500A0B8C8 /* MineOrderDetailCell.m in Sources */, 823E9CF51D012D1B00750F58 /* NewViewController.m in Sources */, C2E20CF11CE410DC00EA5913 /* CarShipVC.m in Sources */, 82F973421CF8361A0082F93E /* ExecuteViewController.m in Sources */, diff --git a/zhiche--delivery.xcworkspace/xcuserdata/leebruce.xcuserdatad/UserInterfaceState.xcuserstate b/zhiche--delivery.xcworkspace/xcuserdata/leebruce.xcuserdatad/UserInterfaceState.xcuserstate index bdea1a6331c592745d5b109ff632a7828b26eb01..92e033dad807974c2eb5b2df810318af9d7827d4 100644 Binary files a/zhiche--delivery.xcworkspace/xcuserdata/leebruce.xcuserdatad/UserInterfaceState.xcuserstate and b/zhiche--delivery.xcworkspace/xcuserdata/leebruce.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/zhiche--delivery/.DS_Store b/zhiche--delivery/.DS_Store index e1fea9e79ee015618519b03de2ff05691bfbf5fc..4190fecb7a26c4febfa1e25a682d24ae14beca29 100644 Binary files a/zhiche--delivery/.DS_Store and b/zhiche--delivery/.DS_Store differ diff --git a/zhiche--delivery/Delivery/.DS_Store b/zhiche--delivery/Delivery/.DS_Store index f19bc5b752bf8d0f8470d00ccf013a08bb490e7e..6c38fb82371fce04e1d6c794e6430395c0823537 100644 Binary files a/zhiche--delivery/Delivery/.DS_Store and b/zhiche--delivery/Delivery/.DS_Store differ diff --git a/zhiche--delivery/Delivery/Login/LoginViewController.m b/zhiche--delivery/Delivery/Login/LoginViewController.m index a10d6b68a3dff3fade0aaf4f4312c7419a604614..bf81862d8ef84f2633067e3dbc50145b769cce5b 100644 --- a/zhiche--delivery/Delivery/Login/LoginViewController.m +++ b/zhiche--delivery/Delivery/Login/LoginViewController.m @@ -154,12 +154,9 @@ Common *c = [[Common alloc]init]; NSString *string = [NSString stringWithFormat:@"%@login/%@",Main_interface,self.phoneTextField.text]; -// NSString *string = @"http://220.249.50.163/kyle/order/getbyid"; NSDictionary *dic = @{@"phone":self.phoneTextField.text}; - -// NSDictionary *dic = @{@"id":@"1"}; - + [c afPostRequestWithUrlString:string parms:dic finishedBlock:^(id responseObj) { NSDictionary *dictionary = [NSJSONSerialization JSONObjectWithData:responseObj options:NSJSONReadingMutableLeaves error:nil]; @@ -216,7 +213,7 @@ -(void)registerButtonAction { - NSString *string = [NSString stringWithFormat:@"%@login/codelogin",Main_interface]; +// NSString *string = [NSString stringWithFormat:@"%@login/codelogin",Main_interface]; NSDictionary *dic = @{@"phone":self.phoneTextField.text, @"code":self.captchaTextField.text, @@ -224,7 +221,7 @@ Common *c = [[Common alloc]init]; - [c afPostRequestWithUrlString:string parms:dic finishedBlock:^(id responseObj) { + [c afPostRequestWithUrlString:login_codeLogin parms:dic finishedBlock:^(id responseObj) { NSDictionary *dictonary = [NSJSONSerialization JSONObjectWithData:responseObj options:NSJSONReadingMutableLeaves error:nil]; @@ -255,22 +252,6 @@ } -//-(void)test -//{ -// NSString *string = @"http://220.249.50.163/kyle/order/statisticorderstatus"; -// Common *c = [[Common alloc]init]; -// [c afPostRequestWithUrlString:string parms:nil finishedBlock:^(id responseObj) { -// -// NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:responseObj options:NSJSONReadingMutableLeaves error:nil]; -// -// NSLog(@"%@",dic); -// -// -// }failedBlock:^(NSString *errorMsg) { -// NSLog(@"%@",errorMsg); -// }]; -//} - #pragma mark 联系客服 -(void)callButton { diff --git a/zhiche--delivery/Delivery/Main/.DS_Store b/zhiche--delivery/Delivery/Main/.DS_Store index 3dc457c7b0b4bb3de3dc41115032bcce671013a2..f7c31fe76f7fba5a563acb445bf0f31756925d0d 100644 Binary files a/zhiche--delivery/Delivery/Main/.DS_Store and b/zhiche--delivery/Delivery/Main/.DS_Store differ diff --git a/zhiche--delivery/Delivery/Main/1/.DS_Store b/zhiche--delivery/Delivery/Main/1/.DS_Store index 2be757cd73ee7f4bea3538b9b9dd143a00418b28..680ad2d0b5ac808e0d0500bf6a0447bee93acd57 100644 Binary files a/zhiche--delivery/Delivery/Main/1/.DS_Store and b/zhiche--delivery/Delivery/Main/1/.DS_Store differ diff --git a/zhiche--delivery/Delivery/Main/1/Cell/MineOrderDetailCell.h b/zhiche--delivery/Delivery/Main/1/Cell/MineOrderDetailCell.h deleted file mode 100644 index 04691c02c9ff4b9f29986719386681e3f6a89588..0000000000000000000000000000000000000000 --- a/zhiche--delivery/Delivery/Main/1/Cell/MineOrderDetailCell.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// MineOrderDetailCell.h -// zhiche--delivery -// -// Created by LeeBruce on 16/5/10. -// Copyright © 2016年 LeeBruce. All rights reserved. -// - -#import - -@interface MineOrderDetailCell : UITableViewCell - -@property (weak, nonatomic) IBOutlet UIImageView *ImageView; - -@property (weak, nonatomic) IBOutlet UILabel *titleLabel; - -@property (weak, nonatomic) IBOutlet UILabel *numberLabel; - -@property (weak, nonatomic) IBOutlet UILabel *bottomLabel; - - -@end diff --git a/zhiche--delivery/Delivery/Main/1/Cell/MineOrderDetailCell.m b/zhiche--delivery/Delivery/Main/1/Cell/MineOrderDetailCell.m deleted file mode 100644 index 0421cb36e315ca5415811cf7869e7899be3f6447..0000000000000000000000000000000000000000 --- a/zhiche--delivery/Delivery/Main/1/Cell/MineOrderDetailCell.m +++ /dev/null @@ -1,24 +0,0 @@ -// -// MineOrderDetailCell.m -// zhiche--delivery -// -// Created by LeeBruce on 16/5/10. -// Copyright © 2016年 LeeBruce. All rights reserved. -// - -#import "MineOrderDetailCell.h" - -@implementation MineOrderDetailCell - -- (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 diff --git a/zhiche--delivery/Delivery/Main/1/Cell/MineOrderDetailCell.xib b/zhiche--delivery/Delivery/Main/1/Cell/MineOrderDetailCell.xib deleted file mode 100644 index f2170e3ce8d9fba6189f09457d10ce2cfae60360..0000000000000000000000000000000000000000 --- a/zhiche--delivery/Delivery/Main/1/Cell/MineOrderDetailCell.xib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/zhiche--delivery/Delivery/Main/1/Controller/HomeViewController.m b/zhiche--delivery/Delivery/Main/1/Controller/HomeViewController.m index fee4eb258de62e4df32332286925f1e63b48585b..983624cb35ad8951664ee8bd2e90a81750aca6be 100644 --- a/zhiche--delivery/Delivery/Main/1/Controller/HomeViewController.m +++ b/zhiche--delivery/Delivery/Main/1/Controller/HomeViewController.m @@ -211,31 +211,7 @@ default: break; } -// -// switch (sender.tag) { -// case 0:{ -// PlaceOrderVC * placeOrder = [[PlaceOrderVC alloc]init]; -// [self.navigationController pushViewController:placeOrder animated:YES]; -//// -//// WLOrderController * orderVC = [[WLOrderController alloc]init]; -//// [self.navigationController pushViewController:orderVC animated:YES]; -// } -// break; -// -// case 1:{ -//// -// MineOrderVC *mineVC = [[MineOrderVC alloc]init]; -// -// [self.navigationController pushViewController:mineVC animated:YES]; -// -// } -// break; -// default: -// break; -// } -// -// TESTViewController *testVC = [[TESTViewController alloc]init]; -// [self.navigationController pushViewController:testVC animated:YES]; + } diff --git a/zhiche--delivery/Delivery/Main/2/.DS_Store b/zhiche--delivery/Delivery/Main/2/.DS_Store index d60076e4c542170db13b589d3799821a16bc8e23..8df68439254c3767ab9ad940cefe26d6a0ba1037 100644 Binary files a/zhiche--delivery/Delivery/Main/2/.DS_Store and b/zhiche--delivery/Delivery/Main/2/.DS_Store differ diff --git a/zhiche--delivery/Delivery/Main/2/Cell/OrderRootCell.m b/zhiche--delivery/Delivery/Main/2/Cell/OrderRootCell.m index e49a37dd7cd7dc419e29231d4cfe4332a398679f..d5b63e33556ea7b8dabbc585706b0409e4c27c82 100644 --- a/zhiche--delivery/Delivery/Main/2/Cell/OrderRootCell.m +++ b/zhiche--delivery/Delivery/Main/2/Cell/OrderRootCell.m @@ -34,8 +34,6 @@ view.backgroundColor = LineGrayColor; [self.contentView addSubview:view]; - - UILabel *numberL = [[UILabel alloc]initWithFrame:CGRectMake(14, 0, 70, 30)]; [view addSubview:numberL]; numberL.font = Font(15); @@ -55,10 +53,7 @@ self.timeL.textColor = [UIColor redColor]; [view addSubview:self.timeL]; -// UILabel *timeLabel = [self backLabelWithFrame:CGRectMake(CGRectGetMinX(self.timeL.frame) - 70, 0, 70, 30) andFont:15]; -// timeLabel.textColor = [UIColor redColor]; -// timeLabel.text = @"剩余时间:"; -// [view addSubview:timeLabel]; + UIImageView *timeImage = [[UIImageView alloc]initWithFrame:CGRectMake(CGRectGetMinX(self.timeL.frame) - 10, 10, 10, 10)]; timeImage.backgroundColor = [UIColor cyanColor]; [view addSubview:timeImage]; @@ -212,10 +207,6 @@ self.carStyleL.font = Font(14); self.carStyleL.text = @"沃尔沃XC90,沃尔沃V60,沃尔沃XCV40,沃尔沃S60,沃尔沃XC90(混合)"; - - - - UILabel *lineL3 = [[UILabel alloc]init]; [self.contentView addSubview:lineL3]; [lineL3 mas_makeConstraints:^(MASConstraintMaker *make) { @@ -227,131 +218,7 @@ lineL3.backgroundColor = GrayColor; - -// UILabel *lineL4 = [[UILabel alloc]init]; -// [self.contentView addSubview:lineL4]; -// [lineL4 mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.size.mas_equalTo(CGSizeMake(screenWidth, 0.5)); -// make.left.mas_equalTo(0); -// make.bottom.mas_equalTo(weakSelf.contentView).offset(-0.5); -// }]; -// lineL4.backgroundColor = GrayColor; - -// //删除按钮 -// self.deleteButton = [UIButton buttonWithType:UIButtonTypeCustom]; -// [self.deleteButton setTitle:@"删除" forState:UIControlStateNormal]; -// [self.deleteButton setTitleColor:BlackColor forState:UIControlStateNormal]; -// [self.contentView addSubview:self.deleteButton]; -// [self.deleteButton mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.left.mas_equalTo(0); -// make.top.mas_equalTo(lineL3.mas_bottom).offset(0); -// make.size.mas_equalTo(CGSizeMake(screenWidth/3, 35)); -// -// }]; -// self.deleteButton.titleLabel.font = Font(14); -// -// UIImageView *imageV1 = [[UIImageView alloc]init]; -// [self.deleteButton.titleLabel sizeToFit]; -// -// [self.deleteButton addSubview:imageV1]; -// [imageV1 mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.right.mas_equalTo(weakSelf.deleteButton.titleLabel.mas_left).offset(-2); -// make.centerY.equalTo(weakSelf.deleteButton); -// make.size.mas_equalTo(CGSizeMake(20, 15)); -// -// }]; -// imageV1.backgroundColor = [UIColor redColor]; - - - -// UILabel *lineL4 = [[UILabel alloc]init]; -// [self.contentView addSubview:lineL4]; -// [lineL4 mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.left.mas_equalTo(weakSelf.deleteButton.mas_right).offset(0); -// make.centerY.equalTo(weakSelf.deleteButton); -// make.size.mas_equalTo(CGSizeMake(0.5, 35)); -// -// }]; -// lineL4.backgroundColor = GrayColor; -// -// -// //重新发布 -// self.repostButton = [UIButton buttonWithType:UIButtonTypeCustom]; -// [self.repostButton setTitle:@"重新发布" forState:UIControlStateNormal]; -// [self.repostButton setTitleColor:BlackColor forState:UIControlStateNormal]; -// -// [self.contentView addSubview:self.repostButton]; -// [self.repostButton mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.left.mas_equalTo(weakSelf.deleteButton.mas_right).offset(0.5); -// make.top.mas_equalTo(lineL3.mas_bottom).offset(0); -// make.size.mas_equalTo(CGSizeMake(screenWidth/3 - 1, 35)); -// -// }]; -// self.repostButton.titleLabel.font = Font(14); -// -// -// UIImageView *imageV3 = [[UIImageView alloc]init]; -// [self.repostButton.titleLabel sizeToFit]; -// [self.repostButton addSubview:imageV3]; -// [imageV3 mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.right.mas_equalTo(weakSelf.repostButton.titleLabel.mas_left).offset(-2); -// make.centerY.equalTo(weakSelf.repostButton); -// make.size.mas_equalTo(CGSizeMake(20, 15)); -// -// }]; -// imageV3.backgroundColor = [UIColor redColor]; -// -// -// -// //详情按钮 -// self.detailButton = [UIButton buttonWithType:UIButtonTypeCustom]; -// [self.detailButton setTitle:@"订单详情" forState:UIControlStateNormal]; -// [self.detailButton setTitleColor:BlackColor forState:UIControlStateNormal]; -// -// [self.contentView addSubview:self.detailButton]; -// [self.detailButton mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.right.mas_equalTo(0); -// make.top.mas_equalTo(lineL3.mas_bottom).offset(0); -// make.size.mas_equalTo(CGSizeMake(screenWidth/3, 35)); -// -// }]; -// self.detailButton.titleLabel.font = Font(14); -// -// -// -// UIImageView *imageV2 = [[UIImageView alloc]init]; -// [self.detailButton.titleLabel sizeToFit]; -// [self.detailButton addSubview:imageV2]; -// [imageV2 mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.right.mas_equalTo(weakSelf.detailButton.titleLabel.mas_left).offset(-2); -// make.centerY.equalTo(weakSelf.deleteButton); -// make.size.mas_equalTo(CGSizeMake(20, 15)); -// -// }]; -// imageV2.backgroundColor = [UIColor redColor]; -// -// -// -// UILabel *lineL5 = [[UILabel alloc]init]; -// [self.contentView addSubview:lineL5]; -// [lineL5 mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.left.mas_equalTo(weakSelf.detailButton.mas_left).offset(0); -// make.centerY.equalTo(weakSelf.deleteButton); -// make.size.mas_equalTo(CGSizeMake(0.5, 35)); -// -// }]; -// lineL5.backgroundColor = GrayColor; - - + } diff --git "a/zhiche--delivery/Delivery/Main/2/Cell/\345\205\266\344\273\226cell/OtherCell.m" "b/zhiche--delivery/Delivery/Main/2/Cell/\345\205\266\344\273\226cell/OtherCell.m" index 49c7abac18cbc229c795c46d0cc585084c33ca4f..5b990fc187a318bf4c259e6bf03f787dd0895793 100644 --- "a/zhiche--delivery/Delivery/Main/2/Cell/\345\205\266\344\273\226cell/OtherCell.m" +++ "b/zhiche--delivery/Delivery/Main/2/Cell/\345\205\266\344\273\226cell/OtherCell.m" @@ -128,7 +128,7 @@ //起始时间 -// self.startTimeL.text = [NSString stringWithFormat:@"%@",[self backDateWithString:model.deliveryDate]]; + self.startTimeL.text = [NSString stringWithFormat:@"%@",model.deliveryDate]; //终止地 @@ -138,8 +138,8 @@ self.endDetailAddress.text = [NSString stringWithFormat:@"%@",model.receiptUnit]; //终止日期 -// self.endTimeL.text = [NSString stringWithFormat:@"%@",[self backDateWithString:model.arriveDate]]; - self.endTimeL.text = [NSString stringWithFormat:@"%@",model.arriveDate]; + + self.endTimeL.text = [NSString stringWithFormat:@"%@",model.arriveDate]; //车 self.carStyleL.text = @""; diff --git a/zhiche--delivery/Delivery/Main/2/Controller/CancelViewController.m b/zhiche--delivery/Delivery/Main/2/Controller/CancelViewController.m index f4ea03f23ea621edcf95023428a973de0bc79dca..0c9952acaf38c7ad6a0bd8542e53732b78e7d33d 100644 --- a/zhiche--delivery/Delivery/Main/2/Controller/CancelViewController.m +++ b/zhiche--delivery/Delivery/Main/2/Controller/CancelViewController.m @@ -45,14 +45,14 @@ self.cancelString = [self.cancelString stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]; - NSString *urlString = [NSString stringWithFormat:@"%@order/cancel",Main_interface]; +// NSString *urlString = [NSString stringWithFormat:@"%@order/cancel",Main_interface]; NSDictionary *diction = @{@"orderid":@(self.integer), @"reason":self.cancelString}; Common *c = [[Common alloc]init]; - [c afPostRequestWithUrlString:urlString parms:diction finishedBlock:^(id responseObj) { + [c afPostRequestWithUrlString:Mine_Order_Cancel parms:diction finishedBlock:^(id responseObj) { NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:responseObj options:NSJSONReadingMutableLeaves error:nil]; diff --git a/zhiche--delivery/Delivery/Main/2/Controller/MineOrderVC.m b/zhiche--delivery/Delivery/Main/2/Controller/MineOrderVC.m index 7c468562397f68ab9ee20d2ce04414b11f79b1f4..198c05b8b066cf85c624ef7b4a4b08eaa407880b 100644 --- a/zhiche--delivery/Delivery/Main/2/Controller/MineOrderVC.m +++ b/zhiche--delivery/Delivery/Main/2/Controller/MineOrderVC.m @@ -102,51 +102,7 @@ //订单状态接口 NSString *urlString = [NSString stringWithFormat:@"%@order/%@?pageNo=%d&pageSize=%d",Main_interface,string,self.pageNo,self.pageSize]; - -// //订单状态接口 -// NSString *urlString = [NSString stringWithFormat:@"%@order/list/%ld?status=%ld&pageNo=%ld&pageSize=%ld",Main_interface,self.statusString,self.statusString,self.pageNo,self.pageSize]; - - /* - 托运阶段 - 已保存 10 - 已发布 20 - 已过期 25 - 处理期 30 - - 订单阶段 - 已确定 40 - 已提车 50 - 将到达 60 - 已交车 70 - 已完成 80 - 已作废 90 - 已取消 95 - 全部 0 - */ - - /** - 未付款 10 - 付定金 20 - 已完成 30 - 开发票 40 - - */ - - /** - 待付款 40 50 60 70 - 执行中 40 50 60 - 已完成 80 - 其他 90 95 - */ - - /** - 待付款 －－已确定 已提车 将到达 已交车 - 执行中 －－已确定 已提车 将到达 - 已完成 －－已完成 - 其他 －－已作废 已取消 - */ - - + [Common requestWithUrlString:urlString contentType:application_json finished:^(id responseObj) { @@ -284,7 +240,6 @@ _number = sender.tag - 300; -#warning 接口调通之后可以去掉 [self.tableView reloadData]; [self initDataSource]; @@ -351,14 +306,12 @@ - (void)didReceiveMemoryWarning { [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. } -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { return self.dataArray.count; -// return 5; } -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section @@ -675,7 +628,7 @@ -(void)repostButtonAction:(UIButton *)sender { - NSString *urlString = [NSString stringWithFormat:@"%@order/publish",Main_interface]; +// NSString *urlString = [NSString stringWithFormat:@"%@order/publish",Main_interface]; MineOrderModel *model = [[MineOrderModel alloc]init]; model = self.dataArray[sender.tag - 2200]; @@ -684,7 +637,7 @@ Common *c = [[Common alloc]init]; - [c afPostRequestWithUrlString:urlString parms:dic finishedBlock:^(id responseObj) { + [c afPostRequestWithUrlString:Mine_Order parms:dic finishedBlock:^(id responseObj) { NSDictionary *dictionary = [NSJSONSerialization JSONObjectWithData:responseObj options:NSJSONReadingMutableLeaves error:nil]; diff --git a/zhiche--delivery/Delivery/Main/2/Controller/PayViewController.m b/zhiche--delivery/Delivery/Main/2/Controller/PayViewController.m index 8ea7bff2bba5e146b4b7e664c142cc275ecd8092..47067b49f7faa29113e2547195c3ab1c1b55c676 100644 --- a/zhiche--delivery/Delivery/Main/2/Controller/PayViewController.m +++ b/zhiche--delivery/Delivery/Main/2/Controller/PayViewController.m @@ -165,10 +165,12 @@ NSString *urlString = [NSString string]; if (self.rowNumber == 0) { - urlString = [NSString stringWithFormat:@"%@pay/alipay",Main_interface]; +// urlString = [NSString stringWithFormat:@"%@pay/alipay",Main_interface]; + urlString = pay_byAli; } else { - urlString = [NSString stringWithFormat:@"%@pay/wx",Main_interface]; +// urlString = [NSString stringWithFormat:@"%@pay/wx",Main_interface]; + urlString = pay_byWx; } diff --git a/zhiche--delivery/Delivery/Main/3/.DS_Store b/zhiche--delivery/Delivery/Main/3/.DS_Store index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..88f73806670b9e6b4d19deb08cb3e2f4fc1066c0 100644 Binary files a/zhiche--delivery/Delivery/Main/3/.DS_Store and b/zhiche--delivery/Delivery/Main/3/.DS_Store differ diff --git a/zhiche--delivery/Delivery/Main/4/.DS_Store b/zhiche--delivery/Delivery/Main/4/.DS_Store index 8c8f2d1996c60d914be814a21367e79e2f2703b3..35089b30d92d33baece0c7be22b7dccec50285f7 100644 Binary files a/zhiche--delivery/Delivery/Main/4/.DS_Store and b/zhiche--delivery/Delivery/Main/4/.DS_Store differ diff --git a/zhiche--delivery/Delivery/Main/4/Cell/CarTypeCell.m b/zhiche--delivery/Delivery/Main/4/Cell/CarTypeCell.m index fe1216837ce97febce138f08f9203088bc1cb87b..a401cf999e08ef363f88de8378a05131cc663044 100644 --- a/zhiche--delivery/Delivery/Main/4/Cell/CarTypeCell.m +++ b/zhiche--delivery/Delivery/Main/4/Cell/CarTypeCell.m @@ -60,10 +60,6 @@ self.brandLabel.textAlignment = NSTextAlignmentCenter; - - - - self.deleteButton = [UIButton buttonWithType:UIButtonTypeCustom]; [self.deleteButton setTitle:@"删除" forState:UIControlStateNormal]; [self.deleteButton setTitleColor:[UIColor blueColor] forState:UIControlStateNormal]; @@ -115,9 +111,6 @@ self.typeLabel.text = @"商务轿车"; self.typeLabel.textAlignment = NSTextAlignmentCenter; - - - } - (void)awakeFromNib { diff --git a/zhiche--delivery/Delivery/Main/4/Cell/DepartCell.m b/zhiche--delivery/Delivery/Main/4/Cell/DepartCell.m index e80e5a1a2323643f606b0eb0d592cf001edf4961..68f72cf4c77f2ad6f8179e9f0c49d03e88d35702 100644 --- a/zhiche--delivery/Delivery/Main/4/Cell/DepartCell.m +++ b/zhiche--delivery/Delivery/Main/4/Cell/DepartCell.m @@ -44,7 +44,6 @@ make.size.mas_equalTo(CGSizeMake(100, 15)); }]; -// self.startLabel.textAlignment = NSTextAlignmentCenter; self.startLabel.font = Font(14); self.startLabel.text = @"北京-八大处"; @@ -53,7 +52,6 @@ self.addressLabel = [[UILabel alloc]init]; [self.contentView addSubview:self.addressLabel]; [self.addressLabel mas_makeConstraints:^(MASConstraintMaker *make) { -// make.left.mas_equalTo(weakSelf.startLabel.mas_right).offset(20); make.centerX.equalTo(weakSelf.contentView); make.centerY.equalTo(weakSelf.startLabel); make.size.mas_equalTo(CGSizeMake(100, 15)); @@ -83,12 +81,10 @@ [self.addressDetailLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(weakSelf.startLabel.mas_bottom).offset(5); -// make.left.mas_equalTo(weakSelf.startLabel.mas_left).offset(0); make.left.equalTo(weakSelf.startLabel); make.size.mas_equalTo(CGSizeMake(screenWidth - 60, 15)); }]; -// self.addressDetailLabel.textAlignment = NSTextAlignmentCenter; self.addressDetailLabel.font = Font(14); self.addressDetailLabel.text = @"北京市朝阳区光华路123号"; @@ -99,27 +95,13 @@ [self.infoLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(weakSelf.addressDetailLabel.mas_bottom).offset(5); -// make.left.mas_equalTo(weakSelf.addressLabel.mas_left).offset(0); make.left.equalTo(weakSelf.startLabel); make.size.mas_equalTo(CGSizeMake(200, 15)); }]; -// self.infoLabel.textAlignment = NSTextAlignmentCenter; self.infoLabel.font = Font(14); self.infoLabel.text = @"hello 12345678909"; -// UILabel *lineL2 = [[UILabel alloc]init]; -// [self.contentView addSubview:lineL2]; -// [lineL2 mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.top.mas_equalTo(weakSelf.infoLabel.mas_bottom).offset(5); -// make.centerX.equalTo(weakSelf.contentView); -// make.size.mas_equalTo(CGSizeMake(screenWidth - 28, 0.5)); -// }]; -// -// lineL2.backgroundColor = GrayColor; - - UILabel *lineL3 = [[UILabel alloc]init]; @@ -263,11 +245,7 @@ -(void)setModel:(DepartModel *)model { -// startLabel; -// addressLabel; -// defaultLabel; -// addressDetailLabel; -// infoLabel; + if (model != _model) { diff --git a/zhiche--delivery/Delivery/Main/4/Cell/InvoiceCell.m b/zhiche--delivery/Delivery/Main/4/Cell/InvoiceCell.m index 91fe727b543420e133a0be3ead7a016a099e456d..d2eccb6518c60884aa8bf6a4390c312d502cd917 100644 --- a/zhiche--delivery/Delivery/Main/4/Cell/InvoiceCell.m +++ b/zhiche--delivery/Delivery/Main/4/Cell/InvoiceCell.m @@ -190,163 +190,6 @@ self.priceLabel.font = Font(14); self.priceLabel.text = @"￥10000"; -// //车型 -// self.carStyleL = [[UILabel alloc]init]; -// [self.contentView addSubview:self.carStyleL]; -// [self.carStyleL mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.top.mas_equalTo(lineL2.mas_bottom).offset(3); -// make.left.mas_equalTo(20); -// make.size.mas_equalTo(CGSizeMake(screenWidth - 80, 20)); -// -// }]; -// -// self.carStyleL.textAlignment = NSTextAlignmentCenter; -// self.carStyleL.font = Font(14); -// self.carStyleL.text = @"沃尔沃XC90,沃尔沃V60,沃尔沃XCV40,沃尔沃S60,沃尔沃XC90(混合)"; -// -// -// //个数 -// self.numberL = [[UILabel alloc]init]; -// [self.contentView addSubview:self.numberL]; -// [self.numberL mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.top.mas_equalTo(lineL2.mas_bottom).offset(3); -// make.left.mas_equalTo(weakSelf.carStyleL.mas_right).offset(5); -// make.size.mas_equalTo(CGSizeMake(50, 20)); -// -// -// }]; -// self.numberL.textAlignment = NSTextAlignmentCenter; -// self.numberL.font = Font(14); -// self.numberL.text = @"共5辆"; -// -// -// UILabel *lineL3 = [[UILabel alloc]init]; -// [self.contentView addSubview:lineL3]; -// [lineL3 mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.top.mas_equalTo(weakSelf.carStyleL.mas_bottom).offset(4); -// make.centerX.equalTo(weakSelf.contentView); -// make.size.mas_equalTo(CGSizeMake(screenWidth - 28, 0.5)); -// }]; -// -// lineL3.backgroundColor = GrayColor; -// -// //删除按钮 -// self.deleteButton = [UIButton buttonWithType:UIButtonTypeCustom]; -// [self.deleteButton setTitle:@"删除" forState:UIControlStateNormal]; -// [self.deleteButton setTitleColor:BlackColor forState:UIControlStateNormal]; -// [self.contentView addSubview:self.deleteButton]; -// [self.deleteButton mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.left.mas_equalTo(0); -// make.top.mas_equalTo(lineL3.mas_bottom).offset(0); -// make.size.mas_equalTo(CGSizeMake(screenWidth/3, 35)); -// -// }]; -// self.deleteButton.titleLabel.font = Font(14); -// -// UIImageView *imageV1 = [[UIImageView alloc]init]; -// [self.deleteButton.titleLabel sizeToFit]; -// -// [self.deleteButton addSubview:imageV1]; -// [imageV1 mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.right.mas_equalTo(weakSelf.deleteButton.titleLabel.mas_left).offset(-2); -// make.centerY.equalTo(weakSelf.deleteButton); -// make.size.mas_equalTo(CGSizeMake(20, 15)); -// -// }]; -// imageV1.backgroundColor = [UIColor redColor]; -// -// -// -// UILabel *lineL4 = [[UILabel alloc]init]; -// [self.contentView addSubview:lineL4]; -// [lineL4 mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.left.mas_equalTo(weakSelf.deleteButton.mas_right).offset(0); -// make.centerY.equalTo(weakSelf.deleteButton); -// make.size.mas_equalTo(CGSizeMake(0.5, 35)); -// -// }]; -// lineL4.backgroundColor = GrayColor; -// -// -// //重新发布 -// self.repostButton = [UIButton buttonWithType:UIButtonTypeCustom]; -// [self.repostButton setTitle:@"重新发布" forState:UIControlStateNormal]; -// [self.repostButton setTitleColor:BlackColor forState:UIControlStateNormal]; -// -// [self.contentView addSubview:self.repostButton]; -// [self.repostButton mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.left.mas_equalTo(weakSelf.deleteButton.mas_right).offset(0.5); -// make.top.mas_equalTo(lineL3.mas_bottom).offset(0); -// make.size.mas_equalTo(CGSizeMake(screenWidth/3 - 1, 35)); -// -// }]; -// self.repostButton.titleLabel.font = Font(14); -// -// -// UIImageView *imageV3 = [[UIImageView alloc]init]; -// [self.repostButton.titleLabel sizeToFit]; -// [self.repostButton addSubview:imageV3]; -// [imageV3 mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.right.mas_equalTo(weakSelf.repostButton.titleLabel.mas_left).offset(-2); -// make.centerY.equalTo(weakSelf.repostButton); -// make.size.mas_equalTo(CGSizeMake(20, 15)); -// -// }]; -// imageV3.backgroundColor = [UIColor redColor]; -// -// -// -// //详情按钮 -// self.detailButton = [UIButton buttonWithType:UIButtonTypeCustom]; -// [self.detailButton setTitle:@"订单详情" forState:UIControlStateNormal]; -// [self.detailButton setTitleColor:BlackColor forState:UIControlStateNormal]; -// -// [self.contentView addSubview:self.detailButton]; -// [self.detailButton mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.right.mas_equalTo(0); -// make.top.mas_equalTo(lineL3.mas_bottom).offset(0); -// make.size.mas_equalTo(CGSizeMake(screenWidth/3, 35)); -// -// }]; -// self.detailButton.titleLabel.font = Font(14); -// -// -// -// UIImageView *imageV2 = [[UIImageView alloc]init]; -// [self.detailButton.titleLabel sizeToFit]; -// [self.detailButton addSubview:imageV2]; -// [imageV2 mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.right.mas_equalTo(weakSelf.detailButton.titleLabel.mas_left).offset(-2); -// make.centerY.equalTo(weakSelf.deleteButton); -// make.size.mas_equalTo(CGSizeMake(20, 15)); -// -// }]; -// imageV2.backgroundColor = [UIColor redColor]; -// -// -// -// UILabel *lineL5 = [[UILabel alloc]init]; -// [self.contentView addSubview:lineL5]; -// [lineL5 mas_makeConstraints:^(MASConstraintMaker *make) { -// -// make.left.mas_equalTo(weakSelf.detailButton.mas_left).offset(0); -// make.centerY.equalTo(weakSelf.deleteButton); -// make.size.mas_equalTo(CGSizeMake(0.5, 35)); -// -// }]; -// lineL5.backgroundColor = GrayColor; - - } diff --git a/zhiche--delivery/Delivery/Main/4/Cell/TopBackView.m b/zhiche--delivery/Delivery/Main/4/Cell/TopBackView.m index d672b158a2e82436f10d154b24b682f7e1af08e5..2a55f5bb871176e7d72015ac9bb3f7447155adf4 100644 --- a/zhiche--delivery/Delivery/Main/4/Cell/TopBackView.m +++ b/zhiche--delivery/Delivery/Main/4/Cell/TopBackView.m @@ -18,9 +18,6 @@ self.frame = frame; self.backgroundColor = [UIColor whiteColor]; - // UIImageView *imageView = [[UIImageView alloc]initWithFrame:CGRectMake((screenWidth - 28)/2, 27, 28, 28)]; - // imageView.image = [UIImage imageNamed:@"common_top_logo"]; - // [topView addSubview:imageView]; UILabel *titleLabel = [[UILabel alloc]initWithFrame:CGRectMake((screenWidth - 150)/2, 34, 150, 15)]; titleLabel.text = string; @@ -62,7 +59,6 @@ }]; -// [self.callButton addTarget:self action:@selector(callTheKeFu) forControlEvents:UIControlEventTouchUpInside]; //返回 self.leftButton = [UIButton buttonWithType:UIButtonTypeSystem]; diff --git a/zhiche--delivery/Delivery/Main/4/Controller/AddressEditVC.m b/zhiche--delivery/Delivery/Main/4/Controller/AddressEditVC.m index 52b795e68c49287aa0ee5d3fe155e359d72775a6..3bf884be840cf03a1875de876fd8e69f190bb540 100644 --- a/zhiche--delivery/Delivery/Main/4/Controller/AddressEditVC.m +++ b/zhiche--delivery/Delivery/Main/4/Controller/AddressEditVC.m @@ -410,7 +410,7 @@ if (weakSelf.store) { - NSString *urlString = [NSString stringWithFormat:@"%@useraddress/upateuseraddress",Main_interface]; +// NSString *urlString = [NSString stringWithFormat:@"%@useraddress/upateuseraddress",Main_interface]; NSDictionary *dictionary = [NSDictionary dictionary]; @@ -450,7 +450,7 @@ - [Com afPostRequestWithUrlString:urlString parms:dictionary finishedBlock:^(id responseObj) { + [Com afPostRequestWithUrlString:userAddress_update parms:dictionary finishedBlock:^(id responseObj) { NSMutableDictionary * dicObj =[NSJSONSerialization JSONObjectWithData:responseObj options:NSJSONReadingMutableContainers error:nil]; @@ -584,7 +584,6 @@ } - //点击return按钮 键盘隐藏 这是协议中的方法 -(BOOL)textFieldShouldReturn:(UITextField *)textField @@ -596,8 +595,6 @@ } - - - (void)didReceiveMemoryWarning { [super didReceiveMemoryWarning]; // Dispose of any resources that can be recreated. diff --git a/zhiche--delivery/Delivery/Main/4/Controller/CarTypeViewController.m b/zhiche--delivery/Delivery/Main/4/Controller/CarTypeViewController.m index e0637b77e10bd495a9cb0ec91063de7f96f79f46..44a6b7ed4fdb99568b559cafc2021e03f4c86ba1 100644 --- a/zhiche--delivery/Delivery/Main/4/Controller/CarTypeViewController.m +++ b/zhiche--delivery/Delivery/Main/4/Controller/CarTypeViewController.m @@ -44,10 +44,10 @@ -(void)initSourceData { - NSString *urlString = [NSString stringWithFormat:@"%@uservehicle/list",Main_interface]; +// NSString *urlString = [NSString stringWithFormat:@"%@uservehicle/list",Main_interface]; - [Common requestWithUrlString:urlString contentType:@"application/json" finished:^(id responseObj) { + [Common requestWithUrlString:user_vehicle_list contentType:application_json finished:^(id responseObj) { self.dataArray = [NSMutableArray arrayWithArray:responseObj[@"data"]]; @@ -57,35 +57,13 @@ } - - + } failed:^(NSString *errorMsg) { NSLog(@"%@",errorMsg); }]; - - -// Common *c = [[Common alloc]init]; -// [c afPostRequestWithUrlString:urlString parms:nil finishedBlock:^(id responseObj) { -// -// NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:responseObj options:NSJSONReadingMutableLeaves error:nil]; -// -// -// self.dataArray = [NSMutableArray arrayWithArray:dic[@"data"]]; -// if (self.dataArray.count > 0) { -// -// [self.tableView reloadData]; -// -// } -// -// -// } failedBlock:^(NSString *errorMsg) { -// NSLog(@"%@",errorMsg); -// }]; - - } -(void)initTableView @@ -131,11 +109,7 @@ ]; } - -// *logoImageV; -// brandLabel; -// *typeLabel; -// *areaLabel; + NSString *brandString = self.dataArray[indexPath.section][@"brandName"]; brandString = [brandString stringByAppendingString:self.dataArray[indexPath.section][@"vehicleName"]]; @@ -185,7 +159,7 @@ choiceVC.callBackId = ^(NSString *str1,NSString *str2 ,NSString *str3,NSString *str4){ - NSString *urlString = [NSString stringWithFormat:@"%@uservehicle/create",Main_interface]; +// NSString *urlString = [NSString stringWithFormat:@"%@uservehicle/create",Main_interface]; NSDictionary *dic = @{@"vehicleid":str1, @@ -198,7 +172,7 @@ Common *c = [[Common alloc]init]; - [c afPostRequestWithUrlString:urlString parms:dic finishedBlock:^(id responseObj) { + [c afPostRequestWithUrlString:user_vehicle_create parms:dic finishedBlock:^(id responseObj) { NSDictionary *dicionary = [NSJSONSerialization JSONObjectWithData:responseObj options:NSJSONReadingMutableLeaves error:nil]; diff --git a/zhiche--delivery/Delivery/Main/4/Controller/ChoiceCarTypeVC.m b/zhiche--delivery/Delivery/Main/4/Controller/ChoiceCarTypeVC.m index 6c75ca61bf6b057ade2fe44d69e0386111b09699..ed6374fa581b3a594c4754ca0a11cd57c61c6b1f 100644 --- a/zhiche--delivery/Delivery/Main/4/Controller/ChoiceCarTypeVC.m +++ b/zhiche--delivery/Delivery/Main/4/Controller/ChoiceCarTypeVC.m @@ -56,9 +56,9 @@ -(void)initDataSource { - NSString *urlString = [NSString stringWithFormat:@"%@brand/list",Main_interface]; +// NSString *urlString = [NSString stringWithFormat:@"%@brand/list",Main_interface]; - [Common requestWithUrlString:urlString contentType:@"application/json" finished:^(id responseObj) { + [Common requestWithUrlString:brand_list contentType:application_json finished:^(id responseObj) { self.leftDataArray = [NSMutableArray arrayWithArray:responseObj[@"data"]]; @@ -71,30 +71,17 @@ NSLog(@"%@",errorMsg); }]; - -// NSArray *array1 = @[@"宝马3系",@"宝马5系",@"宝马X5",@"宝马7系",@"宝马X1",@"宝马X3",@"宝马4系",@"宝马M2"]; -// NSArray *array2 = @[@"XT5",@"CT6",@"ATS-L",@"XTS",@"SRX",@"凯雷德"];//凯迪拉克 -// NSArray *array3 = @[@"奔驰C级",@"奔驰E级",@"奔驰A级",@"奔驰G级",@"奔驰S级",@"奔驰V级"]; -// NSArray *array4 = @[@"辉腾",@"帕萨特",@"朗逸",@"途观",@"凌渡",@"大众CC",@"高尔夫GTI",@"蔚揽",@"Golf",@"迈特威",@"凯路威",@"XL",@"辉昂",@"尚酷",@"Tiguan",@"朗行"]; -// NSArray *array5 = @[@"卡罗拉",@"普拉多",@"汉兰达",@"RAV4",@"锐志",@"凯美瑞",@"皇冠",@"兰德酷路泽",@"丰田埃尔法",@"丰田86",@"花冠"]; -// NSArray *array6 = @[@"奥迪A6",@"奥迪Q5",@"奥迪A4",@"奥迪Q3",@"奥迪Q7",@"奥迪R8"]; -// -// -// self.dataDictionary = [NSMutableDictionary dictionaryWithObjectsAndKeys:array1,@"宝马",array2,@"凯迪拉克",array3,@"奔驰",array4,@"大众",array5,@"丰田",array6,@"奥迪", nil]; -// -// self.dataArray = [NSMutableArray arrayWithArray:self.dataDictionary[@"宝马"]]; - } -(void)initRightDataWith:(NSString *)string { - NSString *urlString = [NSString stringWithFormat:@"%@vehicle/list",Main_interface]; +// NSString *urlString = [NSString stringWithFormat:@"%@vehicle/list",Main_interface]; - NSString * url = [NSString stringWithFormat:@"%@?brandid=%@",urlString,string]; + NSString * url = [NSString stringWithFormat:@"%@?brandid=%@",vehicle_list,string]; - [Common requestWithUrlString:url contentType:@"application/json" finished:^(id responseObj) { + [Common requestWithUrlString:url contentType:application_json finished:^(id responseObj) { if (self.rightDataArray.count > 0) { [self.rightDataArray removeAllObjects]; } @@ -111,9 +98,6 @@ } - - - -(void)initTableView { @@ -241,8 +225,6 @@ self.carTypeID = self.rightDataArray[indexPath.row][@"id"];//车型id -// NSString *string = [NSString stringWithFormat:@"%@m*%@m*%@m",self.rightDataArray[indexPath.row][@"vehicleLengh"],self.rightDataArray[indexPath.row][@"vehicleWidth"],self.rightDataArray[indexPath.row][@"vehicleHeight"]]; - //延迟执行 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ diff --git a/zhiche--delivery/Delivery/Main/4/Controller/DepartViewController.m b/zhiche--delivery/Delivery/Main/4/Controller/DepartViewController.m index 49046bc4df643e2c59cae3c7fb65837ef79bd86d..a3d4b27a7bb480d7873dd6837124a093a34670c6 100644 --- a/zhiche--delivery/Delivery/Main/4/Controller/DepartViewController.m +++ b/zhiche--delivery/Delivery/Main/4/Controller/DepartViewController.m @@ -41,9 +41,6 @@ self.view.backgroundColor = WhiteColor; -// self.dataArray = [NSMutableArray arrayWithObjects:@"1",@"2",@"3",@"4",@"5",nil ]; - - [self initTableView]; } @@ -315,7 +312,7 @@ -(void)defaluButtonAciton:(UIButton *)sender { - NSString *urlString = [NSString stringWithFormat:@"%@useraddress/modify/default",Main_interface]; +// NSString *urlString = [NSString stringWithFormat:@"%@useraddress/modify/default",Main_interface]; DepartModel *model = [[DepartModel alloc]init]; model = self.dataArray[sender.tag - 450]; @@ -325,7 +322,7 @@ Common *c = [[Common alloc]init]; - [c afPostRequestWithUrlString:urlString parms:dic finishedBlock:^(id responseObj) { + [c afPostRequestWithUrlString:userAddress_default parms:dic finishedBlock:^(id responseObj) { NSDictionary *dicionary = [NSJSONSerialization JSONObjectWithData:responseObj options:NSJSONReadingMutableLeaves error:nil]; @@ -375,10 +372,7 @@ [self.navigationController pushViewController:addressVC animated:YES]; -// AddressEditVC *addressVC = [[AddressEditVC alloc]init]; -// addressVC.title = self.topTitle; -// -// [self.navigationController pushViewController:addressVC animated:YES]; + } -(void)backAction diff --git a/zhiche--delivery/Delivery/Main/4/Controller/InstallViewController.m b/zhiche--delivery/Delivery/Main/4/Controller/InstallViewController.m index 45ef217a90483d224968df989619291c33ee806e..1517ea1f8e7167baa258975dc27e4479e7e001ad 100644 --- a/zhiche--delivery/Delivery/Main/4/Controller/InstallViewController.m +++ b/zhiche--delivery/Delivery/Main/4/Controller/InstallViewController.m @@ -50,11 +50,7 @@ [self.view addSubview:topBackView]; self.view.backgroundColor = WhiteColor; -// NSString *string = @"https://7xtqd2.com1.z0.glb.clouddn.com/FguOpAlOAb7uai_0VarZV_B9bQRz?e=1463659030&token=wQknukoe-lwcjLKEnsBz-BrL61M1BEMP0Gq_M2qP:wXxSDH-Hw7G7zmgXXS-CnFk-Cwk="; -// -// -// UIImageView *imageV = [[UIImageView alloc]initWithFrame:[UIScreen mainScreen].bounds]; -// [imageV sd_setImageWithURL:[NSURL URLWithString:string]]; +// [self initSubViews]; @@ -66,9 +62,9 @@ -(void)initDataSource { //用户信息接口 - NSString *urlString = [NSString stringWithFormat:@"%@user",Main_interface]; +// NSString *urlString = [NSString stringWithFormat:@"%@user",Main_interface]; - [Common requestWithUrlString:urlString contentType:application_json finished:^(id responseObj) { + [Common requestWithUrlString:user_info contentType:application_json finished:^(id responseObj) { if ([responseObj[@"success"] boolValue]) { @@ -94,11 +90,9 @@ //拼接图片url NSString *urlString = [NSString stringWithFormat:@"%@qiniu/download/ticket?key=%@",Main_interface,self.dataDictionary[@"pic"]]; -// NSDictionary *diction = @{@"key":self.dataDictionary[@"pic"]}; [Common requestWithUrlString:urlString contentType:application_json finished:^(id responseObj) { - NSLog(@"%@",responseObj); if ([responseObj[@"success"] boolValue]) { @@ -133,16 +127,16 @@ [self.view addSubview:self.tableView]; - UIButton *logoutButton = [UIButton buttonWithType:UIButtonTypeCustom]; - logoutButton.backgroundColor = WhiteColor; - logoutButton.frame = CGRectMake(screenWidth/2 - 140, screenHeight - 98, 280, 35); - [logoutButton setTitle:@"退出登录" forState:UIControlStateNormal]; - logoutButton.layer.cornerRadius = 5; - logoutButton.layer.borderColor = GrayColor.CGColor; - logoutButton.layer.borderWidth = 0.5; - logoutButton.titleLabel.font = Font(15); - [logoutButton addTarget:self action:@selector(logoutButtonAction) forControlEvents:UIControlEventTouchUpInside]; - [logoutButton setTitleColor:BlackColor forState:UIControlStateNormal]; +// UIButton *logoutButton = [UIButton buttonWithType:UIButtonTypeCustom]; +// logoutButton.backgroundColor = WhiteColor; +// logoutButton.frame = CGRectMake(screenWidth/2 - 140, screenHeight - 98, 280, 35); +// [logoutButton setTitle:@"退出登录" forState:UIControlStateNormal]; +// logoutButton.layer.cornerRadius = 5; +// logoutButton.layer.borderColor = GrayColor.CGColor; +// logoutButton.layer.borderWidth = 0.5; +// logoutButton.titleLabel.font = Font(15); +// [logoutButton addTarget:self action:@selector(logoutButtonAction) forControlEvents:UIControlEventTouchUpInside]; +// [logoutButton setTitleColor:BlackColor forState:UIControlStateNormal]; // [self.view addSubview:logoutButton]; } @@ -390,10 +384,9 @@ #pragma mark 从七牛获取Token -(void)getTokenFromQN { - NSString *string = [NSString stringWithFormat:@"%@qiniu/upload/ticket",Main_interface]; +// NSString *string = [NSString stringWithFormat:@"%@qiniu/upload/ticket",Main_interface]; - [Common requestWithUrlString:string contentType:application_json finished:^(id responseObj) { - NSLog(@"%@",responseObj); + [Common requestWithUrlString:qiniu_token contentType:application_json finished:^(id responseObj) { if ([responseObj[@"success"] boolValue]) { self.token = responseObj[@"data"]; @@ -431,7 +424,7 @@ -(void)changePhotoWithString:(NSString *)string { - NSString *urlString = [NSString stringWithFormat:@"%@user/modify",Main_interface]; +// NSString *urlString = [NSString stringWithFormat:@"%@user/modify",Main_interface]; NSDictionary *dictionary = @{@"pic":string, @@ -445,14 +438,10 @@ Common *c = [[Common alloc]init]; - [c afPostRequestWithUrlString:urlString parms:dictionary finishedBlock:^(id responseObj) { + [c afPostRequestWithUrlString:user_modify parms:dictionary finishedBlock:^(id responseObj) { NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:responseObj options:NSJSONReadingMutableContainers error:nil]; - NSLog(@"%@",dic); - - - } failedBlock:^(NSString *errorMsg) { diff --git a/zhiche--delivery/Delivery/Main/4/Controller/InvoiceDetailViewController.m b/zhiche--delivery/Delivery/Main/4/Controller/InvoiceDetailViewController.m index 1e39e741d70886e0304b02b6fb20962d56a278e9..76d1f7bc0c4b877e6a90baf25ea2a84f38b318c1 100644 --- a/zhiche--delivery/Delivery/Main/4/Controller/InvoiceDetailViewController.m +++ b/zhiche--delivery/Delivery/Main/4/Controller/InvoiceDetailViewController.m @@ -76,7 +76,7 @@ -(void)postDataSourceToInternet { //拼接图片url - NSString *urlString = [NSString stringWithFormat:@"%@invoice/create",Main_interface]; +// NSString *urlString = [NSString stringWithFormat:@"%@invoice/create",Main_interface]; NSString *string = [self.areaField.text stringByAppendingString:self.addressField.text]; string = [string stringByReplacingOccurrencesOfString:@"-" withString:@""]; @@ -90,7 +90,7 @@ Common *c = [[Common alloc]init]; - [c afPostRequestWithUrlString:urlString parms:dic finishedBlock:^(id responseObj) { + [c afPostRequestWithUrlString:invoice_create parms:dic finishedBlock:^(id responseObj) { NSDictionary *dictionary = [NSJSONSerialization JSONObjectWithData:responseObj options:NSJSONReadingMutableLeaves error:nil]; diff --git a/zhiche--delivery/Delivery/Main/4/Controller/ManagerController.m b/zhiche--delivery/Delivery/Main/4/Controller/ManagerController.m index d94351dce613c7881d47cfebc82faea2b4c7edb5..5ab516bdbc979e8477cf2f1a34ef0ac123da70f9 100644 --- a/zhiche--delivery/Delivery/Main/4/Controller/ManagerController.m +++ b/zhiche--delivery/Delivery/Main/4/Controller/ManagerController.m @@ -62,18 +62,15 @@ { //个人信息接口 - NSString *urlString = [NSString stringWithFormat:@"%@user",Main_interface]; +// NSString *urlString = [NSString stringWithFormat:@"%@user",Main_interface]; - [Common requestWithUrlString:urlString contentType:application_json finished:^(id responseObj) { + [Common requestWithUrlString:user_info contentType:application_json finished:^(id responseObj) { if ([responseObj[@"success"] boolValue]) { - NSLog(@"%@",responseObj); self.dataDictionary = responseObj[@"data"]; - NSLog(@"%@",self.dataDictionary); - //赋值 [self getValueString]; } @@ -94,11 +91,9 @@ //拼接图片url NSString *urlString = [NSString stringWithFormat:@"%@qiniu/download/ticket?key=%@",Main_interface,self.dataDictionary[@"pic"]]; - // NSDictionary *diction = @{@"key":self.dataDictionary[@"pic"]}; [Common requestWithUrlString:urlString contentType:application_json finished:^(id responseObj) { - NSLog(@"%@",responseObj); if ([responseObj[@"success"] boolValue]) { @@ -136,7 +131,6 @@ NSDateFormatter *dateFormat = [[NSDateFormatter alloc] init]; [dateFormat setDateFormat:@"yyyy-MM-dd"]; NSString *dateString = [dateFormat stringFromDate:nd]; - NSLog(@"date: %@", dateString); return dateString; } @@ -526,10 +520,9 @@ #pragma mark 从七牛获取Token -(void)getTokenFromQN { - NSString *string = [NSString stringWithFormat:@"%@qiniu/upload/ticket",Main_interface]; +// NSString *string = [NSString stringWithFormat:@"%@qiniu/upload/ticket",Main_interface]; - [Common requestWithUrlString:string contentType:application_json finished:^(id responseObj) { - NSLog(@"%@",responseObj); + [Common requestWithUrlString:qiniu_token contentType:application_json finished:^(id responseObj) { if ([responseObj[@"success"] boolValue]) { self.token = responseObj[@"data"]; @@ -539,20 +532,7 @@ NSLog(@"%@",errorMsg); }]; -// [c afPostRequestWithUrlString:string parms:nil finishedBlock:^(id responseObj) { -// -// NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:responseObj options:NSJSONReadingMutableContainers error:nil]; -// -// self.token = dic[@"data"]; -// -// [self uploadImageToQNWithData:[self getImageWith:self.imagev.image]]; -// -// -// } failedBlock:^(NSString *errorMsg) { -// -// NSLog(@"%@",errorMsg); -// -// }]; + } -(void)uploadImageToQNWithData:(NSData *)data @@ -573,7 +553,7 @@ -(void)changePersonInfo { - NSString *urlString = [NSString stringWithFormat:@"%@user/modify",Main_interface]; +// NSString *urlString = [NSString stringWithFormat:@"%@user/modify",Main_interface]; NSDictionary *dictionay = [NSDictionary dictionary]; if (self.nameTextField.text.length <= 0) { @@ -617,7 +597,7 @@ Common *c = [[Common alloc]init]; - [c afPostRequestWithUrlString:urlString parms:dictionay finishedBlock:^(id responseObj) { + [c afPostRequestWithUrlString:user_modify parms:dictionay finishedBlock:^(id responseObj) { NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:responseObj options:NSJSONReadingMutableLeaves error:nil]; diff --git "a/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/AboutViewController.m" "b/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/AboutViewController.m" index 9b126e4d3a495b0f9e68015da1c0dd71a3a2f297..23893eff1cc58416a1bf1fefaeaad88c6f4edb02 100644 --- "a/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/AboutViewController.m" +++ "b/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/AboutViewController.m" @@ -33,7 +33,7 @@ -(void)initWebViews { - NSString *valueString = [NSString stringWithFormat:@"%@templates/cms/about.html",Main_interface]; +// NSString *valueString = [NSString stringWithFormat:@"%@templates/cms/about.html",Main_interface]; // [Common requestWithUrlString:valueString contentType:application_json finished:^(id responseObj) { // @@ -41,7 +41,7 @@ // // if ([responseObj[@"success"] boolValue]) { - NSURL *url = [NSURL URLWithString:valueString]; + NSURL *url = [NSURL URLWithString:about_us]; UIWebView *webView = [[UIWebView alloc]initWithFrame:CGRectMake(0, 64, screenWidth, screenHeight - 64)]; diff --git "a/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/InstroctionViewController.m" "b/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/InstroctionViewController.m" index a02f5604b074161a6d5ee74fc0f860875ff06bea..58259641aa705ed1cb8a26e71fb50af0dec09267 100644 --- "a/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/InstroctionViewController.m" +++ "b/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/InstroctionViewController.m" @@ -33,7 +33,7 @@ -(void)initWebViews { - NSString *valueString = [NSString stringWithFormat:@"%@templates/cms/transport-explain.html",Main_interface]; +// NSString *valueString = [NSString stringWithFormat:@"%@templates/cms/transport-explain.html",Main_interface]; // NSLog(@"%@",valueString); // @@ -43,7 +43,7 @@ // // if ([responseObj[@"success"] boolValue]) { - NSURL *url = [NSURL URLWithString:valueString]; + NSURL *url = [NSURL URLWithString:transport_explain]; UIWebView *webView = [[UIWebView alloc]initWithFrame:CGRectMake(0, 64, screenWidth, screenHeight - 64)]; diff --git "a/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/InvoiceShowViewController.m" "b/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/InvoiceShowViewController.m" index 38c6bfe6652cfe6da7288894b42b1a3da6d433b7..577c6dc6bbf9e9def34593ca17e39b7f62ed0af7 100644 --- "a/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/InvoiceShowViewController.m" +++ "b/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/InvoiceShowViewController.m" @@ -33,7 +33,7 @@ -(void)initWebViews { - NSString *valueString = [NSString stringWithFormat:@"%@templates/cms/invoice-explain.html",Main_interface]; +// NSString *valueString = [NSString stringWithFormat:@"%@templates/cms/invoice-explain.html",Main_interface]; // [Common requestWithUrlString:valueString contentType:application_json finished:^(id responseObj) { // @@ -41,7 +41,7 @@ // // if ([responseObj[@"success"] boolValue]) { - NSURL *url = [NSURL URLWithString:valueString]; + NSURL *url = [NSURL URLWithString:invoice_explain]; UIWebView *webView = [[UIWebView alloc]initWithFrame:CGRectMake(0, 64, screenWidth, screenHeight - 64)]; diff --git "a/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/NewViewController.m" "b/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/NewViewController.m" index cc801a9c41e4e039ffab7eaf13b476eae23df3fd..4c0ce93d23bdc1fe5dab9c8af9d225c6a2f2993d 100644 --- "a/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/NewViewController.m" +++ "b/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/NewViewController.m" @@ -34,7 +34,7 @@ -(void)initWebViews { - NSString *valueString = [NSString stringWithFormat:@"%@cms/userstart",Main_interface]; +// NSString *valueString = [NSString stringWithFormat:@"%@cms/userstart",Main_interface]; // NSLog(@"%@",valueString); // @@ -44,7 +44,7 @@ // // if ([responseObj[@"success"] boolValue]) { - NSURL *url = [NSURL URLWithString:valueString]; + NSURL *url = [NSURL URLWithString:newman_start]; UIWebView *webView = [[UIWebView alloc]initWithFrame:CGRectMake(0, 64, screenWidth, screenHeight - 64)]; diff --git "a/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/RefundViewController.m" "b/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/RefundViewController.m" index 725b85fb748d010d58c0886b5b978b9f8fbd03c1..5a870223289ba268c1617344d79f704ca2bb602e 100644 --- "a/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/RefundViewController.m" +++ "b/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/RefundViewController.m" @@ -32,7 +32,7 @@ -(void)initWebViews { - NSString *valueString = [NSString stringWithFormat:@"%@templates/cms/refund-explain.html",Main_interface]; +// NSString *valueString = [NSString stringWithFormat:@"%@templates/cms/refund-explain.html",Main_interface]; // [Common requestWithUrlString:valueString contentType:application_json finished:^(id responseObj) { // @@ -40,7 +40,7 @@ // // if ([responseObj[@"success"] boolValue]) { - NSURL *url = [NSURL URLWithString:valueString]; + NSURL *url = [NSURL URLWithString:refund_explain]; UIWebView *webView = [[UIWebView alloc]initWithFrame:CGRectMake(0, 64, screenWidth, screenHeight - 64)]; diff --git "a/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/ServeViewController.m" "b/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/ServeViewController.m" index ed693141f53f397277a4ffc6ff9799b48cfb386f..f58da3ec363c3be141aa634b52ac3d32a2bd6daf 100644 --- "a/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/ServeViewController.m" +++ "b/zhiche--delivery/Delivery/Main/4/Controller/\345\256\242\346\234\215\344\270\255\345\277\203/ServeViewController.m" @@ -33,7 +33,7 @@ -(void)initWebViews { // - NSString *valueString = [NSString stringWithFormat:@"%@templates/cms/transport-agreement.html",Main_interface]; +// NSString *valueString = [NSString stringWithFormat:@"%@templates/cms/transport-agreement.html",Main_interface]; // // [Common requestWithUrlString:valueString contentType:application_json finished:^(id responseObj) { // @@ -41,7 +41,7 @@ // // if ([responseObj[@"success"] boolValue]) { - NSURL *url = [NSURL URLWithString:valueString]; + NSURL *url = [NSURL URLWithString:transport_agreement]; UIWebView *webView = [[UIWebView alloc]initWithFrame:CGRectMake(0, 64, screenWidth, screenHeight - 64)]; diff --git a/zhiche--delivery/Delivery/Main/Root/RootViewController.m b/zhiche--delivery/Delivery/Main/Root/RootViewController.m index 88637ee58223fd6d75e1ae4a4373cf9c06c60a62..973823aa5a5570cd2be9c86fea64f64e2140b787 100644 --- a/zhiche--delivery/Delivery/Main/Root/RootViewController.m +++ b/zhiche--delivery/Delivery/Main/Root/RootViewController.m @@ -54,12 +54,7 @@ static RootViewController *rootVC; self.view.backgroundColor = WhiteColor; HomeViewController *homeVC = [[HomeViewController alloc]init]; UINavigationController *homeNC = [[UINavigationController alloc]initWithRootViewController:homeVC]; - -// PriceViewController *priceVC = [[PriceViewController alloc]init]; -// UINavigationController *priceNC = [[UINavigationController alloc]initWithRootViewController:priceVC]; -// -// TransporterViewController *transportVC = [[TransporterViewController alloc]init]; -// UINavigationController *transportNC = [[UINavigationController alloc]initWithRootViewController:transportVC]; + MineOrderVC *orderVC = [[MineOrderVC alloc]init]; UINavigationController *orderNC = [[UINavigationController alloc]initWithRootViewController:orderVC]; @@ -83,8 +78,6 @@ static RootViewController *rootVC; self.backImageView.userInteractionEnabled = YES; [self.view addSubview:self.backImageView]; // -// NSArray *imageNameArr = @[@"home_unicorn_unpress", @"home_project_unpress", @"home_studio_unpress",@"home_my_unpress"]; -// NSArray *selecNameArr = @[@"home_unicorn_press", @"home_project_press", @"home_studio_press",@"home_my_press"]; NSArray *titleArray = @[@"首页",@"订单",@"设置"]; CGFloat space = screenWidth / 4.0; @@ -92,17 +85,13 @@ static RootViewController *rootVC; for (int i = 0; i < titleArray.count; i++) { UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; button.frame = CGRectMake(i * space + 0.5, 0, space, 54 - 1); - - -// [button setImage:[UIImage imageNamed:imageNameArr[i]] forState:UIControlStateNormal]; -// [button setImage:[UIImage imageNamed:selecNameArr[i]] forState:UIControlStateSelected]; + NSString *titleString = [NSString stringWithFormat:@"%@",titleArray[i]]; [button setTitle:titleString forState:UIControlStateNormal]; [button setTitleColor:GrayColor forState:UIControlStateNormal]; -// [button setTitleColor:BlackColor forState:UIControlStateSelected]; button.titleLabel.font = Font(15); diff --git a/zhiche--delivery/Delivery/Singleton/Header.h b/zhiche--delivery/Delivery/Singleton/Header.h index 0c543d5f987dbdaba0fdea70ce81721d297910f0..dc0f3b60a7a994b47e5937ca1e3cb5217cbb9633 100644 --- a/zhiche--delivery/Delivery/Singleton/Header.h +++ b/zhiche--delivery/Delivery/Singleton/Header.h @@ -42,23 +42,14 @@ #define FontOfSize17 17.0 #define FontOfSize19 19.0 -//接口 -//#define Main_interface @"http://192.168.1.217:8080/" -//#define Main_interface @"http://192.168.199.136:8080/kyleapp/" + //接口 #define Main_interface @"http://220.249.50.163/kyle/" -//#define Main_interface @"http://101.201.110.173:8080/kyle/" - -// -//张强地址 -//#define Main_interface @"http://192.168.61.119:8080/" #define application_json @"application/json" - - #define STR_F2(p1, p2) [NSString stringWithFormat:@"%@%@", p1, p2] #define STR_F3(p1, p2,p3) [NSString stringWithFormat:@"%@%@%@", p1, p2,p3] #define STR_F4(p1, p2, p3,p4) [NSString stringWithFormat:@"%@%@%@%@", p1, p2, p3,p4] @@ -81,8 +72,6 @@ //创建订单 #define Order_Addorder_Url STR_F2(Main_interface,@"order/create") -//发布订单 -//#define order_publish STR_F2(Main_interface,@"order/publish") //发布订单 #define Order_Publish_Url STR_F2(Main_interface,@"order/publish") //查询发布订单 @@ -108,6 +97,78 @@ #define application_json @"application/json" +/** + 订单 + + */ +//重新发布 +#define Mine_Order STR_F2(Main_interface,@"order/publish") + +//取消订单 +#define Mine_Order_Cancel STR_F2(Main_interface,@"order/cancel") +/** + + 支付 + + */ +//阿里 +#define pay_byAli STR_F2(Main_interface,@"pay/alipay") +//微信 +#define pay_byWx STR_F2(Main_interface,@"pay/wx") + +/** + 个人信息 + */ +//个人信息 + +#define user_info STR_F2(Main_interface,@"user") + +//个人信息更改 +#define user_modify STR_F2(Main_interface,@"user/modify") + +//七牛token +#define qiniu_token STR_F2(Main_interface,@"qiniu/upload/ticket") + +/** + 用户常用车型列表 + */ + +#define user_vehicle_list STR_F2(Main_interface,@"uservehicle/list") + +//新建车型 +#define user_vehicle_create STR_F2(Main_interface,@"uservehicle/create") + +//车型列表 +#define brand_list STR_F2(Main_interface,@"brand/list") +//车系列表 +#define vehicle_list STR_F2(Main_interface,@"vehicle/list") +//用户默认地址 +#define userAddress_default STR_F2(Main_interface,@"useraddress/modify/default") +//用户地址更新 +#define userAddress_update STR_F2(Main_interface,@"useraddress/upateuseraddress") + +//开取发票 +#define invoice_create STR_F2(Main_interface,@"invoice/create") + +//开票规则 +#define invoice_explain STR_F2(Main_interface,@"templates/cms/invoice-explain.html") + +//关于我们 +#define about_us STR_F2(Main_interface,@"templates/cms/about.html") + +//车辆运输服务协议 +#define transport_agreement STR_F2(Main_interface,@"templates/cms/transport-agreement.html") +//运输说明 +#define transport_explain STR_F2(Main_interface,@"templates/cms/transport-explain.html") +//退款说明 +#define refund_explain STR_F2(Main_interface,@"templates/cms/refund-explain.html") +//新手上路 +#define newman_start STR_F2(Main_interface,@"cms/userstart") + +//登录 +#define login_codeLogin STR_F2(Main_interface,@"login/codelogin") + + #endif /* Header_h */