Skip to content

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

曹云霄

parent 45ca044b
Show whitespace changes
Inline Side-by-side
Showing with 286 additions and 99 deletions
Lighting/Class/CustomerOrderViewController.h
View file @ 7ff09212
......@@ -7,6 +7,8 @@
//
#import "BaseViewController.h"
#import "screeningButton.h"
@interface CustomerOrderViewController : BaseViewController
......@@ -23,9 +25,17 @@
*/
@property (weak, nonatomic) IBOutlet UITextField *searchCustomerOrder;
/**
* 订单状态排序背景
*/
@property (weak, nonatomic) IBOutlet UIView *orderStateBackView;
/**
* 订单状态排序
* 订单状态按钮
*/
@property (weak, nonatomic) IBOutlet UIButton *orderStateButton;
@property (strong, nonatomic) screeningButton *StyleButton;
@end
Lighting/Class/CustomerOrderViewController.m
View file @ 7ff09212
......@@ -19,6 +19,7 @@
[super viewDidLoad];
// Do any additional setup after loading the view.
[self uiConfigAction];
[self getGuideAllcustomerOrder];
}
......@@ -28,6 +29,61 @@
self.customerOrderTableView.dataSource = self;
self.customerOrderTableView.delegate = self;
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(screeningStyleButtonClick:) 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 -获取导购下客户订单
- (void)getGuideAllcustomerOrder
{
OrderBill *allOrder = [[OrderBill alloc]init];
//分页
DataPage *page = [[DataPage alloc]init];
page = 0;
//订单
TOOrderEntity *order = [[TOOrderEntity alloc]init];
order.guideId = [Shoppersmanager manager].guideid;
allOrder.datapage = page;
allOrder.order = order;
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/order/query"] WithRequestType:0 WithParameter:allOrder WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
NSLog(@"%@",returnValue);
}else
{
[self ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
} WithFailureBlock:^(id error) {
NSLog(@"%@",error);
}];
}
#pragma mark -订单状态筛选
- (void)screeningStyleButtonClick:(UIButton *)button
{
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
......
Lighting/Class/OrderdetailsViewController.m
View file @ 7ff09212
......@@ -153,6 +153,7 @@
SettlementViewController *settlement = [[SettlementViewController alloc]init];
settlement.preferredContentSize = CGSizeMake(380, 500);
settlement.goodsArray = self.orderDetails.orderdetailList;
settlement.orderCode = _orderCode;
settlement.modalPresentationStyle = UIModalPresentationFormSheet;
UIPopoverPresentationController *pop = settlement.popoverPresentationController;
pop.sourceView = settlement.view;
......
Lighting/Class/SettlementViewController.h
View file @ 7ff09212
......@@ -103,7 +103,10 @@
@property (weak, nonatomic) IBOutlet UIButton *sureButton;
/**
* 订单编号
*/
@property (nonatomic,copy) NSString *orderCode;
......
Lighting/Class/SettlementViewController.m
View file @ 7ff09212
......@@ -83,7 +83,7 @@
- (IBAction)SureButtonClick:(UIButton *)sender {
[self SurePayRequest];
}
#pragma amrk -支付方式选择
......@@ -96,11 +96,17 @@
#pragma mark -是否开票
- (IBAction)isinvoiceButtonClick:(UIButton *)sender {
NSArray *arr = @[@"是",@"否"];
[self ShowPopoverViewController:CGSizeMake(50, 150) Withdatas:arr ShowButton:sender SelectedIndex:1 GetTitle:YES];
}
#pragma mark -发票类型
- (IBAction)invoiceTypeButtonClick:(UIButton *)sender {
NSArray *arr = @[@"个人发票",@"公司发票"];
[self ShowPopoverViewController:CGSizeMake(100, 150) Withdatas:arr ShowButton:sender SelectedIndex:2 GetTitle:YES];
}
......@@ -133,6 +139,7 @@
*/
- (void)returnCellindexpathwithrow:(NSString *)Type WithcellTitle:(NSString *)title Withselected:(NSInteger)Selected
{
[self dismissViewControllerAnimated:YES completion:nil];
switch (Selected) {
case 0://支付方式
{
......@@ -155,6 +162,39 @@
}
}
#pragma mark -确认支付请求
- (void)SurePayRequest
{
NSString *string = [NSString stringWithFormat:@"%@%@%@/%@/%@/%@/%@",ServerAddress,@"/order/payOrder/",_orderCode,[self ReturnUrlString:self.payTypeButton.currentTitle],[self ReturnUrlString:self.ISinvoiceButton.currentTitle],[self ReturnUrlString:self.invoiceType.currentTitle],[self ReturnUrlString:self.invoiceHeader.text]];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:string WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
NSLog(@"%@",returnValue);
} WithErrorCodeBlock:^(id errorCodeValue) {
} WithFailureBlock:^(id error) {
NSLog(@"%@",error);
}];
}
#pragma mark -汉字转码
- (NSString *)ReturnUrlString:(NSString *)ChineseString
{
NSString* encodedString = [ChineseString stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
return encodedString;
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
......
Lighting/Class/Shoppingcart/GenerateOrdersViewController.m
View file @ 7ff09212
......@@ -54,8 +54,10 @@
Customermanager *customerModel = [Customermanager manager];
[[_datasArray firstObject] addObject:customerModel];
AddressModel *model = [[AddressModel alloc]init];
model.name = @"地址占位";
//地址占位
[[_datasArray objectAtIndex_opple:1] addObject:@"地址占位"];
[[_datasArray objectAtIndex_opple:1] addObject:model];
//加入商品信息
[_datasArray replaceObjectAtIndex:2 withObject:_settlementGoodsdatas];
......@@ -355,18 +357,11 @@
AddressModel *model = [Adressarr objectAtIndex_opple:i];
if (model.isSelected) {
//收货人信息
orderReceiver.receiverName = model.name;
orderReceiver.receiverMobile = model.miblephone;
orderReceiver.receiverAddress = model.address;
break;
}
if (i == Adressarr.count -1) {
[self ErrorMBProgressView:@"未选中地址"];
return;
}
}
}
order.order = orderReceiver;
orderReceiver.guideId = [[Shoppersmanager manager] Shoppers].employee.fid;
orderReceiver.consumerId = [[Customermanager manager] customerID];
......@@ -377,8 +372,27 @@
ShopcarModel *model = [goodArray objectAtIndex_opple:i];
TOOrderdetailEntity *orderGoods = [[TOOrderdetailEntity alloc]init];
orderGoods.goodsId = model.fid;
orderGoods.goodsCover = model.goods.pictures;
orderGoods.goodsCode = model.goods.code;
orderGoods.goodsSpec = model.goods.spec;
orderGoods.goodsName = model.goods.name;
orderGoods.goodsBrand = model.goods.brandId;
orderGoods.goodsNum = model.goods.number;
orderGoods.goodsPrice = model.goods.costPrice;
// orderGoods.goodsUnit = model.goods.unit;
// @synthesize goodsId;
// @synthesize goodsCode;
// @synthesize goodsName;
// @synthesize goodsCover;
// @synthesize goodsSpec;
// @synthesize goodsBrand;
// @synthesize goodsNum;
// @synthesize goodsPrice;
// @synthesize goodsTotalPrice;
[goodidArr addObject:orderGoods];
}
order.orderdetailList = goodidArr;
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/order/save"] WithRequestType:0 WithParameter:order WithReturnValueBlock:^(id returnValue) {
......@@ -398,6 +412,14 @@
} WithFailureBlock:^(id error) {
[self RemoveMBProgressHUDLoding];
}];
return;
}
else if (i == Adressarr.count -1)
{
[self ErrorMBProgressView:@"未选中地址"];
}
}
}
}
......
Lighting/Class/Shoppingcart/ShoppingViewController.m
View file @ 7ff09212
......@@ -77,8 +77,10 @@
#pragma mark - UI
- (void)uiConfigAction
{
self.view.backgroundColor = kTCColor(238, 238, 238);
self.shoppingTableview.dataSource = self;
self.shoppingTableview.delegate = self;
self.shoppingTableview.backgroundColor = [UIColor clearColor];
self.shoppingTableview.tableFooterView = [UIView new];
}
......@@ -166,11 +168,19 @@
}
#pragma mark -设置为当前客户回调
#pragma mark -选中商品回调
- (void)setSelectedButton:(NSInteger)index;
{
ShopcarModel *model = [self.shopResponseArray objectAtIndex_opple:index];
model.isSelected = !model.isSelected;
NSInteger goodsNumber = 0;
for (ShopcarModel *model in self.shopResponseArray) {
if (model.isSelected) {
goodsNumber ++;
}
}
[self.settlementButton setTitle:[NSString stringWithFormat:@"去结算(%ld)",goodsNumber] forState:UIControlStateNormal];
}
......@@ -230,18 +240,59 @@
#pragma mark -删除选中商品
- (IBAction)delecteSelectedGoods:(UIButton *)sender {
//需要删除的cell数组
[self CreateMBProgressHUDLoding];
DeleteCartRequest *delecteGoods = [[DeleteCartRequest alloc]init];
//code数组
NSMutableArray *codeArr = [NSMutableArray array];
//需要删除的cell数组indexpath
NSMutableArray *delecteArray = [NSMutableArray array];
//模型数组
NSMutableArray *delectemodel = [NSMutableArray array];
for (int i=0; i<self.shopResponseArray.count; i++) {
ShopcarModel *model = [self.shopResponseArray objectAtIndex_opple:i];
if (model.isSelected) {
[self.shopResponseArray removeObject:model];
[codeArr addObject:model.fid];
[delectemodel addObject:model];
NSIndexPath *indexpath = [NSIndexPath indexPathForRow:i inSection:0];
[delecteArray addObject:indexpath];
}
}
//没有选中任何商品
if (codeArr.count == 0) {
[self RemoveMBProgressHUDLoding];
return;
}
delecteGoods.cartIds = codeArr;
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/shopcart/delete"] WithRequestType:0 WithParameter:delecteGoods WithReturnValueBlock:^(id returnValue) {
[self RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
//删除商品
for (ShopcarModel *model in delectemodel) {
[self.shopResponseArray removeObject:model];
}
[self.shoppingTableview deleteRowsAtIndexPaths:delecteArray withRowAnimation:UITableViewRowAnimationLeft];
[self SuccessMBProgressView:@"删除成功"];
}else
{
[self ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
} WithFailureBlock:^(id error) {
[self RemoveMBProgressHUDLoding];
}];
}
......
Lighting/Lighting/StoryboardwithCYX.storyboard
View file @ 7ff09212
......@@ -153,7 +153,7 @@
<rect key="frame" x="0.0" y="28" width="721" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NV8-I4-ig4" id="E0m-wU-1b5">
<rect key="frame" x="0.0" y="0.0" width="721" height="99"/>
<rect key="frame" x="0.0" y="0.0" width="721" height="99.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="F66-vh-va3">
......@@ -424,7 +424,7 @@
<rect key="frame" x="0.0" y="28" width="717" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1Sl-4a-xI0" id="Kls-Lg-VEy">
<rect key="frame" x="0.0" y="0.0" width="717" height="99"/>
<rect key="frame" x="0.0" y="0.0" width="717" height="99.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="mhA-C1-oB5">
......@@ -522,7 +522,7 @@
<rect key="frame" x="0.0" y="128" width="717" height="200"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1pL-BK-mae" id="zJa-bo-n5G">
<rect key="frame" x="0.0" y="0.0" width="717" height="199"/>
<rect key="frame" x="0.0" y="0.0" width="717" height="199.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="下单时间：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="DqG-UR-Q08">
......@@ -734,10 +734,10 @@
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="firstcell" rowHeight="84" id="XgA-9w-ut9" customClass="OrderInformationTableViewCell">
<rect key="frame" x="0.0" y="49.5" width="768" height="84"/>
<rect key="frame" x="0.0" y="113.5" width="768" height="84"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XgA-9w-ut9" id="BWi-jv-OOH">
<rect key="frame" x="0.0" y="0.0" width="768" height="83"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="83.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单编号：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="KGm-XJ-NyV">
......@@ -811,10 +811,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="135" id="rIO-yd-hh7" customClass="PersonInformationTableViewCell">
<rect key="frame" x="0.0" y="133.5" width="768" height="135"/>
<rect key="frame" x="0.0" y="197.5" width="768" height="135"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rIO-yd-hh7" id="mn8-g0-Zqo">
<rect key="frame" x="0.0" y="0.0" width="768" height="134"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="134.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="Zdg-s0-xfD">
......@@ -907,10 +907,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="thirdcell" rowHeight="90" id="PfN-24-v5t" customClass="GoodsInformationTableViewCell">
<rect key="frame" x="0.0" y="268.5" width="768" height="90"/>
<rect key="frame" x="0.0" y="332.5" width="768" height="90"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PfN-24-v5t" id="2Je-94-WVY">
<rect key="frame" x="0.0" y="0.0" width="768" height="89"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="89.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货人：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="tiK-JC-Jy4">
......@@ -967,10 +967,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="47T-H0-tG7" customClass="CommodityListTableViewCell">
<rect key="frame" x="0.0" y="358.5" width="768" height="80"/>
<rect key="frame" x="0.0" y="422.5" width="768" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="47T-H0-tG7" id="zXR-bC-Wdh">
<rect key="frame" x="0.0" y="0.0" width="768" height="79"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="79.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="6MS-gq-TMk">
......@@ -1028,10 +1028,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="PNT-Fy-4Hi" customClass="AllpriceTableViewCell">
<rect key="frame" x="0.0" y="438.5" width="768" height="50"/>
<rect key="frame" x="0.0" y="502.5" width="768" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PNT-Fy-4Hi" id="PxE-0c-Zdt">
<rect key="frame" x="0.0" y="0.0" width="768" height="49"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="49.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总数量：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="rbZ-Pg-7Uu">
......@@ -1188,7 +1188,7 @@
</collectionViewFlowLayout>
<cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="productcell" id="J5m-0M-uqb" customClass="ProductCollectionViewCell">
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
<rect key="frame" x="0.0" y="64" width="300" height="300"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
......@@ -1261,10 +1261,10 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="productDetailscell" rowHeight="170" id="Sye-2R-IQf" customClass="ProductDetailsTableViewCell">
<rect key="frame" x="0.0" y="28" width="768" height="170"/>
<rect key="frame" x="0.0" y="92" width="768" height="170"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sye-2R-IQf" id="CXs-SR-gHP">
<rect key="frame" x="0.0" y="0.0" width="768" height="169"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="169.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" id="2bG-Ip-ptr">
......@@ -1656,7 +1656,7 @@
<rect key="frame" x="0.0" y="28" width="717" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZT1-XJ-ObI" id="GWp-Jl-7br">
<rect key="frame" x="0.0" y="0.0" width="717" height="79"/>
<rect key="frame" x="0.0" y="0.0" width="717" height="79.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="PkJ-eJ-ksY">
......@@ -1740,14 +1740,14 @@
</prototypes>
</tableView>
</subviews>
<color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<view contentMode="scaleToFill" id="JEe-lm-M0j">
<rect key="frame" x="25" y="960" width="717" height="64"/>
<rect key="frame" x="0.0" y="960" width="768" height="64"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="QOZ-rd-1Ea">
<rect key="frame" x="539" y="11" width="165" height="42"/>
<rect key="frame" x="564" y="11" width="165" height="42"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="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="17"/>
......@@ -1759,27 +1759,27 @@
</connections>
</button>
<label opaque="NO" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全选" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="aGF-A2-Ikp">
<rect key="frame" x="60" y="21" width="32" height="21"/>
<rect key="frame" x="85" y="21" width="32" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥25600" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SzO-sh-Q17">
<rect key="frame" x="387" y="18" width="144" height="25"/>
<rect key="frame" x="412" y="18" width="144" height="25"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="24"/>
<color key="textColor" red="0.9882352941176471" green="0.33725490196078434" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="合计金额：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lfY-O6-zCQ">
<rect key="frame" x="323" y="21" width="85" height="21"/>
<rect key="frame" x="348" y="21" width="85" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="va8-YD-eVD">
<rect key="frame" x="31" y="22" width="20" height="20"/>
<rect key="frame" x="56" y="22" width="20" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<state key="normal" backgroundImage="box-副本"/>
......@@ -1789,25 +1789,23 @@
</connections>
</button>
<view contentMode="scaleToFill" id="N1y-3D-mbG">
<rect key="frame" x="0.0" y="0.0" width="717" height="1"/>
<rect key="frame" x="25" y="0.0" width="717" height="1"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="0.8666666666666667" green="0.8666666666666667" blue="0.8666666666666667" alpha="1" colorSpace="calibratedRGB"/>
</view>
<label opaque="NO" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="删除" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VF3-g8-ckJ">
<rect key="frame" x="142" y="21" width="32" height="21"/>
<rect key="frame" x="167" y="21" width="32" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="451-RF-HOE">
<rect key="frame" x="113" y="22" width="20" height="20"/>
<rect key="frame" x="139" y="22" width="20" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<state key="normal" backgroundImage="Trash"/>
<state key="selected" backgroundImage="bg"/>
<connections>
<action selector="allSelectedButtonClick:" destination="4Ho-ZE-RT8" eventType="touchUpInside" id="MEh-UA-hfY"/>
<action selector="delecteSelectedGoods:" destination="4Ho-ZE-RT8" eventType="touchUpInside" id="Ylw-dW-E2P"/>
</connections>
</button>
......@@ -1843,10 +1841,10 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="140" id="LsY-i0-h5H" customClass="PersonInformationTableViewCell">
<rect key="frame" x="0.0" y="28" width="768" height="140"/>
<rect key="frame" x="0.0" y="92" width="768" height="140"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LsY-i0-h5H" id="dPG-p9-V2i">
<rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="139.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="qWT-p0-Gta">
......@@ -1940,10 +1938,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="consigneecell" rowHeight="56" id="gfQ-UE-mXV" customClass="GenerateOrdersTableViewCell">
<rect key="frame" x="0.0" y="168" width="768" height="56"/>
<rect key="frame" x="0.0" y="232" width="768" height="56"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gfQ-UE-mXV" id="za6-HU-VEw">
<rect key="frame" x="0.0" y="0.0" width="768" height="55"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="55.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机号码：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="X0Z-8j-BdI">
......@@ -2011,10 +2009,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Modifycell" rowHeight="56" id="Kk4-Fh-HhL" customClass="GenerateOrdersModifyTableViewCell">
<rect key="frame" x="0.0" y="224" width="768" height="56"/>
<rect key="frame" x="0.0" y="288" width="768" height="56"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kk4-Fh-HhL" id="oRX-7p-HkY">
<rect key="frame" x="0.0" y="0.0" width="768" height="55"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="55.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="m0f-EW-LM5">
......@@ -2042,10 +2040,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="G7o-xS-1mB" customClass="CommodityListTableViewCell">
<rect key="frame" x="0.0" y="280" width="768" height="80"/>
<rect key="frame" x="0.0" y="344" width="768" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="G7o-xS-1mB" id="l3e-TL-GCT">
<rect key="frame" x="0.0" y="0.0" width="768" height="79"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="79.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="Un4-g0-sG6">
......@@ -2103,10 +2101,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="6K9-mc-7RW" customClass="AllpriceTableViewCell">
<rect key="frame" x="0.0" y="360" width="768" height="50"/>
<rect key="frame" x="0.0" y="424" width="768" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6K9-mc-7RW" id="Vc7-f6-wGb">
<rect key="frame" x="0.0" y="0.0" width="768" height="49"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="49.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总数量：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ULe-0J-pCd">
......@@ -2745,25 +2743,23 @@
<rect key="frame" x="0.0" y="64" width="768" height="64"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入客户的名称或者手机号" textAlignment="natural" minimumFontSize="17" id="N1p-hh-zrK">
<rect key="frame" x="30" y="18" width="257" height="30"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.93725490199999995" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="line" id="ujv-N5-Mny">
<rect key="frame" x="25" y="22" width="257" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<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"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.75686274509999996" green="0.75686274509999996" blue="0.75686274509999996" alpha="1" colorSpace="calibratedRGB"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="erV-yK-XYa">
<rect key="frame" x="590" y="18" width="100" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="订单状体"/>
</button>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入客户的名称或者手机号" textAlignment="natural" minimumFontSize="17" id="N1p-hh-zrK">
<rect key="frame" x="72" y="21" width="191" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
<color key="backgroundColor" red="0.96470588239999999" green="0.96470588239999999" blue="0.96470588239999999" alpha="1" colorSpace="calibratedRGB"/>
</view>
......@@ -3021,7 +3017,7 @@
<navigationItem key="navigationItem" id="UZV-fG-L31"/>
<connections>
<outlet property="customerOrderTableView" destination="SiR-rm-chD" id="y0S-If-yZc"/>
<outlet property="orderStateButton" destination="erV-yK-XYa" id="EIe-do-RmT"/>
<outlet property="orderStateBackView" destination="9KS-IR-Val" id="EAD-lV-oWX"/>
<outlet property="searchCustomerOrder" destination="N1p-hh-zrK" id="b1f-B2-FLe"/>
</connections>
</viewController>
......
Lighting/Tools/PopoverViewController.m
View file @ 7ff09212
......@@ -29,6 +29,7 @@
self.popoverTableView = [[UITableView alloc]initWithFrame:CGRectMake(0, 0, self.contentSize.width, self.contentSize.height) style:UITableViewStylePlain];
self.popoverTableView.dataSource = self;
self.popoverTableView.delegate = self;
self.popoverTableView.showsVerticalScrollIndicator = NO;
self.popoverTableView.tableFooterView = [UIView new];
[self.view addSubview:self.popoverTableView];
self.popoverTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
......
Lighting/Tools/opple_objc_json_client.h
View file @ 7ff09212
......@@ -957,7 +957,7 @@ extern NSString * const SORTDIRECTION_DESC;
*/
@property (nonatomic, strong) TOGoodsEntity *goods;
/**
* ��法: 取得java.lang.String
* 方法: 取得java.lang.String
*
*
*/
......@@ -1022,6 +1022,12 @@ extern NSString * const SORTDIRECTION_DESC;
*
*/
@property (nonatomic, copy) NSString *resellerId;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, strong) NSNumber *costPrice;
@end /* interface TOShopcartEntity */
#endif
......
Lighting/Tools/opple_objc_json_client.m
View file @ 7ff09212
......@@ -340,6 +340,7 @@
@synthesize goodsNum;
@synthesize consumerId;
@synthesize resellerId;
@synthesize costPrice;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......
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