Commit 5ee6ffec authored by 曹云霄's avatar 曹云霄

添加现金红包拒绝原因

parent d00d4dc3
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ShareGoodsViewController">
......@@ -20,7 +24,7 @@
<inset key="titleEdgeInsets" minX="-59" minY="61" maxX="0.0" maxY="0.0"/>
<inset key="imageEdgeInsets" minX="11" minY="-22" maxX="0.0" maxY="0.0"/>
<state key="normal" title="微信" image="wechat">
<color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="ShareWeiChatAntWeiboAction:" destination="-1" eventType="touchUpInside" id="oQJ-kM-Ca6"/>
......@@ -32,7 +36,7 @@
<inset key="titleEdgeInsets" minX="-59" minY="61" maxX="0.0" maxY="0.0"/>
<inset key="imageEdgeInsets" minX="11" minY="-22" maxX="0.0" maxY="0.0"/>
<state key="normal" title="微博" image="weibo">
<color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="ShareWeiChatAntWeiboAction:" destination="-1" eventType="touchUpInside" id="uFH-1Q-GMU"/>
......@@ -44,14 +48,14 @@
<inset key="titleEdgeInsets" minX="-59" minY="61" maxX="0.0" maxY="0.0"/>
<inset key="imageEdgeInsets" minX="11" minY="-22" maxX="0.0" maxY="0.0"/>
<state key="normal" title="微信朋友圈" image="Friends-Circle">
<color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="ShareWeiChatAntWeiboAction:" destination="-1" eventType="touchUpInside" id="IEt-es-A3G"/>
</connections>
</button>
</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"/>
<constraints>
<constraint firstItem="rpz-DZ-thX" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="20" id="2DR-cN-FHA"/>
<constraint firstItem="nwv-gn-bLJ" firstAttribute="height" secondItem="rpz-DZ-thX" secondAttribute="height" id="5z1-k0-fZq"/>
......
......@@ -97,6 +97,8 @@
#pragma mark -布局
- (void)uiConfigAction
{
ToStoreAddress *storeAddress = [Shoppersmanager manager].storeAddress;
[self.locationButton setTitle:[NSString stringWithFormat:@"%@-%@-%@",storeAddress.province,storeAddress.city,storeAddress.country] forState:UIControlStateNormal];
self.changePersonInformationButton.hidden = YES;
self.informationTableview.tableFooterView = [UIView new];
}
......
......@@ -240,7 +240,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
PromotionalReadPacketModel *readPacketModel = [[PromotionalReadPacketModel alloc]initWithDictionary:dict error:nil];
[weakSelf getConsumerAllPromotion:readPacketModel withBody:readPacketModel.body];
}
}
}else{
[XBLoadingView showHUDViewWithText:MESSAGE(returnValue)];
......@@ -530,7 +529,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
[XBLoadingView hideHUDViewWithDefault];
if (RESULT(returnValue)) {
weakSelf.weChatModel.wxcardDenomation = [RESPONSE(returnValue)[@"denomation"] integerValue];
weakSelf.weChatModel.wxcardDenomation = [RESPONSE(returnValue)[@"denomation"] floatValue];
weakSelf.weChatModel.payNo = RESPONSE(returnValue)[@"payNo"];
for (JSONModel *model in weakSelf.promotionInformationArray) {
if ([model isMemberOfClass:[PromotionWeChatCardModel class]]) {
......@@ -543,7 +542,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
NSString *string = [NSString stringWithFormat:@"微信卡劵(%f元)使用成功",weakSelf.weChatModel.wxcardDenomation];
ShowDefaultAlertView(nil, string, UIAlertControllerStyleAlert,nil,nil);
}else {
ShowDefaultAlertView(nil, message, UIAlertControllerStyleAlert, nil, nil);
ShowAlertView(@"提示", message, @"我知道了", nil, UIAlertControllerStyleAlert, nil, nil);
}
[weakSelf promotionInformationExecutionOrder];
}else{
......
......@@ -73,18 +73,7 @@
for (int i=0;i<weakSelf.customPromotionDatas.count;i++) {
CustomPromotionModel *model2 = weakSelf.customPromotionDatas[i];
if (![model2.conflicts containsObject:model1.type] && ![model1.conflicts containsObject:model2.type]) {
// for (int i=0;i<weakSelf.customPromotionDatas.count;i++) {
// CustomPromotionModel *model3 = weakSelf.customPromotionDatas[i];
// if ([model3.conflicts containsObject:model2.type]) {
// break;
// }
// if (i == weakSelf.customPromotionDatas.count-1) {
// model2.isSelected = YES;
// }
// }
model1.isSelected = YES;
}else{
// model1.isSelected = NO;
}
}
}else {
......
......@@ -49,12 +49,12 @@
//微信卡劵
if ([model isMemberOfClass:[PromotionWeChatCardModel class]]) {
PromotionWeChatCardModel *newWeChatModel = (PromotionWeChatCardModel *)model;
weChatPrice = @{@"price":[NSString stringWithFormat:@"%ld",self.weChatModel.wxcardDenomation],@"priority":@(newWeChatModel.priority)};
weChatPrice = @{@"price":[NSString stringWithFormat:@"%.2f",self.weChatModel.wxcardDenomation],@"priority":@(newWeChatModel.priority)};
}else if ([model isMemberOfClass:[PromotionalDeductionModel class]]) {
//抵扣
PromotionalDeductionModel *deductionModel = (PromotionalDeductionModel *)model;
deductionPrice = @{@"price":[NSString stringWithFormat:@"%ld",deductionModel.total],@"priority":@(deductionModel.priority)};
deductionPrice = @{@"price":[NSString stringWithFormat:@"%.2f",deductionModel.total],@"priority":@(deductionModel.priority)};
}else if ([model isMemberOfClass:[PromotionLuckyDrawModel class]]) {
//抽奖
......@@ -84,7 +84,7 @@
if (drawPrice) {
[array addObject:drawPrice];
}
//安装权限降序排列
//限降序排列
NSArray *chooseArray = [array sortedArrayUsingComparator:^NSComparisonResult(NSDictionary *obj1, NSDictionary *obj2) {
if ([obj1[@"priority"] integerValue] < [obj2[@"priority"] integerValue]) {
return NSOrderedDescending;
......
......@@ -25,11 +25,11 @@
//微信卡劵
if ([promotionModel isMemberOfClass:[PromotionWeChatCardModel class]]) {
PromotionWeChatCardModel *weChatModel = (PromotionWeChatCardModel *)promotionModel;
self.promotionalTitleLabel.text = [NSString stringWithFormat:@"微信卡劵: %ld",weChatModel.total];
self.promotionalTitleLabel.text = [NSString stringWithFormat:@"微信卡劵: %.2f",weChatModel.total];
}else if ([promotionModel isMemberOfClass:[PromotionalDeductionModel class]]) {
//抵扣
PromotionalDeductionModel *deductionModel = (PromotionalDeductionModel *)promotionModel;
self.promotionalTitleLabel.text = [NSString stringWithFormat:@"抵扣金额: %ld元",deductionModel.total];
self.promotionalTitleLabel.text = [NSString stringWithFormat:@"抵扣金额: %.2f元",deductionModel.total];
}else if ([promotionModel isMemberOfClass:[PromotionLuckyDrawModel class]]) {
//抽奖
self.promotionalTitleLabel.text = [NSString stringWithFormat:@"转盘抽奖: %@",self.model.descriptionString];
......
......@@ -21,7 +21,6 @@
@property (nonatomic,weak) id<UploadReceiptsDelegate> delegate;
/**
section 下标
*/
......@@ -32,6 +31,11 @@
*/
@property (weak, nonatomic) IBOutlet UIButton *uploadReceiptsButton;
/**
拒绝原因
*/
@property (weak, nonatomic) IBOutlet UILabel *rejectNoteLabel;
/**
* 订单号
*/
......@@ -47,7 +51,10 @@
*/
@property (nonatomic,strong) GroupByOrderNumber *model;
/**
状态
*/
@property (nonatomic,copy) NSString *stateString;
/**
刷新数据
......
......@@ -25,6 +25,7 @@
self.orderNumberLabel.text = _model.orderNumber;
self.orderTimelabel.text = _model.orderTime;
self.uploadReceiptsButton.hidden = [BaseViewController isBlankString:_model.orderReceiptUrl]?NO:YES;
self.rejectNoteLabel.hidden = YES;
}
......@@ -34,8 +35,15 @@
self.delegate = delegate;
self.orderNumberLabel.text = model.orderNumber;
self.orderTimelabel.text = model.orderTime;
self.uploadReceiptsButton.hidden = [BaseViewController isBlankString:model.orderReceiptUrl]?NO:YES;
self.uploadReceiptsButton.hidden = ([self.stateString isEqualToString:STUDYTASKSTATE_REFUSE] || [self.stateString isEqualToString:STUDYTASKSTATE_USED])?YES:NO;
self.rejectNoteLabel.hidden = [self.stateString isEqualToString:STUDYTASKSTATE_REFUSE]?NO:YES;
NSString *noteString = [model.draws.firstObject remark];
self.rejectNoteLabel.text = [NSString stringWithFormat:@"拒绝原因:%@",noteString];
}
@end
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
......@@ -18,8 +19,8 @@
<rect key="frame" x="678" y="15.5" width="96" height="35"/>
<color key="backgroundColor" red="0.28908365964889526" green="0.6080511212348938" blue="0.82942986488342285" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="96" id="4BC-lC-sbw"/>
<constraint firstAttribute="height" constant="35" id="tiM-h0-qOB"/>
<constraint firstAttribute="width" constant="96" id="UFb-ys-fkz"/>
<constraint firstAttribute="height" constant="35" id="mve-Hz-AvY"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<state key="normal" title="上传小票">
......@@ -35,72 +36,57 @@
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="123456789098" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dyu-RA-dDY">
<rect key="frame" x="88" y="22" width="240" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="DfE-EM-reb"/>
<constraint firstAttribute="width" constant="240" id="L7g-pE-iQW"/>
</constraints>
<rect key="frame" x="86.5" y="23.5" width="107.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="时间:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B5J-F8-QRj">
<rect key="frame" x="360" y="22" width="42" height="21"/>
<constraints>
<constraint firstAttribute="width" constant="42" id="ZEl-EU-QY9"/>
<constraint firstAttribute="height" constant="21" id="uO5-aC-Pp2"/>
</constraints>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="时间:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B5J-F8-QRj">
<rect key="frame" x="334.5" y="23.5" width="46" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单号:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8yQ-hJ-RXU">
<rect key="frame" x="26" y="22" width="52" height="21"/>
<constraints>
<constraint firstAttribute="width" constant="52" id="J29-3f-j2Y"/>
<constraint firstAttribute="height" constant="21" id="c2S-1W-bXE"/>
</constraints>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单号:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8yQ-hJ-RXU">
<rect key="frame" x="25" y="23.5" width="61.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="2016-10-20 13:51:10" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8zE-O4-90C">
<rect key="frame" x="412" y="21" width="164" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="9Q7-dI-9vD"/>
</constraints>
<rect key="frame" x="380.5" y="23.5" width="142.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="拒绝原因:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GWd-vp-5Wt">
<rect key="frame" x="563" y="24" width="76.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" red="0.98431372549999996" green="0.37254901959999998" blue="0.14901960780000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.96470588235294119" green="0.96470588235294119" blue="0.96470588235294119" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="B5J-F8-QRj" firstAttribute="leading" secondItem="Dyu-RA-dDY" secondAttribute="trailing" constant="32" id="20j-9X-zgr"/>
<constraint firstAttribute="bottom" secondItem="B5J-F8-QRj" secondAttribute="bottom" constant="22" id="5GK-7C-8NM"/>
<constraint firstItem="Dyu-RA-dDY" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="22" id="6bK-nK-JpY"/>
<constraint firstItem="8yQ-hJ-RXU" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="22" id="8Sn-3J-sk9"/>
<constraint firstItem="Dyu-RA-dDY" firstAttribute="leading" secondItem="8yQ-hJ-RXU" secondAttribute="trailing" constant="10" id="MUT-kk-D6H"/>
<constraint firstAttribute="trailing" secondItem="Fje-v9-8h3" secondAttribute="trailing" constant="20" id="NMR-1a-0vY"/>
<constraint firstItem="B5J-F8-QRj" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="22" id="Q6u-7C-NxO"/>
<constraint firstItem="8zE-O4-90C" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="21" id="Qli-ZN-vjl"/>
<constraint firstItem="Fje-v9-8h3" firstAttribute="leading" secondItem="8zE-O4-90C" secondAttribute="trailing" constant="102" id="RtT-LB-kEf"/>
<constraint firstAttribute="bottom" secondItem="8yQ-hJ-RXU" secondAttribute="bottom" constant="22" id="RyY-FD-aWW"/>
<constraint firstItem="8yQ-hJ-RXU" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="26" id="U7S-ar-Krk"/>
<constraint firstItem="Fje-v9-8h3" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="15.5" id="YXY-ul-QGE"/>
<constraint firstItem="8zE-O4-90C" firstAttribute="leading" secondItem="B5J-F8-QRj" secondAttribute="trailing" constant="10" id="g5x-iT-kzA"/>
<constraint firstAttribute="bottom" secondItem="8zE-O4-90C" secondAttribute="bottom" constant="23" id="mQo-Oj-1wN"/>
<constraint firstItem="Fje-v9-8h3" firstAttribute="leading" secondItem="8zE-O4-90C" secondAttribute="trailing" constant="102" id="oEq-iM-Z6f"/>
<constraint firstAttribute="bottom" secondItem="Fje-v9-8h3" secondAttribute="bottom" constant="14.5" id="pAu-Ct-2yh"/>
<constraint firstItem="B5J-F8-QRj" firstAttribute="leading" secondItem="Dyu-RA-dDY" secondAttribute="trailing" constant="32" id="pQ0-rI-RkS"/>
<constraint firstItem="Dyu-RA-dDY" firstAttribute="leading" secondItem="8yQ-hJ-RXU" secondAttribute="trailing" constant="10" id="pgf-SA-upN"/>
<constraint firstItem="8zE-O4-90C" firstAttribute="leading" secondItem="B5J-F8-QRj" secondAttribute="trailing" constant="10" id="uEE-9W-dcd"/>
<constraint firstAttribute="bottom" secondItem="Dyu-RA-dDY" secondAttribute="bottom" constant="22" id="wSo-hV-FMr"/>
<constraint firstItem="8yQ-hJ-RXU" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="25" id="3RG-7V-HrH"/>
<constraint firstItem="Dyu-RA-dDY" firstAttribute="centerY" secondItem="8yQ-hJ-RXU" secondAttribute="centerY" id="5qM-hW-YyC"/>
<constraint firstAttribute="trailing" secondItem="Fje-v9-8h3" secondAttribute="trailing" constant="20" id="JTH-ZF-jWx"/>
<constraint firstItem="B5J-F8-QRj" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" multiplier="0.9" id="LYo-o2-dTH"/>
<constraint firstItem="8zE-O4-90C" firstAttribute="centerY" secondItem="B5J-F8-QRj" secondAttribute="centerY" id="OP7-sL-2oT"/>
<constraint firstItem="8zE-O4-90C" firstAttribute="leading" secondItem="B5J-F8-QRj" secondAttribute="trailing" id="VB0-vW-LLN"/>
<constraint firstItem="8yQ-hJ-RXU" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="aHS-qi-D3S"/>
<constraint firstItem="Dyu-RA-dDY" firstAttribute="leading" secondItem="8yQ-hJ-RXU" secondAttribute="trailing" id="cqn-6D-bZV"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="GWd-vp-5Wt" secondAttribute="trailing" constant="20" id="iKd-bS-OU1"/>
<constraint firstItem="B5J-F8-QRj" firstAttribute="centerY" secondItem="8yQ-hJ-RXU" secondAttribute="centerY" id="mU4-xx-5Lm"/>
<constraint firstItem="GWd-vp-5Wt" firstAttribute="centerY" secondItem="8zE-O4-90C" secondAttribute="centerY" id="mdc-wg-TY6"/>
<constraint firstItem="GWd-vp-5Wt" firstAttribute="leading" secondItem="8zE-O4-90C" secondAttribute="trailing" constant="40" id="nh5-rX-zTo"/>
<constraint firstItem="Fje-v9-8h3" firstAttribute="centerY" secondItem="B5J-F8-QRj" secondAttribute="centerY" id="zfC-bF-sNX"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<connections>
<outlet property="orderNumberLabel" destination="Dyu-RA-dDY" id="V8o-b5-YQu"/>
<outlet property="orderTimelabel" destination="8zE-O4-90C" id="9o1-2A-cY3"/>
<outlet property="rejectNoteLabel" destination="GWd-vp-5Wt" id="yE3-55-reT"/>
<outlet property="uploadReceiptsButton" destination="Fje-v9-8h3" id="6ce-we-Qno"/>
</connections>
<point key="canvasLocation" x="420" y="191.5"/>
......
......@@ -132,6 +132,7 @@
- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
{
CardOrderInformationReusableView *headerView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"CardOrderInformationReusableView" forIndexPath:indexPath];
headerView.stateString = self.readPacketState;
[headerView refreshHeaderView:self withEntity:self.readPacketArray[indexPath.section] withSectionIndex:indexPath.section];
return headerView;
}
......
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides.png

22.3 KB | W: 0px | H: 0px

Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides.png

22.9 KB | W: 0px | H: 0px

Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides.png
  • 2-up
  • Swipe
  • Onion skin
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@2x.png

45.2 KB | W: 0px | H: 0px

Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@2x.png

46.2 KB | W: 0px | H: 0px

Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@2x.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@2x.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@2x.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@2x.png
  • 2-up
  • Swipe
  • Onion skin
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@3x.png

69.2 KB | W: 0px | H: 0px

Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@3x.png

70.6 KB | W: 0px | H: 0px

Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@3x.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@3x.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@3x.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@3x.png
  • 2-up
  • Swipe
  • Onion skin
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
......@@ -18,19 +18,17 @@
/**
默认提示选择框
@param viewController 控制器对象
@param title 提示标题
@param message 提示说明
@param style 风格
@param completed 确定回调
@param canceled 取消回调
*/
extern void ShowDefaultAlertView(UIViewController *viewController,NSString *title,NSString *message,UIAlertControllerStyle style,void(^completed)(),void(^canceled)());
extern void ShowDefaultAlertView(NSString *title,NSString *message,UIAlertControllerStyle style,void(^completed)(),void(^canceled)());
/**
提示选择框
@param viewController 控制器对象
@param title 提示标题
@param message 提示说明
@param cancelTitle 取消按钮
......@@ -39,7 +37,7 @@ extern void ShowDefaultAlertView(UIViewController *viewController,NSString *titl
@param completed 确定回调
@param canceled 取消回调
*/
extern void ShowAlertView(UIViewController *viewController,NSString *title,NSString *message,NSString *cancelTitle,NSString *DefaultTitle,UIAlertControllerStyle style,void(^completed)(),void(^canceled)());
extern void ShowAlertView(NSString *title,NSString *message,NSString *cancelTitle,NSString *DefaultTitle,UIAlertControllerStyle style,void(^completed)(),void(^canceled)());
@end
No preview for this file type
No preview for this file type
No preview for this file type
......@@ -97,7 +97,7 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
/**
* 服务器开发地址
*/
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://gomoredev:8082/opple-web/app%@",URL]
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://gomoredev:8082/opple-web/app%@",URL]
//外网http://debenson.picp.io/opple-web/
/**
......@@ -113,7 +113,7 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
//**
// * 服务器正式地址
// */
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
/*****************************************接口地址*****************************************/
......
......@@ -575,11 +575,11 @@ NSString *const GUIDE = @"guide";
*/
NSString *const CONSUMER = @"consumer";
/**
/**discountAction
* 折扣金额
*/
NSString *const deductionAction = @"deductionAction";
//discount
/**
* 现金红包
*/
......@@ -636,7 +636,7 @@ NSString *const CANCEL = @"005";
NSString *const COMPLETED = @"006";
/**
* 已抽奖未使用
* 已抽奖
*/
NSString *const ACCOMPLISHED = @"accomplished";
......
......@@ -4902,6 +4902,9 @@ extern NSString * const GRADEMETHOD_MANUL;
*
*/
@property (nonatomic, copy) NSString *updateName;
@property (nonatomic, copy) NSString *remark;
/**
* 方法: 取得java.lang.String
*
......
......@@ -92,7 +92,7 @@
}
}
#pragma mark - 添加删除按钮
#pragma mark - 添加关闭按钮
- (void)addDismissButton
{
self.dismissButton = [UIButton buttonWithType:UIButtonTypeCustom];
......
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