Skip to content

I
ios1x
Commit ea74566e by houweibin
Options

fix ui

parent c3f046f7
Showing with 18 additions and 12 deletions
iCemarose/Class/UI/Category/KWMCategoryVC.m
......@@ -134,6 +134,7 @@
}
-(void)initTbvLeft{
self.cvRightProduct.mj_footer.hidden = YES;
self.automaticallyAdjustsScrollViewInsets = NO;
[self.tbvLeftCategory registerNib:[UINib nibWithNibName:NSStringFromClass([KWMLeftCategoryCell class]) bundle:nil] forCellReuseIdentifier:NSStringFromClass([KWMLeftCategoryCell class])];
}
......@@ -298,6 +299,7 @@
[tags addObject:cmodel.brand];
}
[self.client getProductsPage:cpage inCollection:cmodel.collection_id withTags:tags sortOrder:cmodel.sort completion:^(NSArray *products,NSUInteger page, BOOL reachedEnd, NSError *error){
weakSelf.cvRightProduct.mj_footer.hidden = reachedEnd;
if (cmodel == self.selectedCategory) {
[weakSelf.refreshUtil hideLoading];
}
......
iCemarose/Class/UI/NewHome/Cell/KWMClothingSetsCell.xib
......@@ -53,13 +53,13 @@
<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="83.5" width="31" height="13"/>
<rect key="frame" x="18" y="82.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="98.5" width="31" height="13"/>
<rect key="frame" x="18" y="96.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"/>
......@@ -68,14 +68,14 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<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="2" id="MS6-LF-xHw"/>
<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="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"/>
<constraint firstAttribute="trailing" secondItem="9za-nW-9Xw" secondAttribute="trailing" id="lNG-tE-Czx"/>
<constraint firstItem="yLu-gy-qUp" firstAttribute="leading" secondItem="HJW-BD-Yxt" secondAttribute="leading" id="qrw-fg-pgo"/>
<constraint firstItem="ETG-Ir-uXq" firstAttribute="top" secondItem="yLu-gy-qUp" secondAttribute="bottom" constant="2" id="r1H-oy-KBr"/>
<constraint firstItem="ETG-Ir-uXq" firstAttribute="top" secondItem="yLu-gy-qUp" secondAttribute="bottom" constant="1" id="r1H-oy-KBr"/>
<constraint firstItem="9za-nW-9Xw" firstAttribute="top" secondItem="HJW-BD-Yxt" secondAttribute="top" id="r31-zi-pm2"/>
</constraints>
</view>
......
iCemarose/Class/UI/NewHome/Cell/KWMClothingSetsHeader.m
......@@ -9,6 +9,7 @@
#import "KWMClothingSetsHeader.h"
#import "KWMClothingSetsCell.h"
#import "UIImageView+WebCache.h"
#import "UIView+Prettify.h"
@interface KWMClothingSetsHeader()
......@@ -63,6 +64,8 @@
self.cvSets.delegate = self;
self.cvSets.dataSource = self;
[self setShadow:CGSizeMake(0,2) shadowRadius:4 shadowOpacity:0.1 shadowColor:[UIColor blackColor]];
[self.cvSets registerNib:[UINib nibWithNibName:NSStringFromClass([KWMClothingSetsCell class]) bundle:nil] forCellWithReuseIdentifier:NSStringFromClass([KWMClothingSetsCell class])];
UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc]init];
......
iCemarose/Class/UI/NewHome/Cell/KWMClothingSetsHeader.xib
......@@ -18,7 +18,7 @@
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="375" height="310"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="317"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nBP-0Q-eKB" userLabel="推荐搭配title view">
......@@ -47,10 +47,10 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d3i-H3-n3M" userLabel="推荐搭配view">
<rect key="frame" x="0.0" y="200" width="375" height="110"/>
<rect key="frame" x="0.0" y="200" width="375" height="117"/>
<subviews>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="Vrm-Ee-B8d">
<rect key="frame" x="0.0" y="0.0" width="375" height="110"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="117"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="yJj-6q-jus">
<size key="itemSize" width="50" height="50"/>
......@@ -64,7 +64,7 @@
<constraints>
<constraint firstAttribute="trailing" secondItem="Vrm-Ee-B8d" secondAttribute="trailing" id="4Ee-9q-Qw4"/>
<constraint firstItem="Vrm-Ee-B8d" firstAttribute="leading" secondItem="d3i-H3-n3M" secondAttribute="leading" id="QHG-5e-T4g"/>
<constraint firstAttribute="height" constant="110" id="ape-VU-LEB"/>
<constraint firstAttribute="height" constant="117" id="ape-VU-LEB"/>
<constraint firstItem="Vrm-Ee-B8d" firstAttribute="top" secondItem="d3i-H3-n3M" secondAttribute="top" id="sK4-AC-qhp"/>
<constraint firstAttribute="bottom" secondItem="Vrm-Ee-B8d" secondAttribute="bottom" id="wyf-yo-UKD"/>
</constraints>
......@@ -85,7 +85,7 @@
</view>
</objects>
<resources>
<image name="ic_triangle" width="16" height="16"/>
<image name="ic_triangle" width="21" height="11"/>
<image name="test_suit" width="375" height="212"/>
</resources>
</document>
iCemarose/Class/UI/NewHome/KWMNewHomeVC.m
......@@ -104,7 +104,7 @@ typedef enum{
self.adHeader = [[KWMAdHeader alloc]initWithFrame:CGRectMake(0, 0, UI_SCREEN_WIDTH, 275)];
self.menuHeader = [[KWMMenuHeader alloc]initWithFrame:CGRectMake(0, 0, UI_SCREEN_WIDTH, 100)];
self.recommendHeader = [[KWMRecommendHeader alloc]initWithFrame:CGRectMake(0, 0, UI_SCREEN_WIDTH, 230)];
self.clothingSetsHeader = [[KWMClothingSetsHeader alloc]initWithFrame:CGRectMake(0, 0, UI_SCREEN_WIDTH, 310)];
self.clothingSetsHeader = [[KWMClothingSetsHeader alloc]initWithFrame:CGRectMake(0, 0, UI_SCREEN_WIDTH, 317)];
self.hotSalesHeader = [[KWMHotSalesHeader alloc]initWithFrame:CGRectMake(0, 0, UI_SCREEN_WIDTH, 250)];
self.adHeader.delegate = self;
......@@ -266,7 +266,7 @@ typedef enum{
height = 230;
break;
case HeaderClothingSets:
height = 310;
height = 317;
break;
case HeaderHotSales:
height = self.hotSalesHeader.actrualHeight;
......
iCemarose/Class/UI/NewProduct/KWMVariantsVC.m
......@@ -162,7 +162,8 @@
//初始化佈局高度
-(void)initContentHeight{
CGFloat height = self.cvVariants.collectionViewLayout.collectionViewContentSize.height;
self.vContentHeight.constant = height + 173;
CGFloat contentHeigt = fminf(UI_SCREEN_HEITHT*0.9,height+173);
self.vContentHeight.constant = contentHeigt;
[self.view layoutIfNeeded];
}
......
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