Commit c9c85863 authored by 曹云霄's avatar 曹云霄

修改项说明:

parent 52acd7e8
...@@ -25,10 +25,12 @@ ...@@ -25,10 +25,12 @@
allNumber += model.goodsNum; allNumber += model.goodsNum;
allPrice += [model.costPrice floatValue] *model.goodsNum; allPrice += [model.costPrice floatValue] *model.goodsNum;
} }
self.goodsAllNumber.text = [NSString stringWithFormat:@"%ld",allNumber];
self.goodsAllPrice.text = [NSString stringWithFormat:@"¥%.2f",allPrice]; self.goodsAllPrice.text = [NSString stringWithFormat:@"¥%.2f",allPrice];
} }
#pragma mark -数据源赋值 #pragma mark -数据源赋值
- (void)setGoodsArray:(NSArray *)goodsArray - (void)setGoodsArray:(NSArray *)goodsArray
{ {
......
...@@ -49,18 +49,10 @@ ...@@ -49,18 +49,10 @@
self.consigneePhoneNumber.text = _model.order.receiverMobile; self.consigneePhoneNumber.text = _model.order.receiverMobile;
self.phoneNumber.text = _model.consumer.mobile; self.phoneNumber.text = _model.consumer.mobile;
self.consigneeAddress.text = _model.order.receiverAddress; self.consigneeAddress.text = _model.order.receiverAddress;
/// 商品个数
CGFloat goodsAllprice = 0;
NSInteger goodsAllnum = 0; NSInteger goodsAllnum = 0;
for (TOOrderdetailEntity *goodslist in _model.orderdetailList) { self.orderTotalPrice.text = [NSString stringWithFormat:@"¥%.2f",[_model.order.orderPrice floatValue]];
goodsAllprice += [goodslist.goodsTotalPrice floatValue];
goodsAllnum += [goodslist.goodsNum integerValue];
}
self.orderTotalPrice.text = [NSString stringWithFormat:@"¥%.2f",goodsAllprice];
self.styleNumber.text = [NSString stringWithFormat:@"%ld",goodsAllnum]; self.styleNumber.text = [NSString stringWithFormat:@"%ld",goodsAllnum];
//撤销订单、去支付 //撤销订单、去支付
if ([_model.order.orderState isEqualToString:@"001"]) { if ([_model.order.orderState isEqualToString:@"001"]) {
self.delecteOrder.hidden = NO; self.delecteOrder.hidden = NO;
......
...@@ -225,7 +225,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -225,7 +225,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
queryDrawState.orderNumberEquals = self.orderCode; queryDrawState.orderNumberEquals = self.orderCode;
} }
queryDrawState.winnerIdEquals = [Customermanager manager].model.fid; queryDrawState.winnerIdEquals = [Customermanager manager].model.fid;
queryDrawState.stateEquals = !self.isShowPayButton?USED:ACCOMPLISHED; queryDrawState.stateEquals = self.isShowPayButton?ACCOMPLISHED:USED;
DataPage *page = [[DataPage alloc]init]; DataPage *page = [[DataPage alloc]init];
page.page = ZERO; page.page = ZERO;
page.rows = ONE; page.rows = ONE;
...@@ -582,6 +582,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -582,6 +582,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
{ {
PromotionalTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"PromotionalTableViewCell" forIndexPath:indexPath]; PromotionalTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"PromotionalTableViewCell" forIndexPath:indexPath];
NSString *describe = nil; NSString *describe = nil;
cell.userInteractionEnabled = self.isUserInteractionEnabled;
id object = self.promotionalArray[indexPath.row]; id object = self.promotionalArray[indexPath.row];
if ([object isKindOfClass:[PromotionalGoodsModel class]]) { if ([object isKindOfClass:[PromotionalGoodsModel class]]) {
PromotionalGoodsModel *goodsModel = object; PromotionalGoodsModel *goodsModel = object;
...@@ -593,7 +594,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -593,7 +594,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
describe = [NSString stringWithFormat:@"折扣金额:%ld",deductionModel.total]; describe = [NSString stringWithFormat:@"折扣金额:%ld",deductionModel.total];
} }
cell.promotionalTitleLabel.text = describe; cell.promotionalTitleLabel.text = describe;
cell.userInteractionEnabled = self.isUserInteractionEnabled;
return cell; return cell;
} }
break; break;
...@@ -669,7 +669,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -669,7 +669,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{ {
if (indexPath.section == 5) { if (indexPath.section == 5 && self.isUserInteractionEnabled) {
PromotionalTableViewCell *promotionalCell = [tableView cellForRowAtIndexPath:indexPath]; PromotionalTableViewCell *promotionalCell = [tableView cellForRowAtIndexPath:indexPath];
id object = self.promotionalArray[indexPath.row]; id object = self.promotionalArray[indexPath.row];
if ([object isKindOfClass:[PromotionalGoodsModel class]]) { if ([object isKindOfClass:[PromotionalGoodsModel class]]) {
...@@ -696,6 +696,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -696,6 +696,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
WS(weakSelf); WS(weakSelf);
NSString *server = [NSString stringWithFormat:SERVERREQUESTURL(ORDERDETAILSURL),[Shoppersmanager manager].Shoppers.employee.departid,self.orderCode]; NSString *server = [NSString stringWithFormat:SERVERREQUESTURL(ORDERDETAILSURL),[Shoppersmanager manager].Shoppers.employee.departid,self.orderCode];
NSString *newServer = [server stringByReplacingOccurrencesOfString:@"/app" withString:@""]; NSString *newServer = [server stringByReplacingOccurrencesOfString:@"/app" withString:@""];
[self callAirprintWithURL:[NSURL URLWithString:newServer] SuccessBlock:^{ [self callAirprintWithURL:[NSURL URLWithString:newServer] SuccessBlock:^{
[weakSelf SuccessMBProgressView:@"打印完成"]; [weakSelf SuccessMBProgressView:@"打印完成"];
......
...@@ -1722,6 +1722,7 @@ ...@@ -1722,6 +1722,7 @@
TargetAttributes = { TargetAttributes = {
29706DA01CD082980003C412 = { 29706DA01CD082980003C412 = {
CreatedOnToolsVersion = 7.3; CreatedOnToolsVersion = 7.3;
DevelopmentTeam = 39XYE6VSP8;
}; };
}; };
}; };
...@@ -2089,7 +2090,7 @@ ...@@ -2089,7 +2090,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets"; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
CLANG_ENABLE_OBJC_WEAK = YES; CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
COMPRESS_PNG_FILES = NO; COMPRESS_PNG_FILES = NO;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)"; FRAMEWORK_SEARCH_PATHS = "$(inherited)";
...@@ -2131,7 +2132,7 @@ ...@@ -2131,7 +2132,7 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple; PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "ce8104e7-12c7-4aa2-a135-c4d3731e559c";
STRIP_PNG_TEXT = NO; STRIP_PNG_TEXT = NO;
TARGETED_DEVICE_FAMILY = 2; TARGETED_DEVICE_FAMILY = 2;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**"; USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
...@@ -2146,7 +2147,7 @@ ...@@ -2146,7 +2147,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets"; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
CLANG_ENABLE_OBJC_WEAK = YES; CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
COMPRESS_PNG_FILES = NO; COMPRESS_PNG_FILES = NO;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)"; FRAMEWORK_SEARCH_PATHS = "$(inherited)";
...@@ -2188,7 +2189,7 @@ ...@@ -2188,7 +2189,7 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple; PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "ce8104e7-12c7-4aa2-a135-c4d3731e559c";
STRIP_PNG_TEXT = NO; STRIP_PNG_TEXT = NO;
TARGETED_DEVICE_FAMILY = 2; TARGETED_DEVICE_FAMILY = 2;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**"; USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
......
...@@ -737,28 +737,28 @@ ...@@ -737,28 +737,28 @@
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <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"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总数量:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="rbZ-Pg-7Uu">
<rect key="frame" x="406" y="15" width="72" height="21"/> <rect key="frame" x="316" y="15" width="72" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总计:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ywx-T1-GlW"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总计:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ywx-T1-GlW">
<rect key="frame" x="616" y="15" width="48" height="21"/> <rect key="frame" x="526" y="15" width="48" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥25600" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bp3-LQ-5yj"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥25600" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bp3-LQ-5yj">
<rect key="frame" x="658" y="14" width="324" height="21"/> <rect key="frame" x="568" y="14" width="324" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/> <fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="jlx-YW-sGm"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="jlx-YW-sGm">
<rect key="frame" x="479" y="15" width="103" height="21"/> <rect key="frame" x="389" y="15" width="103" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/> <fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
......
...@@ -145,6 +145,7 @@ static const char MJRefreshReloadDataBlockKey = '\0'; ...@@ -145,6 +145,7 @@ static const char MJRefreshReloadDataBlockKey = '\0';
[self executeReloadDataBlock]; [self executeReloadDataBlock];
} }
@end @end
@implementation UICollectionView (MJRefresh) @implementation UICollectionView (MJRefresh)
......
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
*/ */
@property (nonatomic,strong) PromptinformationView *promptView; @property (nonatomic,strong) PromptinformationView *promptView;
/**
* 打印
*/
@property (nonatomic,strong) UIPrintInteractionController *printControl; @property (nonatomic,strong) UIPrintInteractionController *printControl;
@end @end
@implementation BaseViewController @implementation BaseViewController
...@@ -273,17 +272,17 @@ ...@@ -273,17 +272,17 @@
#pragma mark 调用airPrint无线打印机 #pragma mark 调用airPrint无线打印机
- (void)callAirprintWithURL:(NSURL *)datasurl SuccessBlock:(void (^)())success ErrorBlock:(void (^)())failed - (void)callAirprintWithURL:(NSURL *)datasurl SuccessBlock:(void (^)())success ErrorBlock:(void (^)())failed
{ {
UIPrintInteractionController *printControl = [UIPrintInteractionController sharedPrintController]; self.printControl = [UIPrintInteractionController sharedPrintController];
printControl.delegate = self; self.printControl.delegate = self;
[self.webView loadRequest:[NSURLRequest requestWithURL:datasurl]];//网页 [self.webView loadRequest:[NSURLRequest requestWithURL:datasurl]];//网页
self.webView.navigationDelegate = self; self.webView.navigationDelegate = self;
printControl.printFormatter = [self.webView viewPrintFormatter];//布局打印视图绘制的内容。
UIPrintInfo *printInfo = [UIPrintInfo printInfo]; UIPrintInfo *printInfo = [UIPrintInfo printInfo];
printInfo.outputType = UIPrintInfoOutputGeneral; printInfo.outputType = UIPrintInfoOutputGeneral;
printInfo.jobName = @"订单明细"; printInfo.jobName = @"订单明细";
printInfo.duplex = UIPrintInfoDuplexShortEdge; printInfo.duplex = UIPrintInfoDuplexShortEdge;
self.printControl.printInfo = printInfo; self.printControl.printInfo = printInfo;
self.printControl.showsPageRange = YES; self.printControl.showsPageRange = YES;
self.printControl.printFormatter = [self.webView viewPrintFormatter];//布局打印视图绘制的内容。
void (^completionHandler)(UIPrintInteractionController *, BOOL, NSError *) = ^(UIPrintInteractionController *pic, BOOL completed, NSError *error) { void (^completionHandler)(UIPrintInteractionController *, BOOL, NSError *) = ^(UIPrintInteractionController *pic, BOOL completed, NSError *error) {
if (completed) if (completed)
{ {
......
...@@ -47,11 +47,6 @@ ...@@ -47,11 +47,6 @@
#pragma mark -UI #pragma mark -UI
- (void)uiConfigAction - (void)uiConfigAction
{ {
NSSet *websiteDataTypes = [NSSet setWithArray:@[WKWebsiteDataTypeDiskCache,WKWebsiteDataTypeMemoryCache,]];
NSDate *dateFrom = [NSDate dateWithTimeIntervalSince1970:0];
[[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:websiteDataTypes modifiedSince:dateFrom completionHandler:^{
NSLog(@"清除缓存成功");
}];
self.webView = [[WKWebView alloc] initWithFrame:self.view.bounds configuration:self.config]; self.webView = [[WKWebView alloc] initWithFrame:self.view.bounds configuration:self.config];
[self.view addSubview:self.webView]; [self.view addSubview:self.webView];
self.webView.navigationDelegate = self; self.webView.navigationDelegate = self;
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
/** /**
* 服务器开发地址 * 服务器开发地址
*/ */
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL] #define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://192.168.199.188:8081/opple-web/app%@",URL]
/** /**
* 服务器测试地址 * 服务器测试地址
......
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