Merge branch 'master' of git.oschina.net:kollway-kollway/newcemarose

iCemarose/Class/UI/NewHome/KWMNewHomeVC.m

@@ -8,6 +8,7 @@
 
 #import "KWMNewHomeVC.h"
 #import "KWMShopCartVC.h"
+#import "KWMSearchFeedbackVC.h"
 #import "KWMNewHomeCell.h"
 #import "KWMSearchBar.h"
 #import "KWMHomeData.h"
@@ -120,7 +121,7 @@ typedef enum{
 -(void)initTitleView{
     self.titleView = [[KWMSearchBar alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, 64)];
     self.titleView.delegate = self;
-    self.titleView.btnSearch.hidden = YES;
+    self.titleView.btnSearch.hidden = NO;
     [self.view addSubview:self.titleView];
 }
 
@@ -298,6 +299,11 @@ typedef enum{
     [self.navigationController pushViewController:contactVC animated:YES];
 }
 
+-(void)kwm_startSearch{
+    KWMSearchFeedbackVC *vc = (KWMSearchFeedbackVC *)[KWMBaseVC findControllerBy:[KWMSearchFeedbackVC kwmTag] fromStoryboard:@"New"];
+    [self.navigationController pushViewController:vc animated:YES];
+}
+
 #pragma makr - api
 //- (void)requestProduct:(NSString *)tag{
 //    NSMutableArray *tags = nil;

iCemarose/Class/UI/NewProduct/KWMNewProductVC.m

@@ -165,6 +165,7 @@
     self.color = nil;
     self.variant = nil;
     self.count = 0;
+    [self.btnLike setImage:[UIImage imageNamed:@"ic_like_unable"] forState:UIControlStateNormal];
     if(self.detailView1){
         [self.detailView1 setSelect:nil color:nil count:0];
     }
@@ -200,6 +201,10 @@
         [self presentViewController:nav animated:YES completion:nil];
         return;
     }
+    if(!self.variant){
+        [self showToast:@"请先选择尺码/顏色"];
+        return;
+    }
     if(self.isLikeVariant){
         [self requestRemoveWish];
     }else{