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
75b3d262
Commit
75b3d262
authored
7 years ago
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
第一次选择省市区时需要刷新数据
parent
c0ba85d4
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
24 additions
and
6 deletions
+24
-6
LocationViewController.m
Lighting/Class/Location/Controller/LocationViewController.m
+1
-0
OrderdetailsViewController.m
...ient/Orderdetails/Controller/OrderdetailsViewController.m
+0
-1
GenerateOrdersViewController.m
...ss/Shoppingcart/Controller/GenerateOrdersViewController.m
+1
-0
CardBeenUseViewController.m
...ss/XXuserController/CardStock/CardBeenUseViewController.m
+2
-1
CardDontUseViewController.m
...ss/XXuserController/CardStock/CardDontUseViewController.m
+2
-1
ReadPacketViewController.m
...ss/XXuserController/ReadPacket/ReadPacketViewController.m
+3
-1
BasePullCollectionViewController.h
...ting/Tools/Parentclass/BasePullCollectionViewController.h
+5
-0
BasePullCollectionViewController.m
...ting/Tools/Parentclass/BasePullCollectionViewController.m
+10
-2
No files found.
Lighting/Class/Location/Controller/LocationViewController.m
View file @
75b3d262
...
...
@@ -60,6 +60,7 @@
[
XBLoadingView
showHUDViewWithSuccessText
:
@"保存成功"
completeBlock
:
^
{
[
weakSelf
dismissViewControllerAnimated
:
YES
completion
:
nil
];
}];
[
weakSelf
getStoreAddress
:
nil
];
}
else
{
[
XBLoadingView
showHUDViewWithText
:
MESSAGE
(
returnValue
)];
...
...
This diff is collapsed.
Click to expand it.
Lighting/Class/MyClient/Orderdetails/Controller/OrderdetailsViewController.m
View file @
75b3d262
...
...
@@ -719,7 +719,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
//支付成功
WS
(
weakSelf
);
[
settlement
setPaySuccessReturnBlock
:
^
{
if
(
weakSelf
.
DelecteAndPayButtonBlock
)
{
weakSelf
.
DelecteAndPayButtonBlock
(
_cellindex
,
PAID
);
}
...
...
This diff is collapsed.
Click to expand it.
Lighting/Class/Shoppingcart/Controller/GenerateOrdersViewController.m
View file @
75b3d262
...
...
@@ -388,6 +388,7 @@
orderDetails
.
isShowPayButton
=
YES
;
orderDetails
.
isUserInteractionEnabled
=
YES
;
orderDetails
.
isShowHeaderView
=
YES
;
orderDetails
.
isShowShareButton
=
YES
;
orderDetails
.
isSliding
=
YES
;
//取消滑动返回
[
weakSelf
pushViewController
:
orderDetails
animated
:
YES
];
...
...
This diff is collapsed.
Click to expand it.
Lighting/Class/XXuserController/CardStock/CardBeenUseViewController.m
View file @
75b3d262
...
...
@@ -54,13 +54,14 @@
[
super
viewDidLoad
];
[
self
setupCollectionView
];
self
.
tempIndex
=
@"0"
;
}
#pragma mark -获取数据
-
(
void
)
loadWebDataSource
{
WS
(
weakSelf
);
if
(
self
.
pullPageIndex
==
ONE
)
{
if
(
self
.
pullPageIndex
==
ZERO
)
{
[
self
.
datasArray
removeAllObjects
];
}
self
.
requestModel
.
page
.
page
=
self
.
pullPageIndex
;
...
...
This diff is collapsed.
Click to expand it.
Lighting/Class/XXuserController/CardStock/CardDontUseViewController.m
View file @
75b3d262
...
...
@@ -60,6 +60,7 @@
[
super
viewDidLoad
];
[
self
setupCollectionView
];
self
.
tempIndex
=
@"0"
;
}
#pragma mark - UICollectionView
...
...
@@ -76,7 +77,7 @@
-
(
void
)
loadWebDataSource
{
WS
(
weakSelf
);
if
(
self
.
pullPageIndex
==
ONE
)
{
if
(
self
.
pullPageIndex
==
ZERO
)
{
[
self
.
datasArray
removeAllObjects
];
}
self
.
requestModel
.
page
.
page
=
self
.
pullPageIndex
;
...
...
This diff is collapsed.
Click to expand it.
Lighting/Class/XXuserController/ReadPacket/ReadPacketViewController.m
View file @
75b3d262
...
...
@@ -39,13 +39,14 @@
[
super
viewDidLoad
];
[
self
setupCollectionView
];
self
.
tempIndex
=
@"0"
;
}
#pragma mark -加载数据
-
(
void
)
loadWebDataSource
{
WS
(
weakSelf
);
if
(
self
.
pullPageIndex
==
ONE
)
{
if
(
self
.
pullPageIndex
==
ZERO
)
{
[
self
.
readPacketArray
removeAllObjects
];
}
self
.
queryReadPacket
.
page
.
page
=
self
.
pullPageIndex
;
...
...
@@ -78,6 +79,7 @@
}];
}
#pragma mark - UICollectionView
-
(
void
)
setupCollectionView
{
...
...
This diff is collapsed.
Click to expand it.
Lighting/Tools/Parentclass/BasePullCollectionViewController.h
View file @
75b3d262
...
...
@@ -20,6 +20,11 @@
*/
@property
(
nonatomic
,
assign
)
NSInteger
pullPageIndex
;
/**
临时分页
*/
@property
(
nonatomic
,
copy
)
NSString
*
tempIndex
;
/**
* 加载网络数据 需要重载
*/
...
...
This diff is collapsed.
Click to expand it.
Lighting/Tools/Parentclass/BasePullCollectionViewController.m
View file @
75b3d262
...
...
@@ -28,7 +28,11 @@
self
.
collectionView
.
delegate
=
self
;
self
.
collectionView
.
dataSource
=
self
;
self
.
collectionView
.
alwaysBounceVertical
=
YES
;
self
.
pullPageIndex
=
ONE
;
if
([
self
.
tempIndex
isEqualToString
:
@"0"
])
{
_pullPageIndex
=
ZERO
;
}
else
{
_pullPageIndex
=
ONE
;
}
}
#pragma mark - 添加上、下拉刷新
...
...
@@ -57,7 +61,11 @@
{
[
self
setupNotDataDelegate
];
[
XBLoadingView
showHUDViewWithDefault
];
_pullPageIndex
=
ONE
;
if
([
self
.
tempIndex
isEqualToString
:
@"0"
])
{
_pullPageIndex
=
ZERO
;
}
else
{
_pullPageIndex
=
ONE
;
}
[
self
loadWebDataSource
];
}
...
...
This diff is collapsed.
Click to expand it.
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