diff --git a/iCemarose/Class/Classify/UIViewController+HTTP.m b/iCemarose/Class/Classify/UIViewController+HTTP.m index 11bce64..b1b6170 100644 --- a/iCemarose/Class/Classify/UIViewController+HTTP.m +++ b/iCemarose/Class/Classify/UIViewController+HTTP.m @@ -26,14 +26,14 @@ encodeURL=[encodeURL stringByReplacingCharactersInRange:tcr.range withString:[[encodeURL substringWithRange:tcr.range] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]; } // NSURL *url = [[NSURL alloc] initWithString:[encodeURL stringByReplacingOccurrencesOfRegex:@"^https?" withString:@"cemarose"]]; - NSURL *url = [[NSURL alloc] initWithString:URLString]; + NSURL *url = [[NSURL alloc] initWithString:encodeURL]; if ([JLRoutes canRouteURL:url]) { [JLRoutes routeURL:url]; // }else if ([application respondsToSelector:@selector(openURL:options:completionHandler:)]) { // [application openURL:[NSURL URLWithString:URLString] options:@{} completionHandler:nil]; - } else { + } else if(url){ // [application openURL:[NSURL URLWithString:URLString]]; - TOWebViewController *wv = [[DPWebViewController alloc] initWithURLString:URLString]; + TOWebViewController *wv = [[DPWebViewController alloc] initWithURLString:encodeURL]; wv.hidesBottomBarWhenPushed = YES; [[AppDelegate mainViewController].selectedViewController pushViewController:wv animated:YES]; } diff --git a/iCemarose/Class/UI/NewHome/Cell/KWMHotSalesHeader.xib b/iCemarose/Class/UI/NewHome/Cell/KWMHotSalesHeader.xib index 7985dcc..358ccf7 100644 --- a/iCemarose/Class/UI/NewHome/Cell/KWMHotSalesHeader.xib +++ b/iCemarose/Class/UI/NewHome/Cell/KWMHotSalesHeader.xib @@ -23,8 +23,28 @@ <rect key="frame" x="0.0" y="0.0" width="375" height="300"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ruv-UI-DGw" userLabel="热卖单品Banner"> + <rect key="frame" x="0.0" y="0.0" width="375" height="190"/> + <color key="backgroundColor" red="0.90588235289999997" green="0.81960784310000001" blue="0.74117647060000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <constraints> + <constraint firstAttribute="height" constant="190" id="NbW-Kh-s5O"/> + </constraints> + </view> + <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="UGY-II-IMu"> + <rect key="frame" x="0.0" y="250" width="375" height="0.0"/> + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <constraints> + <constraint firstAttribute="height" id="SEw-Tw-g0a"/> + </constraints> + <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="Bjo-LO-kzZ"> + <size key="itemSize" width="50" height="50"/> + <size key="headerReferenceSize" width="0.0" height="0.0"/> + <size key="footerReferenceSize" width="0.0" height="0.0"/> + <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/> + </collectionViewFlowLayout> + </collectionView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d0n-L5-xP1" userLabel="热卖单品title view"> - <rect key="frame" x="0.0" y="10" width="375" height="50"/> + <rect key="frame" x="0.0" y="200" width="375" height="50"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uhq-ZL-9OL"> <rect key="frame" x="97.5" y="24.5" width="40" height="1"/> @@ -60,35 +80,15 @@ <constraint firstItem="ILX-tg-IwY" firstAttribute="centerY" secondItem="d0n-L5-xP1" secondAttribute="centerY" id="r8p-Ru-bb6"/> </constraints> </view> - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ruv-UI-DGw" userLabel="热卖单品Banner"> - <rect key="frame" x="0.0" y="60" width="375" height="190"/> - <color key="backgroundColor" red="0.90588235289999997" green="0.81960784310000001" blue="0.74117647060000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <constraints> - <constraint firstAttribute="height" constant="190" id="NbW-Kh-s5O"/> - </constraints> - </view> - <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="UGY-II-IMu"> - <rect key="frame" x="0.0" y="250" width="375" height="0.0"/> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <constraints> - <constraint firstAttribute="height" id="SEw-Tw-g0a"/> - </constraints> - <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="Bjo-LO-kzZ"> - <size key="itemSize" width="50" height="50"/> - <size key="headerReferenceSize" width="0.0" height="0.0"/> - <size key="footerReferenceSize" width="0.0" height="0.0"/> - <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/> - </collectionViewFlowLayout> - </collectionView> </subviews> <constraints> <constraint firstAttribute="trailing" secondItem="UGY-II-IMu" secondAttribute="trailing" id="6ji-Iq-sFG"/> <constraint firstItem="Ruv-UI-DGw" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="9fw-Ph-Q4P"/> - <constraint firstItem="Ruv-UI-DGw" firstAttribute="top" secondItem="d0n-L5-xP1" secondAttribute="bottom" id="BTm-DX-XK4"/> + <constraint firstItem="Ruv-UI-DGw" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="AWZ-Bt-2gv"/> + <constraint firstItem="d0n-L5-xP1" firstAttribute="top" secondItem="Ruv-UI-DGw" secondAttribute="bottom" constant="10" id="PCa-LX-p7a"/> <constraint firstAttribute="trailing" secondItem="Ruv-UI-DGw" secondAttribute="trailing" id="RLP-eB-Asb"/> - <constraint firstItem="UGY-II-IMu" firstAttribute="top" secondItem="Ruv-UI-DGw" secondAttribute="bottom" id="VJK-eY-4rm"/> - <constraint firstItem="d0n-L5-xP1" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="10" id="aWf-1E-iKC"/> <constraint firstItem="d0n-L5-xP1" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="g82-sr-LTG"/> + <constraint firstItem="UGY-II-IMu" firstAttribute="top" secondItem="d0n-L5-xP1" secondAttribute="bottom" id="gsh-qH-TNQ"/> <constraint firstAttribute="trailing" secondItem="d0n-L5-xP1" secondAttribute="trailing" id="iHt-uY-XiY"/> <constraint firstItem="UGY-II-IMu" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="whN-vO-ZIi"/> </constraints> diff --git a/iCemarose/Class/UI/NewHome/KWMNewHomeVC.m b/iCemarose/Class/UI/NewHome/KWMNewHomeVC.m index 0f00f6d..8ac495e 100644 --- a/iCemarose/Class/UI/NewHome/KWMNewHomeVC.m +++ b/iCemarose/Class/UI/NewHome/KWMNewHomeVC.m @@ -396,6 +396,9 @@ typedef enum{ - (void)setHomeData:(KWMHomeData *)homeData { _homeData = homeData; +//#if DEBUG +// [self.homeData.ad_banner[0] setUrl:@"https://www.cemarose.com/pages/sale_test_111"]; +//#endif // [self.homeData.ad_banner[0] setUrl:@"https://www.cemarose.cn/collections/skirts/girls"]; self.adHeader.adArray = self.homeData.ad_banner; self.hotSalesHeader.bannerArray = self.homeData.hot_sales_ads; diff --git a/iCemarose/Info.plist b/iCemarose/Info.plist index e61bb9b..fcf3dd1 100644 --- a/iCemarose/Info.plist +++ b/iCemarose/Info.plist @@ -15,7 +15,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.5.3</string> + <string>1.5.4</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -56,7 +56,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>2017080418</string> + <string>2017080814</string> <key>ITSAppUsesNonExemptEncryption</key> <false/> <key>LSApplicationQueriesSchemes</key>