Skip to content

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

修改部分bug

parent ee126bc1
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 34 deletions
Lighting/Class/PaymentsDetailsTableViewController.m
View file @ 521d6dec
...@@ -59,6 +59,21 @@ ...@@ -59,6 +59,21 @@
self.amountLabel.text = string; self.amountLabel.text = string;
self.createTimeLabel.text = self.model.createDate; self.createTimeLabel.text = self.model.createDate;
self.serialNumberLabel.text = self.model.orderNumber; self.serialNumberLabel.text = self.model.orderNumber;
self.amountTypeLabel.text = [self separatePaymentsAndWithfrawal:self.model.state];
self.currentAmountLabel.text = [self.model.afteramount stringValue];
}
#pragma mark - 区分提现还是返佣
- (NSString *)separatePaymentsAndWithfrawal:(NSString *)state
{
if ([state isEqualToString:@"0"]) {
return @"返佣";
}
if ([state isEqualToString:@"1"]) {
return @"提现";
}
return nil;
} }
......
Lighting/Class/RebateDetailsViewController.m
View file @ 521d6dec
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
[self CreateMBProgressHUDLoding]; [self CreateMBProgressHUDLoding];
WS(weakSelf); WS(weakSelf);
NSString *urlString = [NSString stringWithFormat:@"%@/%@",WITHDRAWALPROGRESSDETAILS,self.applyUUID]; NSString *urlString = [NSString stringWithFormat:@"%@/%@",WITHDRAWALPROGRESSDETAILS,self.applyUUID];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(urlString) WithRequestType:0 WithParameter:nil WithReturnValueBlock:^(id returnValue) { [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(urlString) WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding]; [weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) { if ([returnValue[@"code"] isEqualToNumber:@0]) {
TOApplyBillEntity *result = [[TOApplyBillEntity alloc]initWithDictionary:returnValue[@"data"] error:nil]; TOApplyBillEntity *result = [[TOApplyBillEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];
......
Lighting/Class/RebateViewController.m
View file @ 521d6dec
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
/** /**
* 账户数据 * 账户数据
*/ */
@property (nonatomic,strong) EarningsRequest *model; @property (nonatomic,strong) EarningsResponse *model;
@end @end
...@@ -145,13 +145,13 @@ ...@@ -145,13 +145,13 @@
WS(weakSelf); WS(weakSelf);
[self CreateMBProgressHUDLoding]; [self CreateMBProgressHUDLoding];
NSString *URL = [NSString stringWithFormat:@"%@/%@",REBATE,[Shoppersmanager manager].Shoppers.employee.fid]; NSString *URL = [NSString stringWithFormat:@"%@/%@",REBATE,[Shoppersmanager manager].Shoppers.employee.fid];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(URL) WithRequestType:0 WithParameter:nil WithReturnValueBlock:^(id returnValue) { [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(URL) WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding]; [weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) { if ([returnValue[@"code"] isEqualToNumber:@0]) {
weakSelf.model = [[EarningsRequest alloc]initWithDictionary:returnValue[@"data"] error:nil]; weakSelf.model = [[EarningsResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
weakSelf.currentAmountLabel.text = [returnValue[@"data"][@"accountTotal"] stringValue]; weakSelf.currentAmountLabel.text = [returnValue[@"data"][@"accountTotal"] stringValue];
// weakSelf.yesterdayAmountLabel.text = [returnValue[@"data"][@"yesterdayEarnings"] stringValue]; weakSelf.yesterdayAmountLabel.text = [returnValue[@"data"][@"yesterdayEarnings"] stringValue];
weakSelf.historyAmountLabel.text = [returnValue[@"data"][@"historyEarning"] stringValue]; weakSelf.historyAmountLabel.text = [returnValue[@"data"][@"historyEarning"] stringValue];
}else }else
{ {
...@@ -176,6 +176,7 @@ ...@@ -176,6 +176,7 @@
rebateDetails.rebateAmount = [self.model.accountTotal stringValue]; rebateDetails.rebateAmount = [self.model.accountTotal stringValue];
[rebateDetails setShowApplyDetails:^(TOApplyBillEntity *entity) { [rebateDetails setShowApplyDetails:^(TOApplyBillEntity *entity) {
WithdrawalTableViewController *detailVC = [weakSelf.getStoryboardWithName instantiateViewControllerWithIdentifier:@"WithdrawalTableViewController"]; WithdrawalTableViewController *detailVC = [weakSelf.getStoryboardWithName instantiateViewControllerWithIdentifier:@"WithdrawalTableViewController"];
detailVC.model = entity;
[weakSelf.navigationController pushViewController:detailVC animated:YES]; [weakSelf.navigationController pushViewController:detailVC animated:YES];
}]; }];
[self.navigationController pushViewController:rebateDetails animated:YES]; [self.navigationController pushViewController:rebateDetails animated:YES];
......
Lighting/Lighting.xcodeproj/project.pbxproj
View file @ 521d6dec
...@@ -1484,6 +1484,7 @@ ...@@ -1484,6 +1484,7 @@
TargetAttributes = { TargetAttributes = {
29706DA01CD082980003C412 = { 29706DA01CD082980003C412 = {
CreatedOnToolsVersion = 7.3; CreatedOnToolsVersion = 7.3;
DevelopmentTeam = 39XYE6VSP8;
}; };
}; };
}; };
...@@ -1864,7 +1865,7 @@ ...@@ -1864,7 +1865,7 @@
"\"UIKit\"", "\"UIKit\"",
"$(inherited)", "$(inherited)",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple.c48; PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "ce8104e7-12c7-4aa2-a135-c4d3731e559c"; PROVISIONING_PROFILE = "ce8104e7-12c7-4aa2-a135-c4d3731e559c";
STRIP_PNG_TEXT = NO; STRIP_PNG_TEXT = NO;
...@@ -1925,7 +1926,7 @@ ...@@ -1925,7 +1926,7 @@
"\"UIKit\"", "\"UIKit\"",
"$(inherited)", "$(inherited)",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple.c48; PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "ce8104e7-12c7-4aa2-a135-c4d3731e559c"; PROVISIONING_PROFILE = "ce8104e7-12c7-4aa2-a135-c4d3731e559c";
STRIP_PNG_TEXT = NO; STRIP_PNG_TEXT = NO;
......
Lighting/Lighting/StoryboardwithCYX.storyboard
View file @ 521d6dec
...@@ -2252,7 +2252,7 @@ ...@@ -2252,7 +2252,7 @@
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1122.00" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="CIr-H0-jGO"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="CIr-H0-jGO">
<rect key="frame" x="85" y="48" width="100" height="21"/> <rect key="frame" x="85" y="48" width="100" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/> <fontDescription key="fontDescription" type="system" pointSize="17"/>
...@@ -2264,7 +2264,7 @@ ...@@ -2264,7 +2264,7 @@
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.87058823529999996" green="0.87058823529999996" blue="0.87058823529999996" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.87058823529999996" green="0.87058823529999996" blue="0.87058823529999996" alpha="1" colorSpace="calibratedRGB"/>
</view> </view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2222.55" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="GB6-Be-cTJ"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="GB6-Be-cTJ">
<rect key="frame" x="338" y="47" width="100" height="21"/> <rect key="frame" x="338" y="47" width="100" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/> <fontDescription key="fontDescription" type="system" pointSize="17"/>
...@@ -2291,7 +2291,7 @@ ...@@ -2291,7 +2291,7 @@
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.87058823529411766" green="0.87058823529411766" blue="0.87058823529411766" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.87058823529411766" green="0.87058823529411766" blue="0.87058823529411766" alpha="1" colorSpace="calibratedRGB"/>
</view> </view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12121.45" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ix4-ZS-Oz4"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ix4-ZS-Oz4">
<rect key="frame" x="212" y="47" width="100" height="21"/> <rect key="frame" x="212" y="47" width="100" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/> <fontDescription key="fontDescription" type="system" pointSize="17"/>
...@@ -2397,21 +2397,21 @@ ...@@ -2397,21 +2397,21 @@
<rect key="frame" x="0.0" y="0.0" width="768" height="69.5"/> <rect key="frame" x="0.0" y="0.0" width="768" height="69.5"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="返佣" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="IgV-UM-cUZ"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="IgV-UM-cUZ">
<rect key="frame" x="25" y="13" width="100" height="21"/> <rect key="frame" x="25" y="13" width="100" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" 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="+200.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dY0-XW-m6d"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dY0-XW-m6d">
<rect key="frame" x="605" y="25" width="140" height="21"/> <rect key="frame" x="605" y="25" width="140" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/> <fontDescription key="fontDescription" type="system" pointSize="16"/>
<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="2016年08月26日16:25:33" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Ljq-nl-sFJ"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Ljq-nl-sFJ">
<rect key="frame" x="25" y="37" width="179" height="21"/> <rect key="frame" x="25" y="37" width="179" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
...@@ -2468,7 +2468,7 @@ ...@@ -2468,7 +2468,7 @@
<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="+200" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="68c-Zr-9Hm"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="68c-Zr-9Hm">
<rect key="frame" x="568" y="68" width="169" height="25"/> <rect key="frame" x="568" y="68" width="169" height="25"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="22"/> <fontDescription key="fontDescription" type="system" pointSize="22"/>
...@@ -2513,28 +2513,28 @@ ...@@ -2513,28 +2513,28 @@
<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="hzm-P6-ujd"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hzm-P6-ujd">
<rect key="frame" x="598" y="15" width="150" height="21"/> <rect key="frame" x="598" y="15" width="150" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<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="2016-08-26 18:54:29" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="UHn-jG-QmV"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="UHn-jG-QmV">
<rect key="frame" x="556" y="44" width="192" height="21"/> <rect key="frame" x="556" y="44" width="192" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<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="NJ929188216318388" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SQc-Pe-QLV"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SQc-Pe-QLV">
<rect key="frame" x="598" y="73" width="150" height="21"/> <rect key="frame" x="598" y="73" width="150" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<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="1044" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wxw-6U-5l8"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wxw-6U-5l8">
<rect key="frame" x="598" y="103" width="150" height="21"/> <rect key="frame" x="598" y="103" width="150" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
...@@ -2591,21 +2591,21 @@ ...@@ -2591,21 +2591,21 @@
<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="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SLc-Hh-EOX"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SLc-Hh-EOX">
<rect key="frame" x="65" y="13" width="139" height="21"/> <rect key="frame" x="65" y="13" width="139" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" 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="+200.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="nw7-yq-t8s"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="nw7-yq-t8s">
<rect key="frame" x="605" y="21" width="140" height="21"/> <rect key="frame" x="605" y="21" width="140" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/> <fontDescription key="fontDescription" type="system" pointSize="16"/>
<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="2016年08月26日16:25:33" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Tdh-Rb-cNX"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Tdh-Rb-cNX">
<rect key="frame" x="25" y="37" width="179" height="21"/> <rect key="frame" x="25" y="37" width="179" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
...@@ -2673,7 +2673,7 @@ ...@@ -2673,7 +2673,7 @@
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-08-28 10:03:41" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="s3d-4S-Hli"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="s3d-4S-Hli">
<rect key="frame" x="138" y="170" width="170" height="21"/> <rect key="frame" x="138" y="170" width="170" 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="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
...@@ -2687,7 +2687,7 @@ ...@@ -2687,7 +2687,7 @@
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-08-28 10:03:41" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3Wy-5J-W1w"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3Wy-5J-W1w">
<rect key="frame" x="460" y="170" width="170" height="21"/> <rect key="frame" x="460" y="170" width="170" 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="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
...@@ -2725,21 +2725,21 @@ ...@@ -2725,21 +2725,21 @@
<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="200" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="UOg-pQ-dye"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="UOg-pQ-dye">
<rect key="frame" x="598" y="10" width="150" height="21"/> <rect key="frame" x="598" y="10" width="150" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<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="2016-08-26 18:54:29" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bNQ-A8-lu4"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bNQ-A8-lu4">
<rect key="frame" x="556" y="39" width="192" height="21"/> <rect key="frame" x="556" y="39" width="192" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<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="NJ929188216318388" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="XCK-AI-v31"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="XCK-AI-v31">
<rect key="frame" x="598" y="68.5" width="150" height="21"/> <rect key="frame" x="598" y="68.5" width="150" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
......
Lighting/Tools/opple_objc_json_client.h
View file @ 521d6dec
...@@ -65,7 +65,7 @@ extern NSString * const SORTDIRECTION_DESC; ...@@ -65,7 +65,7 @@ extern NSString * const SORTDIRECTION_DESC;
@class LoginResult; @class LoginResult;
@class ConsumerQueryCondition; @class ConsumerQueryCondition;
@class ExceptionCode; @class ExceptionCode;
@class EarningsRequest; @class EarningsResponse;
@class ApplyRequest; @class ApplyRequest;
@class OrderResponse; @class OrderResponse;
@class TSDepart; @class TSDepart;
...@@ -124,7 +124,7 @@ extern NSString * const SORTDIRECTION_DESC; ...@@ -124,7 +124,7 @@ extern NSString * const SORTDIRECTION_DESC;
@protocol LoginResult @end @protocol LoginResult @end
@protocol ConsumerQueryCondition @end @protocol ConsumerQueryCondition @end
@protocol ExceptionCode @end @protocol ExceptionCode @end
@protocol EarningsRequest @end @protocol EarningsResponse @end
@protocol ApplyRequest @end @protocol ApplyRequest @end
@protocol OrderResponse @end @protocol OrderResponse @end
@protocol TSDepart @end @protocol TSDepart @end
...@@ -161,7 +161,9 @@ extern NSString * const SORTDIRECTION_DESC; ...@@ -161,7 +161,9 @@ extern NSString * const SORTDIRECTION_DESC;
/** /**
* @author Administrator * 流水请求
@author nevermore
@since 0.1 @since 0.1
*/ */
...@@ -2171,6 +2173,12 @@ extern NSString * const SORTDIRECTION_DESC; ...@@ -2171,6 +2173,12 @@ extern NSString * const SORTDIRECTION_DESC;
* *
*/ */
@property (nonatomic, strong) NSNumber *amount; @property (nonatomic, strong) NSNumber *amount;
/**
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, strong) NSNumber *afteramount;
/** /**
* 方法: 取得java.lang.String * 方法: 取得java.lang.String
* *
...@@ -2530,7 +2538,7 @@ extern NSString * const SORTDIRECTION_DESC; ...@@ -2530,7 +2538,7 @@ extern NSString * const SORTDIRECTION_DESC;
/** /**
* (no documentation provided) * (no documentation provided)
*/ */
@interface EarningsRequest : JSONModel @interface EarningsResponse : JSONModel
/** /**
* (no documentation provided) * (no documentation provided)
* *
...@@ -2549,7 +2557,7 @@ extern NSString * const SORTDIRECTION_DESC; ...@@ -2549,7 +2557,7 @@ extern NSString * const SORTDIRECTION_DESC;
* *
*/ */
@property (nonatomic, strong) NSNumber *historyEarning; @property (nonatomic, strong) NSNumber *historyEarning;
@end /* interface EarningsRequest */ @end /* interface EarningsResponse */
...@@ -2823,7 +2831,9 @@ extern NSString * const SORTDIRECTION_DESC; ...@@ -2823,7 +2831,9 @@ extern NSString * const SORTDIRECTION_DESC;
/** /**
* @author nevermore * 流水明细分页查询结果
@author nevermore
@since 0.1 @since 0.1
*/ */
...@@ -2839,7 +2849,11 @@ extern NSString * const SORTDIRECTION_DESC; ...@@ -2839,7 +2849,11 @@ extern NSString * const SORTDIRECTION_DESC;
/** /**
* (no documentation provided) * 查询提现进度分页
@author nevermore
@since 0.1
*/ */
@interface RsApplyBillResponse : PageRows @interface RsApplyBillResponse : PageRows
/** /**
......
Lighting/Tools/opple_objc_json_client.m
View file @ 521d6dec
...@@ -760,6 +760,7 @@ NSString * const SORTDIRECTION_DESC = @"desc"; ...@@ -760,6 +760,7 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@synthesize employeeId; @synthesize employeeId;
@synthesize orderId; @synthesize orderId;
@synthesize amount; @synthesize amount;
@synthesize afteramount;
@synthesize remark; @synthesize remark;
@synthesize orderNumber; @synthesize orderNumber;
@synthesize employeeName; @synthesize employeeName;
...@@ -925,7 +926,7 @@ NSString * const SORTDIRECTION_DESC = @"desc"; ...@@ -925,7 +926,7 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end @end
@implementation EarningsRequest @implementation EarningsResponse
@synthesize accountTotal; @synthesize accountTotal;
@synthesize yesterdayEarnings; @synthesize yesterdayEarnings;
@synthesize historyEarning; @synthesize historyEarning;
......
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