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
ceaa02d1
Commit
ceaa02d1
authored
Apr 18, 2017
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化使用微信卡劵提示
parent
6d585141
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
5 deletions
+12
-5
ExperienceCentreViewController.m
...eriencecentre/Controller/ExperienceCentreViewController.m
+1
-0
ShareGoodsViewController.m
Class/Experiencecentre/Controller/ShareGoodsViewController.m
+2
-2
OrderdetailsViewController.m
...ient/Orderdetails/controller/OrderdetailsViewController.m
+7
-1
CYConstManager.h
Tools/CYConst/CYConstManager.h
+2
-2
No files found.
Class/Experiencecentre/Controller/ExperienceCentreViewController.m
View file @
ceaa02d1
...
@@ -273,6 +273,7 @@
...
@@ -273,6 +273,7 @@
}
}
shareController
.
shareID
=
goodsID
;
shareController
.
shareID
=
goodsID
;
shareController
.
shareImage
=
[
self
capture
];
shareController
.
shareImage
=
[
self
capture
];
shareController
.
type
=
SHARE_GOODS
;
shareController
.
preferredContentSize
=
CGSizeMake
(
290
,
120
);
shareController
.
preferredContentSize
=
CGSizeMake
(
290
,
120
);
shareController
.
modalPresentationStyle
=
UIModalPresentationPopover
;
shareController
.
modalPresentationStyle
=
UIModalPresentationPopover
;
UIPopoverPresentationController
*
popover
=
shareController
.
popoverPresentationController
;
UIPopoverPresentationController
*
popover
=
shareController
.
popoverPresentationController
;
...
...
Class/Experiencecentre/Controller/ShareGoodsViewController.m
View file @
ceaa02d1
...
@@ -116,8 +116,8 @@
...
@@ -116,8 +116,8 @@
switch
(
self
.
type
)
{
switch
(
self
.
type
)
{
case
SHARE_GOODS
:
case
SHARE_GOODS
:
{
{
UMShare
ImageObject
*
shareObject
=
[[
UMShareImageObject
alloc
]
init
];
UMShare
WebpageObject
*
shareObject
=
[
UMShareWebpageObject
shareObjectWithTitle
:
@"欧立方体验中心一键分享"
descr
:
@"欧立方体验中心一键分享"
thumImage
:
self
.
shareImage
];
[
shareObject
setShareImage
:
self
.
shareImage
]
;
shareObject
.
webpageUrl
=
shareWeb
;
messageObject
.
shareObject
=
shareObject
;
messageObject
.
shareObject
=
shareObject
;
}
}
...
...
Class/MyClient/Orderdetails/controller/OrderdetailsViewController.m
View file @
ceaa02d1
...
@@ -538,7 +538,13 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
...
@@ -538,7 +538,13 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
weChatModel
.
total
=
weakSelf
.
weChatModel
.
wxcardDenomation
;
break
;
weChatModel
.
total
=
weakSelf
.
weChatModel
.
wxcardDenomation
;
break
;
}
}
}
}
[
XBLoadingView
showHUDViewWithText
:[
NSString
stringWithFormat
:
@"微信卡劵(%ld元)使用成功"
,
weakSelf
.
weChatModel
.
wxcardDenomation
]];
NSString
*
message
=
MESSAGE
(
returnValue
);
if
([[
self
class
]
isBlankString
:
message
])
{
[
XBLoadingView
showHUDViewWithText
:[
NSString
stringWithFormat
:
@"微信卡劵(%ld元)使用成功"
,
weakSelf
.
weChatModel
.
wxcardDenomation
]];
}
else
{
[
XBLoadingView
showHUDViewWithText
:
message
];
}
[
weakSelf
promotionInformationExecutionOrder
];
[
weakSelf
promotionInformationExecutionOrder
];
}
else
{
}
else
{
ShowDefaultAlertView
(
self
,
nil
,
[
NSString
stringWithFormat
:
@"微信卡劵使用失败:(%@),是否重试?"
,
returnValue
[
@"msg"
]],
UIAlertControllerStyleAlert
,
^
{
ShowDefaultAlertView
(
self
,
nil
,
[
NSString
stringWithFormat
:
@"微信卡劵使用失败:(%@),是否重试?"
,
returnValue
[
@"msg"
]],
UIAlertControllerStyleAlert
,
^
{
...
...
Tools/CYConst/CYConstManager.h
View file @
ceaa02d1
...
@@ -96,14 +96,14 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
...
@@ -96,14 +96,14 @@ 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/
//外网http://debenson.picp.io/opple-web/
/**
/**
* 服务器测试地址
* 服务器测试地址
*/
*/
#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