Skip to content

O
Opple-iOS
Commit d2d48b1c authored by 勾芒's avatar 勾芒
Browse files
Options

caoyunxiao

parent 86b6e5fc
Hide whitespace changes
Inline Side-by-side
Showing with 343 additions and 148 deletions
Lighting/Class/AdditionalTableViewCell.m
View file @ d2d48b1c
......@@ -25,7 +25,6 @@
self.invoiceHeader.text = _model.billTitle;
self.invoiceType.text = _model.billType;
self.invoiceType.text = _model.payType;
}
......
Lighting/Class/ClientViewController.m
View file @ d2d48b1c
......@@ -72,6 +72,7 @@
page.page = 1;
condition.page = page;
page.rows = 10;
self.indexPage = 1;
[self.informationTableview.mj_footer resetNoMoreData];
[self getShoppersAssociatedCustomer:condition isRemoveArray:YES];
}];
......@@ -83,13 +84,13 @@
[self.informationTableview.mj_header beginRefreshing];
//上拉加载
self.informationTableview.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init];
DataPage *page = [[DataPage alloc]init];
if (self.indexPage ++ > self.totalPages) {
[self.informationTableview.mj_footer endRefreshingWithNoMoreData];
}else
{
ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init];
DataPage *page = [[DataPage alloc]init];
page.page = self.indexPage ++;
page.rows = 10;
condition.page = page;
......
Lighting/Class/CustomerOrderTableViewCell.h
View file @ d2d48b1c
......@@ -9,7 +9,7 @@
#import <UIKit/UIKit.h>
/**
* 撤销订单
* 撤销订单、去支付
*/
@protocol undoOrderDelegate <NSObject>
......@@ -21,7 +21,12 @@
*
* @param cellindex cell下标
*/
- (void)undoOrderButtonClick:(NSInteger)cellindex WithButtonCurrent:(NSString *)title;
- (void)undoOrderButtonClick:(NSInteger)cellindex;
/**
* 去支付
*/
- (void)TopayButtonClick:(NSInteger)cellindex;
@end
......@@ -159,6 +164,10 @@
*/
@property (weak, nonatomic) IBOutlet UIImageView *orderStateImageView;
/**
* 去支付
*/
@property (weak, nonatomic) IBOutlet UIButton *gotoPayButton;
......
Lighting/Class/CustomerOrderTableViewCell.m
View file @ d2d48b1c
......@@ -22,6 +22,8 @@
{
self.delecteOrder.layer.masksToBounds = YES;
self.delecteOrder.layer.cornerRadius = kCornerRadius;
self.gotoPayButton.layer.masksToBounds = YES;
self.gotoPayButton.layer.cornerRadius = kCornerRadius;
self.cellBackView.layer.masksToBounds = YES;
self.cellBackView.layer.cornerRadius = kCornerRadius;
......@@ -38,7 +40,7 @@
_model = model;
self.orderDate.text = _model.order.createDate;
self.orderSerialNumber.text = _model.order.orderNumber;
self.shoppersName.text = _model.employee.userName;
self.shoppersName.text = _model.employee.realName;
self.customerName.text = _model.consumer.name;
[self.customerHeader sd_setImageWithURL:[NSURL URLWithString:_model.consumer.picture] placeholderImage:ReplaceImage];
self.orderStatus.text = _model.order.orderState;
......@@ -54,14 +56,14 @@
}
self.orderTotalPrice.text = [NSString stringWithFormat:@"%ld",goodsAllprice];
//撤销订单、去支付
if ([_model.order.orderState isEqualToString:@"002"] || [_model.order.orderState isEqualToString:@"001"]) {
if ([_model.order.orderState isEqualToString:@"001"]) {
self.delecteOrder.hidden = NO;
if ([_model.order.orderState isEqualToString:@"001"]) {
[self.delecteOrder setTitle:@"去支付" forState:UIControlStateNormal];
}
self.gotoPayButton.hidden = NO;
}else
{
self.delecteOrder.hidden = YES;
self.gotoPayButton.hidden = YES;
}
//订单状态图片
self.orderStateImageView.image = [BaseViewController ReturnOrderStateImageWithStateCode:[_model.order.orderState integerValue]];
......@@ -86,14 +88,22 @@
#pragma mark -撤销订单
- (IBAction)delecteOrderButtonClick:(UIButton *)sender {
if ([self.delegate respondsToSelector:@selector(undoOrderButtonClick:WithButtonCurrent:)]) {
if ([self.delegate respondsToSelector:@selector(undoOrderButtonClick:)]) {
[self.delegate undoOrderButtonClick:_cellIndex WithButtonCurrent:sender.currentTitle];
[self.delegate undoOrderButtonClick:_cellIndex];
}
}
#pragma mark -去支付
- (IBAction)GotoPayButtonClick:(UIButton *)sender {
if ([self.delegate respondsToSelector:@selector(TopayButtonClick:)]) {
[self.delegate TopayButtonClick:_cellIndex];
}
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
......
Lighting/Class/CustomerOrderViewController.m
View file @ d2d48b1c
......@@ -26,6 +26,11 @@
*/
@property (nonatomic,strong) NSArray *orderStateArray;
/**
* 总页数
*/
@property (nonatomic,assign) int totalPages;
@end
@implementation CustomerOrderViewController
......@@ -60,9 +65,25 @@
}
#pragma mark -视图渲染完成
- (void)viewDidAppear:(BOOL)animated
#pragma mark -UI
- (void)uiConfigAction
{
self.searchCustomerOrder.delegate = self;
self.view.backgroundColor = kTCColor(238, 238, 238);
self.customerOrderTableView.dataSource = self;
self.customerOrderTableView.delegate = self;
self.customerOrderTableView.backgroundColor = [UIColor clearColor];
self.StyleButton = [screeningButton buttonWithType:UIButtonTypeCustom];
self.StyleButton.frame = CGRectMake(ScreenWidth-250, 20, 150, 30);
self.StyleButton.backgroundColor = kTCColor(131, 131, 131);
[self.StyleButton setTitle:@"订单状态" forState:UIControlStateNormal];
[self.StyleButton addTarget:self action:@selector(OrderStateButtonClick:) forControlEvents:UIControlEventTouchUpInside];
[self.StyleButton setImage:TCImage(@"down_arr") forState:UIControlStateNormal];
self.StyleButton.layer.masksToBounds = YES;
self.StyleButton.layer.cornerRadius = 10;
[self.orderStateBackView addSubview:self.StyleButton];
//下拉刷新
MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
OrderBill *allOrder = [[OrderBill alloc]init];
......@@ -75,55 +96,38 @@
Neworder.guideId = [Shoppersmanager manager].Shoppers.employee.fid;
allOrder.datapage = page;
allOrder.order = Neworder;
[self.customerOrderTableView.mj_footer resetNoMoreData];
self.indexPage = 1;
[self getGuideAllcustomerOrder:YES WithorderBill:allOrder];
}];
headerRefresh.stateLabel.hidden = YES;
headerRefresh.lastUpdatedTimeLabel.hidden = YES;
self.customerOrderTableView.mj_header = headerRefresh;
[self.customerOrderTableView.mj_header beginRefreshing];
//上拉加载
self.customerOrderTableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
OrderBill *allOrder = [[OrderBill alloc]init];
//分页
DataPage *page = [[DataPage alloc]init];
page.page = self.indexPage;
page.rows = 10;
//订单
TOOrderEntity *Neworder = [[TOOrderEntity alloc]init];
Neworder.guideId = [Shoppersmanager manager].Shoppers.employee.fid;
allOrder.datapage = page;
allOrder.order = Neworder;
self.indexPage ++;
[self getGuideAllcustomerOrder:NO WithorderBill:allOrder];
if (self.indexPage ++ > self.totalPages) {
[self.customerOrderTableView.mj_footer endRefreshingWithNoMoreData];
}else
{
OrderBill *allOrder = [[OrderBill alloc]init];
//分页
DataPage *page = [[DataPage alloc]init];
page.page = self.indexPage ++;
page.rows = 10;
//订单
TOOrderEntity *Neworder = [[TOOrderEntity alloc]init];
Neworder.guideId = [Shoppersmanager manager].Shoppers.employee.fid;
allOrder.datapage = page;
allOrder.order = Neworder;
[self getGuideAllcustomerOrder:NO WithorderBill:allOrder];
}
}];
}
#pragma mark -UI
- (void)uiConfigAction
{
self.searchCustomerOrder.delegate = self;
self.view.backgroundColor = kTCColor(238, 238, 238);
self.customerOrderTableView.dataSource = self;
self.customerOrderTableView.delegate = self;
self.customerOrderTableView.backgroundColor = [UIColor clearColor];
self.StyleButton = [screeningButton buttonWithType:UIButtonTypeCustom];
self.StyleButton.frame = CGRectMake(ScreenWidth-250, 20, 150, 30);
self.StyleButton.backgroundColor = kTCColor(131, 131, 131);
[self.StyleButton setTitle:@"订单状态" forState:UIControlStateNormal];
[self.StyleButton addTarget:self action:@selector(OrderStateButtonClick:) forControlEvents:UIControlEventTouchUpInside];
[self.StyleButton setImage:TCImage(@"down_arr") forState:UIControlStateNormal];
self.StyleButton.layer.masksToBounds = YES;
self.StyleButton.layer.cornerRadius = 10;
[self.orderStateBackView addSubview:self.StyleButton];
}
#pragma mark -获取导购下客户订单 ----isdelecte 表示是否清空数组
- (void)getGuideAllcustomerOrder:(BOOL)isdelecte WithorderBill:(OrderBill *)allOrder
{
......@@ -139,6 +143,7 @@
[self.datasArray removeAllObjects];
}
OrderResponse *Allorder = [[OrderResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
self.totalPages = (int)returnValue[@"data"][@"totalPages"];
for (OrderBill *model in Allorder.orderBillList) {
[self.datasArray addObject:model];
}
......@@ -194,13 +199,17 @@
{
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"];
TOOrderEntity *model = [[self.datasArray objectAtIndex_opple:indexPath.row] order];
orderdetails.orderCode = model.orderNumber;
orderdetails.sectionTitle = @[@"订单信息",@"客户信息",@"收货信息",@"商品信息",@"附件信息"];
orderdetails.isShowattachment = YES;
if ([model.orderState isEqualToString:@"006"]) {
orderdetails.isShowPrintButton = YES;
orderdetails.isDelectedButton = NO;
}
if ([model.orderState isEqualToString:@"001"]) {
orderdetails.isShowPayButton = YES;
orderdetails.isDelectedButton = YES;
orderdetails.isShowPrintButton = YES;
}
[self.navigationController pushViewController:orderdetails animated:YES];
......@@ -297,8 +306,8 @@
OrderBill *allOrder = [[OrderBill alloc]init];
//分页
DataPage *page = [[DataPage alloc]init];
page.page = self.indexPage;
page.rows = 10;
page.page = 1;
page.rows = 9999;
//订单
TOOrderEntity *Neworder = [[TOOrderEntity alloc]init];
Neworder.guideId = [Shoppersmanager manager].Shoppers.employee.fid;
......@@ -309,10 +318,8 @@
customer.name = textField.text;
customer.mobile = textField.text;
allOrder.consumer = customer;
self.indexPage = 0;
self.indexPage = 1;
[self getGuideAllcustomerOrder:YES WithorderBill:allOrder];
return YES;
}
......@@ -325,11 +332,10 @@
*
* @param cellindex cell下标
*/
- (void)undoOrderButtonClick:(NSInteger)cellindex WithButtonCurrent:(NSString *)title
- (void)undoOrderButtonClick:(NSInteger)cellindex
{
[self CreateMBProgressHUDLoding];
if ([title isEqualToString:@"撤销订单"]) {
[self CreateMBProgressHUDLoding];
OrderBill *model = [self.datasArray objectAtIndex_opple:cellindex];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@%@/%@/%@",ServerAddress,@"/order/updateOrderState/",model.order.orderNumber,model.order.orderState,@"005"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
......@@ -352,16 +358,41 @@
[self RemoveMBProgressHUDLoding];
}];
}else if ([title isEqualToString:@"去支付"])
{
}
}
/**
* 去支付
*/
- (void)TopayButtonClick:(NSInteger)cellindex
{
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"];
TOOrderEntity *model = [[self.datasArray objectAtIndex_opple:cellindex] order];
orderdetails.orderCode = model.orderNumber;
orderdetails.sectionTitle = @[@"订单信息",@"客户信息",@"收货信息",@"商品信息",@"附件信息"];
orderdetails.isShowattachment = YES;
if ([model.orderState isEqualToString:@"006"]) {
orderdetails.isShowPrintButton = YES;
orderdetails.isDelectedButton = NO;
}
if ([model.orderState isEqualToString:@"001"]) {
orderdetails.isShowPayButton = YES;
orderdetails.isDelectedButton = YES;
orderdetails.isShowPrintButton = YES;
}
//撤销、支付回调
[orderdetails setDelecteAndPayButtonBlock:^(NSInteger cellindex, NSString *orderSate) {
OrderBill *model = [self.datasArray objectAtIndex_opple:cellindex];
model.order.orderState = orderSate;
NSIndexPath *indexapath = [NSIndexPath indexPathForRow:cellindex inSection:0];
[self.customerOrderTableView reloadRowsAtIndexPaths:@[indexapath] withRowAnimation:UITableViewRowAnimationNone];
}];
[self.navigationController pushViewController:orderdetails animated:YES];
}
......
Lighting/Class/FullScreenViewController.m
View file @ d2d48b1c
......@@ -71,6 +71,7 @@ static NSString * const reuseIdentifier = @"Cell";
UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom];
backButton.frame = CGRectMake(50, 0, 100, 64);
[backButton setTitle:@"返回" forState:UIControlStateNormal];
[backButton addTarget:self action:@selector(BackButtonClick) forControlEvents:UIControlEventTouchUpInside];
[self.backView addSubview:backButton];
//随心配
......
Lighting/Class/OrderdetailsViewController.h
View file @ d2d48b1c
......@@ -46,4 +46,28 @@
*/
@property (nonatomic,assign) BOOL isShowPrintButton;
/**
* 是否显示撤销订单
*/
@property (nonatomic,assign) BOOL isDelectedButton;
/**
* 撤销按钮、支付按钮完成回调
*/
@property (nonatomic,copy) void(^DelecteAndPayButtonBlock)(NSInteger cellindex,NSString *orderState);
/**
* cell下标
*/
@property (nonatomic,assign) NSInteger cellindex;
@end
Lighting/Class/OrderdetailsViewController.m
View file @ d2d48b1c
......@@ -103,7 +103,7 @@
//预览
UIButton *previewButton = [UIButton buttonWithType:UIButtonTypeSystem];
previewButton.frame = CGRectMake(50, 15, 150, 30);
[previewButton setTitle:@"预览" forState:UIControlStateNormal];
[previewButton setTitle:self.isDelectedButton?@"撤销订单":@"预览" forState:UIControlStateNormal];
previewButton.titleLabel.font = [UIFont systemFontOfSize:12];
[previewButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[previewButton addTarget:self action:@selector(PreviewButtonClick:) forControlEvents:UIControlEventTouchUpInside];
......@@ -112,17 +112,21 @@
previewButton.layer.cornerRadius = kCornerRadius;
[headerView addSubview:previewButton];
//打印
UIButton *printButton = [UIButton buttonWithType:UIButtonTypeSystem];
printButton.frame = CGRectMake(ScreenWidth-50-150, 15, 150, 30);
[printButton setTitle:@"打印" forState:UIControlStateNormal];
[printButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
printButton.titleLabel.font = [UIFont systemFontOfSize:12];
[printButton addTarget:self action:@selector(AirprintButtonClick:) forControlEvents:UIControlEventTouchUpInside];
printButton.layer.masksToBounds = YES;
printButton.layer.cornerRadius = kCornerRadius;
printButton.backgroundColor = kMainBlueColor;
[headerView addSubview:printButton];
//显示撤销按钮的情况下，不显示打印按钮
if (!self.isDelectedButton) {
//打印
UIButton *printButton = [UIButton buttonWithType:UIButtonTypeSystem];
printButton.frame = CGRectMake(ScreenWidth-50-150, 15, 150, 30);
[printButton setTitle:@"打印" forState:UIControlStateNormal];
[printButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
printButton.titleLabel.font = [UIFont systemFontOfSize:12];
[printButton addTarget:self action:@selector(AirprintButtonClick:) forControlEvents:UIControlEventTouchUpInside];
printButton.layer.masksToBounds = YES;
printButton.layer.cornerRadius = kCornerRadius;
printButton.backgroundColor = kMainBlueColor;
[headerView addSubview:printButton];
}
//横线
UIView *lineView = [[UIView alloc]initWithFrame:CGRectMake(0, 59, ScreenWidth, 1)];
......@@ -161,8 +165,12 @@
[settlement setPaySuccessReturnBlock:^{
[self getOrderDetailsData];
self.isDelectedButton = NO;
[self CreateTableviewHeaderView];
self.orderDetailsTableview.tableFooterView = nil;
if (self.DelecteAndPayButtonBlock) {
self.DelecteAndPayButtonBlock(_cellindex,@"002");
}
}];
settlement.preferredContentSize = CGSizeMake(380, 500);
......@@ -396,17 +404,49 @@
}
#pragma mark -预览订单
#pragma mark -预览订单、撤销订单
- (void)PreviewButtonClick:(UIButton *)button
{
[self DownloadPDF:^(id returnValue) {
if ([button.currentTitle isEqualToString:@"预览"]) {
[self DownloadPDF:^(id returnValue) {
PDFViewController *pdfVc = [[PDFViewController alloc]init];
pdfVc.pdfURLString = self.PDFpath;
[self presentViewController:pdfVc animated:YES completion:nil];
}];
}else if ([button.currentTitle isEqualToString:@"撤销订单"])
{
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@%@/%@/%@",ServerAddress,@"/order/updateOrderState/",_orderCode,@"001",@"005"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[self RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
[self SuccessMBProgressView:@"撤销成功"];
UIView *view = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 0)];
self.orderDetailsTableview.tableHeaderView = view;
self.orderDetailsTableview.tableFooterView = nil;
self.orderDetails.order.orderState = @"005";
[self.orderDetailsTableview reloadData];
if (self.DelecteAndPayButtonBlock) {
self.DelecteAndPayButtonBlock(_cellindex,@"005");
}
}
else
{
[self ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
} WithFailureBlock:^(id error) {
[self RemoveMBProgressHUDLoding];
}];
}
PDFViewController *pdfVc = [[PDFViewController alloc]init];
pdfVc.pdfURLString = self.PDFpath;
[self presentViewController:pdfVc animated:YES completion:nil];
}];
}
......
Lighting/Class/ProductDetailsHeaderView.m
View file @ d2d48b1c
......@@ -29,6 +29,7 @@
make.left.equalTo(self.inventoryLabe);
make.top.equalTo(self.inventoryLabe).offset(40);
make.width.mas_equalTo(200);
make.height.mas_equalTo(40);
}];
}
......
Lighting/Class/ProductDetailsHeaderView.xib
View file @ d2d48b1c
......@@ -38,7 +38,6 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="编号：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="usf-4V-c8q">
<rect key="frame" x="514" y="44" width="56" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" 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"/>
......@@ -46,7 +45,6 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="LAD-89757" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="b7B-yI-JEC">
<rect key="frame" x="572" y="44" width="130" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" 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"/>
......@@ -54,7 +52,6 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="名称：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5aK-6t-o1q">
<rect key="frame" x="514" y="76" width="56" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" 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"/>
......@@ -62,7 +59,6 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="名称字段" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="NlJ-8b-gcl">
<rect key="frame" x="572" y="76" width="130" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" 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"/>
......@@ -70,7 +66,6 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="品牌：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hX3-Vg-O1n">
<rect key="frame" x="514" y="106" width="56" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" 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"/>
......@@ -78,7 +73,6 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="欧普" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Hf9-WK-7u5">
<rect key="frame" x="572" y="106" width="130" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" 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"/>
......@@ -86,7 +80,6 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="吊牌价：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ol6-U8-o5v">
<rect key="frame" x="514" y="137" width="56" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" 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"/>
......@@ -94,7 +87,6 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥12800" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rka-oV-nyM">
<rect key="frame" x="572" y="137" width="130" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" 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"/>
......@@ -102,7 +94,6 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="数量：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Vfu-v1-b5l">
<rect key="frame" x="514" y="227" width="56" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" 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"/>
......@@ -110,7 +101,6 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="库存：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9XR-2D-r0I">
<rect key="frame" x="514" y="272" width="56" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" 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"/>
......@@ -118,7 +108,6 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="34" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="zXN-Uh-XtZ">
<rect key="frame" x="572" y="272" width="70" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" 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"/>
......@@ -126,17 +115,15 @@
<button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="SQd-9e-TXr">
<rect key="frame" x="659" y="221" width="30" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.97647058819999999" green="0.95686274510000002" blue="0.94509803920000002" alpha="1" colorSpace="calibratedRGB"/>
<state key="normal" title="+"/>
<state key="normal" backgroundImage="add"/>
</button>
<button opaque="NO" tag="100" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="rRp-ny-V8g">
<rect key="frame" x="572" y="221" width="30" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.97647058819999999" green="0.95686274510000002" blue="0.94509803920000002" alpha="1" colorSpace="calibratedRGB"/>
<state key="normal" title="-"/>
<state key="normal" backgroundImage="reduce"/>
</button>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="1" borderStyle="roundedRect" textAlignment="center" minimumFontSize="17" id="gOn-EI-HN5">
<rect key="frame" x="610" y="221" width="40" height="30"/>
<rect key="frame" x="604" y="221" width="50" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
......@@ -185,7 +172,9 @@
<resources>
<image name="140046029-MX260-D112-03-星冠-5700K（4）" width="600" height="450"/>
<image name="2" width="45" height="45"/>
<image name="add" width="49" height="45"/>
<image name="down_arr" width="22" height="12"/>
<image name="icon-2" width="25" height="15"/>
<image name="reduce" width="49" height="45"/>
</resources>
</document>
Lighting/Class/ProductDetailsViewController.m
View file @ d2d48b1c
......@@ -368,7 +368,7 @@
[self ErrorMBProgressView:@"必须设置当前客户"];
return;
}
[self StartAddShoppingCarAnimationWithimage:TCImage(@"欧") withStartpoint:[self.headerView convertPoint:[button center] toView:self.view.window]];
[self StartAddShoppingCarAnimationWithimage:self.headerView.goodsImageview.image withStartpoint:[self.headerView convertPoint:[button center] toView:self.view.window]];
SaveShoppingCartRequest *shopCar = [[SaveShoppingCartRequest alloc]init];
shopCar.consumerId = [[Customermanager manager] customerID];
shopCar.goodsId = _goodsID;
......
Lighting/Class/ProductLibraryViewController.m
View file @ d2d48b1c
......@@ -135,6 +135,7 @@
Newpage.page = 1;
Newpage.rows = 10;
conditon.page = Newpage;
self.indexPage = 1;
//搜索
if (_selectedCode) {
conditon.categoryEquals = _selectedCode;
......@@ -316,6 +317,7 @@
[cell.productImageView sd_setImageWithURL:[NSURL URLWithString:[imageArray firstObject]] placeholderImage:REPLACEIMAGE];
cell.productPrice.text = [NSString stringWithFormat:@"￥%@",[[[self.datasArray objectAtIndex_opple:indexPath.item] guidePrice] stringValue]];
cell.cellindex = indexPath.item;
cell.productParameter.text = [[self.datasArray objectAtIndex_opple:indexPath.item] spec];
//加入购物车
__weak typeof(self) weakSelf = self;
__weak typeof(ProductCollectionViewCell *) weakCell = cell;
......
Lighting/Class/ScannerViewController.m
View file @ d2d48b1c
......@@ -82,8 +82,8 @@
[self.view.layer insertSublayer:self.previewLayer atIndex:0];
//
CGSize size = [UIScreen mainScreen].bounds.size;
CGRect cropRect = self.scanRectView.frame;
// CGSize size = [UIScreen mainScreen].bounds.size;
// CGRect cropRect = self.scanRectView.frame;
// CGFloat p1 = size.height/size.width;
// CGFloat p2 = 1920./1080.; //使用1080p的图像输出
output.rectOfInterest = CGRectMake(self.scanRectView.frame.origin.y/ScreenHeight,((ScreenWidth-self.scanRectView.frame.size.width)/2)/ScreenWidth, self.scanRectView.frame.size.height/ScreenHeight, self.scanRectView.frame.size.width/ScreenWidth);
......
Lighting/Class/SceneLibraryViewController.m
View file @ d2d48b1c
......@@ -221,7 +221,7 @@
{
FullScreenViewController *fullScreenVC = [[FullScreenViewController alloc]init];
[self presentViewController:fullScreenVC animated:YES completion:nil];
[self presentViewController:fullScreenVC animated:NO completion:nil];
}
......
Lighting/Class/SettlementViewController.m
View file @ d2d48b1c
......@@ -8,8 +8,22 @@
#import "SettlementViewController.h"
@interface SettlementViewController ()<ReturnTableviewcellIndexpathdelegate>
/**
* 支付宝二维码
*/
@property (nonatomic,copy) NSString *zhiFubaoLabe;
/**
* 微信二维码
*/
@property (nonatomic,copy) NSString *weiXinLabe;
@end
@implementation SettlementViewController
......@@ -72,7 +86,16 @@
{
[[NetworkRequestClassManager Manager ] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/employee/getReseller"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
NSLog(@"%@",returnValue);
if ([returnValue[@"code"] isEqualToNumber:@0]) {
NSLog(@"获取二维码成功");
self.zhiFubaoLabe = returnValue[@"data"][@"weixin"];
self.weiXinLabe = returnValue[@"data"][@"zhifubao"];
}else
{
NSLog(@"获取二维码失败");
}
} WithErrorCodeBlock:^(id errorCodeValue) {
......
Lighting/Class/Shoppingcart/AddressViewController.m
View file @ d2d48b1c
......@@ -145,6 +145,12 @@
#pragma mark 新增按钮点击，或者保存
- (IBAction)addAddressButtonClick:(UIButton *)sender {
NSString *phoneNumber = self.PhoneNumber.text;
if (![HENLENSONG isValidateMobile:phoneNumber]) {
[self ErrorMBProgressView:@"手机号码格式不正确"];
return;
}
if ([sender.currentTitle isEqualToString:@"新增"]) {
[self addAddressInformationRequest];
......@@ -243,7 +249,7 @@
address.fid = _model.fid;
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/shippingAddress/save"] WithRequestType:0 WithParameter:address WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/shippingAddress/update"] WithRequestType:0 WithParameter:address WithReturnValueBlock:^(id returnValue) {
[self RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......
Lighting/Lighting/Images.xcassets/add.imageset/Contents.json 0 → 100644
View file @ d2d48b1c
{
"images" : [
{
"idiom" : "universal",
"filename" : "add.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "add@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/reduce.imageset/Contents.json 0 → 100644
View file @ d2d48b1c
{
"images" : [
{
"idiom" : "universal",
"filename" : "reduce.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "reduce@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Info.plist
View file @ d2d48b1c
......@@ -11,7 +11,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<string>欧立方</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
......
Lighting/Lighting/StoryboardwithCYX.storyboard
View file @ d2d48b1c
......@@ -951,18 +951,18 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="6MS-gq-TMk">
<rect key="frame" x="10" y="4" width="70" height="70"/>
<rect key="frame" x="18" y="4" width="70" height="70"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="吊灯" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="aGq-4q-dKu">
<rect key="frame" x="102" y="5" width="100" height="70"/>
<rect key="frame" x="107" y="5" width="100" height="70"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="数量 1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="phP-5K-crl">
<rect key="frame" x="280" y="29" width="72" height="21"/>
<rect key="frame" x="239" y="29" width="126" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
......@@ -1169,11 +1169,11 @@
<imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="ouS-bk-kdM">
<rect key="frame" x="0.0" y="0.0" width="300" height="214"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.98431372549019602" green="0.96862745098039216" blue="0.92941176470588238" alpha="1" colorSpace="calibratedRGB"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="LAD-1220-OPPO吊灯(D1000mm*1220mm)" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="KUt-Kl-mRA">
<rect key="frame" x="15" y="222" width="194" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="1" green="0.80664989730000003" blue="0.42312353260000002" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
......@@ -1181,16 +1181,14 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥2000" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="FjE-DF-jhC">
<rect key="frame" x="16" y="267" width="179" height="23"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="1" green="0.80664989730000003" blue="0.42312353260000002" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<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="fb6-vA-YdH">
<rect key="frame" x="245" y="245" width="50" height="50"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="fb6-vA-YdH">
<rect key="frame" x="250" y="250" width="50" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" alpha="1" colorSpace="calibratedRGB"/>
<state key="normal" title="+"/>
<state key="normal" image="jia"/>
<connections>
<action selector="AddShoppingcarButtonClick:" destination="J5m-0M-uqb" eventType="touchUpInside" id="qsE-nO-ZHl"/>
</connections>
......@@ -1644,7 +1642,7 @@
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.97647058823529409" green="0.95686274509803915" blue="0.94509803921568625" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<state key="normal" title="+"/>
<state key="normal" backgroundImage="add"/>
<connections>
<action selector="reduceAndaddButtonClick:" destination="ZT1-XJ-ObI" eventType="touchUpInside" id="e4z-VP-QRY"/>
</connections>
......@@ -1653,7 +1651,7 @@
<rect key="frame" x="500" y="24" width="30" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.97647058823529409" green="0.95686274509803915" blue="0.94509803921568625" alpha="1" colorSpace="calibratedRGB"/>
<state key="normal" title="-"/>
<state key="normal" backgroundImage="reduce"/>
<connections>
<action selector="reduceAndaddButtonClick:" destination="ZT1-XJ-ObI" eventType="touchUpInside" id="QbW-hx-wRj"/>
</connections>
......@@ -2676,11 +2674,11 @@
<objects>
<viewController storyboardIdentifier="customerorder" id="QTx-ut-yBB" customClass="CustomerOrderViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="szp-KJ-fw4">
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" id="9KS-IR-Val">
<rect key="frame" x="0.0" y="64" width="768" height="64"/>
<rect key="frame" x="0.0" y="64" width="1024" height="64"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="line" id="ujv-N5-Mny">
......@@ -2689,7 +2687,7 @@
<color key="backgroundColor" red="0.96470588235294119" green="0.96470588235294119" blue="0.96470588235294119" alpha="1" colorSpace="calibratedRGB"/>
</imageView>
<view contentMode="scaleToFill" id="Pwf-JZ-HoY">
<rect key="frame" x="0.0" y="64" width="768" height="0.0"/>
<rect key="frame" x="0.0" y="64" width="1024" height="0.0"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.75686274509999996" green="0.75686274509999996" blue="0.75686274509999996" alpha="1" colorSpace="calibratedRGB"/>
</view>
......@@ -2704,71 +2702,71 @@
<color key="backgroundColor" red="0.96470588239999999" green="0.96470588239999999" blue="0.96470588239999999" alpha="1" colorSpace="calibratedRGB"/>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="263" sectionHeaderHeight="28" sectionFooterHeight="28" id="SiR-rm-chD">
<rect key="frame" x="24" y="128" width="721" height="876"/>
<rect key="frame" x="24" y="128" width="977" height="1218"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="0.0" colorSpace="calibratedRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="customerordercell" rowHeight="260" id="YwA-DX-QXj" customClass="CustomerOrderTableViewCell">
<rect key="frame" x="0.0" y="28" width="721" height="260"/>
<rect key="frame" x="0.0" y="28" width="977" height="260"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="YwA-DX-QXj" id="jSd-hf-XkG">
<rect key="frame" x="0.0" y="0.0" width="721" height="260"/>
<rect key="frame" x="0.0" y="0.0" width="977" height="260"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" id="mff-AO-i22">
<rect key="frame" x="15" y="14" width="692" height="232"/>
<rect key="frame" x="15" y="14" width="948" height="232"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<view contentMode="scaleToFill" id="WUf-NE-jYR">
<rect key="frame" x="-15" y="60" width="721" height="1"/>
<rect key="frame" x="-15" y="60" width="977" height="1"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-12-12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="kQR-9e-2aA">
<rect key="frame" x="13" y="22" width="92" height="21"/>
<rect key="frame" x="9" y="22" width="184" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单编号：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="gD6-An-cx8">
<rect key="frame" x="127" y="22" width="85" height="21"/>
<rect key="frame" x="211" y="22" width="80" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="X21291291929129192" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="UBn-rZ-q4s">
<rect key="frame" x="214" y="22" width="160" height="21"/>
<rect key="frame" x="290" y="22" width="160" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="操作员：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7od-1Z-yjM">
<rect key="frame" x="394" y="22" width="65" height="21"/>
<rect key="frame" x="458" y="22" width="65" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="某某某" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2tu-Jm-J34">
<rect key="frame" x="464" y="22" width="120" height="21"/>
<rect key="frame" x="521" y="22" width="120" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="48u-VY-KRi">
<rect key="frame" x="579" y="18" width="100" height="30"/>
<rect key="frame" x="829.5" y="18" width="100" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="撤销订单">
<state key="normal" title="去支付">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="delecteOrderButtonClick:" destination="YwA-DX-QXj" eventType="touchUpInside" id="v9u-PF-8gt"/>
<action selector="GotoPayButtonClick:" destination="YwA-DX-QXj" eventType="touchUpInside" id="nde-AL-CWt"/>
</connections>
</button>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="OFm-kC-2XE">
......@@ -2783,7 +2781,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dAD-mk-dai">
<rect key="frame" x="210" y="75" width="150" height="21"/>
<rect key="frame" x="210" y="75" width="229.5" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
......@@ -2797,7 +2795,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xiN-d1-iB0">
<rect key="frame" x="210" y="104" width="150" height="21"/>
<rect key="frame" x="210" y="104" width="229.5" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
......@@ -2811,28 +2809,28 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="C5B-Cd-Dld">
<rect key="frame" x="210" y="133" width="150" height="21"/>
<rect key="frame" x="210" y="133" width="229.5" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货人电话：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="qck-CI-dEu">
<rect key="frame" x="391" y="162" width="85" height="21"/>
<rect key="frame" x="556" y="162" width="85" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="u5r-Hn-I4p">
<rect key="frame" x="470" y="162" width="150" height="21"/>
<rect key="frame" x="644" y="162" width="205.5" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="WCY-am-93b">
<rect key="frame" x="457" y="104" width="180" height="21"/>
<rect key="frame" x="626" y="104" width="246.5" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
......@@ -2846,21 +2844,21 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="4K4-52-8jM">
<rect key="frame" x="210" y="191" width="150" height="21"/>
<rect key="frame" x="210" y="191" width="229.5" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单总计：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="frI-nb-PUu">
<rect key="frame" x="391" y="133" width="72" height="21"/>
<rect key="frame" x="552.5" y="133" width="72" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="XtQ-6M-2qP">
<rect key="frame" x="457" y="133" width="180" height="21"/>
<rect key="frame" x="626" y="133" width="246.5" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
......@@ -2874,23 +2872,35 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="cD2-g8-oDq">
<rect key="frame" x="210" y="162" width="150" height="21"/>
<rect key="frame" x="210" y="162" width="229.5" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="联系电话：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="LvQ-XY-wOw">
<rect key="frame" x="391" y="104" width="72" height="21"/>
<rect key="frame" x="552.5" y="104" width="72" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="已完成" id="gwm-J1-ZGN">
<rect key="frame" x="533" y="66" width="100" height="100"/>
<rect key="frame" x="763.5" y="66" width="100" height="100"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="C2G-15-Wfw">
<rect key="frame" x="697" y="18" width="100" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.34901960780000002" green="0.67450980390000004" blue="0.86274509799999999" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="撤销订单">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="delecteOrderButtonClick:" destination="YwA-DX-QXj" eventType="touchUpInside" id="mBs-ed-Tuz"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
......@@ -2905,7 +2915,8 @@
<outlet property="consigneePhoneNumber" destination="u5r-Hn-I4p" id="UR6-O4-lez"/>
<outlet property="customerHeader" destination="OFm-kC-2XE" id="ed6-Q6-dms"/>
<outlet property="customerName" destination="xiN-d1-iB0" id="I7n-gc-Mmd"/>
<outlet property="delecteOrder" destination="48u-VY-KRi" id="eK1-l4-nhe"/>
<outlet property="delecteOrder" destination="C2G-15-Wfw" id="SzF-Cc-lX6"/>
<outlet property="gotoPayButton" destination="48u-VY-KRi" id="YDf-FZ-NWh"/>
<outlet property="orderAll" destination="frI-nb-PUu" id="g7d-7o-W3q"/>
<outlet property="orderDate" destination="kQR-9e-2aA" id="WGA-bb-FYT"/>
<outlet property="orderSerialNumber" destination="UBn-rZ-q4s" id="9g5-Q0-m4m"/>
......@@ -2923,6 +2934,7 @@
<color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/>
</view>
<navigationItem key="navigationItem" id="UZV-fG-L31"/>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="iPadPro"/>
<connections>
<outlet property="customerOrderTableView" destination="SiR-rm-chD" id="y0S-If-yZc"/>
<outlet property="orderStateBackView" destination="9KS-IR-Val" id="EAD-lV-oWX"/>
......@@ -3138,10 +3150,13 @@
<image name="05产品库-详情_03" width="500" height="375"/>
<image name="Trash" width="25" height="26"/>
<image name="aboutus" width="1024" height="510"/>
<image name="add" width="49" height="45"/>
<image name="bg" width="26" height="26"/>
<image name="box-副本" width="26" height="26"/>
<image name="jia" width="30" height="30"/>
<image name="line" width="301" height="30"/>
<image name="now" width="110" height="110"/>
<image name="reduce" width="49" height="45"/>
<image name="已完成" width="88" height="87"/>
<image name="视角" width="27" height="28"/>
</resources>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment