Skip to content

I
ios1x
Commit a12cfc9b by houweibin
Options

1，修改各处分割线样式 

2，首页品牌的更多品牌-跳转触发方式调整
3，首页分类头部搜索ui样式调整
4，其他一些细微的调整，padding，字体之类的
parent 2ac5ba34
Showing with 191 additions and 118 deletions
iCemarose/Assets.xcassets/ic_product_7day.imageset/Contents.json
......@@ -6,12 +6,12 @@
},
{
"idiom" : "universal",
"filename" : "52.png",
"filename" : "ic_product_7day@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "78.png",
"filename" : "ic_product_7day@3x.png",
"scale" : "3x"
}
],
......
iCemarose/Assets.xcassets/ic_search_gray.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_search_gray@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_search_gray@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
iCemarose/Base.lproj/Main.storyboard
......@@ -152,7 +152,7 @@
<rect key="frame" x="60" y="49" width="315" height="1"/>
<color key="backgroundColor" red="0.84705882352941175" green="0.85882352941176465" blue="0.87058823529411766" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="7p3-HE-XW0"/>
<constraint firstAttribute="height" constant="0.5" id="7p3-HE-XW0"/>
</constraints>
</view>
</subviews>
......@@ -173,7 +173,7 @@
<outletCollection property="gestureRecognizers" destination="I8a-iq-XYY" appends="YES" id="T3S-8g-NHp"/>
</connections>
</view>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZJV-Hx-p4h" userLabel="vGiftcards">
<view hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZJV-Hx-p4h" userLabel="vGiftcards">
<rect key="frame" x="0.0" y="210" width="375" height="0.0"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_mine_list_menu_about us" translatesAutoresizingMaskIntoConstraints="NO" id="kli-Ed-9su">
......@@ -200,7 +200,7 @@
<rect key="frame" x="60" y="-1" width="315" height="1"/>
<color key="backgroundColor" red="0.84705882349999995" green="0.85882352939999995" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="fNh-w3-KG1"/>
<constraint firstAttribute="height" constant="0.5" id="fNh-w3-KG1"/>
</constraints>
</view>
</subviews>
......@@ -248,7 +248,7 @@
<rect key="frame" x="60" y="49" width="315" height="1"/>
<color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Xow-hA-06D"/>
<constraint firstAttribute="height" constant="0.5" id="Xow-hA-06D"/>
</constraints>
</view>
</subviews>
......@@ -296,7 +296,7 @@
<rect key="frame" x="60" y="49" width="315" height="1"/>
<color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="wSt-87-Bfb"/>
<constraint firstAttribute="height" constant="0.5" id="wSt-87-Bfb"/>
</constraints>
</view>
</subviews>
......@@ -344,7 +344,7 @@
<rect key="frame" x="60" y="49" width="315" height="1"/>
<color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="cTs-ug-Lvq"/>
<constraint firstAttribute="height" constant="0.5" id="cTs-ug-Lvq"/>
</constraints>
</view>
</subviews>
......@@ -660,18 +660,18 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PQO-Nr-Fwf" userLabel="vLine">
<rect key="frame" x="0.0" y="64" width="375" height="1"/>
<view hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PQO-Nr-Fwf" userLabel="vLine">
<rect key="frame" x="0.0" y="64" width="375" height="0.0"/>
<color key="backgroundColor" red="0.82338023559999995" green="0.82338023559999995" blue="0.82338023559999995" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="axm-QQ-1Rb"/>
<constraint firstAttribute="height" id="axm-QQ-1Rb"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sN5-Cc-hcJ">
<rect key="frame" x="0.0" y="65" width="375" height="553"/>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sN5-Cc-hcJ" userLabel="更多品牌">
<rect key="frame" x="0.0" y="64" width="375" height="554"/>
<subviews>
<view multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BAk-Vf-OXH" userLabel="vBackground">
<rect key="frame" x="0.0" y="253" width="375" height="300"/>
<rect key="frame" x="0.0" y="254" width="375" height="300"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="更多品牌" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yL8-CP-A62">
<rect key="frame" x="155.5" y="139" width="64" height="22.5"/>
......@@ -719,18 +719,6 @@
<outlet property="delegate" destination="T5W-xY-Sju" id="ksR-6g-P6g"/>
</connections>
</collectionView>
<button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a8r-6e-exm">
<rect key="frame" x="0.0" y="418" width="375" height="200"/>
<accessibility key="accessibilityConfiguration">
<accessibilityTraits key="traits" button="YES" notEnabled="YES"/>
</accessibility>
<constraints>
<constraint firstAttribute="height" constant="200" id="uiL-9u-ABE"/>
</constraints>
<connections>
<action selector="onClickMoreBrand:" destination="T5W-xY-Sju" eventType="touchUpInside" id="h6R-jL-JDT"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<gestureRecognizers/>
......@@ -740,13 +728,10 @@
<constraint firstItem="fof-U6-K0T" firstAttribute="top" secondItem="3b7-rO-fho" secondAttribute="bottom" id="4a4-oX-eRg"/>
<constraint firstAttribute="trailing" secondItem="3b7-rO-fho" secondAttribute="trailing" id="CGV-Xy-qQd"/>
<constraint firstItem="sN5-Cc-hcJ" firstAttribute="leading" secondItem="FFR-zw-6xy" secondAttribute="leading" id="DMa-he-Ktq"/>
<constraint firstItem="a8r-6e-exm" firstAttribute="leading" secondItem="FFR-zw-6xy" secondAttribute="leading" id="EzH-B5-ivR"/>
<constraint firstItem="sN5-Cc-hcJ" firstAttribute="top" secondItem="PQO-Nr-Fwf" secondAttribute="bottom" id="Fn3-Dt-J1p"/>
<constraint firstItem="fof-U6-K0T" firstAttribute="top" secondItem="sN5-Cc-hcJ" secondAttribute="bottom" id="GGe-YT-h0L"/>
<constraint firstAttribute="trailing" secondItem="sN5-Cc-hcJ" secondAttribute="trailing" id="LZA-Zy-lUD"/>
<constraint firstAttribute="trailing" secondItem="a8r-6e-exm" secondAttribute="trailing" id="X7r-mr-avT"/>
<constraint firstAttribute="trailing" secondItem="PQO-Nr-Fwf" secondAttribute="trailing" id="Zv7-cQ-L3H"/>
<constraint firstItem="fof-U6-K0T" firstAttribute="top" secondItem="a8r-6e-exm" secondAttribute="bottom" id="jf8-eB-NSH"/>
<constraint firstItem="3b7-rO-fho" firstAttribute="top" secondItem="FFR-zw-6xy" secondAttribute="top" constant="64" id="oN5-Df-zud"/>
<constraint firstItem="PQO-Nr-Fwf" firstAttribute="top" secondItem="FFR-zw-6xy" secondAttribute="top" constant="64" id="yhz-jf-H1p"/>
</constraints>
......@@ -754,9 +739,7 @@
<navigationItem key="navigationItem" id="2uR-JF-yRk"/>
<connections>
<outlet property="backgroundHeight" destination="jyL-uA-oGv" id="d7y-8E-CYY"/>
<outlet property="btnMore" destination="a8r-6e-exm" id="qLf-jp-hN5"/>
<outlet property="ctvBrand" destination="3b7-rO-fho" id="DMX-iy-hz6"/>
<outlet property="moreBtnHeight" destination="uiL-9u-ABE" id="Dod-ub-OoS"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="9Jm-1u-Wt2" userLabel="First Responder" sceneMemberID="firstResponder"/>
......@@ -1134,7 +1117,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aPr-fM-NN3" userLabel="left">
<rect key="frame" x="0.0" y="0.0" width="90" height="554"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="60" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="WcE-6c-JQz">
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" rowHeight="60" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="WcE-6c-JQz">
<rect key="frame" x="0.0" y="0.0" width="90" height="554"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
......@@ -1199,7 +1182,7 @@
<constraint firstAttribute="trailing" secondItem="J3W-GJ-IkI" secondAttribute="trailing" id="t3N-3e-6AN"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a7V-Cz-8by">
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a7V-Cz-8by">
<rect key="frame" x="0.0" y="0.0" width="375" height="1"/>
<color key="backgroundColor" red="0.72156862749999995" green="0.72156862749999995" blue="0.72156862749999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
......@@ -1257,7 +1240,7 @@
<rect key="frame" x="0.0" y="64" width="375" height="1"/>
<color key="backgroundColor" red="0.82745098039215681" green="0.83921568627450982" blue="0.85098039215686272" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="sW8-vv-bTF"/>
<constraint firstAttribute="height" constant="0.5" id="sW8-vv-bTF"/>
</constraints>
</view>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="T1z-z9-rlz">
......
iCemarose/Class/UI/Brand/KWMBrandVC.h
......@@ -11,7 +11,6 @@
@interface KWMBrandVC : KWMBaseVC<UICollectionViewDataSource,UICollectionViewDelegate,UICollectionViewDelegateFlowLayout>
@property (weak, nonatomic) IBOutlet UICollectionView *ctvBrand;
@property (weak, nonatomic) IBOutlet UIButton *btnMore;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *backgroundHeight;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *moreBtnHeight;
......
iCemarose/Class/UI/Brand/KWMBrandVC.m
......@@ -51,7 +51,6 @@ static NSString *cellId = @"KWMBrandCell";
colorArr = [NSArray arrayWithObjects:@"#D8A88D",@"#A4C8C6",@"#E6C995",@"#718473",@"#D7B48B", nil];
// 底部背景高度 = 屏幕高 - 64 nav高度 - 最后一个cell的高度 - tabar高度44
self.backgroundHeight.constant = UI_SCREEN_HEITHT - 64 - 280 - 44;
self.moreBtnHeight.constant = UI_SCREEN_HEITHT - 64 - 280 - 44;
[self.ctvBrand registerClass:[UICollectionReusableView class] forSupplementaryViewOfKind:UICollectionElementKindSectionFooter withReuseIdentifier:@"FooterView"];
[self initView];
......@@ -77,6 +76,11 @@ static NSString *cellId = @"KWMBrandCell";
self.ctvBrand.delegate = self;
self.ctvBrand.showsVerticalScrollIndicator = NO;
[self.ctvBrand registerNib:[UINib nibWithNibName:@"KWMBrandCell" bundle:nil] forCellWithReuseIdentifier:cellId];
//collectionview滑动到末尾后，点击底部空白(更多品牌)去往所有品牌页面
self.ctvBrand.backgroundView = [[UIView alloc] initWithFrame:self.view.frame];
self.ctvBrand.backgroundView.userInteractionEnabled = YES;
UITapGestureRecognizer *tapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onClickMoreBrand:)];
self.ctvBrand.backgroundView.gestureRecognizers = @[tapRecognizer];
}
- (void) initHeardView{
......@@ -252,11 +256,6 @@ static NSString *cellId = @"KWMBrandCell";
-(void)scrollViewDidScroll:(UIScrollView *)scrollView{
NSIndexPath *path = [self.ctvBrand indexPathForItemAtPoint:CGPointMake(scrollView.contentOffset.x, scrollView.contentOffset.y)];
if(path.row == 7){
self.btnMore.userInteractionEnabled = YES;
}else{
self.btnMore.userInteractionEnabled = NO;
}
}
......
iCemarose/Class/UI/Category/Cell/KWMCategoryTitleView.m
......@@ -7,12 +7,13 @@
//
#import "KWMCategoryTitleView.h"
#import "UIView+Prettify.h"
@interface KWMCategoryTitleView()
@property(nonatomic,weak) IBOutlet UIView *vView;
@property(nonatomic,weak) IBOutlet UISearchBar *searchBar;
@property(nonatomic,weak) IBOutlet UIView *vSearchBar;
@property(nonatomic,weak) IBOutlet UILabel *lbCount;
......@@ -58,7 +59,7 @@
}
-(void)initView{
[self.vSearchBar setBorder:0 cornerRadius:2 borderColor:nil];
}
-(void)setCount:(NSNumber *)count{
......
iCemarose/Class/UI/Category/Cell/KWMCategoryTitleView.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" 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="12089"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="PingFang.ttc">
<string>PingFangSC-Regular</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="KWMCategoryTitleView">
<connections>
<outlet property="lbCount" destination="y0m-sW-G7x" id="svw-DK-ZPg"/>
<outlet property="searchBar" destination="mzZ-Oc-Ztf" id="Kdx-g8-ibf"/>
<outlet property="vSearchBar" destination="kbH-GA-9za" id="qdj-xe-yvf"/>
<outlet property="vView" destination="iN0-l3-epB" id="ndu-9n-FK3"/>
</connections>
</placeholder>
......@@ -67,7 +72,33 @@
<constraint firstItem="y0m-sW-G7x" firstAttribute="centerY" secondItem="cX3-qt-ofW" secondAttribute="centerY" id="wzb-Ju-Mir"/>
</constraints>
</view>
<searchBar contentMode="redraw" searchBarStyle="minimal" placeholder="搜索" translatesAutoresizingMaskIntoConstraints="NO" id="mzZ-Oc-Ztf">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kbH-GA-9za" userLabel="vSearchBar">
<rect key="frame" x="22" y="9" width="299" height="26"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_search_gray" translatesAutoresizingMaskIntoConstraints="NO" id="l8Z-gQ-WHH">
<rect key="frame" x="127.5" y="6" width="14" height="14"/>
<constraints>
<constraint firstAttribute="width" constant="14" id="1uB-dz-Oxq"/>
<constraint firstAttribute="height" constant="14" id="UXg-hs-Zqz"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="搜索" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hoc-e3-xti">
<rect key="frame" x="152.5" y="4.5" width="24" height="17"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="12"/>
<color key="textColor" red="0.71372549019999998" green="0.71372549019999998" blue="0.73725490199999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.95686274510000002" green="0.96078431369999995" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="hoc-e3-xti" firstAttribute="centerY" secondItem="kbH-GA-9za" secondAttribute="centerY" id="AUg-Vw-l0Z"/>
<constraint firstItem="hoc-e3-xti" firstAttribute="centerX" secondItem="kbH-GA-9za" secondAttribute="centerX" constant="15" id="Hhy-SA-w0k"/>
<constraint firstAttribute="height" constant="26" id="N7H-gE-z7v"/>
<constraint firstItem="l8Z-gQ-WHH" firstAttribute="centerY" secondItem="kbH-GA-9za" secondAttribute="centerY" id="Ncr-Jw-BKz"/>
<constraint firstItem="l8Z-gQ-WHH" firstAttribute="centerX" secondItem="kbH-GA-9za" secondAttribute="centerX" constant="-15" id="Q1p-Fj-iIS"/>
</constraints>
</view>
<searchBar hidden="YES" contentMode="redraw" searchBarStyle="minimal" placeholder="搜索" translatesAutoresizingMaskIntoConstraints="NO" id="mzZ-Oc-Ztf">
<rect key="frame" x="0.0" y="0.0" width="321" height="44"/>
<textInputTraits key="textInputTraits"/>
</searchBar>
......@@ -80,8 +111,10 @@
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="kbH-GA-9za" firstAttribute="leading" secondItem="fl4-ro-VaX" secondAttribute="leading" constant="22" id="9ul-Nq-DFT"/>
<constraint firstAttribute="bottom" secondItem="mzZ-Oc-Ztf" secondAttribute="bottom" id="CWv-py-5v4"/>
<constraint firstItem="7Cc-is-gm9" firstAttribute="centerY" secondItem="fl4-ro-VaX" secondAttribute="centerY" id="HRV-Pg-tR7"/>
<constraint firstItem="kbH-GA-9za" firstAttribute="centerY" secondItem="fl4-ro-VaX" secondAttribute="centerY" id="IgC-gb-fir"/>
<constraint firstItem="mzZ-Oc-Ztf" firstAttribute="leading" secondItem="fl4-ro-VaX" secondAttribute="leading" id="N7h-jj-ByO"/>
<constraint firstItem="7Cc-is-gm9" firstAttribute="leading" secondItem="mzZ-Oc-Ztf" secondAttribute="trailing" id="XUo-Xu-TIQ"/>
<constraint firstItem="Iiv-qH-KSw" firstAttribute="top" secondItem="fl4-ro-VaX" secondAttribute="top" id="YRc-Wl-O6W"/>
......@@ -91,6 +124,7 @@
<constraint firstAttribute="bottom" secondItem="Iiv-qH-KSw" secondAttribute="bottom" id="hfA-3K-TyT"/>
<constraint firstItem="7Cc-is-gm9" firstAttribute="leading" secondItem="Iiv-qH-KSw" secondAttribute="trailing" id="kLf-i6-xsT"/>
<constraint firstItem="cX3-qt-ofW" firstAttribute="trailing" secondItem="7Cc-is-gm9" secondAttribute="trailing" constant="-11" id="ml8-u3-zgZ"/>
<constraint firstItem="7Cc-is-gm9" firstAttribute="leading" secondItem="kbH-GA-9za" secondAttribute="trailing" id="v0k-1U-HbN"/>
<constraint firstItem="cX3-qt-ofW" firstAttribute="bottom" secondItem="7Cc-is-gm9" secondAttribute="bottom" constant="-13" id="xom-ON-VI4"/>
</constraints>
</view>
......@@ -111,5 +145,6 @@
</objects>
<resources>
<image name="btn_ nav_shop cart" width="21" height="22"/>
<image name="ic_search_gray" width="14" height="14"/>
</resources>
</document>
iCemarose/Class/UI/Category/KWMBrandFilterVC.m
......@@ -25,6 +25,7 @@
- (void)viewDidLoad {
[super viewDidLoad];
[self.tbvBrand registerNib:[UINib nibWithNibName:NSStringFromClass([KWMSearchBrandsCell class]) bundle:nil] forCellReuseIdentifier:NSStringFromClass([KWMSearchBrandsCell class])];
[self.tbvBrand setSectionIndexColor:[UIColor sam_colorWithHex:@"#272636"]];
}
- (void)didReceiveMemoryWarning {
......
iCemarose/Class/UI/NewHome/Cell/KWMClothingSetsCell.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" 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="12089"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="PingFang.ttc">
<string>PingFangSC-Regular</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
......@@ -47,19 +52,19 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CARAMEL" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yLu-gy-qUp">
<rect key="frame" x="0.0" y="66" width="66" height="15.5"/>
<rect key="frame" x="0.0" y="70" width="66" height="15.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
<color key="textColor" red="0.3411764705882353" green="0.3411764705882353" blue="0.3411764705882353" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥2450" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ETG-Ir-uXq">
<rect key="frame" x="18" y="82.5" width="31" height="13"/>
<rect key="frame" x="18" y="86.5" width="31" height="13"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="9"/>
<color key="textColor" red="0.94509803921568625" green="0.5725490196078431" blue="0.60392156862745094" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥2900" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y7j-iw-wgF">
<rect key="frame" x="18" y="96.5" width="31" height="13"/>
<rect key="frame" x="18" y="100.5" width="31" height="13"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="9"/>
<color key="textColor" red="0.59215686274509804" green="0.59215686274509804" blue="0.59215686274509804" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
......@@ -69,7 +74,7 @@
<constraints>
<constraint firstAttribute="trailing" secondItem="yLu-gy-qUp" secondAttribute="trailing" id="J6w-IL-OFe"/>
<constraint firstItem="Y7j-iw-wgF" firstAttribute="top" secondItem="ETG-Ir-uXq" secondAttribute="bottom" constant="1" id="MS6-LF-xHw"/>
<constraint firstItem="yLu-gy-qUp" firstAttribute="top" secondItem="9za-nW-9Xw" secondAttribute="bottom" id="Sjr-vz-04G"/>
<constraint firstItem="yLu-gy-qUp" firstAttribute="top" secondItem="9za-nW-9Xw" secondAttribute="bottom" constant="4" id="Sjr-vz-04G"/>
<constraint firstItem="9za-nW-9Xw" firstAttribute="leading" secondItem="HJW-BD-Yxt" secondAttribute="leading" id="WTp-pJ-BqU"/>
<constraint firstItem="ETG-Ir-uXq" firstAttribute="centerX" secondItem="HJW-BD-Yxt" secondAttribute="centerX" id="dnx-YL-XeU"/>
<constraint firstItem="Y7j-iw-wgF" firstAttribute="centerX" secondItem="HJW-BD-Yxt" secondAttribute="centerX" id="jRu-cc-UUM"/>
......
iCemarose/Class/UI/NewHome/Cell/KWMHotSalesHeader.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" 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="13173"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="PingFang.ttc">
<string>PingFangSC-Regular</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="KWMHotSalesHeader">
<connections>
......@@ -48,17 +53,17 @@
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uhq-ZL-9OL">
<rect key="frame" x="97.5" y="24.5" width="40" height="1"/>
<color key="backgroundColor" red="0.84705882349999995" green="0.85882352939999995" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" red="0.31764705882352939" green="0.31764705882352939" blue="0.31764705882352939" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="40" id="hzU-8w-40e"/>
<constraint firstAttribute="height" constant="1" id="xaE-u5-Def"/>
<constraint firstAttribute="height" constant="0.5" id="xaE-u5-Def"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ILX-tg-IwY">
<rect key="frame" x="237.5" y="24.5" width="40" height="1"/>
<color key="backgroundColor" red="0.84705882349999995" green="0.85882352939999995" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" red="0.31764705882352939" green="0.31764705882352939" blue="0.31764705882352939" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Nec-hp-m8B"/>
<constraint firstAttribute="height" constant="0.5" id="Nec-hp-m8B"/>
<constraint firstAttribute="width" constant="40" id="Rei-3E-m0o"/>
</constraints>
</view>
......
iCemarose/Class/UI/NewHome/Cell/KWMRecommendHeader.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" 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="12089"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="PingFang.ttc">
<string>PingFangSC-Regular</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="KWMRecommendHeader">
<connections>
......@@ -25,18 +30,18 @@
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oxh-Z4-5Du">
<rect key="frame" x="97.5" y="24.5" width="40" height="1"/>
<color key="backgroundColor" red="0.84705882349999995" green="0.85882352939999995" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" red="0.31764705882352939" green="0.31764705882352939" blue="0.31764705882352939" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="dN7-5L-uPZ"/>
<constraint firstAttribute="height" constant="0.5" id="dN7-5L-uPZ"/>
<constraint firstAttribute="width" constant="40" id="u4w-ir-uYu"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Fhz-dH-m9M">
<rect key="frame" x="237.5" y="24.5" width="40" height="1"/>
<color key="backgroundColor" red="0.84705882349999995" green="0.85882352939999995" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" red="0.31764705882352939" green="0.31764705882352939" blue="0.31764705882352939" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="40" id="Q9Q-rN-rC2"/>
<constraint firstAttribute="height" constant="1" id="mTX-4g-wc5"/>
<constraint firstAttribute="height" constant="0.5" id="mTX-4g-wc5"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="主推单品" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Fq-VX-XvA">
......
iCemarose/Class/UI/NewProduct/Cell/KWMFirstDetailView.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" 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="13173"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="PingFang.ttc">
<string>PingFangSC-Light</string>
<string>PingFangSC-Regular</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="KWMFirstDetailView">
<connections>
......@@ -80,14 +86,14 @@
<rect key="frame" x="21" y="98" width="100" height="30"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_product_real" translatesAutoresizingMaskIntoConstraints="NO" id="NYM-Eo-x6g">
<rect key="frame" x="0.0" y="4" width="20" height="22"/>
<rect key="frame" x="0.0" y="4" width="22" height="22"/>
<constraints>
<constraint firstAttribute="height" constant="22" id="OYT-lj-ldV"/>
<constraint firstAttribute="width" constant="20" id="ioH-oW-AyC"/>
<constraint firstAttribute="width" constant="22" id="ioH-oW-AyC"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="正品保证" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rod-fs-hfy">
<rect key="frame" x="30" y="7.5" width="48" height="17"/>
<rect key="frame" x="32" y="7.5" width="48" height="17"/>
<fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="12"/>
<color key="textColor" red="0.15294117647058825" green="0.14901960784313725" blue="0.21176470588235294" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
......@@ -107,14 +113,14 @@
<rect key="frame" x="121" y="98" width="100" height="30"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_product_7day" translatesAutoresizingMaskIntoConstraints="NO" id="jxm-XE-ewW">
<rect key="frame" x="0.0" y="4" width="24" height="22"/>
<rect key="frame" x="0.0" y="3.5" width="25" height="23"/>
<constraints>
<constraint firstAttribute="width" constant="24" id="6LP-3V-BBJ"/>
<constraint firstAttribute="height" constant="22" id="eN2-by-SKX"/>
<constraint firstAttribute="width" constant="25" id="6LP-3V-BBJ"/>
<constraint firstAttribute="height" constant="23" id="eN2-by-SKX"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="7天退换" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LIh-x6-zk9">
<rect key="frame" x="34" y="7.5" width="43" height="17"/>
<rect key="frame" x="35" y="7.5" width="43" height="17"/>
<fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="12"/>
<color key="textColor" red="0.1529411765" green="0.14901960780000001" blue="0.21176470589999999" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
......@@ -186,7 +192,7 @@
<rect key="frame" x="21" y="0.0" width="354" height="1"/>
<color key="backgroundColor" red="0.84705882349999995" green="0.85882352939999995" blue="0.87058823529999996" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="bxm-oi-0tI"/>
<constraint firstAttribute="height" constant="0.5" id="bxm-oi-0tI"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择尺码/颜色" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o3P-oH-Xcb">
......@@ -199,7 +205,7 @@
<rect key="frame" x="20" y="49" width="355" height="1"/>
<color key="backgroundColor" red="0.84705882349999995" green="0.85882352939999995" blue="0.87058823529999996" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="PfY-sI-qsS"/>
<constraint firstAttribute="height" constant="0.5" id="PfY-sI-qsS"/>
</constraints>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="button_mine_more" translatesAutoresizingMaskIntoConstraints="NO" id="rd9-oQ-6Yd">
......@@ -241,7 +247,7 @@
<rect key="frame" x="20" y="-1" width="355" height="1"/>
<color key="backgroundColor" red="0.84705882349999995" green="0.85882352939999995" blue="0.87058823529999996" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="aZ5-j8-htj"/>
<constraint firstAttribute="height" constant="0.5" id="aZ5-j8-htj"/>
</constraints>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="button_mine_more" translatesAutoresizingMaskIntoConstraints="NO" id="thi-C2-XsQ">
......@@ -318,8 +324,8 @@
</objects>
<resources>
<image name="button_mine_more" width="7" height="14"/>
<image name="ic_product_7day" width="26" height="23"/>
<image name="ic_product_7day" width="25" height="23"/>
<image name="ic_product_gift" width="22" height="23"/>
<image name="ic_product_real" width="22" height="23"/>
<image name="ic_product_real" width="23" height="23"/>
</resources>
</document>
iCemarose/Class/UI/NewProduct/NewProduct.storyboard
......@@ -30,14 +30,14 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kgb-zB-eBa" userLabel="头部">
<rect key="frame" x="0.0" y="20" width="375" height="30"/>
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
<subviews>
<view alpha="0.5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BOo-eV-XG1">
<rect key="frame" x="0.0" y="0.0" width="375" height="30"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rOq-W5-pGL" userLabel="返回">
<rect key="frame" x="18" y="0.0" width="30" height="30"/>
<rect key="frame" x="18" y="7" width="30" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="SGb-fZ-yeP"/>
<constraint firstAttribute="height" constant="30" id="oKg-42-WkV"/>
......@@ -48,7 +48,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GyL-XU-Wjr" userLabel="分享">
<rect key="frame" x="292" y="6" width="22" height="18"/>
<rect key="frame" x="292" y="13" width="22" height="18"/>
<constraints>
<constraint firstAttribute="height" constant="18" id="WAd-Ea-6Ih"/>
<constraint firstAttribute="width" constant="22" id="pvF-z2-BcF"/>
......@@ -59,7 +59,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jLv-Vv-7Vi" userLabel="喜欢">
<rect key="frame" x="334" y="4" width="19" height="22"/>
<rect key="frame" x="334" y="11" width="19" height="22"/>
<state key="normal" image="ic_like"/>
<connections>
<action selector="onClickLike:" destination="Vzq-D6-e57" eventType="touchUpInside" id="MAt-Kp-nD0"/>
......@@ -77,12 +77,12 @@
<constraint firstAttribute="trailing" secondItem="jLv-Vv-7Vi" secondAttribute="trailing" constant="22" id="jTo-3x-wfd"/>
<constraint firstItem="BOo-eV-XG1" firstAttribute="leading" secondItem="kgb-zB-eBa" secondAttribute="leading" id="qRf-xm-atP"/>
<constraint firstAttribute="bottom" secondItem="BOo-eV-XG1" secondAttribute="bottom" id="uam-hn-aQd"/>
<constraint firstAttribute="height" constant="30" id="vlJ-Bg-nSx"/>
<constraint firstAttribute="height" constant="44" id="vlJ-Bg-nSx"/>
<constraint firstAttribute="trailing" secondItem="BOo-eV-XG1" secondAttribute="trailing" id="xjI-ha-DFF"/>
</constraints>
</view>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="T6J-Gp-5iu">
<rect key="frame" x="0.0" y="50" width="375" height="567"/>
<rect key="frame" x="0.0" y="64" width="375" height="553"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="X5Y-fo-qOg">
<rect key="frame" x="-0.5" y="0.0" width="375" height="1161.5"/>
......@@ -220,7 +220,7 @@
<constraint firstAttribute="trailing" secondItem="kgb-zB-eBa" secondAttribute="trailing" id="FyY-BZ-73X"/>
<constraint firstItem="kgb-zB-eBa" firstAttribute="leading" secondItem="IxM-8o-F8K" secondAttribute="leading" id="KfD-qL-WSj"/>
<constraint firstItem="aqB-2y-BKU" firstAttribute="top" secondItem="T6J-Gp-5iu" secondAttribute="bottom" id="kEG-am-iPo"/>
<constraint firstItem="T6J-Gp-5iu" firstAttribute="top" secondItem="Pjy-Ny-sa9" secondAttribute="bottom" constant="30" id="nNS-e6-C1V"/>
<constraint firstItem="T6J-Gp-5iu" firstAttribute="top" secondItem="Pjy-Ny-sa9" secondAttribute="bottom" constant="44" id="nNS-e6-C1V"/>
</constraints>
</view>
<connections>
......
iCemarose/Class/UI/ShopCart/Cell/KWMShopCarCell.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" 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="13173"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="PingFang.ttc">
<string>PingFangSC-Medium</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
......@@ -36,7 +41,7 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CAMAREL" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0r2-at-8ZX">
<rect key="frame" x="150" y="30" width="96.5" height="25.5"/>
<rect key="frame" x="150" y="30" width="96" height="25.5"/>
<fontDescription key="fontDescription" type="system" pointSize="21"/>
<color key="textColor" red="0.30588235294117649" green="0.30588235294117649" blue="0.30588235294117649" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
......@@ -54,19 +59,19 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" / " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OTs-GR-kpE" userLabel="/">
<rect key="frame" x="171" y="82" width="45.5" height="20.5"/>
<rect key="frame" x="171" y="82" width="45" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.30588235289999999" green="0.30588235289999999" blue="0.30588235289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="X" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kEC-98-tF6" userLabel="X">
<rect key="frame" x="216.5" y="88.5" width="7" height="12"/>
<rect key="frame" x="216" y="88.5" width="7" height="12"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" red="0.30588235289999999" green="0.30588235289999999" blue="0.30588235289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xlh-Sb-hYQ" userLabel="lbCount">
<rect key="frame" x="223.5" y="82" width="8" height="20.5"/>
<rect key="frame" x="223" y="82" width="8" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.30588235289999999" green="0.30588235289999999" blue="0.30588235289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
......@@ -99,7 +104,7 @@
<rect key="frame" x="0.0" y="140" width="375" height="1"/>
<color key="backgroundColor" red="0.84705882352941175" green="0.85882352941176465" blue="0.87058823529411766" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="TyH-uD-VE2"/>
<constraint firstAttribute="height" constant="0.5" id="TyH-uD-VE2"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xh1-Gn-vIk">
......
iCemarose/Class/UI/ShopCart/ShopCart.storyboard
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" 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="13173"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="PingFang.ttc">
<string>PingFangSC-Medium</string>
<string>PingFangSC-Regular</string>
</array>
</customFonts>
<scenes>
<!--购物车-->
<scene sceneID="fMY-82-VLB">
......@@ -57,7 +63,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="1"/>
<color key="backgroundColor" red="0.85882352941176465" green="0.85882352941176465" blue="0.85882352941176465" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="H9c-wb-fg2"/>
<constraint firstAttribute="height" constant="0.5" id="H9c-wb-fg2"/>
</constraints>
</view>
</subviews>
......@@ -116,9 +122,9 @@
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k8A-rc-sdg" userLabel="vLine">
<rect key="frame" x="0.0" y="20" width="375" height="1"/>
<color key="backgroundColor" red="0.82338023559999995" green="0.82338023559999995" blue="0.82338023559999995" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.82745098039215681" green="0.83921568627450982" blue="0.85098039215686272" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="8jv-63-tLu"/>
<constraint firstAttribute="height" constant="0.5" id="8jv-63-tLu"/>
</constraints>
</view>
</subviews>
......@@ -1111,7 +1117,7 @@
<rect key="frame" x="34" y="44" width="341" height="1"/>
<color key="backgroundColor" red="0.84705882349999995" green="0.85882352939999995" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Obc-IN-AaS"/>
<constraint firstAttribute="height" constant="0.5" id="Obc-IN-AaS"/>
</constraints>
</view>
</subviews>
......@@ -1149,7 +1155,7 @@
<rect key="frame" x="34" y="44" width="341" height="1"/>
<color key="backgroundColor" red="0.84705882352941175" green="0.85882352941176465" blue="0.87058823529411766" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="OJ9-V0-HEb"/>
<constraint firstAttribute="height" constant="0.5" id="OJ9-V0-HEb"/>
</constraints>
</view>
</subviews>
......@@ -1185,7 +1191,7 @@
<rect key="frame" x="34" y="44" width="341" height="1"/>
<color key="backgroundColor" red="0.84705882349999995" green="0.85882352939999995" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="JcO-gJ-lg6"/>
<constraint firstAttribute="height" constant="0.5" id="JcO-gJ-lg6"/>
</constraints>
</view>
</subviews>
......@@ -1222,7 +1228,7 @@
<rect key="frame" x="34" y="44" width="341" height="1"/>
<color key="backgroundColor" red="0.84705882349999995" green="0.85882352939999995" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Xhg-8c-TTH"/>
<constraint firstAttribute="height" constant="0.5" id="Xhg-8c-TTH"/>
</constraints>
</view>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="line" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="E4Y-O9-BjA" customClass="KWMTextFieldUtil">
......@@ -1259,7 +1265,7 @@
<rect key="frame" x="83" y="44" width="292" height="1"/>
<color key="backgroundColor" red="0.84705882349999995" green="0.85882352939999995" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="w26-gp-mS1"/>
<constraint firstAttribute="height" constant="0.5" id="w26-gp-mS1"/>
</constraints>
</view>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="line" placeholder="补充详细地址，如几号楼几单元" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Ad4-zz-DYh" customClass="KWMTextFieldUtil">
......@@ -1296,7 +1302,7 @@
<rect key="frame" x="34" y="44" width="341" height="1"/>
<color key="backgroundColor" red="0.84705882349999995" green="0.85882352939999995" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Km1-3W-vyS"/>
<constraint firstAttribute="height" constant="0.5" id="Km1-3W-vyS"/>
</constraints>
</view>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="line" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Wg1-Ef-7g2" customClass="KWMTextFieldUtil">
......@@ -1338,7 +1344,7 @@
<rect key="frame" x="34" y="44" width="341" height="1"/>
<color key="backgroundColor" red="0.84705882349999995" green="0.85882352939999995" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="7MD-g2-L1F"/>
<constraint firstAttribute="height" constant="0.5" id="7MD-g2-L1F"/>
</constraints>
</view>
</subviews>
......@@ -1380,7 +1386,7 @@
<rect key="frame" x="34" y="44" width="341" height="1"/>
<color key="backgroundColor" red="0.84705882349999995" green="0.85882352939999995" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="sxe-u2-PYh"/>
<constraint firstAttribute="height" constant="0.5" id="sxe-u2-PYh"/>
</constraints>
</view>
</subviews>
......@@ -1408,7 +1414,7 @@
<rect key="frame" x="0.0" y="20" width="375" height="1"/>
<color key="backgroundColor" red="0.84705882349999995" green="0.85882352939999995" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="tGv-vO-sfb"/>
<constraint firstAttribute="height" constant="0.5" id="tGv-vO-sfb"/>
</constraints>
</view>
</subviews>
......
iCemarose/Class/View/FilterView/KWMNormalFilterTab.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.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.XIB" version="3.0" toolsVersion="13196" 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="12120"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13196"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
......@@ -45,9 +45,9 @@
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UTV-01-O0q">
<rect key="frame" x="0.0" y="29" width="375" height="1"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<color key="backgroundColor" red="0.84705882352941175" green="0.85882352941176465" blue="0.87058823529411766" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="hcy-0b-OH8"/>
<constraint firstAttribute="height" constant="0.5" id="hcy-0b-OH8"/>
</constraints>
</view>
</subviews>
......
iCemarose/Class/View/KWMProductSameBrandView.xib
......@@ -28,9 +28,9 @@
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vRx-YQ-XJY" userLabel="vLine">
<rect key="frame" x="50" y="29" width="275" height="1"/>
<color key="backgroundColor" red="0.84705882352941175" green="0.85882352941176465" blue="0.87058823529411766" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.31764705882352939" green="0.31764705882352939" blue="0.31764705882352939" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="pCT-z7-EiF"/>
<constraint firstAttribute="height" constant="0.5" id="pCT-z7-EiF"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Bjg-FM-5CZ">
......
iCemarose/Class/View/KWMTBVSectionHeardView.m
......@@ -42,7 +42,7 @@
[[NSBundle mainBundle] loadNibNamed:@"KWMTBVSectionHeardView" owner:self options:nil];
[self addSubview:self.vContent];
self.vContent.frame = CGRectMake(0, 0, self.frame.size.width, self.frame.size.height);
self.vLine.backgroundColor = [UIColor colorWithRed:241.0/255 green:242.0/255 blue:243.0/255 alpha:1];
// self.vLine.backgroundColor = [UIColor colorWithRed:241.0/255 green:242.0/255 blue:243.0/255 alpha:1];
UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onClickWacthMore:)];
self.ivMore.userInteractionEnabled = YES;
[self.ivMore addGestureRecognizer:tapGesture];
......
iCemarose/Class/View/KWMTBVSectionHeardView.xib
......@@ -29,9 +29,9 @@
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aAy-jd-lsA" userLabel="vLine">
<rect key="frame" x="50" y="14.5" width="275" height="1"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<color key="backgroundColor" red="0.31764705882352939" green="0.31764705882352939" blue="0.31764705882352939" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="ue9-CP-Ub2"/>
<constraint firstAttribute="height" constant="0.5" id="ue9-CP-Ub2"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016秋季新品" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wdX-Ml-DYY">
......@@ -42,7 +42,7 @@
<constraint firstAttribute="height" constant="20" id="SNN-ZY-07K"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="14"/>
<color key="textColor" red="0.25863381410256414" green="0.25863381410256414" blue="0.25863381410256414" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
<variation key="default">
<mask key="constraints">
......
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