Skip to content

O
Opple-iOS
Commit d2b3a199 authored by 曹云霄's avatar 曹云霄
Browse files
Options

Merge branch 'master' into learningCenter

parents f4261d69 caf061a8
Show whitespace changes
Inline Side-by-side
Showing with 159 additions and 54 deletions
Class/OrderdetailsViewController.m
View file @ d2b3a199
......@@ -84,6 +84,11 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
*/
@property (nonatomic,strong) WeChatCardModel *weChatModel;
/**
扫描微信卡劵（重试）
*/
@property (nonatomic,strong) PromotionWeChatCardModel *tempWeChatModel;
......@@ -517,6 +522,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
- (void)scanWeChatCardNumber:(PromotionWeChatCardModel *)weChatModel
{
WS(weakSelf);
self.tempWeChatModel = weChatModel;
QRViewController *scanVC = [[QRViewController alloc] initWithScanCompleteHandler:^(NSString *url) {
[weakSelf dismissViewControllerAnimated:YES completion:^{
weakSelf.weChatModel.wxcardNumber = url;
......@@ -529,6 +535,11 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
[weakSelf.promotionInformationArray removeObject:model];break;
}
}
if (!weakSelf.promotionInformationArray.count) {
if ([weakSelf.sectionTitle containsObject:@"促销信息"]) {
[weakSelf.sectionTitle removeLastObject];
}
}
[weakSelf promotionInformationExecutionOrder];
}];
dispatch_async(dispatch_get_main_queue(), ^{
......@@ -553,11 +564,16 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
weChatModel.total = weakSelf.weChatModel.wxcardDenomation;break;
}
}
[weakSelf SHOWPrompttext:@"微信卡劵使用成功" ComcpleteBlock:nil];
[weakSelf SHOWPrompttext:[NSString stringWithFormat:@"微信卡劵(%ld元)使用成功",weakSelf.weChatModel.wxcardDenomation] ComcpleteBlock:^{
[weakSelf promotionInformationExecutionOrder];
}];
}else{
[weakSelf ErrorMBProgressView:returnValue[@"msg"]];
}
[weakSelf promptBoxWithMessage:[NSString stringWithFormat:@"微信卡劵使用失败:(%@),是否重试？",returnValue[@"msg"]] cancelBlock:^{
[weakSelf promotionInformationExecutionOrder];
} sureBlock:^{
[weakSelf scanWeChatCardNumber:weakSelf.tempWeChatModel];
}];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding];
......
Class/PromotionChooseViewController.m
View file @ d2b3a199
......@@ -125,7 +125,12 @@
#pragma mark - 退出促销条件选择
- (IBAction)dismissPromotionChooseNavigation:(UIBarButtonItem *)sender {
[self dismissViewControllerAnimated:YES completion:nil];
WS(weakSelf);
[self promptBoxWithMessage:@"退出后此单将不在享受促销" cancelBlock:^{
} sureBlock:^{
[weakSelf dismissViewControllerAnimated:YES completion:nil];
}];
}
#pragma mark - 确认促销条件选择
......
Class/SettlementViewController.m
View file @ d2b3a199
......@@ -31,6 +31,11 @@
*/
@property (nonatomic,strong) PayViewController *payController;
/**
总金额来源
*/
@property (nonatomic,copy) NSString *totalAmountSource;
@end
......@@ -50,7 +55,7 @@
[super viewDidLoad];
[self uiConfigAction];
[self setGoodsArray];
[self calculateGoodsTotalAmountAndTotalNumber];
[self getPayQrCode];
}
......@@ -84,7 +89,7 @@
#pragma mark -支付总金额，商品总数量
- (void)setGoodsArray
- (void)calculateGoodsTotalAmountAndTotalNumber
{
NSInteger goodsAllNumber = 0;//总数量
for (TOOrderdetailEntity *model in _goodsArray) {
......@@ -149,18 +154,22 @@
}];
//计算促销后的价格
CGFloat newPrice = allPrice;
NSMutableString *priceString = [NSMutableString stringWithFormat:@"原价 %.2f元",allPrice];
for (NSDictionary *dict in chooseArray) {
if ([dict isEqual:deductionPrice]) {
CGFloat deduction = [dict[@"price"] floatValue];
newPrice = newPrice - deduction;
[priceString appendString:[NSString stringWithFormat:@" - 抵扣促销 %.2f元",deduction]];
}else if ([dict isEqual:weChatPrice]){
CGFloat weChat = [dict[@"price"] floatValue];
newPrice = newPrice - weChat;
[priceString appendString:[NSString stringWithFormat:@" - 微信卡劵 %.2f元",weChat]];
}else if ([dict isEqual:drawPrice]){
CGFloat draw = [self.resultModel.number floatValue]/100.0;
newPrice = newPrice * draw;
[priceString appendString:[NSString stringWithFormat:@" X 转盘抽奖 %@",self.resultModel.descriptionString]];
}
}
//判断促销是否为空
......@@ -168,7 +177,9 @@
if (newPrice < 0) {
newPrice = 0;
}
[priceString appendString:[NSString stringWithFormat:@" = %.2f元",newPrice]];
}
self.totalAmountSource = priceString;
return newPrice;
}
......@@ -527,10 +538,12 @@
self.myScrollView.contentOffset = CGPointMake(0, 0);
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
#pragma mark - 价格疑问
- (IBAction)priceQuestionButtonClickAction:(UIButton *)sender {
[self promptCustomerTitle:@"我知道了" withMessage:self.totalAmountSource finish:nil];
}
@end
Class/SettlementViewController.xib
View file @ d2b3a199
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="10116" systemVersion="15F34" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SettlementViewController">
......@@ -29,18 +30,18 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="Zin-kL-ulL">
<rect key="frame" x="0.0" y="0.0" width="380" height="500"/>
<frame key="frameInset" width="380" height="500"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="BtK-gu-0KG">
<rect key="frame" x="93" y="140" width="160" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<inset key="titleEdgeInsets" minX="-50" minY="0.0" maxX="0.0" maxY="0.0"/>
<inset key="imageEdgeInsets" minX="120" minY="6" maxX="0.0" maxY="5"/>
<state key="normal" title="现金、支票、转账、刷卡" image="down_arr">
<color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="payTypeButtonClick:" destination="-1" eventType="touchUpInside" id="i6M-fm-Kha"/>
......@@ -48,11 +49,11 @@
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="vDt-el-S5r">
<rect key="frame" x="25" y="445" width="130" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<state key="normal" title="取消">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="CancelButtonClick:" destination="-1" eventType="touchUpInside" id="6As-mE-5Ro"/>
......@@ -60,11 +61,11 @@
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="wNR-jl-cxy">
<rect key="frame" x="203" y="445" width="130" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<state key="normal" title="确认">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="SureButtonClick:" destination="-1" eventType="touchUpInside" id="tue-Vx-ZkB"/>
......@@ -74,18 +75,18 @@
<rect key="frame" x="25" y="331" width="58" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<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="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="h52-sh-k1p">
<rect key="frame" x="93" y="327" width="160" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<inset key="titleEdgeInsets" minX="-50" minY="0.0" maxX="50" maxY="0.0"/>
<inset key="imageEdgeInsets" minX="120" minY="6" maxX="0.0" maxY="5"/>
<state key="normal" title="个人发票" image="down_arr">
<color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="invoiceTypeButtonClick:" destination="-1" eventType="touchUpInside" id="glI-Tn-twP"/>
......@@ -94,12 +95,12 @@
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="RrC-9S-Ofh">
<rect key="frame" x="93" y="283" width="160" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<inset key="titleEdgeInsets" minX="-50" minY="0.0" maxX="86" maxY="0.0"/>
<inset key="imageEdgeInsets" minX="120" minY="6" maxX="0.0" maxY="5"/>
<state key="normal" title="否" image="down_arr">
<color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="isinvoiceButtonClick:" destination="-1" eventType="touchUpInside" id="6wf-TG-crT"/>
......@@ -109,7 +110,7 @@
<rect key="frame" x="25" y="287" width="58" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<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="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" id="beF-Oa-HVo">
......@@ -117,28 +118,28 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="nrc-w9-AuC">
<rect key="frame" x="10" y="0.0" width="240" height="30"/>
<frame key="frameInset" minX="10" width="240" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="发票抬头:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="58b-Vg-zBQ">
<rect key="frame" x="25" y="376" width="58" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<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="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="u1Q-iA-oUv">
<rect key="frame" x="93" y="219" width="160" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<state key="normal" backgroundImage="图层-1">
<color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="selected" backgroundImage="图层-3"/>
<connections>
......@@ -148,9 +149,9 @@
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="pfa-IW-8J9">
<rect key="frame" x="93" y="180" width="160" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<state key="normal" backgroundImage="weixinselected">
<color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="selected" backgroundImage="weixin"/>
<connections>
......@@ -161,7 +162,7 @@
<rect key="frame" x="25" y="144" width="58" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<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="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" id="kRj-KI-B8x">
......@@ -169,20 +170,20 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="Wku-Nz-Jvr">
<rect key="frame" x="10" y="0.0" width="150" height="30"/>
<frame key="frameInset" minX="10" width="150" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总金额:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Bjc-Ns-VND">
<rect key="frame" x="25" y="103" width="50" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<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="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" id="V10-sC-tjf">
......@@ -190,20 +191,20 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="kfb-PC-RSU">
<rect key="frame" x="10" y="1" width="150" height="30"/>
<frame key="frameInset" minX="10" minY="1" width="150" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总数量:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="KHc-WJ-xQd">
<rect key="frame" x="25" y="64" width="50" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<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="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" id="JWa-n5-tJQ">
......@@ -211,28 +212,42 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="结算信息" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SoB-nK-luK">
<rect key="frame" x="8" y="13" width="150" height="21"/>
<frame key="frameInset" minX="8" minY="13" width="150" 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"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.95686274510000002" green="0.95686274510000002" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.95686274510000002" green="0.95686274510000002" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="uWZ-vV-OOs">
<rect key="frame" x="257" y="98" width="30" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" backgroundImage="question"/>
<connections>
<action selector="priceQuestionButtonClickAction:" destination="-1" eventType="touchUpInside" id="tYn-0Q-zMk"/>
</connections>
</button>
</subviews>
</scrollView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="521" y="319"/>
</view>
</objects>
<resources>
<image name="down_arr" width="22" height="12"/>
<image name="weixin" width="175" height="30"/>
<image name="weixinselected" width="175" height="30"/>
<image name="图层-1" width="175" height="30"/>
<image name="图层-3" width="175" height="30"/>
<image name="down_arr" width="16" height="9"/>
<image name="question" width="24" height="24"/>
<image name="weixin" width="174" height="30"/>
<image name="weixinselected" width="174" height="30"/>
<image name="图层-1" width="174" height="30"/>
<image name="图层-3" width="174" height="30"/>
</resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation" orientation="landscapeRight"/>
<simulatedScreenMetrics key="destination"/>
</simulatedMetricsContainer>
</document>
Lighting/Images.xcassets/question.imageset/Contents.json 0 → 100644
View file @ d2b3a199
{
"images" : [
{
"idiom" : "universal",
"filename" : "question.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "question@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "question@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Info.plist
View file @ d2b3a199
......@@ -15,7 +15,7 @@
<key>CFBundleName</key>
<string>欧立方</string>
<key>CFBundleShortVersionString</key>
<string>1.2.5</string>
<string>1.2.6</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
......
Tools/BaseViewController.h
View file @ d2b3a199
......@@ -161,5 +161,15 @@
*/
+ (BOOL)isBlankString:(NSString *)string;
/**
选择框
@param message 文本
@param cancel 取消
@param sure 确认
*/
- (void)promptBoxWithMessage:(NSString *)message cancelBlock:(void(^)())cancel sureBlock:(void(^)())sure;
@end
Tools/BaseViewController.m
View file @ d2b3a199
......@@ -565,6 +565,29 @@
return NO;
}
/**
选择框
@param message 文本
@param cancel 取消
@param sure 确认
*/
- (void)promptBoxWithMessage:(NSString *)message cancelBlock:(void(^)())cancel sureBlock:(void(^)())sure
{
UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"提示" message:message preferredStyle:UIAlertControllerStyleAlert];
[alertVC addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
if (cancel) {
cancel();
}
}]];
[alertVC addAction:[UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
if (sure) {
sure();
}
}]];
[self presentViewController:alertVC animated:YES completion:nil];
}
- (void)dealloc
{
......
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