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
d91fb208
Commit
d91fb208
authored
Nov 10, 2016
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改项说明:修复搜索闪退、促销价格大于商品总价
parent
968d8665
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
SearchViewController.m
Class/SearchViewController.m
+1
-1
SettlementViewController.m
Class/SettlementViewController.m
+2
-1
PrefixHeader.pch
Tools/PrefixHeader.pch
+2
-2
No files found.
Class/SearchViewController.m
View file @
d91fb208
...
...
@@ -102,7 +102,7 @@
[
self
.
localSearchArray
addObject
:
not
.
object
];
}
//调用商品控制器
ProductLibraryViewController
*
productVC
=
[[
self
getStoryboardWithName
]
instantiateViewControllerWithIdentifier
:
@"
productlibrary
"
];
ProductLibraryViewController
*
productVC
=
[[
self
getStoryboardWithName
]
instantiateViewControllerWithIdentifier
:
@"
ProductLibraryViewController
"
];
productVC
.
selectedCode
=
not
.
object
;
[
self
.
navigationController
pushViewController
:
productVC
animated
:
YES
];
}
...
...
Class/SettlementViewController.m
View file @
d91fb208
...
...
@@ -84,7 +84,6 @@
}
#pragma mark -支付总金额,商品总数量
-
(
void
)
setGoodsArray
{
...
...
@@ -105,6 +104,8 @@
}
}
goodAllprice
-=
totalNumber
;
/// 促销金额大于商品金额情况
goodAllprice
=
(
goodAllprice
<
0
)?
0
:
goodAllprice
;
/// 抽奖结果<打折>
if
([
self
.
resultModel
.
type
isEqualToString
:
@"discount"
])
{
goodAllprice
=
goodAllprice
*
([
self
.
resultModel
.
number
integerValue
]
/
100
.
0
);
...
...
Tools/PrefixHeader.pch
View file @
d91fb208
...
...
@@ -115,7 +115,7 @@
/**
* 服务器开发地址
*/
//
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
///**
// * 服务器开发地址
...
...
@@ -125,7 +125,7 @@
/**
* 服务器测试地址
*/
#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]
///**
// * 服务器正式地址
...
...
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