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

修改项说明:优化

parent c2f0580c
...@@ -536,8 +536,8 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -536,8 +536,8 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
weakSelf.isShowHeaderView = YES; weakSelf.isShowHeaderView = YES;
[weakSelf CreateTableviewHeaderView]; [weakSelf CreateTableviewHeaderView];
weakSelf.orderDetailsTableview.tableFooterView = nil; weakSelf.orderDetailsTableview.tableFooterView = nil;
__block BOOL isJDEcard;//促销中是否有京东E卡; static BOOL isJDEcard = NO;//促销中是否有京东E卡;
__block BOOL isGuideDraw;//促销中是否有导购抽奖机会 static BOOL isGuideDraw = NO;//促销中是否有导购抽奖机会
/// 刷新数据成功 /// 刷新数据成功
[weakSelf getOrderDetailsData:^{ [weakSelf getOrderDetailsData:^{
/// 先判断促销中有无E卡,有则认为发放成功 /// 先判断促销中有无E卡,有则认为发放成功
...@@ -561,6 +561,9 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -561,6 +561,9 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
}else if (!isJDEcard && isGuideDraw) { }else if (!isJDEcard && isGuideDraw) {
[weakSelf rebateApplySuccess:@"抽奖机会已放到你的账户"]; [weakSelf rebateApplySuccess:@"抽奖机会已放到你的账户"];
} }
/// 初始化判断
isGuideDraw = NO;
isJDEcard = NO;
}]; }];
}]; }];
} }
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</AdditionalOptions> </AdditionalOptions>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Debug" buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0" launchStyle = "0"
......
...@@ -808,7 +808,7 @@ ...@@ -808,7 +808,7 @@
<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="iOu-WG-fyV"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="折扣金额" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="iOu-WG-fyV">
<frame key="frameInset" minX="12.5" minY="12" height="21" maxX="-42.5"/> <frame key="frameInset" minX="12.5" minY="12" height="21" maxX="-203.5"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="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="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
...@@ -136,12 +136,12 @@ ...@@ -136,12 +136,12 @@
/** /**
* 服务器测试地址 * 服务器测试地址
*/ */
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL] //#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
///** ///**
// * 服务器正式地址 // * 服务器正式地址
// */ // */
//#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]
/** /**
* 搜索框输入通知 * 搜索框输入通知
......
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