Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
Opple-iOS
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张杰
Opple-iOS
Commits
b264ee99
Commit
b264ee99
authored
Nov 14, 2016
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改项说明:优化
parent
c2f0580c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
6 deletions
+9
-6
OrderdetailsViewController.m
Class/OrderdetailsViewController.m
+5
-2
Lighting.xcscheme
Lighting.xcodeproj/xcshareddata/xcschemes/Lighting.xcscheme
+1
-1
StoryboardwithCYX.storyboard
Lighting/StoryboardwithCYX.storyboard
+1
-1
PrefixHeader.pch
Tools/PrefixHeader.pch
+2
-2
No files found.
Class/OrderdetailsViewController.m
View file @
b264ee99
...
...
@@ -536,8 +536,8 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
weakSelf
.
isShowHeaderView
=
YES
;
[
weakSelf
CreateTableviewHeaderView
];
weakSelf
.
orderDetailsTableview
.
tableFooterView
=
nil
;
__block
BOOL
isJDEcard
;
//促销中是否有京东E卡;
__block
BOOL
isGuideDraw
;
//促销中是否有导购抽奖机会
static
BOOL
isJDEcard
=
NO
;
//促销中是否有京东E卡;
static
BOOL
isGuideDraw
=
NO
;
//促销中是否有导购抽奖机会
/// 刷新数据成功
[
weakSelf
getOrderDetailsData
:
^
{
/// 先判断促销中有无E卡,有则认为发放成功
...
...
@@ -561,6 +561,9 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
}
else
if
(
!
isJDEcard
&&
isGuideDraw
)
{
[
weakSelf
rebateApplySuccess
:
@"抽奖机会已放到你的账户"
];
}
/// 初始化判断
isGuideDraw
=
NO
;
isJDEcard
=
NO
;
}];
}];
}
...
...
Lighting.xcodeproj/xcshareddata/xcschemes/Lighting.xcscheme
View file @
b264ee99
...
...
@@ -42,7 +42,7 @@
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration =
"
Debug
"
buildConfiguration =
"
Release
"
selectedDebuggerIdentifier =
"Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier =
"Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle =
"0"
...
...
Lighting/StoryboardwithCYX.storyboard
View file @
b264ee99
...
...
@@ -808,7 +808,7 @@
<autoresizingMask
key=
"autoresizingMask"
/>
<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"
>
<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"
/>
<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"
/>
...
...
Tools/PrefixHeader.pch
View file @
b264ee99
...
...
@@ -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]
/**
* 搜索框输入通知
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment