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
81145eba
Commit
81145eba
authored
Jul 14, 2017
by
lee
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
u
parent
4ae110f7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
31 additions
and
26 deletions
+31
-26
AppDelegate+Deeplink.m
iCemarose/Class/AppDelegate+Deeplink.m
+4
-1
KWMOrderVC.m
iCemarose/Class/UI/Mine/KWMOrderVC.m
+3
-2
KWMNewHomeVC.m
iCemarose/Class/UI/NewHome/KWMNewHomeVC.m
+1
-1
KWMNewVC.m
iCemarose/Class/UI/Product/KWMNewVC.m
+3
-2
KWMProductDetailVC.h
iCemarose/Class/UI/Product/KWMProductDetailVC.h
+19
-19
KWMProductDetailVC.m
iCemarose/Class/UI/Product/KWMProductDetailVC.m
+0
-0
KWMSelectedGoodsVC.m
iCemarose/Class/UI/Product/KWMSelectedGoodsVC.m
+1
-1
No files found.
iCemarose/Class/AppDelegate+Deeplink.m
View file @
81145eba
...
...
@@ -27,6 +27,7 @@
KWMSelectedGoodsVC
*
selectedGoodsVC
=
(
KWMSelectedGoodsVC
*
)[
KWMBaseVC
findControllerBy
:[
KWMSelectedGoodsVC
kwmTag
]
fromStoryboard
:
@"New"
];
selectedGoodsVC
.
handle
=
parameters
[
@"handle"
];
selectedGoodsVC
.
ctags
=
tags
;
selectedGoodsVC
.
title
=
parameters
[
@"title"
];
[[
AppDelegate
mainViewController
].
selectedViewController
pushViewController
:
selectedGoodsVC
animated
:
YES
];
return
YES
;
}];
...
...
@@ -43,7 +44,8 @@
[
routes
addRoute
:
@"/blogs/:blog/:handle"
handler
:
^
BOOL
(
NSDictionary
<
NSString
*
,
id
>
*
_Nonnull
parameters
)
{
KWMBlogDetailVC
*
blogDetailVC
=
(
KWMBlogDetailVC
*
)[
KWMBlogDetailVC
findControllerBy
:
@"KWMBlogDetailVC"
fromStoryboard
:
@"Home"
];
blogDetailVC
.
handle
=
parameters
[
@"handle"
];
blogDetailVC
.
type
=
KWMContentTypeBlog
;
blogDetailVC
.
type
=
KWMContentTypeBlog
;;
blogDetailVC
.
title
=
parameters
[
@"title"
];
[[
AppDelegate
mainViewController
].
selectedViewController
pushViewController
:
blogDetailVC
animated
:
YES
];
return
YES
;
}];
...
...
@@ -51,6 +53,7 @@
KWMBlogDetailVC
*
blogDetailVC
=
(
KWMBlogDetailVC
*
)[
KWMBlogDetailVC
findControllerBy
:
@"KWMBlogDetailVC"
fromStoryboard
:
@"Home"
];
blogDetailVC
.
handle
=
parameters
[
@"handle"
];
blogDetailVC
.
type
=
KWMContentTypePage
;
blogDetailVC
.
title
=
parameters
[
@"title"
];
[[
AppDelegate
mainViewController
].
selectedViewController
pushViewController
:
blogDetailVC
animated
:
YES
];
return
YES
;
}];
...
...
iCemarose/Class/UI/Mine/KWMOrderVC.m
View file @
81145eba
...
...
@@ -8,7 +8,7 @@
#import "KWMOrderVC.h"
#import "KWMOrderCell.h"
#import "KWM
ProductDetail
VC.h"
#import "KWM
NewProduct
VC.h"
#import "KWMImageUtil.h"
#import "KWMStringUtil.h"
...
...
@@ -141,7 +141,8 @@
}
-
(
void
)
kwm_onClickProduct
:
(
NSNumber
*
)
productId
{
KWMProductDetailVC
*
productDetailVC
=
(
KWMProductDetailVC
*
)[
KWMProductDetailVC
findControllerBy
:[
KWMProductDetailVC
kwmTag
]
fromStoryboard
:
@"New"
];
// KWMProductDetailVC *productDetailVC = (KWMProductDetailVC *)[KWMProductDetailVC findControllerBy:[KWMProductDetailVC kwmTag] fromStoryboard:@"New"];
KWMNewProductVC
*
productDetailVC
=
[
KWMNewProductVC
getNewInstance
];
productDetailVC
.
productId
=
productId
;
[
self
.
navigationController
pushViewController
:
productDetailVC
animated
:
YES
];
}
...
...
iCemarose/Class/UI/NewHome/KWMNewHomeVC.m
View file @
81145eba
...
...
@@ -154,7 +154,7 @@ typedef enum{
#pragma mark - KWMMenuDelegate
-
(
void
)
kwm_onClickHotMenu
{
[
self
openURLWithString
:
@"https://cemarose.myshopify.com/collections/new"
];
[
self
openURLWithString
:
@"https://cemarose.myshopify.com/collections/new
?title=%E6%9C%80%E6%96%B0%E5%8D%95%E5%93%81
"
];
}
-
(
void
)
kwm_onClickNewMenu
{
...
...
iCemarose/Class/UI/Product/KWMNewVC.m
View file @
81145eba
...
...
@@ -18,7 +18,7 @@
#import "KWMSelectedGoodsVC.h"
#import "KWMBrandCaramelVC.h"
#import "UIColor+SAMAdditions.h"
#import "KWM
ProductDetail
VC.h"
#import "KWM
NewProduct
VC.h"
#import "KWMShoppingCart.h"
...
...
@@ -281,7 +281,8 @@ static NSString * idStr = @"KWMNewGoodsCell";
if
(
product
==
nil
)
{
return
;
}
KWMProductDetailVC
*
goodsDetailvc
=
(
KWMProductDetailVC
*
)[
KWMBaseVC
findControllerBy
:[
KWMProductDetailVC
kwmTag
]
fromStoryboard
:
@"New"
];
// KWMProductDetailVC *goodsDetailvc = (KWMProductDetailVC *)[KWMBaseVC findControllerBy:[KWMProductDetailVC kwmTag] fromStoryboard:@"New"];
KWMNewProductVC
*
goodsDetailvc
=
[
KWMNewProductVC
getNewInstance
];
goodsDetailvc
.
product
=
product
;
[
self
.
navigationController
pushViewController
:
goodsDetailvc
animated
:
YES
];
}
...
...
iCemarose/Class/UI/Product/KWMProductDetailVC.h
View file @
81145eba
////
//// KWMProductDetailVC.h
//// iCemarose
////
//// Created by HouWeiBin on 2017/1/11.
//// Copyright © 2017年 kollway. All rights reserved.
////
//
// KWMProductDetailVC.h
// iCemarose
//#import "KWMBaseVC.h"
//
// Created by HouWeiBin on 2017/1/11.
// Copyright © 2017年 kollway. All rights reserved.
//@interface KWMProductDetailVC : KWMBaseVC
//
#import "KWMBaseVC.h"
@interface
KWMProductDetailVC
:
KWMBaseVC
@property
(
nonatomic
)
BUYProduct
*
product
;
@property
(
nonatomic
)
NSNumber
*
productId
;
/**
* SKU 人为定义的SKU
*/
@property
(
nonatomic
)
NSString
*
handle
;
@end
//@property (nonatomic) BUYProduct *product;
//
//@property (nonatomic) NSNumber *productId;
//
///**
// * SKU 人为定义的SKU
// */
//@property (nonatomic) NSString *handle;
//
//@end
iCemarose/Class/UI/Product/KWMProductDetailVC.m
View file @
81145eba
This diff is collapsed.
Click to expand it.
iCemarose/Class/UI/Product/KWMSelectedGoodsVC.m
View file @
81145eba
...
...
@@ -53,7 +53,7 @@ static NSString *idStr = @"KWMBrandCaramelCell";
self
.
hasNextPage
=
NO
;
self
.
collectionSort
=
BUYCollectionSortCreatedDescending
;
if
(
self
.
handle
)
{
if
(
self
.
handle
&&
!
self
.
title
)
{
self
.
title
=
self
.
handle
.
capitalizedString
;
}
else
if
(
self
.
productType
!=
nil
){
//初始化双行标题栏
...
...
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