Commit 5a894330 by lee

u

parent f044f0e8
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
}]; }];
[routes addRoute:@"/products/:id" handler:^BOOL(NSDictionary<NSString *,id> * _Nonnull parameters) { [routes addRoute:@"/products/:id" handler:^BOOL(NSDictionary<NSString *,id> * _Nonnull parameters) {
NSLog(@"product id %@",parameters[@"id"]); NSLog(@"product id %@",parameters[@"id"]);
KWMProductDetailVC *productDetailVC = (KWMProductDetailVC*)[KWMBaseVC findControllerBy:[KWMProductDetailVC kwmTag] fromStoryboard:@"New"]; // KWMProductDetailVC *productDetailVC = (KWMProductDetailVC*)[KWMBaseVC findControllerBy:[KWMProductDetailVC kwmTag] fromStoryboard:@"New"];
// productDetailVC.product = brandCell.leftProduct; // productDetailVC.product = brandCell.leftProduct;
productDetailVC.handle = parameters[@"id"]; // productDetailVC.handle = parameters[@"id"];
[[AppDelegate mainViewController].selectedViewController.navigationController pushViewController:productDetailVC animated:YES]; // [[AppDelegate mainViewController].selectedViewController.navigationController pushViewController:productDetailVC animated:YES];
return YES; return YES;
}]; }];
} }
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#import "KWMStringUtil.h" #import "KWMStringUtil.h"
#import "KWMBrandCaramelVC.h" #import "KWMBrandCaramelVC.h"
#import "KWMSearchBrandsCell.h" #import "KWMSearchBrandsCell.h"
#import <RXCollections/RXCollection.h>
...@@ -298,7 +299,10 @@ static NSString *identify = @"KWMSearchBrandsCell"; ...@@ -298,7 +299,10 @@ static NSString *identify = @"KWMSearchBrandsCell";
if([weakSelf hasCemaroseError:result]){ if([weakSelf hasCemaroseError:result]){
return ; return ;
} }
NSArray *indexArray= [result.brands arrayWithPinYinFirstLetterFormat]; // NSArray *indexArray= [result.brands arrayWithPinYinFirstLetterFormat];
NSArray *indexArray= [[result.brands rx_filterWithBlock:^BOOL(id each) {
return each && each != [NSNull null];
}] arrayWithPinYinFirstLetterFormat];
_dataArray =[NSMutableArray arrayWithArray:indexArray]; _dataArray =[NSMutableArray arrayWithArray:indexArray];
[weakSelf.tbvSearchBrand reloadData]; [weakSelf.tbvSearchBrand reloadData];
}; };
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>2017063017</string> <string>2017070509</string>
<key>LSApplicationQueriesSchemes</key> <key>LSApplicationQueriesSchemes</key>
<array> <array>
<string>weixin</string> <string>weixin</string>
......
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