Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
ios1x
Overview
Overview
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
cemarose
ios1x
Commits
2d878d7a
Commit
2d878d7a
authored
7 years ago
by
lee
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of git.oschina.net:kollway-kollway/newcemarose
parents
90e1f7ce
fa7590e7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
13 deletions
+13
-13
KWMNewVC.m
iCemarose/Class/UI/Product/KWMNewVC.m
+10
-5
KWMSelectedGoodsVC.m
iCemarose/Class/UI/Product/KWMSelectedGoodsVC.m
+0
-5
New.storyboard
iCemarose/Class/UI/Product/New.storyboard
+3
-3
No files found.
iCemarose/Class/UI/Product/KWMNewVC.m
View file @
2d878d7a
...
...
@@ -8,6 +8,7 @@
#import "KWMNewVC.h"
#import "KWMStringUtil.h"
#import "KWMSelectedGoodsVC.h"
#import "KWMNewTypeSelectedVC.h"
#import "KWMSearchFeedbackVC.h"
#import "KWMShopCartVC.h"
...
...
@@ -172,11 +173,15 @@ static NSString * idStr = @"KWMNewGoodsCell";
//点击婴儿
-
(
IBAction
)
onClickBabyBtn
:
(
id
)
sender
{
if
([
TestModel
isEqualToString
:
@"YES"
]){
// KWMSelectedGoodsVC * selectedGoodsVC = (KWMSelectedGoodsVC *)[KWMBaseVC findControllerBy:[KWMSelectedGoodsVC kwmTag] fromStoryboard:@"New"];
// [self.navigationController pushViewController:selectedGoodsVC animated:YES];
KWMProductDetailVC
*
vc
=
(
KWMProductDetailVC
*
)[
KWMBaseVC
findControllerBy
:[
KWMProductDetailVC
kwmTag
]
fromStoryboard
:
@"New"
];
vc
.
productId
=
@
(
11406082255
);
[
self
.
navigationController
pushViewController
:
vc
animated
:
YES
];
KWMSelectedGoodsVC
*
selectedGoodsVC
=
(
KWMSelectedGoodsVC
*
)[
KWMBaseVC
findControllerBy
:[
KWMSelectedGoodsVC
kwmTag
]
fromStoryboard
:
@"New"
];
BUYCollection
*
collection
=
[
BUYCollection
new
];
collection
.
identifier
=
@
(
441199887
);
selectedGoodsVC
.
collection
=
collection
;
[
self
.
navigationController
pushViewController
:
selectedGoodsVC
animated
:
YES
];
// KWMProductDetailVC *vc = (KWMProductDetailVC *)[KWMBaseVC findControllerBy:[KWMProductDetailVC kwmTag] fromStoryboard:@"New"];
// vc.productId = @(11406082255);
// [self.navigationController pushViewController:vc animated:YES];
return
;
}
[
self
JumpToNewSelectedVCWith
:
self
.
btnBaby
.
titleLabel
.
text
type
:
0
];
...
...
This diff is collapsed.
Click to expand it.
iCemarose/Class/UI/Product/KWMSelectedGoodsVC.m
View file @
2d878d7a
...
...
@@ -240,11 +240,6 @@ static NSString *idStr = @"KWMBrandCaramelCell";
-
(
void
)
requestProductList
{
NSNumber
*
collectionId
;
if
([
TestModel
isEqualToString
:
@"YES"
]){
//测试
self
.
collection
=
[[
BUYCollection
alloc
]
init
];
self
.
collection
.
identifier
=
@
(
293330499
);
}
if
(
self
.
collection
!=
nil
){
collectionId
=
self
.
collection
.
identifier
;
}
...
...
This diff is collapsed.
Click to expand it.
iCemarose/Class/UI/Product/New.storyboard
View file @
2d878d7a
<?xml version="1.0" encoding="UTF-8"?>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB"
version=
"3.0"
toolsVersion=
"1212
0"
systemVersion=
"16E195
"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
colorMatched=
"YES"
>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB"
version=
"3.0"
toolsVersion=
"1212
1"
systemVersion=
"16F73
"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
colorMatched=
"YES"
>
<device
id=
"retina4_7"
orientation=
"portrait"
>
<adaptation
id=
"fullscreen"
/>
</device>
<dependencies>
<deployment
identifier=
"iOS"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"1208
8
"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"1208
9
"
/>
<capability
name=
"Constraints to layout margins"
minToolsVersion=
"6.0"
/>
<capability
name=
"documents saved in the Xcode 8 format"
minToolsVersion=
"8.0"
/>
</dependencies>
...
...
@@ -128,7 +128,7 @@
<!--选中分类商品列表-->
<scene
sceneID=
"dDc-Kg-deu"
>
<objects>
<viewController
storyboardIdentifier=
"KWMSelectedGoodsVC"
useStoryboardIdentifierAsRestorationIdentifier=
"YES"
id=
"pw7-pT-2H3"
userLabel=
"选中分类商品列表"
customClass=
"KWMSelectedGoodsVC"
sceneMemberID=
"viewController"
>
<viewController
storyboardIdentifier=
"KWMSelectedGoodsVC"
hidesBottomBarWhenPushed=
"YES"
useStoryboardIdentifierAsRestorationIdentifier=
"YES"
id=
"pw7-pT-2H3"
userLabel=
"选中分类商品列表"
customClass=
"KWMSelectedGoodsVC"
sceneMemberID=
"viewController"
>
<layoutGuides>
<viewControllerLayoutGuide
type=
"top"
id=
"BBC-0e-AMD"
/>
<viewControllerLayoutGuide
type=
"bottom"
id=
"xz3-5e-tlv"
/>
...
...
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