Skip to content

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

debug

parent 6f6e8b62
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 25 deletions
Lighting/Class/AllCustomerViewController.m
View file @ e145e4f4
...@@ -217,7 +217,6 @@ ...@@ -217,7 +217,6 @@
NSString *customerID = [[weakSelf.CustomerresultArray objectAtIndex_opple:indexPath.row] fid]; NSString *customerID = [[weakSelf.CustomerresultArray objectAtIndex_opple:indexPath.row] fid];
NSDictionary *dict = @{@"customerid":customerID,@"title":title,@"model":[weakSelf.CustomerresultArray objectAtIndex_opple:indexPath.row]}; NSDictionary *dict = @{@"customerid":customerID,@"title":title,@"model":[weakSelf.CustomerresultArray objectAtIndex_opple:indexPath.row]};
[[NSNotificationCenter defaultCenter] postNotificationName:@"SETUPCURRENTCUSTOMER" object:dict]; [[NSNotificationCenter defaultCenter] postNotificationName:@"SETUPCURRENTCUSTOMER" object:dict];
}]; }];
[self.navigationController pushViewController:clientdetails animated:YES]; [self.navigationController pushViewController:clientdetails animated:YES];
} }
...@@ -305,8 +304,8 @@ ...@@ -305,8 +304,8 @@
case 0://start == end case 0://start == end
{ {
[formater setDateFormat:@"yyyy-MM-dd HH:dd:ss"]; [formater setDateFormat:@"yyyy-MM-dd HH:dd:ss"];
searchCustomer.createTimeBegin = [formater stringFromDate:[self ReturnZeroTime:date]]; // searchCustomer.createTimeBegin = [formater stringFromDate:[self ReturnZeroTime:date]];
searchCustomer.createTimeEnd = [formater stringFromDate:[self ReturnZeroTime:date1]]; // searchCustomer.createTimeEnd = [formater stringFromDate:[self ReturnZeroTime:date1]];
} }
break; break;
case 1://start > end case 1://start > end
......
Lighting/Class/ClientViewController.m
View file @ e145e4f4
...@@ -372,7 +372,6 @@ ...@@ -372,7 +372,6 @@
} WithErrorCodeBlock:^(id errorCodeValue) { } WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self promptCustomerWithString:@"网络连接已断开"]; [self promptCustomerWithString:@"网络连接已断开"];
} WithFailureBlock:^(id error) { } WithFailureBlock:^(id error) {
...@@ -537,7 +536,6 @@ ...@@ -537,7 +536,6 @@
} WithErrorCodeBlock:^(id errorCodeValue) { } WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self promptCustomerWithString:@"网络连接已断开"]; [self promptCustomerWithString:@"网络连接已断开"];
} WithFailureBlock:^(id error) { } WithFailureBlock:^(id error) {
......
Lighting/Class/SettlementViewController.m
View file @ e145e4f4
...@@ -283,7 +283,6 @@ ...@@ -283,7 +283,6 @@
[self ErrorMBProgressView:@"发票抬头不能为空"]; [self ErrorMBProgressView:@"发票抬头不能为空"];
return; return;
} }
}else if ([self.invoiceType.currentTitle isEqualToString:@"个人发票"]) }else if ([self.invoiceType.currentTitle isEqualToString:@"个人发票"])
{ {
order.billType = @"002"; order.billType = @"002";
......
Lighting/Class/Shoppingcart/GenerateOrdersViewController.m
View file @ e145e4f4
...@@ -235,6 +235,11 @@ ...@@ -235,6 +235,11 @@
break; break;
case 1: case 1:
{ {
NSArray *arr = [self.datasArray objectAtIndex_opple:indexPath.section];
if (indexPath.row == arr.count-1) {
return 70;
}
return 56; return 56;
} }
break; break;
......
Lighting/Class/Shoppingcart/ShoppingTableViewCell.h
View file @ e145e4f4
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
/** /**
* 当前商品数量、成交价 * 当前商品数量、成交价
*/ */
- (void)ChangeGoodsNumber:(int)goodsNumber WithcostPrice:(int)costprice Withcellindex:(NSInteger)cellindex; - (void)ChangeGoodsNumber:(int)goodsNumber WithcostPrice:(CGFloat)costprice Withcellindex:(NSInteger)cellindex;
@end @end
......
Lighting/Class/Shoppingcart/ShoppingTableViewCell.m
View file @ e145e4f4
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
self.specifications.text = _model.goods.size; self.specifications.text = _model.goods.size;
self.goodsCode.text = _model.goods.code; self.goodsCode.text = _model.goods.code;
self.tagsPriceLabe.text = [_model.goods.tagPrice stringValue]; self.tagsPriceLabe.text = [_model.goods.tagPrice stringValue];
self.clinchTextfield.text = [_model.costPrice stringValue]?[_model.costPrice stringValue]:[_model.goods.tagPrice stringValue]; self.clinchTextfield.text = [NSString stringWithFormat:@"%.2f",[_model.costPrice floatValue]?[_model.costPrice floatValue]:[_model.goods.tagPrice floatValue]];
self.goodsNumbersLabe.text = [NSString stringWithFormat:@"%d",_model.goodsNum]; self.goodsNumbersLabe.text = [NSString stringWithFormat:@"%d",_model.goodsNum];
if ([_model.costPrice integerValue] == 0) { if ([_model.costPrice integerValue] == 0) {
_model.costPrice = _model.goods.tagPrice; _model.costPrice = _model.goods.tagPrice;
...@@ -90,10 +90,10 @@ ...@@ -90,10 +90,10 @@
break; break;
} }
//改变价格 //改变价格
self.productPriceLabe.text = [NSString stringWithFormat:@"￥%ld",[self.goodsNumbersLabe.text integerValue]*[_model.goods.costPrice integerValue]]; self.productPriceLabe.text = [NSString stringWithFormat:@"￥%.2f",[self.goodsNumbersLabe.text integerValue]*[_model.costPrice floatValue]];
_model.costPrice = [NSNumber numberWithFloat:[self.clinchTextfield.text floatValue]]; // _model.costPrice = [NSNumber numberWithFloat:[self.clinchTextfield.text floatValue]];
if ([self.delegate respondsToSelector:@selector(ChangeGoodsNumber:WithcostPrice:Withcellindex:)]) { if ([self.delegate respondsToSelector:@selector(ChangeGoodsNumber:WithcostPrice:Withcellindex:)]) {
[self.delegate ChangeGoodsNumber:[self.goodsNumbersLabe.text intValue] WithcostPrice:[self.clinchTextfield.text intValue]Withcellindex:_cellindex]; [self.delegate ChangeGoodsNumber:[self.goodsNumbersLabe.text intValue] WithcostPrice:[self.clinchTextfield.text floatValue]Withcellindex:_cellindex];
} }
} }
...@@ -119,10 +119,10 @@ ...@@ -119,10 +119,10 @@
}else }else
{ {
//改变价格 //改变价格
self.productPriceLabe.text = [NSString stringWithFormat:@"￥%ld",[self.goodsNumbersLabe.text integerValue]*[textField.text integerValue]]; self.productPriceLabe.text = [NSString stringWithFormat:@"￥%.2f",[self.goodsNumbersLabe.text integerValue]*[textField.text floatValue]];
if ([self.delegate respondsToSelector:@selector(ChangeGoodsNumber:WithcostPrice:Withcellindex:)]) { if ([self.delegate respondsToSelector:@selector(ChangeGoodsNumber:WithcostPrice:Withcellindex:)]) {
[self.delegate ChangeGoodsNumber:[self.goodsNumbersLabe.text intValue] WithcostPrice:[self.clinchTextfield.text intValue]Withcellindex:_cellindex]; [self.delegate ChangeGoodsNumber:[self.goodsNumbersLabe.text intValue] WithcostPrice:[self.clinchTextfield.text floatValue]Withcellindex:_cellindex];
} }
} }
return YES; return YES;
......
Lighting/Class/Shoppingcart/ShoppingViewController.m
View file @ e145e4f4
...@@ -387,8 +387,9 @@ ...@@ -387,8 +387,9 @@
#pragma mark -改变商品数量 #pragma mark -改变商品数量
- (void)ChangeGoodsNumber:(int)goodsNumber WithcostPrice:(int)costprice Withcellindex:(NSInteger)cellindex - (void)ChangeGoodsNumber:(int)goodsNumber WithcostPrice:(CGFloat)costprice Withcellindex:(NSInteger)cellindex
{ {
[self CreateMBProgressHUDLoding];
//保存商品数量 //保存商品数量
ShopcarModel *model = [self.shopResponseArray objectAtIndex_opple:cellindex]; ShopcarModel *model = [self.shopResponseArray objectAtIndex_opple:cellindex];
model.goodsNum = goodsNumber; model.goodsNum = goodsNumber;
...@@ -396,10 +397,9 @@ ...@@ -396,10 +397,9 @@
//保存成交价格 //保存成交价格
ShopcarModel *Newmodel = [self.shopResponseArray objectAtIndex_opple:cellindex]; ShopcarModel *Newmodel = [self.shopResponseArray objectAtIndex_opple:cellindex];
Newmodel.costPrice = [NSNumber numberWithInteger:costprice]; Newmodel.costPrice = [NSNumber numberWithFloat:costprice];
// [self.shopResponseArray replaceObjectAtIndex:cellindex withObject:Newmodel]; // [self.shopResponseArray replaceObjectAtIndex:cellindex withObject:Newmodel];
[self CalculateSelectedGoodsAllprice];
////在服务器保存数量、成交价 ////在服务器保存数量、成交价
//购物车ID //购物车ID
...@@ -407,13 +407,15 @@ ...@@ -407,13 +407,15 @@
//商品id //商品id
NSString *goodsis = [[[self.shopResponseArray objectAtIndex_opple:cellindex] goods] fid]; NSString *goodsis = [[[self.shopResponseArray objectAtIndex_opple:cellindex] goods] fid];
//成交价 //成交价
NSString *costpriceString = [NSString stringWithFormat:@"%d",costprice]; NSString *costpriceString = [NSString stringWithFormat:@"%.2f",costprice];
//商品数量 //商品数量
NSString *goodsNumberString = [NSString stringWithFormat:@"%d",goodsNumber]; NSString *goodsNumberString = [NSString stringWithFormat:@"%d",goodsNumber];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@%@/%@/%@/%@",ServerAddress,@"/shopcart/updateCostPrice/",carid,goodsis,costpriceString,goodsNumberString] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) { [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@%@/%@/%@/%@",ServerAddress,@"/shopcart/updateCostPrice/",carid,goodsis,costpriceString,goodsNumberString] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[self RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) { if ([returnValue[@"code"] isEqualToNumber:@0]) {
NSLog(@"写入服务器成功"); NSLog(@"写入服务器成功");
[self CalculateSelectedGoodsAllprice];
[self QueryShoppingCarNumber]; [self QueryShoppingCarNumber];
} }
...@@ -424,6 +426,7 @@ ...@@ -424,6 +426,7 @@
NSLog(@"%@",error); NSLog(@"%@",error);
NSLog(@"写入服务器失败"); NSLog(@"写入服务器失败");
[self RemoveMBProgressHUDLoding];
}]; }];
} }
......
Lighting/Class/Tabbar/Toolview.m
View file @ e145e4f4
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
//按钮 //按钮
NSString *realName = [Shoppersmanager manager].Shoppers.employee.realName?[Shoppersmanager manager].Shoppers.employee.realName:@"服务导购"; NSString *realName = [Shoppersmanager manager].Shoppers.employee.realName?[Shoppersmanager manager].Shoppers.employee.realName:@"服务导购";
NSArray *titleArray = [NSArray arrayWithObjects:@"功能菜单",realName,@"我的客户",@"购物车", nil]; NSArray *titleArray = [NSArray arrayWithObjects:@"功能菜单",realName,@"我的客户",@"购物袋", nil];
//图片 //图片
NSArray *imageArray = [NSArray arrayWithObjects:@"dial",@"Cog",@"data",@"ablum", nil]; NSArray *imageArray = [NSArray arrayWithObjects:@"dial",@"Cog",@"data",@"ablum", nil];
for (int i=1; i<5; i++) { for (int i=1; i<5; i++) {
......
Lighting/Lighting/StoryboardwithCYX.storyboard
View file @ e145e4f4
...@@ -1181,7 +1181,7 @@ ...@@ -1181,7 +1181,7 @@
</collectionViewFlowLayout> </collectionViewFlowLayout>
<cells> <cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="productcell" id="J5m-0M-uqb" customClass="ProductCollectionViewCell"> <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="productcell" id="J5m-0M-uqb" customClass="ProductCollectionViewCell">
<rect key="frame" x="0.0" y="64" width="300" height="300"/> <rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/> <rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
...@@ -1263,7 +1263,7 @@ ...@@ -1263,7 +1263,7 @@
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
<prototypes> <prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="productDetailscell" rowHeight="170" id="Sye-2R-IQf" customClass="ProductDetailsTableViewCell"> <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="113.5" width="768" height="170"/> <rect key="frame" x="0.0" y="49.5" width="768" height="170"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sye-2R-IQf" id="CXs-SR-gHP"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sye-2R-IQf" id="CXs-SR-gHP">
<rect key="frame" x="0.0" y="0.0" width="768" height="169.5"/> <rect key="frame" x="0.0" y="0.0" width="768" height="169.5"/>
...@@ -2015,11 +2015,11 @@ ...@@ -2015,11 +2015,11 @@
<outlet property="isSelectedButton" destination="fs3-Vh-g5G" id="avL-eW-lce"/> <outlet property="isSelectedButton" destination="fs3-Vh-g5G" id="avL-eW-lce"/>
</connections> </connections>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Modifycell" rowHeight="56" id="Kk4-Fh-HhL" customClass="GenerateOrdersModifyTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Modifycell" rowHeight="70" id="Kk4-Fh-HhL" customClass="GenerateOrdersModifyTableViewCell">
<rect key="frame" x="0.0" y="258" width="768" height="56"/> <rect key="frame" x="0.0" y="258" width="768" height="70"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kk4-Fh-HhL" id="oRX-7p-HkY"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kk4-Fh-HhL" id="oRX-7p-HkY">
<rect key="frame" x="0.0" y="0.0" width="768" height="55.5"/> <rect key="frame" x="0.0" y="0.0" width="768" height="69.5"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="m0f-EW-LM5"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="m0f-EW-LM5">
...@@ -2038,6 +2038,10 @@ ...@@ -2038,6 +2038,10 @@
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state> </state>
</button> </button>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="lineNew" id="4A8-SN-0BX">
<rect key="frame" x="0.0" y="65" width="768" height="5"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
</imageView>
</subviews> </subviews>
</tableViewCellContentView> </tableViewCellContentView>
<color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/>
...@@ -2047,7 +2051,7 @@ ...@@ -2047,7 +2051,7 @@
</connections> </connections>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="G7o-xS-1mB" customClass="CommodityListTableViewCell"> <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="314" width="768" height="80"/> <rect key="frame" x="0.0" y="328" width="768" height="80"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="G7o-xS-1mB" id="l3e-TL-GCT"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="G7o-xS-1mB" id="l3e-TL-GCT">
<rect key="frame" x="0.0" y="0.0" width="768" height="79.5"/> <rect key="frame" x="0.0" y="0.0" width="768" height="79.5"/>
...@@ -2119,7 +2123,7 @@ ...@@ -2119,7 +2123,7 @@
</connections> </connections>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="6K9-mc-7RW" customClass="AllpriceTableViewCell"> <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="394" width="768" height="50"/> <rect key="frame" x="0.0" y="408" width="768" height="50"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6K9-mc-7RW" id="Vc7-f6-wGb"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6K9-mc-7RW" id="Vc7-f6-wGb">
<rect key="frame" x="0.0" y="0.0" width="768" height="49.5"/> <rect key="frame" x="0.0" y="0.0" width="768" height="49.5"/>
...@@ -3234,6 +3238,7 @@ ...@@ -3234,6 +3238,7 @@
<image name="box-副本" width="26" height="26"/> <image name="box-副本" width="26" height="26"/>
<image name="jia" width="30" height="30"/> <image name="jia" width="30" height="30"/>
<image name="line" width="301" height="30"/> <image name="line" width="301" height="30"/>
<image name="lineNew" width="1024" height="7"/>
<image name="now" width="110" height="110"/> <image name="now" width="110" height="110"/>
<image name="reduce" width="49" height="45"/> <image name="reduce" width="49" height="45"/>
<image name="已完成" width="88" height="87"/> <image name="已完成" width="88" height="87"/>
......
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