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

iCemarose/Class/UI/Product/KWMNewVC.m

@@ -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];

iCemarose/Class/UI/Product/KWMSelectedGoodsVC.m

@@ -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;
     }

iCemarose/Class/UI/Product/New.storyboard

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" 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="12121" 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="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
         <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"/>