Skip to content

I
ios1x
Commit 3030a13a by houweibin
Options

1，删去旧筛选view

parent fb2ff498
Showing with 14 additions and 521 deletions
iCemarose.xcodeproj/project.pbxproj
...@@ -242,8 +242,6 @@ ...@@ -242,8 +242,6 @@
C0F586791E24F820001248E2 /* KWMDetailCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0F5864B1E24F820001248E2 /* KWMDetailCell.xib */; }; C0F586791E24F820001248E2 /* KWMDetailCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0F5864B1E24F820001248E2 /* KWMDetailCell.xib */; };
C0F5867A1E24F820001248E2 /* KWMDoubleTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = C0F5864D1E24F820001248E2 /* KWMDoubleTitleView.m */; }; C0F5867A1E24F820001248E2 /* KWMDoubleTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = C0F5864D1E24F820001248E2 /* KWMDoubleTitleView.m */; };
C0F5867B1E24F820001248E2 /* KWMDoubleTitleView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0F5864E1E24F820001248E2 /* KWMDoubleTitleView.xib */; }; C0F5867B1E24F820001248E2 /* KWMDoubleTitleView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0F5864E1E24F820001248E2 /* KWMDoubleTitleView.xib */; };
C0F5867C1E24F820001248E2 /* KWMFilterView.m in Sources */ = {isa = PBXBuildFile; fileRef = C0F586501E24F820001248E2 /* KWMFilterView.m */; };
C0F5867D1E24F820001248E2 /* KWMFilterView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0F586511E24F820001248E2 /* KWMFilterView.xib */; };
C0F5867E1E24F820001248E2 /* KWMNewGoodsCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C0F586531E24F820001248E2 /* KWMNewGoodsCell.m */; }; C0F5867E1E24F820001248E2 /* KWMNewGoodsCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C0F586531E24F820001248E2 /* KWMNewGoodsCell.m */; };
C0F5867F1E24F820001248E2 /* KWMNewGoodsCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0F586541E24F820001248E2 /* KWMNewGoodsCell.xib */; }; C0F5867F1E24F820001248E2 /* KWMNewGoodsCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0F586541E24F820001248E2 /* KWMNewGoodsCell.xib */; };
C0F586801E24F820001248E2 /* KWMNewTypeView.m in Sources */ = {isa = PBXBuildFile; fileRef = C0F586561E24F820001248E2 /* KWMNewTypeView.m */; }; C0F586801E24F820001248E2 /* KWMNewTypeView.m in Sources */ = {isa = PBXBuildFile; fileRef = C0F586561E24F820001248E2 /* KWMNewTypeView.m */; };
...@@ -706,9 +704,6 @@ ...@@ -706,9 +704,6 @@
C0F5864C1E24F820001248E2 /* KWMDoubleTitleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMDoubleTitleView.h; sourceTree = "<group>"; }; C0F5864C1E24F820001248E2 /* KWMDoubleTitleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMDoubleTitleView.h; sourceTree = "<group>"; };
C0F5864D1E24F820001248E2 /* KWMDoubleTitleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMDoubleTitleView.m; sourceTree = "<group>"; }; C0F5864D1E24F820001248E2 /* KWMDoubleTitleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMDoubleTitleView.m; sourceTree = "<group>"; };
C0F5864E1E24F820001248E2 /* KWMDoubleTitleView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KWMDoubleTitleView.xib; sourceTree = "<group>"; }; C0F5864E1E24F820001248E2 /* KWMDoubleTitleView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KWMDoubleTitleView.xib; sourceTree = "<group>"; };
C0F5864F1E24F820001248E2 /* KWMFilterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMFilterView.h; sourceTree = "<group>"; };
C0F586501E24F820001248E2 /* KWMFilterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMFilterView.m; sourceTree = "<group>"; };
C0F586511E24F820001248E2 /* KWMFilterView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KWMFilterView.xib; sourceTree = "<group>"; };
C0F586521E24F820001248E2 /* KWMNewGoodsCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMNewGoodsCell.h; sourceTree = "<group>"; }; C0F586521E24F820001248E2 /* KWMNewGoodsCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMNewGoodsCell.h; sourceTree = "<group>"; };
C0F586531E24F820001248E2 /* KWMNewGoodsCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMNewGoodsCell.m; sourceTree = "<group>"; }; C0F586531E24F820001248E2 /* KWMNewGoodsCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMNewGoodsCell.m; sourceTree = "<group>"; };
C0F586541E24F820001248E2 /* KWMNewGoodsCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KWMNewGoodsCell.xib; sourceTree = "<group>"; }; C0F586541E24F820001248E2 /* KWMNewGoodsCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KWMNewGoodsCell.xib; sourceTree = "<group>"; };
...@@ -1134,6 +1129,7 @@ ...@@ -1134,6 +1129,7 @@
C034E6C51D6AECF9006EE129 /* View */ = { C034E6C51D6AECF9006EE129 /* View */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
C0CCB3B51EEA520C00BC2FB8 /* FilterView */,
C0DD53251EE55190002D1E0C /* Cell */, C0DD53251EE55190002D1E0C /* Cell */,
C0DD53261EE55190002D1E0C /* Loading */, C0DD53261EE55190002D1E0C /* Loading */,
C034E7C31D6B10A0006EE129 /* CorePhotoBroswer */, C034E7C31D6B10A0006EE129 /* CorePhotoBroswer */,
...@@ -1646,6 +1642,13 @@ ...@@ -1646,6 +1642,13 @@
path = Cell; path = Cell;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
C0CCB3B51EEA520C00BC2FB8 /* FilterView */ = {
isa = PBXGroup;
children = (
);
path = FilterView;
sourceTree = "<group>";
};
C0DD53251EE55190002D1E0C /* Cell */ = { C0DD53251EE55190002D1E0C /* Cell */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -1719,9 +1722,6 @@ ...@@ -1719,9 +1722,6 @@
C0F5864C1E24F820001248E2 /* KWMDoubleTitleView.h */, C0F5864C1E24F820001248E2 /* KWMDoubleTitleView.h */,
C0F5864D1E24F820001248E2 /* KWMDoubleTitleView.m */, C0F5864D1E24F820001248E2 /* KWMDoubleTitleView.m */,
C0F5864E1E24F820001248E2 /* KWMDoubleTitleView.xib */, C0F5864E1E24F820001248E2 /* KWMDoubleTitleView.xib */,
C0F5864F1E24F820001248E2 /* KWMFilterView.h */,
C0F586501E24F820001248E2 /* KWMFilterView.m */,
C0F586511E24F820001248E2 /* KWMFilterView.xib */,
C0F586521E24F820001248E2 /* KWMNewGoodsCell.h */, C0F586521E24F820001248E2 /* KWMNewGoodsCell.h */,
C0F586531E24F820001248E2 /* KWMNewGoodsCell.m */, C0F586531E24F820001248E2 /* KWMNewGoodsCell.m */,
C0F586541E24F820001248E2 /* KWMNewGoodsCell.xib */, C0F586541E24F820001248E2 /* KWMNewGoodsCell.xib */,
...@@ -1865,7 +1865,7 @@ ...@@ -1865,7 +1865,7 @@
TargetAttributes = { TargetAttributes = {
C034E6891D6AEB12006EE129 = { C034E6891D6AEB12006EE129 = {
CreatedOnToolsVersion = 7.3.1; CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = 72Z44QQ9ZD; DevelopmentTeam = 6HFG5LS2Y2;
ProvisioningStyle = Manual; ProvisioningStyle = Manual;
}; };
C034E6A21D6AEB13006EE129 = { C034E6A21D6AEB13006EE129 = {
...@@ -1911,7 +1911,6 @@ ...@@ -1911,7 +1911,6 @@
801230F31DD30704008C7904 /* KWMSearchBrandsCell.xib in Resources */, 801230F31DD30704008C7904 /* KWMSearchBrandsCell.xib in Resources */,
C084F4591D6D976F00A0625D /* KWMSearchBar.xib in Resources */, C084F4591D6D976F00A0625D /* KWMSearchBar.xib in Resources */,
C0DD53381EE55190002D1E0C /* KWMLoadingView.xib in Resources */, C0DD53381EE55190002D1E0C /* KWMLoadingView.xib in Resources */,
C0F5867D1E24F820001248E2 /* KWMFilterView.xib in Resources */,
C0F586811E24F820001248E2 /* KWMNewTypeView.xib in Resources */, C0F586811E24F820001248E2 /* KWMNewTypeView.xib in Resources */,
C0AF039F1DD5C8EE0060623F /* KWMNeedAddressView.xib in Resources */, C0AF039F1DD5C8EE0060623F /* KWMNeedAddressView.xib in Resources */,
C084F4541D6D8CA700A0625D /* KWMBlogCell.xib in Resources */, C084F4541D6D8CA700A0625D /* KWMBlogCell.xib in Resources */,
...@@ -2161,7 +2160,6 @@ ...@@ -2161,7 +2160,6 @@
80ED0A491D93B82F00B28DF2 /* KWMShopCartItem+CoreDataProperties.m in Sources */, 80ED0A491D93B82F00B28DF2 /* KWMShopCartItem+CoreDataProperties.m in Sources */,
80537ADB1D86A7E100AB5122 /* KWMUserModel.m in Sources */, 80537ADB1D86A7E100AB5122 /* KWMUserModel.m in Sources */,
C034E84E1D6B10A0006EE129 /* UIImage+Water.m in Sources */, C034E84E1D6B10A0006EE129 /* UIImage+Water.m in Sources */,
C0F5867C1E24F820001248E2 /* KWMFilterView.m in Sources */,
C034E86B1D6B10A0006EE129 /* EGORefreshTableHeaderView.m in Sources */, C034E86B1D6B10A0006EE129 /* EGORefreshTableHeaderView.m in Sources */,
C0DD53191EE54C5F002D1E0C /* KWMSearchFeedBackView.m in Sources */, C0DD53191EE54C5F002D1E0C /* KWMSearchFeedBackView.m in Sources */,
C03A05061E35DC5800BAA889 /* KWMNewGiftCardVC.m in Sources */, C03A05061E35DC5800BAA889 /* KWMNewGiftCardVC.m in Sources */,
......
iCemarose/Class/UI/Brand/Brand.storyboard
...@@ -116,63 +116,11 @@ ...@@ -116,63 +116,11 @@
<constraint firstItem="R23-SN-2Bb" firstAttribute="centerY" secondItem="evT-5t-rty" secondAttribute="centerY" id="w2g-0d-F8E"/> <constraint firstItem="R23-SN-2Bb" firstAttribute="centerY" secondItem="evT-5t-rty" secondAttribute="centerY" id="w2g-0d-F8E"/>
</constraints> </constraints>
</view> </view>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Li-5W-7f5" customClass="KWMFilterView">
<rect key="frame" x="0.0" y="65" width="375" height="602"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hDa-nl-Tlr" userLabel="v筛选(新)"> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hDa-nl-Tlr" userLabel="v筛选(新)">
<rect key="frame" x="0.0" y="64" width="375" height="0.0"/> <rect key="frame" x="0.0" y="64" width="375" height="0.0"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bgT-J7-XAe" userLabel="left">
<rect key="frame" x="0.0" y="0.0" width="187.5" height="0.0"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="筛选" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E2F-rc-MkG">
<rect key="frame" x="80" y="-10" width="28" height="20"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="14"/>
<color key="textColor" red="0.31764705882352939" green="0.31764705882352939" blue="0.31764705882352939" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints> <constraints>
<constraint firstItem="E2F-rc-MkG" firstAttribute="centerY" secondItem="bgT-J7-XAe" secondAttribute="centerY" id="V2N-bD-opb"/>
<constraint firstItem="E2F-rc-MkG" firstAttribute="centerX" secondItem="bgT-J7-XAe" secondAttribute="centerX" id="c2b-WH-FLs"/>
</constraints>
<connections>
<outletCollection property="gestureRecognizers" destination="9c4-MD-7Lg" appends="YES" id="INt-ba-DAG"/>
</connections>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="shz-Mj-x88" userLabel="right">
<rect key="frame" x="187.5" y="0.0" width="187.5" height="0.0"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="排序" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4kk-AI-Ue8">
<rect key="frame" x="79.5" y="-10" width="28" height="20"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="14"/>
<color key="textColor" red="0.31764705882352939" green="0.31764705882352939" blue="0.31764705882352939" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="4kk-AI-Ue8" firstAttribute="centerY" secondItem="shz-Mj-x88" secondAttribute="centerY" id="MM9-kD-8GO"/>
<constraint firstItem="4kk-AI-Ue8" firstAttribute="centerX" secondItem="shz-Mj-x88" secondAttribute="centerX" id="jPh-JB-ELN"/>
</constraints>
<connections>
<outletCollection property="gestureRecognizers" destination="ig2-Qj-7Vg" appends="YES" id="YNr-kb-ck2"/>
</connections>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="shz-Mj-x88" secondAttribute="bottom" id="BYB-Ci-Alg"/>
<constraint firstItem="shz-Mj-x88" firstAttribute="top" secondItem="hDa-nl-Tlr" secondAttribute="top" id="Boj-gZ-NbY"/>
<constraint firstItem="bgT-J7-XAe" firstAttribute="leading" secondItem="hDa-nl-Tlr" secondAttribute="leading" id="FSP-MV-SKt"/>
<constraint firstAttribute="height" id="HK4-OE-vEa"/> <constraint firstAttribute="height" id="HK4-OE-vEa"/>
<constraint firstItem="shz-Mj-x88" firstAttribute="leading" secondItem="bgT-J7-XAe" secondAttribute="trailing" id="N9h-61-PbB"/>
<constraint firstItem="shz-Mj-x88" firstAttribute="width" secondItem="bgT-J7-XAe" secondAttribute="width" id="Z7S-qy-Rbj"/>
<constraint firstItem="bgT-J7-XAe" firstAttribute="top" secondItem="hDa-nl-Tlr" secondAttribute="top" id="iAq-80-rQV"/>
<constraint firstAttribute="bottom" secondItem="bgT-J7-XAe" secondAttribute="bottom" id="lQE-Yt-tCr"/>
<constraint firstAttribute="trailing" secondItem="shz-Mj-x88" secondAttribute="trailing" id="oy5-jA-UW2"/>
</constraints> </constraints>
</view> </view>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Cy8-TS-7aW"> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Cy8-TS-7aW">
...@@ -188,11 +136,8 @@ ...@@ -188,11 +136,8 @@
<constraint firstItem="3n2-hH-xH7" firstAttribute="top" secondItem="hkC-I1-C67" secondAttribute="bottom" id="8n4-Ym-DBt"/> <constraint firstItem="3n2-hH-xH7" firstAttribute="top" secondItem="hkC-I1-C67" secondAttribute="bottom" id="8n4-Ym-DBt"/>
<constraint firstItem="IcS-3H-XUB" firstAttribute="leading" secondItem="zpX-41-Ngk" secondAttribute="leading" id="CIl-uD-o0w"/> <constraint firstItem="IcS-3H-XUB" firstAttribute="leading" secondItem="zpX-41-Ngk" secondAttribute="leading" id="CIl-uD-o0w"/>
<constraint firstAttribute="trailing" secondItem="IcS-3H-XUB" secondAttribute="trailing" id="Cv2-YS-e4D"/> <constraint firstAttribute="trailing" secondItem="IcS-3H-XUB" secondAttribute="trailing" id="Cv2-YS-e4D"/>
<constraint firstItem="3n2-hH-xH7" firstAttribute="top" secondItem="7Li-5W-7f5" secondAttribute="bottom" id="Dgc-Ob-D1N"/>
<constraint firstItem="hkC-I1-C67" firstAttribute="top" secondItem="gML-uH-K3J" secondAttribute="bottom" id="EOU-LB-816"/> <constraint firstItem="hkC-I1-C67" firstAttribute="top" secondItem="gML-uH-K3J" secondAttribute="bottom" id="EOU-LB-816"/>
<constraint firstAttribute="trailing" secondItem="7Li-5W-7f5" secondAttribute="trailing" id="Jgy-TO-X0t"/>
<constraint firstItem="hDa-nl-Tlr" firstAttribute="leading" secondItem="zpX-41-Ngk" secondAttribute="leading" id="NhL-d5-aXA"/> <constraint firstItem="hDa-nl-Tlr" firstAttribute="leading" secondItem="zpX-41-Ngk" secondAttribute="leading" id="NhL-d5-aXA"/>
<constraint firstItem="7Li-5W-7f5" firstAttribute="top" secondItem="zpX-41-Ngk" secondAttribute="top" constant="65" id="NqW-sc-tSL"/>
<constraint firstItem="evT-5t-rty" firstAttribute="leading" secondItem="zpX-41-Ngk" secondAttribute="leading" id="Og9-68-h35"/> <constraint firstItem="evT-5t-rty" firstAttribute="leading" secondItem="zpX-41-Ngk" secondAttribute="leading" id="Og9-68-h35"/>
<constraint firstItem="3n2-hH-xH7" firstAttribute="top" secondItem="Cy8-TS-7aW" secondAttribute="bottom" id="PIf-9Z-uEf"/> <constraint firstItem="3n2-hH-xH7" firstAttribute="top" secondItem="Cy8-TS-7aW" secondAttribute="bottom" id="PIf-9Z-uEf"/>
<constraint firstItem="IcS-3H-XUB" firstAttribute="top" secondItem="hDa-nl-Tlr" secondAttribute="bottom" constant="10" id="VMa-R5-OFW"/> <constraint firstItem="IcS-3H-XUB" firstAttribute="top" secondItem="hDa-nl-Tlr" secondAttribute="bottom" constant="10" id="VMa-R5-OFW"/>
...@@ -203,7 +148,6 @@ ...@@ -203,7 +148,6 @@
<constraint firstAttribute="trailing" secondItem="Cy8-TS-7aW" secondAttribute="trailing" id="iCF-U2-txU"/> <constraint firstAttribute="trailing" secondItem="Cy8-TS-7aW" secondAttribute="trailing" id="iCF-U2-txU"/>
<constraint firstItem="Cy8-TS-7aW" firstAttribute="top" secondItem="hDa-nl-Tlr" secondAttribute="bottom" id="kzM-OO-4XA"/> <constraint firstItem="Cy8-TS-7aW" firstAttribute="top" secondItem="hDa-nl-Tlr" secondAttribute="bottom" id="kzM-OO-4XA"/>
<constraint firstItem="3n2-hH-xH7" firstAttribute="top" secondItem="IcS-3H-XUB" secondAttribute="bottom" id="s35-CK-Hrw"/> <constraint firstItem="3n2-hH-xH7" firstAttribute="top" secondItem="IcS-3H-XUB" secondAttribute="bottom" id="s35-CK-Hrw"/>
<constraint firstItem="7Li-5W-7f5" firstAttribute="leading" secondItem="zpX-41-Ngk" secondAttribute="leading" id="tSH-fZ-Hx1"/>
<constraint firstItem="hkC-I1-C67" firstAttribute="leading" secondItem="zpX-41-Ngk" secondAttribute="leading" id="uWV-7g-3iq"/> <constraint firstItem="hkC-I1-C67" firstAttribute="leading" secondItem="zpX-41-Ngk" secondAttribute="leading" id="uWV-7g-3iq"/>
</constraints> </constraints>
</view> </view>
...@@ -211,7 +155,6 @@ ...@@ -211,7 +155,6 @@
<size key="freeformSize" width="375" height="667"/> <size key="freeformSize" width="375" height="667"/>
<connections> <connections>
<outlet property="btnBottom" destination="lgS-Wb-cuc" id="yWf-RS-4uY"/> <outlet property="btnBottom" destination="lgS-Wb-cuc" id="yWf-RS-4uY"/>
<outlet property="filterView" destination="7Li-5W-7f5" id="vlZ-hW-czm"/>
<outlet property="ivBrand" destination="bSu-Ww-ztC" id="i4m-wL-R2a"/> <outlet property="ivBrand" destination="bSu-Ww-ztC" id="i4m-wL-R2a"/>
<outlet property="tbvBrandCaramel" destination="IcS-3H-XUB" id="Op2-g8-Z4j"/> <outlet property="tbvBrandCaramel" destination="IcS-3H-XUB" id="Op2-g8-Z4j"/>
<outlet property="tvDescription" destination="09X-K0-Zki" id="rlf-aR-PPB"/> <outlet property="tvDescription" destination="09X-K0-Zki" id="rlf-aR-PPB"/>
...@@ -219,21 +162,10 @@ ...@@ -219,21 +162,10 @@
<outlet property="vBackgroudTop" destination="9ij-Of-WPP" id="FgA-b2-2oQ"/> <outlet property="vBackgroudTop" destination="9ij-Of-WPP" id="FgA-b2-2oQ"/>
<outlet property="vBackground" destination="RSg-ot-hh6" id="npW-oZ-LuL"/> <outlet property="vBackground" destination="RSg-ot-hh6" id="npW-oZ-LuL"/>
<outlet property="vBlurred" destination="hkC-I1-C67" id="TWz-Ts-ve0"/> <outlet property="vBlurred" destination="hkC-I1-C67" id="TWz-Ts-ve0"/>
<outlet property="vFilter" destination="Cy8-TS-7aW" id="mHF-Cf-CEw"/>
<outlet property="vNoneGoods" destination="evT-5t-rty" id="cte-zL-TVM"/> <outlet property="vNoneGoods" destination="evT-5t-rty" id="cte-zL-TVM"/>
</connections> </connections>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="ppo-c8-mZD" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="ppo-c8-mZD" userLabel="First Responder" sceneMemberID="firstResponder"/>
<tapGestureRecognizer id="9c4-MD-7Lg" userLabel="tap筛选">
<connections>
<action selector="onClickFilter:" destination="eiC-Xl-2es" id="MaL-V8-aet"/>
</connections>
</tapGestureRecognizer>
<tapGestureRecognizer id="ig2-Qj-7Vg" userLabel="tap排序">
<connections>
<action selector="onClickSort:" destination="eiC-Xl-2es" id="PXm-1n-9wt"/>
</connections>
</tapGestureRecognizer>
</objects> </objects>
<point key="canvasLocation" x="520.79999999999995" y="-353.07346326836586"/> <point key="canvasLocation" x="520.79999999999995" y="-353.07346326836586"/>
</scene> </scene>
......
iCemarose/Class/UI/Brand/KWMBrandCaramelVC.h
...@@ -10,10 +10,8 @@ ...@@ -10,10 +10,8 @@
#import "KWMBarandSelectView.h" #import "KWMBarandSelectView.h"
#import "Buy/Buy.h" #import "Buy/Buy.h"
#import "KWMNewGoodsModel.h" #import "KWMNewGoodsModel.h"
#import "KWMFilterView.h"
#import "KWMFilterVC.h"
@interface KWMBrandCaramelVC : KWMBasePageVC<KWMBarandSelectViewDelegate,KWMFilterDelegate,KWMFilterVCDelegate> @interface KWMBrandCaramelVC : KWMBasePageVC<KWMBarandSelectViewDelegate>
@property (weak, nonatomic) IBOutlet UITableView *tbvBrandCaramel; @property (weak, nonatomic) IBOutlet UITableView *tbvBrandCaramel;
@property (weak, nonatomic) IBOutlet UITextView *tvDescription; @property (weak, nonatomic) IBOutlet UITextView *tvDescription;
...@@ -25,12 +23,9 @@ ...@@ -25,12 +23,9 @@
@property (weak, nonatomic) IBOutlet UIView *vBlurred;//模糊背景 @property (weak, nonatomic) IBOutlet UIView *vBlurred;//模糊背景
@property (weak, nonatomic) IBOutlet UIView *vNoneGoods;//没有商品 @property (weak, nonatomic) IBOutlet UIView *vNoneGoods;//没有商品
@property (weak, nonatomic) IBOutlet UIView *vFilter;//筛选空间容器
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *vBackgroudTop; @property (weak, nonatomic) IBOutlet NSLayoutConstraint *vBackgroudTop;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *tvDescriptionTop; @property (weak, nonatomic) IBOutlet NSLayoutConstraint *tvDescriptionTop;
@property (weak, nonatomic) IBOutlet KWMFilterView *filterView;
@property (nonatomic) BOOL isLoading; @property (nonatomic) BOOL isLoading;
...@@ -48,8 +43,5 @@ ...@@ -48,8 +43,5 @@
- (IBAction)onClickBotomBtn:(id)sender; - (IBAction)onClickBotomBtn:(id)sender;
- (IBAction)onClickFilter:(id)sender;
- (IBAction)onClickSort:(id)sender;
@end @end
iCemarose/Class/UI/Brand/KWMBrandCaramelVC.m
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
[super viewDidLoad]; [super viewDidLoad];
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
self.collectionSort = BUYCollectionSortCreatedDescending; self.collectionSort = BUYCollectionSortCreatedDescending;
self.filterView.delegate = self;
self.automaticallyAdjustsScrollViewInsets = NO; self.automaticallyAdjustsScrollViewInsets = NO;
self.tvDescription.editable = NO; self.tvDescription.editable = NO;
mark = -1; mark = -1;
...@@ -77,17 +76,6 @@ ...@@ -77,17 +76,6 @@
if(self.goodModel){ if(self.goodModel){
[self initCacheData]; [self initCacheData];
} }
[self initFilterVC];
}
-(void)initFilterVC{
if(!filterVC){
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"New" bundle:nil];
filterVC = [storyboard instantiateViewControllerWithIdentifier:[KWMFilterVC kwmTag]];
[self addChildViewController:filterVC];
[self.vFilter addSubview:filterVC.view];
filterVC.delegate = self;
}
} }
-(void)initCacheData{ -(void)initCacheData{
...@@ -139,20 +127,6 @@ ...@@ -139,20 +127,6 @@
_barandSelectView.count = [[KWMShoppingCart sharedInstance] count].integerValue; _barandSelectView.count = [[KWMShoppingCart sharedInstance] count].integerValue;
_barandSelectView.lbBrand.text = [_brand uppercaseString]; _barandSelectView.lbBrand.text = [_brand uppercaseString];
rightButton =[UIButton buttonWithType:UIButtonTypeRoundedRect];
rightButton.frame = CGRectMake(UI_SCREEN_WIDTH-100, 33, 40, 20);
[rightButton addTarget:self action:@selector(clickRightButton) forControlEvents:UIControlEventTouchUpInside];
[rightButton setTitle:@"排序 +" forState:UIControlStateNormal];
[rightButton setTitleColor:[UIColor sam_colorWithHex:@"4E4E4E"] forState:UIControlStateNormal];
rightButton.titleLabel.font=[UIFont systemFontOfSize:11];
[rightButton.layer setMasksToBounds:YES];
rightButton.layer.cornerRadius = 1; //圆角（圆形）
rightButton.layer.borderColor = [UIColor sam_colorWithHex:@"4E4E4E"].CGColor; //要设置的颜色
rightButton.layer.borderWidth = 1; //要设置的描边宽
[self.barandSelectView addSubview:rightButton];
[self.view addSubview:_barandSelectView]; [self.view addSubview:_barandSelectView];
_barandSelectView.delegate = self; _barandSelectView.delegate = self;
} }
...@@ -194,26 +168,6 @@ static NSString *idStr = @"KWMBrandCaramelCell"; ...@@ -194,26 +168,6 @@ static NSString *idStr = @"KWMBrandCaramelCell";
isUp = !isUp; isUp = !isUp;
} }
-(void)onClickSort:(id)sender{
self.vFilter.hidden = NO;
[self initFilterVC];
if(filterVC){
[filterVC setBgImage:[KWMImageBlurUtil getBlurImage:self.tbvBrandCaramel]];
BOOL isSort = YES;
[filterVC setType:isSort];
}
}
-(void)onClickFilter:(id)sender{
self.vFilter.hidden = NO;
[self initFilterVC];
if(filterVC){
[filterVC setBgImage:[KWMImageBlurUtil getBlurImage:self.tbvBrandCaramel]];
BOOL isSort = YES;
[filterVC setType:!isSort];
}
}
//动画 筛选显示：0:不显示 1:显示 2:没有 //动画 筛选显示：0:不显示 1:显示 2:没有
- (void)changeFrameBy:(NSInteger)value WithImageName:(NSString *)imageStr AndShowView:(NSInteger)showNum{ - (void)changeFrameBy:(NSInteger)value WithImageName:(NSString *)imageStr AndShowView:(NSInteger)showNum{
...@@ -232,24 +186,6 @@ static NSString *idStr = @"KWMBrandCaramelCell"; ...@@ -232,24 +186,6 @@ static NSString *idStr = @"KWMBrandCaramelCell";
}]; }];
} }
-(void)clickRightButton{
if(self.isLoading){
return;
}
self.filterView.hidden = !self.filterView.hidden;
self.filterView.collectionSort = self.collectionSort;
if(self.filterView.hidden){
rightButton.titleLabel.text = @"排序 +";
[rightButton setTitle:@"排序 +" forState:UIControlStateNormal];
}else{
rightButton.titleLabel.text = @"排序 -";
[rightButton setTitle:@"排序 -" forState:UIControlStateNormal];
}
}
-(void)kwm_onCancelFilter{
self.vFilter.hidden = YES;
}
-(void)kwm_onClickSort:(BUYCollectionSort)sort{ -(void)kwm_onClickSort:(BUYCollectionSort)sort{
self.hasNextPage = YES; self.hasNextPage = YES;
...@@ -257,16 +193,6 @@ static NSString *idStr = @"KWMBrandCaramelCell"; ...@@ -257,16 +193,6 @@ static NSString *idStr = @"KWMBrandCaramelCell";
[self reLoadData]; [self reLoadData];
} }
-(void)kwm_onHide{
if(self.filterView.hidden){
rightButton.titleLabel.text = @"排序 +";
[rightButton setTitle:@"排序 +" forState:UIControlStateNormal];
}else{
[rightButton setTitle:@"排序 -" forState:UIControlStateNormal];
rightButton.titleLabel.text = @"排序 -";
}
}
#pragma mark -- KWMBarandSelectViewDelegate #pragma mark -- KWMBarandSelectViewDelegate
//点击返回按钮回调 //点击返回按钮回调
- (void)kwm_clickBackBtn{ - (void)kwm_clickBackBtn{
......
iCemarose/Class/UI/Product/Cell/KWMFilterView.h deleted 100644 → 0
//
// KWMFilterView.h
// iCemarose
//
// Created by HouWeiBin on 2016/12/9.
// Copyright © 2016年 kollway. All rights reserved.
//
#import <UIKit/UIKit.h>
#import "Buy/Buy.h"
@protocol KWMFilterDelegate <NSObject>
- (void)kwm_onClickSort:(BUYCollectionSort)sort;
- (void)kwm_onHide;
@end
@interface KWMFilterView : UIView
@property (weak, nonatomic) IBOutlet UIView *vContent;
@property (weak, nonatomic) IBOutlet UIButton *btnNewToOld;
@property (weak, nonatomic) IBOutlet UIButton *btnDearToCheap;
@property (weak, nonatomic) IBOutlet UIButton *btnCheapToDear;
@property (weak, nonatomic) id<KWMFilterDelegate>delegate;
- (IBAction)onClikcNewToOld:(id)sender;
- (IBAction)onClickDearToCheap:(id)sender;
-(IBAction)onClickCheapToDear:(id)sender;
-(IBAction)onClickBg:(id)sender;
-(IBAction)onClickComplete:(id)sender;
@property (nonatomic) BUYCollectionSort collectionSort;
@end
iCemarose/Class/UI/Product/Cell/KWMFilterView.m deleted 100644 → 0
//
// KWMFilterView.m
// iCemarose
//
// Created by HouWeiBin on 2016/12/9.
// Copyright © 2016年 kollway. All rights reserved.
//
#import "KWMFilterView.h"
#import "UIColor+SAMAdditions.h"
@implementation KWMFilterView
- (id)init{
if (self=[super init]){
[self addView];
}
return self;
}
- (id)initWithCoder:(NSCoder *)aDecoder {
self = [super initWithCoder:aDecoder];
if (self) {
[self addView];
}
return self;
}
-(instancetype)initWithFrame:(CGRect)frame{
if (self =[super initWithFrame:frame]) {
[self addView];
}
return self;
}
-(void)awakeFromNib{
[super awakeFromNib];
}
-(void) addView{
[[NSBundle mainBundle] loadNibNamed:NSStringFromClass([self class])
owner:self
options:nil];
self.vContent.frame = CGRectMake(0, 0, self.frame.size.width, self.frame.size.height);
[self addSubview:self.vContent];
[self initView];
}
-(void)setCollectionSort:(BUYCollectionSort)collectionSort{
if(collectionSort == BUYCollectionSortPriceDescending){
[self onClickDearToCheap:nil];
}else if(collectionSort == BUYCollectionSortPriceAscending){
[self onClickCheapToDear:nil];
}else{
[self onClikcNewToOld:nil];
}
}
-(void)initView{
[self initButton:self.btnNewToOld];
[self initButton:self.btnCheapToDear];
[self initButton:self.btnDearToCheap];
[self setButtonSelect:self.btnNewToOld isSelect:YES];
}
-(void)initButton:(UIButton *)button{
[button.layer setMasksToBounds:YES];
button.layer.cornerRadius = 1; //圆角（圆形）
button.layer.borderColor = [UIColor blackColor].CGColor; //要设置的颜色
button.layer.borderWidth = 1; //要设置的描边宽
}
-(void)setButtonSelect:(UIButton *)button isSelect:(BOOL)isSelect{
if(isSelect){
//设置背景颜色
button.backgroundColor = [UIColor sam_colorWithHex:@"393939"];
button.titleLabel.textColor = [UIColor sam_colorWithHex:@"ffffff"];
[button setTitleColor:[UIColor sam_colorWithHex:@"ffffff"] forState:UIControlStateNormal];
}else{
button.backgroundColor = [UIColor sam_colorWithHex:@"ffffff"];
[button setTitleColor:[UIColor sam_colorWithHex:@"4c5966"] forState:UIControlStateNormal];
}
}
-(void)onClikcNewToOld:(id)sender{
[self setButtonSelect:self.btnNewToOld isSelect:YES];
[self setButtonSelect:self.btnDearToCheap isSelect:NO];
[self setButtonSelect:self.btnCheapToDear isSelect:NO];
_collectionSort = BUYCollectionSortCreatedDescending;
}
-(void)onClickDearToCheap:(id)sender{
[self setButtonSelect:self.btnNewToOld isSelect:NO];
[self setButtonSelect:self.btnDearToCheap isSelect:YES];
[self setButtonSelect:self.btnCheapToDear isSelect:NO];
_collectionSort = BUYCollectionSortPriceDescending;
}
-(void)onClickCheapToDear:(id)sender{
[self setButtonSelect:self.btnNewToOld isSelect:NO];
[self setButtonSelect:self.btnDearToCheap isSelect:NO];
[self setButtonSelect:self.btnCheapToDear isSelect:YES];
_collectionSort = BUYCollectionSortPriceAscending;
}
-(void)onClickBg:(id)sender{
self.hidden = YES;
if(self.delegate!=nil){
[self.delegate kwm_onHide];
}
}
-(void)onClickComplete:(id)sender{
self.hidden = YES;
if(self.delegate!=nil){
[self.delegate kwm_onClickSort:_collectionSort];
[self.delegate kwm_onHide];
}
}
@end
iCemarose/Class/UI/Product/Cell/KWMFilterView.xib deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16A323" 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="11524"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="KWMFilterView">
<connections>
<outlet property="btnCheapToDear" destination="eOi-uc-TfU" id="jQl-hk-HyC"/>
<outlet property="btnDearToCheap" destination="yYc-hx-ogT" id="MwR-JV-czr"/>
<outlet property="btnNewToOld" destination="3uq-sv-8x0" id="3oF-ne-5qM"/>
<outlet property="vContent" destination="iN0-l3-epB" id="C7r-lm-tvu"/>
</connections>
</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="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dC1-cs-Gvq" userLabel="bg">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.40000000000000002" colorSpace="calibratedRGB"/>
<connections>
<action selector="onClickBg:" destination="-1" eventType="touchUpInside" id="bcL-09-Pgy"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mcn-wz-yiS" userLabel="content">
<rect key="frame" x="0.0" y="0.0" width="375" height="167"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hfL-49-KeK" userLabel="line">
<rect key="frame" x="0.0" y="0.0" width="375" height="1"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="qs9-cz-lay"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3uq-sv-8x0">
<rect key="frame" x="35" y="25" width="93" height="37"/>
<constraints>
<constraint firstAttribute="width" secondItem="3uq-sv-8x0" secondAttribute="height" multiplier="90:36" id="DQF-P3-FPq"/>
</constraints>
<state key="normal" title="新-旧款">
<color key="titleColor" red="0.30588235294117649" green="0.30588235294117649" blue="0.30588235294117649" alpha="1" colorSpace="calibratedRGB"/>
</state>
<connections>
<action selector="onClikcNewToOld:" destination="-1" eventType="touchUpInside" id="Gwa-ds-gT6"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yYc-hx-ogT">
<rect key="frame" x="141" y="25" width="93" height="37"/>
<constraints>
<constraint firstAttribute="width" secondItem="yYc-hx-ogT" secondAttribute="height" multiplier="91:36" id="CC0-Bf-ZAI"/>
</constraints>
<state key="normal" title="高-低价">
<color key="titleColor" red="0.30588235294117649" green="0.30588235294117649" blue="0.30588235294117649" alpha="1" colorSpace="calibratedRGB"/>
</state>
<connections>
<action selector="onClickDearToCheap:" destination="-1" eventType="touchUpInside" id="wq2-ti-3Ft"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eOi-uc-TfU">
<rect key="frame" x="247" y="25" width="93" height="37"/>
<constraints>
<constraint firstAttribute="width" secondItem="eOi-uc-TfU" secondAttribute="height" multiplier="91:36" id="RcS-2a-KZA"/>
</constraints>
<state key="normal" title="低-高价">
<color key="titleColor" red="0.30588235294117649" green="0.30588235294117649" blue="0.30588235294117649" alpha="1" colorSpace="calibratedRGB"/>
</state>
<connections>
<action selector="onClickCheapToDear:" destination="-1" eventType="touchUpInside" id="nKH-wI-Clg"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wp2-h3-MDu">
<rect key="frame" x="40" y="82" width="295" height="50"/>
<color key="backgroundColor" red="0.14117647059999999" green="0.14117647059999999" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="i4C-Bz-g8w"/>
</constraints>
<state key="normal" title="完成">
<color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="onClickComplete:" destination="-1" eventType="touchUpInside" id="Gzv-UN-y3x"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="wp2-h3-MDu" secondAttribute="trailing" constant="40" id="Adb-ir-4QC"/>
<constraint firstItem="hfL-49-KeK" firstAttribute="top" secondItem="Mcn-wz-yiS" secondAttribute="top" id="FvN-ZR-ZWt"/>
<constraint firstItem="yYc-hx-ogT" firstAttribute="width" secondItem="3uq-sv-8x0" secondAttribute="width" id="OGR-nu-DkG"/>
<constraint firstAttribute="trailing" secondItem="hfL-49-KeK" secondAttribute="trailing" id="RJL-GC-hgv"/>
<constraint firstItem="3uq-sv-8x0" firstAttribute="top" secondItem="Mcn-wz-yiS" secondAttribute="top" constant="25" id="Rdb-hW-dwA"/>
<constraint firstItem="eOi-uc-TfU" firstAttribute="leading" secondItem="yYc-hx-ogT" secondAttribute="trailing" constant="13" id="UGn-Z9-Qrq"/>
<constraint firstItem="eOi-uc-TfU" firstAttribute="width" secondItem="3uq-sv-8x0" secondAttribute="width" id="V6d-ff-DvU"/>
<constraint firstItem="yYc-hx-ogT" firstAttribute="leading" secondItem="3uq-sv-8x0" secondAttribute="trailing" constant="13" id="XMQ-Bi-lGl"/>
<constraint firstItem="eOi-uc-TfU" firstAttribute="top" secondItem="Mcn-wz-yiS" secondAttribute="top" constant="25" id="YwO-Pb-jze"/>
<constraint firstItem="hfL-49-KeK" firstAttribute="leading" secondItem="Mcn-wz-yiS" secondAttribute="leading" id="aTF-jw-AGm"/>
<constraint firstItem="wp2-h3-MDu" firstAttribute="top" secondItem="eOi-uc-TfU" secondAttribute="bottom" constant="20" id="cmM-Wl-DeA"/>
<constraint firstItem="yYc-hx-ogT" firstAttribute="top" secondItem="Mcn-wz-yiS" secondAttribute="top" constant="25" id="dtZ-MZ-Fzb"/>
<constraint firstItem="wp2-h3-MDu" firstAttribute="leading" secondItem="Mcn-wz-yiS" secondAttribute="leading" constant="40" id="gfv-Ca-fVR"/>
<constraint firstAttribute="trailing" secondItem="eOi-uc-TfU" secondAttribute="trailing" constant="35" id="hLG-oK-pHp"/>
<constraint firstAttribute="bottom" secondItem="wp2-h3-MDu" secondAttribute="bottom" constant="35" id="okt-09-b6d"/>
<constraint firstItem="3uq-sv-8x0" firstAttribute="leading" secondItem="Mcn-wz-yiS" secondAttribute="leading" constant="35" id="usz-dJ-ttm"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="dC1-cs-Gvq" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="7DX-dD-mgz"/>
<constraint firstAttribute="trailing" secondItem="Mcn-wz-yiS" secondAttribute="trailing" id="BgH-OI-0Zh"/>
<constraint firstItem="dC1-cs-Gvq" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="EBW-Wf-bPg"/>
<constraint firstItem="Mcn-wz-yiS" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Nvz-6G-hdo"/>
<constraint firstItem="Mcn-wz-yiS" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Prs-A7-vRL"/>
<constraint firstAttribute="trailing" secondItem="dC1-cs-Gvq" secondAttribute="trailing" id="lKs-RH-iU5"/>
<constraint firstAttribute="bottom" secondItem="dC1-cs-Gvq" secondAttribute="bottom" id="pRe-E0-Lbd"/>
</constraints>
</view>
</objects>
</document>
iCemarose/Class/UI/Product/KWMSelectedGoodsVC.h
...@@ -9,12 +9,11 @@ ...@@ -9,12 +9,11 @@
#import "KWMBasePageVC.h" #import "KWMBasePageVC.h"
#import "KWMProductType.h" #import "KWMProductType.h"
#import "KWMDoubleTitleView.h" #import "KWMDoubleTitleView.h"
#import "KWMFilterView.h"
#import "KWMBrandCaramelCell.h" #import "KWMBrandCaramelCell.h"
#import "UIColor+SAMAdditions.h" #import "UIColor+SAMAdditions.h"
//选中的商品列表 //选中的商品列表
@interface KWMSelectedGoodsVC : KWMBasePageVC<KWMBrandCaramelCellDelegate,KWMFilterDelegate> @interface KWMSelectedGoodsVC : KWMBasePageVC<KWMBrandCaramelCellDelegate>
@property (weak, nonatomic) IBOutlet UITableView *tbvSelectedGoods; @property (weak, nonatomic) IBOutlet UITableView *tbvSelectedGoods;
...@@ -26,8 +25,6 @@ ...@@ -26,8 +25,6 @@
@property (weak, nonatomic) IBOutlet KWMDoubleTitleView *vDoubleTitle; @property (weak, nonatomic) IBOutlet KWMDoubleTitleView *vDoubleTitle;
@property (weak, nonatomic) IBOutlet KWMFilterView *filterView;
@property (weak, nonatomic) IBOutlet UIImageView *testImageView; @property (weak, nonatomic) IBOutlet UIImageView *testImageView;
//双重标题view的高度 //双重标题view的高度
......
iCemarose/Class/UI/Product/KWMSelectedGoodsVC.m
...@@ -48,7 +48,6 @@ static NSString *idStr = @"KWMBrandCaramelCell"; ...@@ -48,7 +48,6 @@ static NSString *idStr = @"KWMBrandCaramelCell";
- (void)initView{ - (void)initView{
self.collectionSort = BUYCollectionSortCreatedDescending; self.collectionSort = BUYCollectionSortCreatedDescending;
self.filterView.delegate = self;
if(self.productType != nil){ if(self.productType != nil){
//初始化双行标题栏 //初始化双行标题栏
NSString *mTitle; NSString *mTitle;
...@@ -69,18 +68,6 @@ static NSString *idStr = @"KWMBrandCaramelCell"; ...@@ -69,18 +68,6 @@ static NSString *idStr = @"KWMBrandCaramelCell";
openPosition = -1; openPosition = -1;
self.automaticallyAdjustsScrollViewInsets = NO; self.automaticallyAdjustsScrollViewInsets = NO;
rightButton =[UIButton buttonWithType:UIButtonTypeRoundedRect];
rightButton.frame = CGRectMake(0, 5, 40, 20);
[rightButton addTarget:self action:@selector(clickRightButton) forControlEvents:UIControlEventTouchUpInside];
[rightButton setTitle:@"排序 +" forState:UIControlStateNormal];
UIBarButtonItem *button =[[UIBarButtonItem alloc] initWithCustomView:rightButton];
self.navigationItem.rightBarButtonItem = button;
rightButton.titleLabel.font=[UIFont systemFontOfSize:11];
[rightButton.layer setMasksToBounds:YES];
rightButton.layer.cornerRadius = 1; //圆角（圆形）
rightButton.layer.borderColor = [UIColor sam_colorWithHex:@"4E4E4E"].CGColor; //要设置的颜色
rightButton.layer.borderWidth = 1; //要设置的描边宽
isSelect = NO; isSelect = NO;
vStopTap = [[UIView alloc] initWithFrame:CGRectMake(0, 20, UI_SCREEN_WIDTH, 44)]; vStopTap = [[UIView alloc] initWithFrame:CGRectMake(0, 20, UI_SCREEN_WIDTH, 44)];
vStopTap.backgroundColor = [UIColor clearColor]; vStopTap.backgroundColor = [UIColor clearColor];
...@@ -119,48 +106,6 @@ static NSString *idStr = @"KWMBrandCaramelCell"; ...@@ -119,48 +106,6 @@ static NSString *idStr = @"KWMBrandCaramelCell";
} }
} }
-(void)clickRightButton{
// UIToolbar *toolBar = [[UIToolbar alloc]initWithFrame:self.testImageView.frame];
// toolBar.barStyle = UIBarStyleDefault;
// [self.view addSubview:toolBar];
// UIBlurEffect *beffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark];
// UIVisualEffectView *view = [[UIVisualEffectView alloc]initWithEffect:beffect];
// view.frame = self.testImageView.frame;
// [self.view addSubview:view];
if(self.isLoading){
return;
}
self.filterView.hidden = !self.filterView.hidden;
self.filterView.collectionSort = self.collectionSort;
if(self.filterView.hidden){
rightButton.titleLabel.text = @"排序 +";
[rightButton setTitle:@"排序 +" forState:UIControlStateNormal];
}else{
[rightButton setTitle:@"排序 -" forState:UIControlStateNormal];
rightButton.titleLabel.text = @"排序 -";
}
}
-(void)kwm_onClickSort:(BUYCollectionSort)sort{
self.hasNextPage = YES;
self.collectionSort = sort;
[self reLoadData];
}
-(void)kwm_onHide{
if(self.filterView.hidden){
rightButton.titleLabel.text = @"排序 +";
[rightButton setTitle:@"排序 +" forState:UIControlStateNormal];
}else{
rightButton.titleLabel.text = @"排序 -";
[rightButton setTitle:@"排序 -" forState:UIControlStateNormal];
}
}
-(UITableView *)targetTableView{ -(UITableView *)targetTableView{
return self.tbvSelectedGoods; return self.tbvSelectedGoods;
} }
......
iCemarose/Class/UI/Product/New.storyboard
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <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">
<device id="retina4_7" orientation="portrait"> <device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/> <adaptation id="fullscreen"/>
</device> </device>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/> <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
<rect key="frame" x="0.0" y="20" width="375" height="647"/> <rect key="frame" x="0.0" y="20" width="375" height="647"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view> </view>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PWv-M7-7vS" customClass="KWMFilterView"> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PWv-M7-7vS">
<rect key="frame" x="0.0" y="20" width="375" height="647"/> <rect key="frame" x="0.0" y="20" width="375" height="647"/>
<color key="backgroundColor" red="0.99607843137254903" green="0.99607843137254903" blue="0.99607843137254903" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <color key="backgroundColor" red="0.99607843137254903" green="0.99607843137254903" blue="0.99607843137254903" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</view> </view>
...@@ -179,7 +179,6 @@ ...@@ -179,7 +179,6 @@
</constraints> </constraints>
</view> </view>
<connections> <connections>
<outlet property="filterView" destination="PWv-M7-7vS" id="piZ-Y6-d6q"/>
<outlet property="tbvSelectedGoods" destination="fcD-Y9-l8X" id="Dem-kS-25O"/> <outlet property="tbvSelectedGoods" destination="fcD-Y9-l8X" id="Dem-kS-25O"/>
<outlet property="vBackground" destination="UZg-qo-bkR" id="JQg-We-lk1"/> <outlet property="vBackground" destination="UZg-qo-bkR" id="JQg-We-lk1"/>
<outlet property="vHeard" destination="ZQ3-np-q9I" id="Xrs-R6-EGM"/> <outlet property="vHeard" destination="ZQ3-np-q9I" id="Xrs-R6-EGM"/>
......
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