Commit 81145eba by lee

u

parent 4ae110f7
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
KWMSelectedGoodsVC * selectedGoodsVC = (KWMSelectedGoodsVC *)[KWMBaseVC findControllerBy:[KWMSelectedGoodsVC kwmTag] fromStoryboard:@"New"]; KWMSelectedGoodsVC * selectedGoodsVC = (KWMSelectedGoodsVC *)[KWMBaseVC findControllerBy:[KWMSelectedGoodsVC kwmTag] fromStoryboard:@"New"];
selectedGoodsVC.handle = parameters[@"handle"]; selectedGoodsVC.handle = parameters[@"handle"];
selectedGoodsVC.ctags = tags; selectedGoodsVC.ctags = tags;
selectedGoodsVC.title = parameters[@"title"];
[[AppDelegate mainViewController].selectedViewController pushViewController:selectedGoodsVC animated:YES]; [[AppDelegate mainViewController].selectedViewController pushViewController:selectedGoodsVC animated:YES];
return YES; return YES;
}]; }];
...@@ -43,7 +44,8 @@ ...@@ -43,7 +44,8 @@
[routes addRoute:@"/blogs/:blog/:handle" handler:^BOOL(NSDictionary<NSString *,id> * _Nonnull parameters) { [routes addRoute:@"/blogs/:blog/:handle" handler:^BOOL(NSDictionary<NSString *,id> * _Nonnull parameters) {
KWMBlogDetailVC *blogDetailVC = (KWMBlogDetailVC *)[KWMBlogDetailVC findControllerBy:@"KWMBlogDetailVC" fromStoryboard:@"Home"]; KWMBlogDetailVC *blogDetailVC = (KWMBlogDetailVC *)[KWMBlogDetailVC findControllerBy:@"KWMBlogDetailVC" fromStoryboard:@"Home"];
blogDetailVC.handle = parameters[@"handle"]; blogDetailVC.handle = parameters[@"handle"];
blogDetailVC.type = KWMContentTypeBlog; blogDetailVC.type = KWMContentTypeBlog;;
blogDetailVC.title = parameters[@"title"];
[[AppDelegate mainViewController].selectedViewController pushViewController:blogDetailVC animated:YES]; [[AppDelegate mainViewController].selectedViewController pushViewController:blogDetailVC animated:YES];
return YES; return YES;
}]; }];
...@@ -51,6 +53,7 @@ ...@@ -51,6 +53,7 @@
KWMBlogDetailVC *blogDetailVC = (KWMBlogDetailVC *)[KWMBlogDetailVC findControllerBy:@"KWMBlogDetailVC" fromStoryboard:@"Home"]; KWMBlogDetailVC *blogDetailVC = (KWMBlogDetailVC *)[KWMBlogDetailVC findControllerBy:@"KWMBlogDetailVC" fromStoryboard:@"Home"];
blogDetailVC.handle = parameters[@"handle"]; blogDetailVC.handle = parameters[@"handle"];
blogDetailVC.type = KWMContentTypePage; blogDetailVC.type = KWMContentTypePage;
blogDetailVC.title = parameters[@"title"];
[[AppDelegate mainViewController].selectedViewController pushViewController:blogDetailVC animated:YES]; [[AppDelegate mainViewController].selectedViewController pushViewController:blogDetailVC animated:YES];
return YES; return YES;
}]; }];
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#import "KWMOrderVC.h" #import "KWMOrderVC.h"
#import "KWMOrderCell.h" #import "KWMOrderCell.h"
#import "KWMProductDetailVC.h" #import "KWMNewProductVC.h"
#import "KWMImageUtil.h" #import "KWMImageUtil.h"
#import "KWMStringUtil.h" #import "KWMStringUtil.h"
...@@ -141,7 +141,8 @@ ...@@ -141,7 +141,8 @@
} }
- (void)kwm_onClickProduct:(NSNumber *)productId{ - (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; productDetailVC.productId = productId;
[self.navigationController pushViewController:productDetailVC animated:YES]; [self.navigationController pushViewController:productDetailVC animated:YES];
} }
......
...@@ -154,7 +154,7 @@ typedef enum{ ...@@ -154,7 +154,7 @@ typedef enum{
#pragma mark - KWMMenuDelegate #pragma mark - KWMMenuDelegate
-(void)kwm_onClickHotMenu{ -(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{ -(void)kwm_onClickNewMenu{
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#import "KWMSelectedGoodsVC.h" #import "KWMSelectedGoodsVC.h"
#import "KWMBrandCaramelVC.h" #import "KWMBrandCaramelVC.h"
#import "UIColor+SAMAdditions.h" #import "UIColor+SAMAdditions.h"
#import "KWMProductDetailVC.h" #import "KWMNewProductVC.h"
#import "KWMShoppingCart.h" #import "KWMShoppingCart.h"
...@@ -281,7 +281,8 @@ static NSString * idStr = @"KWMNewGoodsCell"; ...@@ -281,7 +281,8 @@ static NSString * idStr = @"KWMNewGoodsCell";
if (product == nil) { if (product == nil) {
return; 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; goodsDetailvc.product = product;
[self.navigationController pushViewController:goodsDetailvc animated:YES]; [self.navigationController pushViewController:goodsDetailvc animated:YES];
} }
......
////
//// KWMProductDetailVC.h
//// iCemarose
////
//// Created by HouWeiBin on 2017/1/11.
//// Copyright © 2017年 kollway. All rights reserved.
////
// //
// KWMProductDetailVC.h //#import "KWMBaseVC.h"
// iCemarose
// //
// Created by HouWeiBin on 2017/1/11. //@interface KWMProductDetailVC : KWMBaseVC
// Copyright © 2017年 kollway. All rights reserved.
// //
//@property (nonatomic) BUYProduct *product;
#import "KWMBaseVC.h" //
//@property (nonatomic) NSNumber *productId;
@interface KWMProductDetailVC : KWMBaseVC //
///**
@property (nonatomic) BUYProduct *product; // * SKU 人为定义的SKU
// */
@property (nonatomic) NSNumber *productId; //@property (nonatomic) NSString *handle;
//
/** //@end
* SKU 人为定义的SKU
*/
@property (nonatomic) NSString *handle;
@end
...@@ -53,7 +53,7 @@ static NSString *idStr = @"KWMBrandCaramelCell"; ...@@ -53,7 +53,7 @@ static NSString *idStr = @"KWMBrandCaramelCell";
self.hasNextPage = NO; self.hasNextPage = NO;
self.collectionSort = BUYCollectionSortCreatedDescending; self.collectionSort = BUYCollectionSortCreatedDescending;
if (self.handle) { if (self.handle && !self.title) {
self.title = self.handle.capitalizedString; self.title = self.handle.capitalizedString;
}else if(self.productType != nil){ }else if(self.productType != nil){
//初始化双行标题栏 //初始化双行标题栏
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment