Skip to content

I
ios1x
Commit 40c76005 by houweibin
Options

small fix

parent 7557dc54
master
No related merge requests found
Showing with 15 additions and 9 deletions
iCemarose.xcodeproj/project.pbxproj
...@@ -217,7 +217,6 @@ ...@@ -217,7 +217,6 @@
C04834341F1325A000A5BFB4 /* KWMClothingSetsHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = C04834331F1325A000A5BFB4 /* KWMClothingSetsHeader.m */; }; C04834341F1325A000A5BFB4 /* KWMClothingSetsHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = C04834331F1325A000A5BFB4 /* KWMClothingSetsHeader.m */; };
C04834371F1325CB00A5BFB4 /* KWMHotSalesHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = C04834361F1325CB00A5BFB4 /* KWMHotSalesHeader.m */; }; C04834371F1325CB00A5BFB4 /* KWMHotSalesHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = C04834361F1325CB00A5BFB4 /* KWMHotSalesHeader.m */; };
C048343B1F13274300A5BFB4 /* KWMNewHomeVC.m in Sources */ = {isa = PBXBuildFile; fileRef = C04834391F13274300A5BFB4 /* KWMNewHomeVC.m */; }; C048343B1F13274300A5BFB4 /* KWMNewHomeVC.m in Sources */ = {isa = PBXBuildFile; fileRef = C04834391F13274300A5BFB4 /* KWMNewHomeVC.m */; };
C048343C1F13274300A5BFB4 /* KWMNewHomeVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = C048343A1F13274300A5BFB4 /* KWMNewHomeVC.xib */; };
C048343E1F13288F00A5BFB4 /* KWMMenuHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = C048343D1F13288F00A5BFB4 /* KWMMenuHeader.xib */; }; C048343E1F13288F00A5BFB4 /* KWMMenuHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = C048343D1F13288F00A5BFB4 /* KWMMenuHeader.xib */; };
C04834411F13350F00A5BFB4 /* KWMRecommendHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = C04834401F13350F00A5BFB4 /* KWMRecommendHeader.m */; }; C04834411F13350F00A5BFB4 /* KWMRecommendHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = C04834401F13350F00A5BFB4 /* KWMRecommendHeader.m */; };
C04834451F1337A800A5BFB4 /* KWMNewHomeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C04834431F1337A800A5BFB4 /* KWMNewHomeCell.m */; }; C04834451F1337A800A5BFB4 /* KWMNewHomeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C04834431F1337A800A5BFB4 /* KWMNewHomeCell.m */; };
...@@ -749,7 +748,6 @@ ...@@ -749,7 +748,6 @@
C04834361F1325CB00A5BFB4 /* KWMHotSalesHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMHotSalesHeader.m; sourceTree = "<group>"; }; C04834361F1325CB00A5BFB4 /* KWMHotSalesHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMHotSalesHeader.m; sourceTree = "<group>"; };
C04834381F13274300A5BFB4 /* KWMNewHomeVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMNewHomeVC.h; sourceTree = "<group>"; }; C04834381F13274300A5BFB4 /* KWMNewHomeVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMNewHomeVC.h; sourceTree = "<group>"; };
C04834391F13274300A5BFB4 /* KWMNewHomeVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMNewHomeVC.m; sourceTree = "<group>"; }; C04834391F13274300A5BFB4 /* KWMNewHomeVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMNewHomeVC.m; sourceTree = "<group>"; };
C048343A1F13274300A5BFB4 /* KWMNewHomeVC.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KWMNewHomeVC.xib; sourceTree = "<group>"; };
C048343D1F13288F00A5BFB4 /* KWMMenuHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KWMMenuHeader.xib; sourceTree = "<group>"; }; C048343D1F13288F00A5BFB4 /* KWMMenuHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KWMMenuHeader.xib; sourceTree = "<group>"; };
C048343F1F13350F00A5BFB4 /* KWMRecommendHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMRecommendHeader.h; sourceTree = "<group>"; }; C048343F1F13350F00A5BFB4 /* KWMRecommendHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMRecommendHeader.h; sourceTree = "<group>"; };
C04834401F13350F00A5BFB4 /* KWMRecommendHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMRecommendHeader.m; sourceTree = "<group>"; }; C04834401F13350F00A5BFB4 /* KWMRecommendHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMRecommendHeader.m; sourceTree = "<group>"; };
...@@ -1921,7 +1919,6 @@ ...@@ -1921,7 +1919,6 @@
C04834251F13242600A5BFB4 /* Cell */, C04834251F13242600A5BFB4 /* Cell */,
C04834381F13274300A5BFB4 /* KWMNewHomeVC.h */, C04834381F13274300A5BFB4 /* KWMNewHomeVC.h */,
C04834391F13274300A5BFB4 /* KWMNewHomeVC.m */, C04834391F13274300A5BFB4 /* KWMNewHomeVC.m */,
C048343A1F13274300A5BFB4 /* KWMNewHomeVC.xib */,
); );
path = NewHome; path = NewHome;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -2351,7 +2348,6 @@ ...@@ -2351,7 +2348,6 @@
C0DD53381EE55190002D1E0C /* KWMLoadingView.xib in Resources */, C0DD53381EE55190002D1E0C /* KWMLoadingView.xib in Resources */,
C0F586811E24F820001248E2 /* KWMNewTypeView.xib in Resources */, C0F586811E24F820001248E2 /* KWMNewTypeView.xib in Resources */,
C0AF039F1DD5C8EE0060623F /* KWMNeedAddressView.xib in Resources */, C0AF039F1DD5C8EE0060623F /* KWMNeedAddressView.xib in Resources */,
C048343C1F13274300A5BFB4 /* KWMNewHomeVC.xib in Resources */,
C084F4541D6D8CA700A0625D /* KWMBlogCell.xib in Resources */, C084F4541D6D8CA700A0625D /* KWMBlogCell.xib in Resources */,
C05910951E34A729002990B3 /* KWMNewGiftCardCell.xib in Resources */, C05910951E34A729002990B3 /* KWMNewGiftCardCell.xib in Resources */,
C0CC14091D7823B0007B5986 /* KWMSizeCell.xib in Resources */, C0CC14091D7823B0007B5986 /* KWMSizeCell.xib in Resources */,
......
iCemarose/Base.lproj/Main.storyboard
...@@ -1205,8 +1205,15 @@ ...@@ -1205,8 +1205,15 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5Zn-TL-hsD" userLabel="line">
<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"/>
</constraints>
</view>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="T1z-z9-rlz"> <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="T1z-z9-rlz">
<rect key="frame" x="0.0" y="88" width="375" height="530"/> <rect key="frame" x="0.0" y="65" width="375" height="553"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="BcI-5v-hSE"> <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="BcI-5v-hSE">
<size key="itemSize" width="50" height="50"/> <size key="itemSize" width="50" height="50"/>
...@@ -1233,9 +1240,12 @@ ...@@ -1233,9 +1240,12 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints> <constraints>
<constraint firstAttribute="trailing" secondItem="T1z-z9-rlz" secondAttribute="trailing" id="0wc-Yi-qru"/> <constraint firstAttribute="trailing" secondItem="T1z-z9-rlz" secondAttribute="trailing" id="0wc-Yi-qru"/>
<constraint firstItem="5Zn-TL-hsD" firstAttribute="leading" secondItem="fiQ-A6-I4g" secondAttribute="leading" id="86E-BK-xd4"/>
<constraint firstItem="T1z-z9-rlz" firstAttribute="top" secondItem="5Zn-TL-hsD" secondAttribute="bottom" id="XFv-24-3oU"/>
<constraint firstAttribute="trailing" secondItem="5Zn-TL-hsD" secondAttribute="trailing" id="aqn-cz-fe4"/>
<constraint firstItem="7nS-iD-8eZ" firstAttribute="top" secondItem="T1z-z9-rlz" secondAttribute="bottom" id="e8Y-7q-Dxx"/> <constraint firstItem="7nS-iD-8eZ" firstAttribute="top" secondItem="T1z-z9-rlz" secondAttribute="bottom" id="e8Y-7q-Dxx"/>
<constraint firstItem="T1z-z9-rlz" firstAttribute="leading" secondItem="fiQ-A6-I4g" secondAttribute="leading" id="u26-Oo-qx3"/> <constraint firstItem="T1z-z9-rlz" firstAttribute="leading" secondItem="fiQ-A6-I4g" secondAttribute="leading" id="u26-Oo-qx3"/>
<constraint firstItem="T1z-z9-rlz" firstAttribute="top" secondItem="Iv3-Qt-qCa" secondAttribute="bottom" constant="24" id="w7n-oP-oiG"/> <constraint firstItem="5Zn-TL-hsD" firstAttribute="top" secondItem="fiQ-A6-I4g" secondAttribute="top" constant="64" id="yA0-oD-5oB"/>
</constraints> </constraints>
</view> </view>
<navigationItem key="navigationItem" id="xTg-gj-jEd"/> <navigationItem key="navigationItem" id="xTg-gj-jEd"/>
......
iCemarose/Class/UI/NewHome/Cell/KWMNewHomeCell.m
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
self.lbPrice.textAlignment = textAlignment; self.lbPrice.textAlignment = textAlignment;
self.lbName.numberOfLines = 1; self.lbName.numberOfLines = 1;
self.lbBrand.numberOfLines = 1; self.lbBrand.numberOfLines = 1;
self.precentOfProductImageView = [self.precentOfProductImageView updateMultiplier:0.7]; // self.precentOfProductImageView = [self.precentOfProductImageView updateMultiplier:1];
self.vImageContentView.backgroundColor = [UIColor sam_colorWithHex:@"E7D1BC"]; // self.vImageContentView.backgroundColor = [UIColor sam_colorWithHex:@"F1929A"];
} }
} }
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
self.lbPrice.text = [KWMStringUtil price:variant.price]; self.lbPrice.text = [KWMStringUtil price:variant.price];
} }
} }
} }
+(NSInteger)acturlHeight:(BUYProduct *)product width:(NSInteger)width{ +(NSInteger)acturlHeight:(BUYProduct *)product width:(NSInteger)width{
......
iCemarose/Class/View/KWMBannerView.m
...@@ -85,6 +85,7 @@ ...@@ -85,6 +85,7 @@
} }
if(self.foregroundView && self.foregroundView.tag == 1002){ if(self.foregroundView && self.foregroundView.tag == 1002){
KWMPageControl *pageControl = (KWMPageControl *)self.foregroundView; KWMPageControl *pageControl = (KWMPageControl *)self.foregroundView;
pageControl.numberOfPages = [self numberOfItemsInCarousel:carousel];
//pageControl圆点右对齐 //pageControl圆点右对齐
NSInteger count = self.delegate?[self.delegate numberOfPagesForBanner:self]:0; NSInteger count = self.delegate?[self.delegate numberOfPagesForBanner:self]:0;
CGSize pageControlSize = [pageControl sizeForNumberOfPages:count]; CGSize pageControlSize = [pageControl sizeForNumberOfPages:count];
......
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