Skip to content

I
ios1x
Commit 76309da3 by houweibin
Options

1，地址添加国家编辑入口 

2，出版本前准备
3，应该未完成功能
4，其他调整
parent 036617e2
Showing with 271 additions and 146 deletions
iCemarose.xcodeproj/project.pbxproj
......@@ -227,6 +227,7 @@
C0DD533A1EE55190002D1E0C /* KWMSplashView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0DD53301EE55190002D1E0C /* KWMSplashView.xib */; };
C0DD533B1EE55190002D1E0C /* KWMSuperLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = C0DD53321EE55190002D1E0C /* KWMSuperLoadingView.m */; };
C0DD533C1EE55190002D1E0C /* MMJRefreshNormalHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = C0DD53341EE55190002D1E0C /* MMJRefreshNormalHeader.m */; };
C0DD534D1EE6AE06002D1E0C /* BaseCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C0DD534C1EE6AE06002D1E0C /* BaseCell.m */; };
C0E8AE091D7D030B00C193DC /* KWMEditAddressVC.m in Sources */ = {isa = PBXBuildFile; fileRef = C0E8AE081D7D030B00C193DC /* KWMEditAddressVC.m */; };
C0E8AE0C1D7D503600C193DC /* KWMPaySuccessVC.m in Sources */ = {isa = PBXBuildFile; fileRef = C0E8AE0B1D7D503600C193DC /* KWMPaySuccessVC.m */; };
C0E8AE121D7D52B200C193DC /* KWMPayTypeVC.m in Sources */ = {isa = PBXBuildFile; fileRef = C0E8AE111D7D52B200C193DC /* KWMPayTypeVC.m */; };
......@@ -677,6 +678,8 @@
C0DD53321EE55190002D1E0C /* KWMSuperLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMSuperLoadingView.m; sourceTree = "<group>"; };
C0DD53331EE55190002D1E0C /* MMJRefreshNormalHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMJRefreshNormalHeader.h; sourceTree = "<group>"; };
C0DD53341EE55190002D1E0C /* MMJRefreshNormalHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMJRefreshNormalHeader.m; sourceTree = "<group>"; };
C0DD534B1EE6AE06002D1E0C /* BaseCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseCell.h; sourceTree = "<group>"; };
C0DD534C1EE6AE06002D1E0C /* BaseCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseCell.m; sourceTree = "<group>"; };
C0E8AE071D7D030B00C193DC /* KWMEditAddressVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMEditAddressVC.h; sourceTree = "<group>"; };
C0E8AE081D7D030B00C193DC /* KWMEditAddressVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMEditAddressVC.m; sourceTree = "<group>"; };
C0E8AE0A1D7D503600C193DC /* KWMPaySuccessVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMPaySuccessVC.h; sourceTree = "<group>"; };
......@@ -1641,6 +1644,8 @@
C0DD53251EE55190002D1E0C /* Cell */ = {
isa = PBXGroup;
children = (
C0DD534B1EE6AE06002D1E0C /* BaseCell.h */,
C0DD534C1EE6AE06002D1E0C /* BaseCell.m */,
);
path = Cell;
sourceTree = "<group>";
......@@ -2119,6 +2124,7 @@
8077F79A1D73E39000A2E2E2 /* KWMBrandCaramelCell.m in Sources */,
9BE61D011ECD71610031D21E /* KWMCartResult.m in Sources */,
C084F4571D6D975400A0625D /* KWMSearchBar.m in Sources */,
C0DD534D1EE6AE06002D1E0C /* BaseCell.m in Sources */,
C0E8AE091D7D030B00C193DC /* KWMEditAddressVC.m in Sources */,
807AF4A51DC984950000A326 /* KWMCustomerResult.m in Sources */,
C066650F1D7675FC00F02EF4 /* KWMAboutUsVC.m in Sources */,
......
iCemarose/Class/UI/Home/Cell/KWMBlogCell.m
......@@ -7,6 +7,7 @@
//
#import "KWMBlogCell.h"
#import "KWMImageUtil.h"
#import <SDWebImage/UIImageView+WebCache.h>
@implementation KWMBlogCell
......@@ -46,7 +47,8 @@
if (article.imageScr == nil) {
self.imageHeight.constant = 0;
}else{
NSURL *imageURL = [NSURL URLWithString:article.imageScr];
NSString *imageString = [KWMImageUtil getProductImageUrlByOriginalUrl:article.imageScr ImageSize:NormalImage];
NSURL *imageURL = [NSURL URLWithString:imageString];
[self.ivImg sd_setImageWithURL:imageURL placeholderImage:[UIImage imageNamed:@"ic_loading_big"]];
}
}
......
iCemarose/Class/UI/Login/Login.storyboard
<?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">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
......@@ -21,78 +21,44 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="im_logo" translatesAutoresizingMaskIntoConstraints="NO" id="7U8-AN-1tB">
<rect key="frame" x="113" y="132" width="150" height="27"/>
<constraints>
<constraint firstAttribute="width" constant="150" id="3qF-L8-g13"/>
<constraint firstAttribute="height" constant="27" id="bZk-4i-lt6"/>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HiY-gY-I4h">
<rect key="frame" x="44" y="545" width="287" height="44"/>
<color key="backgroundColor" red="0.1529411765" green="0.14901960780000001" blue="0.21176470589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="ZeY-mz-TCC"/>
</constraints>
<state key="normal" title="下一步">
<color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="onClickNextBtn:" destination="WI0-Nr-9dh" eventType="touchUpInside" id="eWc-2O-tDV"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cZA-Am-Uhr">
<rect key="frame" x="235.5" y="432" width="91" height="20"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="asr-TI-lDQ">
<rect key="frame" x="279" y="31" width="86" height="25"/>
<constraints>
<constraint firstAttribute="width" constant="91" id="Jff-f7-3Yb"/>
<constraint firstAttribute="height" constant="20" id="Zos-4c-U3M"/>
<constraint firstAttribute="height" constant="25" id="4wO-xH-fdi"/>
<constraint firstAttribute="width" constant="86" id="Q8N-FI-4OM"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="14"/>
<state key="normal" title="邮箱">
<color key="titleColor" red="0.15294117647058825" green="0.14901960784313725" blue="0.21176470588235294" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="12"/>
<inset key="imageEdgeInsets" minX="8" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="随便看看">
<color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
</state>
<connections>
<action selector="onClickEmailBtn:" destination="WI0-Nr-9dh" eventType="touchUpInside" id="9oX-RQ-PXf"/>
<action selector="onClickRightBtn:" destination="WI0-Nr-9dh" eventType="touchUpInside" id="oLo-rv-0FW"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="/" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5ey-do-5Eg">
<rect key="frame" x="135" y="432" width="7" height="20"/>
<fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="w5P-Hm-hFd">
<rect key="frame" x="157.5" y="432" width="60" height="20"/>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="button_mine_more" translatesAutoresizingMaskIntoConstraints="NO" id="D9M-py-37G">
<rect key="frame" x="344" y="36" width="10" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="60" id="sSc-e1-jfV"/>
<constraint firstAttribute="height" constant="20" id="sqg-hz-tAH"/>
<constraint firstAttribute="width" constant="10" id="Zfz-zL-G3O"/>
<constraint firstAttribute="height" constant="16" id="bsb-cW-f4F"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="14"/>
<state key="normal" title="QQ">
<color key="titleColor" red="0.1529411765" green="0.14901960780000001" blue="0.21176470589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="onClickQQBtn:" destination="WI0-Nr-9dh" eventType="touchUpInside" id="U2h-WW-HYu"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="/" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3ZX-6C-wRv">
<rect key="frame" x="217.5" y="432" width="18" height="20"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="im_logo" translatesAutoresizingMaskIntoConstraints="NO" id="7U8-AN-1tB">
<rect key="frame" x="113" y="132" width="150" height="27"/>
<constraints>
<constraint firstAttribute="width" constant="18" id="HYX-EX-UQt"/>
<constraint firstAttribute="width" constant="150" id="3qF-L8-g13"/>
<constraint firstAttribute="height" constant="27" id="bZk-4i-lt6"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="OR" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aob-ud-437">
<rect key="frame" x="177" y="364" width="22" height="17"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="登录即注册" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mtf-5x-f0v">
<rect key="frame" x="144" y="181" width="88" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="17" id="WMs-Ss-Bia"/>
<constraint firstAttribute="width" constant="22" id="yt1-uQ-yCr"/>
<constraint firstAttribute="width" constant="88" id="PHM-kr-kmf"/>
<constraint firstAttribute="height" constant="20" id="xwa-0u-Srq"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="14"/>
<color key="textColor" red="0.15294117647058825" green="0.14901960784313725" blue="0.21176470588235294" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="14"/>
<color key="textColor" red="0.32941176470588235" green="0.32941176470588235" blue="0.32941176470588235" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="highlightedColor" red="0.32941176470588235" green="0.32941176470588235" blue="0.32941176470588235" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入您的手机号" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0c8-k5-y3n" customClass="KWMTextFieldUtil">
<rect key="frame" x="87" y="282" width="201" height="32"/>
......@@ -124,85 +90,137 @@
<action selector="onClickClearBtn:" destination="WI0-Nr-9dh" eventType="touchUpInside" id="AYr-C3-x2p"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="登录即注册" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mtf-5x-f0v">
<rect key="frame" x="144" y="181" width="88" height="20"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="OR" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aob-ud-437">
<rect key="frame" x="177" y="364" width="22" height="17"/>
<constraints>
<constraint firstAttribute="width" constant="88" id="PHM-kr-kmf"/>
<constraint firstAttribute="height" constant="20" id="xwa-0u-Srq"/>
<constraint firstAttribute="height" constant="17" id="WMs-Ss-Bia"/>
<constraint firstAttribute="width" constant="22" id="yt1-uQ-yCr"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="14"/>
<color key="textColor" red="0.32941176470588235" green="0.32941176470588235" blue="0.32941176470588235" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="highlightedColor" red="0.32941176470588235" green="0.32941176470588235" blue="0.32941176470588235" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="14"/>
<color key="textColor" red="0.15294117647058825" green="0.14901960784313725" blue="0.21176470588235294" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="asr-TI-lDQ">
<rect key="frame" x="279" y="31" width="86" height="25"/>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0cV-gy-t8E" userLabel="选择登录方式">
<rect key="frame" x="0.0" y="401" width="375" height="20"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ctb-DD-ohq">
<rect key="frame" x="45" y="0.0" width="91" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="5R4-Qd-hmB"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="91" id="8iW-uz-GMD"/>
<constraint firstAttribute="width" constant="91" id="gXx-As-3Ef"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="14"/>
<state key="normal" title="微信">
<color key="titleColor" red="0.1529411765" green="0.14901960780000001" blue="0.21176470589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="/ " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P2k-h6-xIB">
<rect key="frame" x="136" y="0.0" width="21" height="20"/>
<fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HY5-xC-MtS">
<rect key="frame" x="157" y="0.0" width="60" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="osl-Hd-u1B"/>
<constraint firstAttribute="width" constant="60" id="svT-f0-ZxJ"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="14"/>
<state key="normal" title="QQ">
<color key="titleColor" red="0.1529411765" green="0.14901960780000001" blue="0.21176470589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="/" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1TB-2I-z3n">
<rect key="frame" x="217" y="0.0" width="18" height="20"/>
<constraints>
<constraint firstAttribute="width" constant="18" id="Mww-G2-Wcg"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wjr-AJ-aHS">
<rect key="frame" x="235" y="0.0" width="91" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="LIE-lO-q5N"/>
<constraint firstAttribute="width" constant="91" id="dyC-hO-uj5"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="14"/>
<state key="normal" title="邮箱">
<color key="titleColor" red="0.1529411765" green="0.14901960780000001" blue="0.21176470589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="25" id="4wO-xH-fdi"/>
<constraint firstAttribute="width" constant="86" id="Q8N-FI-4OM"/>
<constraint firstItem="HY5-xC-MtS" firstAttribute="centerX" secondItem="0cV-gy-t8E" secondAttribute="centerX" id="3MY-8a-EWA"/>
<constraint firstAttribute="height" constant="20" id="DiO-lt-3Fq"/>
<constraint firstItem="wjr-AJ-aHS" firstAttribute="top" secondItem="0cV-gy-t8E" secondAttribute="top" id="Gc8-c6-RFW"/>
<constraint firstItem="1TB-2I-z3n" firstAttribute="leading" secondItem="HY5-xC-MtS" secondAttribute="trailing" id="Nmx-p0-iA0"/>
<constraint firstItem="wjr-AJ-aHS" firstAttribute="leading" secondItem="1TB-2I-z3n" secondAttribute="trailing" id="R6D-zD-Y8B"/>
<constraint firstItem="HY5-xC-MtS" firstAttribute="leading" secondItem="P2k-h6-xIB" secondAttribute="trailing" id="RNi-rG-nHW"/>
<constraint firstItem="Ctb-DD-ohq" firstAttribute="top" secondItem="0cV-gy-t8E" secondAttribute="top" id="Z9i-sk-QGh"/>
<constraint firstItem="P2k-h6-xIB" firstAttribute="leading" secondItem="Ctb-DD-ohq" secondAttribute="trailing" id="lNG-hj-gvP"/>
<constraint firstItem="HY5-xC-MtS" firstAttribute="top" secondItem="0cV-gy-t8E" secondAttribute="top" id="pb5-vm-3eZ"/>
<constraint firstItem="1TB-2I-z3n" firstAttribute="top" secondItem="0cV-gy-t8E" secondAttribute="top" id="pbJ-ho-uob"/>
<constraint firstItem="P2k-h6-xIB" firstAttribute="top" secondItem="0cV-gy-t8E" secondAttribute="top" id="u1y-1x-Fzg"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="12"/>
<inset key="imageEdgeInsets" minX="8" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="随便看看">
<color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cZA-Am-Uhr">
<rect key="frame" x="147.5" y="432" width="80" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="Zos-4c-U3M"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="14"/>
<state key="normal" title="/ 邮箱登录 /">
<color key="titleColor" red="0.15294117647058825" green="0.14901960784313725" blue="0.21176470588235294" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="onClickRightBtn:" destination="WI0-Nr-9dh" eventType="touchUpInside" id="oLo-rv-0FW"/>
<action selector="onClickEmailBtn:" destination="WI0-Nr-9dh" eventType="touchUpInside" id="9oX-RQ-PXf"/>
</connections>
</button>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="button_mine_more" translatesAutoresizingMaskIntoConstraints="NO" id="D9M-py-37G">
<rect key="frame" x="344" y="36" width="10" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="10" id="Zfz-zL-G3O"/>
<constraint firstAttribute="height" constant="16" id="bsb-cW-f4F"/>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zc4-WI-l41">
<rect key="frame" x="44" y="432" width="91" height="20"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HiY-gY-I4h">
<rect key="frame" x="44" y="545" width="287" height="44"/>
<color key="backgroundColor" red="0.1529411765" green="0.14901960780000001" blue="0.21176470589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="2Xw-Ln-IAW"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="91" id="BpK-7n-eMX"/>
<constraint firstAttribute="width" constant="91" id="E5u-DB-e21"/>
<constraint firstAttribute="height" constant="44" id="ZeY-mz-TCC"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="14"/>
<state key="normal" title="微信">
<color key="titleColor" red="0.1529411765" green="0.14901960780000001" blue="0.21176470589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<state key="normal" title="下一步">
<color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="onClickWechatBtn:" destination="WI0-Nr-9dh" eventType="touchUpInside" id="kxD-eH-YXA"/>
<action selector="onClickNextBtn:" destination="WI0-Nr-9dh" eventType="touchUpInside" id="eWc-2O-tDV"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="u9U-m1-VeK" firstAttribute="centerY" secondItem="0c8-k5-y3n" secondAttribute="centerY" id="25t-Oi-zog"/>
<constraint firstItem="w5P-Hm-hFd" firstAttribute="centerX" secondItem="ely-f5-Lwm" secondAttribute="centerX" id="4MN-lF-M0M"/>
<constraint firstItem="Zc4-WI-l41" firstAttribute="top" secondItem="w5P-Hm-hFd" secondAttribute="top" id="5ku-Kw-bVr"/>
<constraint firstItem="rId-0e-u0H" firstAttribute="trailing" secondItem="0c8-k5-y3n" secondAttribute="trailing" id="75j-Nn-dmV"/>
<constraint firstItem="Djf-FZ-FEl" firstAttribute="top" secondItem="HiY-gY-I4h" secondAttribute="bottom" constant="78" id="9tF-dE-M4M"/>
<constraint firstAttribute="trailing" secondItem="HiY-gY-I4h" secondAttribute="trailing" constant="44" id="Aaw-WU-fjk"/>
<constraint firstItem="cZA-Am-Uhr" firstAttribute="top" secondItem="aob-ud-437" secondAttribute="bottom" constant="51" id="DAS-0A-mel"/>
<constraint firstItem="cZA-Am-Uhr" firstAttribute="centerX" secondItem="ely-f5-Lwm" secondAttribute="centerX" id="INv-hl-t8A"/>
<constraint firstAttribute="trailing" secondItem="0cV-gy-t8E" secondAttribute="trailing" id="JaY-sn-fs7"/>
<constraint firstItem="7U8-AN-1tB" firstAttribute="top" secondItem="ely-f5-Lwm" secondAttribute="top" constant="132" id="KBC-Fn-o3r"/>
<constraint firstItem="3ZX-6C-wRv" firstAttribute="top" secondItem="aob-ud-437" secondAttribute="bottom" constant="51" id="KJv-WH-Hde"/>
<constraint firstItem="aob-ud-437" firstAttribute="centerX" secondItem="ely-f5-Lwm" secondAttribute="centerX" id="KU0-IE-DgX"/>
<constraint firstItem="0c8-k5-y3n" firstAttribute="centerX" secondItem="ely-f5-Lwm" secondAttribute="centerX" id="Ka8-Ji-nhM"/>
<constraint firstItem="aob-ud-437" firstAttribute="top" secondItem="rId-0e-u0H" secondAttribute="bottom" constant="49" id="NQa-TC-6pa"/>
<constraint firstItem="asr-TI-lDQ" firstAttribute="top" secondItem="ely-f5-Lwm" secondAttribute="top" constant="31" id="OH6-Xy-NVa"/>
<constraint firstItem="rId-0e-u0H" firstAttribute="top" secondItem="0c8-k5-y3n" secondAttribute="bottom" id="Pbi-2f-q1U"/>
<constraint firstItem="Mtf-5x-f0v" firstAttribute="top" secondItem="7U8-AN-1tB" secondAttribute="bottom" constant="22" id="QW2-mK-nvw"/>
<constraint firstItem="5ey-do-5Eg" firstAttribute="top" secondItem="aob-ud-437" secondAttribute="bottom" constant="51" id="R27-0d-tTJ"/>
<constraint firstItem="0c8-k5-y3n" firstAttribute="top" secondItem="ely-f5-Lwm" secondAttribute="top" constant="282" id="UTS-0F-XzY"/>
<constraint firstAttribute="trailing" secondItem="asr-TI-lDQ" secondAttribute="trailing" constant="10" id="XFp-1Y-R4t"/>
<constraint firstItem="0cV-gy-t8E" firstAttribute="top" secondItem="aob-ud-437" secondAttribute="bottom" constant="20" id="aPx-Mj-qmj"/>
<constraint firstItem="rId-0e-u0H" firstAttribute="leading" secondItem="0c8-k5-y3n" secondAttribute="leading" id="dDY-IZ-Cor"/>
<constraint firstItem="HiY-gY-I4h" firstAttribute="leading" secondItem="ely-f5-Lwm" secondAttribute="leading" constant="44" id="dRc-s8-oUa"/>
<constraint firstItem="cZA-Am-Uhr" firstAttribute="leading" secondItem="3ZX-6C-wRv" secondAttribute="trailing" id="e4e-iE-VwL"/>
<constraint firstItem="D9M-py-37G" firstAttribute="centerY" secondItem="asr-TI-lDQ" secondAttribute="centerY" id="esT-RO-7I8"/>
<constraint firstItem="3ZX-6C-wRv" firstAttribute="leading" secondItem="w5P-Hm-hFd" secondAttribute="trailing" id="kjr-xL-bYb"/>
<constraint firstItem="w5P-Hm-hFd" firstAttribute="top" secondItem="aob-ud-437" secondAttribute="bottom" constant="51" id="m57-ti-rEm"/>
<constraint firstItem="5ey-do-5Eg" firstAttribute="leading" secondItem="Zc4-WI-l41" secondAttribute="trailing" id="nR7-SH-H6J"/>
<constraint firstItem="Mtf-5x-f0v" firstAttribute="centerX" secondItem="ely-f5-Lwm" secondAttribute="centerX" id="oQd-We-ZTF"/>
<constraint firstItem="0cV-gy-t8E" firstAttribute="leading" secondItem="ely-f5-Lwm" secondAttribute="leading" id="rj8-wN-hPr"/>
<constraint firstItem="u9U-m1-VeK" firstAttribute="leading" secondItem="0c8-k5-y3n" secondAttribute="trailing" constant="5" id="sAJ-wG-nmR"/>
<constraint firstAttribute="trailing" secondItem="D9M-py-37G" secondAttribute="trailing" constant="21" id="uOD-Qy-P3D"/>
<constraint firstItem="w5P-Hm-hFd" firstAttribute="leading" secondItem="5ey-do-5Eg" secondAttribute="trailing" constant="15.5" id="uVr-Sk-Lib"/>
<constraint firstItem="7U8-AN-1tB" firstAttribute="centerX" secondItem="ely-f5-Lwm" secondAttribute="centerX" id="xEp-1a-bHf"/>
</constraints>
</view>
......
iCemarose/Class/UI/Mine/Cell/KWMOrderCell.m
......@@ -76,7 +76,8 @@
isShow = showAll;//记录是否展开
if(position == 0){
self.vHeader.hidden = NO;
self.headerHeight.constant = 80;
//self.headerHeight.constant = 80;
self.headerHeight.constant = 45;
}else{
self.vHeader.hidden = YES;
self.headerHeight.constant = 0;
......
iCemarose/Class/UI/Mine/Cell/KWMOrderCell.xib
......@@ -19,10 +19,10 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9GU-8G-dS5" userLabel="header">
<rect key="frame" x="0.0" y="0.0" width="375" height="80"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="45"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AZR-1t-dC0">
<rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="35"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单：42043124" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jGI-UQ-mqY">
<rect key="frame" x="27" y="9" width="99" height="18.5"/>
......@@ -31,13 +31,13 @@
<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="z8Q-AY-djl">
<rect key="frame" x="273" y="42" width="34.5" height="17"/>
<rect key="frame" x="273" y="7" width="34.5" height="17"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="12"/>
<color key="textColor" red="0.94509803920000002" green="0.57254901960000004" blue="0.60392156860000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2630" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j8B-sN-dbR">
<rect key="frame" x="309" y="37.5" width="38.5" height="22.5"/>
<rect key="frame" x="309" y="2.5" width="38.5" height="22.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="16"/>
<color key="textColor" red="0.94509803921568625" green="0.5725490196078431" blue="0.60392156862745094" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
......@@ -53,7 +53,7 @@
</connections>
</button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gxP-ry-glr">
<rect key="frame" x="27" y="34" width="53" height="31"/>
<rect key="frame" x="27" y="-1" width="53" height="31"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<state key="normal" title="取消订单">
<color key="titleColor" red="0.22352941176470587" green="0.22352941176470587" blue="0.22352941176470587" alpha="1" colorSpace="calibratedRGB"/>
......@@ -67,7 +67,7 @@
<constraints>
<constraint firstItem="jGI-UQ-mqY" firstAttribute="centerY" secondItem="AZR-1t-dC0" secondAttribute="centerY" id="2PX-eQ-5Vc"/>
<constraint firstItem="z8Q-AY-djl" firstAttribute="bottom" secondItem="j8B-sN-dbR" secondAttribute="bottom" constant="-1" id="996-Oc-OCL"/>
<constraint firstAttribute="height" constant="70" id="BeA-GR-GUJ"/>
<constraint firstAttribute="height" constant="35" id="BeA-GR-GUJ"/>
<constraint firstItem="gxP-ry-glr" firstAttribute="leading" secondItem="AZR-1t-dC0" secondAttribute="leading" constant="27" id="LHm-QN-4y6"/>
<constraint firstItem="jGI-UQ-mqY" firstAttribute="top" secondItem="AZR-1t-dC0" secondAttribute="top" constant="9" id="Q5p-Me-6Vr"/>
<constraint firstAttribute="bottom" secondItem="gxP-ry-glr" secondAttribute="bottom" constant="5" id="Qee-qh-xKt"/>
......@@ -89,12 +89,12 @@
<constraints>
<constraint firstItem="AZR-1t-dC0" firstAttribute="top" secondItem="9GU-8G-dS5" secondAttribute="top" id="Szs-Kf-cpj"/>
<constraint firstItem="AZR-1t-dC0" firstAttribute="leading" secondItem="9GU-8G-dS5" secondAttribute="leading" id="jqw-l8-sfc"/>
<constraint firstAttribute="height" constant="80" id="nDR-HH-jdo"/>
<constraint firstAttribute="height" constant="45" id="nDR-HH-jdo"/>
<constraint firstAttribute="trailing" secondItem="AZR-1t-dC0" secondAttribute="trailing" id="wfW-Ki-zB9"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ijW-ut-DIo" userLabel="content">
<rect key="frame" x="0.0" y="80" width="375" height="80"/>
<rect key="frame" x="0.0" y="45" width="375" height="80"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_loading" translatesAutoresizingMaskIntoConstraints="NO" id="nIn-Ka-NkB">
<rect key="frame" x="27" y="5" width="60" height="60"/>
......@@ -136,7 +136,7 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="p1A-G5-zfb" userLabel="footer">
<rect key="frame" x="0.0" y="160" width="375" height="40"/>
<rect key="frame" x="0.0" y="125" width="375" height="40"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="zbc-4i-Uw4"/>
......
iCemarose/Class/UI/Mine/KWMOrderVC.m
......@@ -77,18 +77,22 @@
//如果是尾行
bool isShowOther = [sectionArr containsObject:[NSString stringWithFormat:@"%ld",(long)indexPath.section]];
if(indexPath.row == 3 && !isShowOther){
return 200-80;
//return 200-80;
return 165-45;
}
NSInteger allRow = [self returnSectionRow:indexPath.section];
if (indexPath.row == (allRow -1) && allRow > 4) {//最后一行
return 200-80;
//return 200-80;
return 165-45;
}
//如果是首行
if(indexPath.row == 0){
return 200-40;
//return 200-40;
return 165-40;
}
//如果是中间几行
return 200 - 80 -40;
//return 200 - 80 -40;
return 165-45-40;
}
-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
......
iCemarose/Class/UI/ShopCart/KWMEditAddressVC.h
......@@ -12,13 +12,12 @@
@interface KWMEditAddressVC : KWMBaseVC<UITextFieldDelegate>
@property (weak, nonatomic) IBOutlet KWMTextFieldUtil *tfCountry;
@property (weak, nonatomic) IBOutlet KWMTextFieldUtil *tfProvince;
@property (weak, nonatomic) IBOutlet KWMTextFieldUtil *tfCity;
@property (weak, nonatomic) IBOutlet KWMTextFieldUtil *tfArea;
@property (weak, nonatomic) IBOutlet KWMTextFieldUtil *tfAddress;
@property (weak, nonatomic) IBOutlet KWMTextFieldUtil *tfAddressDetail;
......@@ -31,7 +30,7 @@
//固定值为30，弹出软键盘时修改
@property(nonatomic,weak)IBOutlet NSLayoutConstraint *heightOfProvinceTop;
@property(nonatomic,weak)IBOutlet NSLayoutConstraint *marginTopOfCountry;
//保存用上个页面传过来的地址对象，为空时表示此页为“添加地址”页面
......
iCemarose/Class/UI/ShopCart/KWMEditAddressVC.m
......@@ -33,9 +33,9 @@
}
- (void)onClickBackgroundView:(UITapGestureRecognizer *)tapGesture{
[self.tfCountry resignFirstResponder];
[self.tfProvince resignFirstResponder];
[self.tfCity resignFirstResponder];
[self.tfArea resignFirstResponder];
[self.tfAddress resignFirstResponder];
[self.tfAddressDetail resignFirstResponder];
[self.tfZip resignFirstResponder];
......@@ -47,6 +47,7 @@
-(void)initTextField{
self.tfName.delegate = self;
self.tfPhone.delegate = self;
self.tfCountry.delegate = self;
self.tfProvince.delegate = self;
self.tfCity.delegate = self;
self.tfAddress.delegate = self;
......@@ -55,11 +56,11 @@
[self.tfProvince setTextFiledCountLimit:10];
[self.tfCity setTextFiledCountLimit:10];
[self.tfArea setTextFiledCountLimit:10];
[self.tfName setTextFiledCountLimit:10];
[self.tfAddress setTextFiledCountLimit:50];
[self.tfAddressDetail setTextFiledCountLimit:50];
self.tfCountry.tag = 0;
self.tfProvince.tag = 1;
self.tfCity.tag = 2;
self.tfAddress.tag = 3;
......@@ -81,6 +82,7 @@
if (_address) {
self.tfName.text = _address.lastName;
self.tfPhone.text = _address.phone;
self.tfCountry.text = _address.country;
self.tfProvince.text = _address.province;
self.tfCity.text = _address.city;
self.tfAddress.text = _address.address1;
......@@ -91,7 +93,9 @@
//点击存储按钮
-(void)clickRightButton{
if([KWMStringUtil isEmpty:self.tfProvince.text]){
if([KWMStringUtil isEmpty:self.tfCountry.text]){
[self showToast:@"请输入国家"];
}else if([KWMStringUtil isEmpty:self.tfProvince.text]){
[self showToast:@"请输入省份"];
}else if([KWMStringUtil isEmpty:self.tfCity.text]){
[self showToast:@"请输入城市"];
......@@ -137,20 +141,39 @@
requestAddress.city = self.tfCity.text;
requestAddress.address1 = self.tfAddress.text;
requestAddress.address2 = self.tfAddressDetail.text;
requestAddress.country = @"China";
requestAddress.country = self.tfCountry.text;
requestAddress.countryCode = @"";
requestAddress.zip = self.tfZip.text;
requestAddress.firstName = @"";
requestAddress.firstName = requestAddress.firstName?requestAddress.firstName:@"";
return requestAddress;
}
-(void)showAddressError:(NSError *)error{
if(error && error.userInfo){
NSString *errorInfoString = [NSString stringWithFormat:@"%@",error.userInfo];
if(errorInfoString){
if([errorInfoString rangeOfString:@"province"].location != NSNotFound &&
[errorInfoString rangeOfString:@"is not valid"].location != NSNotFound){
[self showToast:@"请填写正确的省份，例如美国的亚拉巴马州则填写:Alabama"];
return;
}
if([errorInfoString rangeOfString:@"country"].location != NSNotFound &&
[errorInfoString rangeOfString:@"is not a valid"].location != NSNotFound){
[self showToast:@"请填写正确的国家，例如美国则填写:United States"];
return;
}
}
}
[self showToast:@"更新地址失败"];
}
-(void)addAddress{
[self showLoading];
[self.client createAddress:[self getAddress] callback:^(BUYAddress *address, NSError *error) {
[self hideLoading];
if(error!=nil){
[self showError:error];
[self showToast:@"更新地址失败"];
[self showAddressError:error];
}else if(address!=nil){
self.address = address;
[self updateCustomerAddress];
......@@ -168,8 +191,7 @@
[self hideLoading];
NSLog(@"error = %@",error);
if (error != nil) {
[self showError:error];
[self showToast:@"更新地址失败"];
[self showAddressError:error];
}else if(address != nil){
[self updateCustomerAddress];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
......@@ -180,6 +202,8 @@
}
- (void)updateCustomerAddress{
[self showLoading];
[self.client getCustomerCallback:^(BUYCustomer * _Nullable customer, NSError * _Nullable error) {
......@@ -209,7 +233,7 @@
if(removeTag < 0){
removeTag = 0;
}
self.heightOfProvinceTop.constant = 30 - 57 * removeTag;
self.marginTopOfCountry.constant = 30 - 57 * removeTag;
[UIView animateWithDuration:0.5 animations:^{
[self.view layoutIfNeeded];
}];
......@@ -219,7 +243,7 @@
//键盘弹出
-(void)keyboardWillHide:(NSNotification *)notification{
self.heightOfProvinceTop.constant = 30;
self.marginTopOfCountry.constant = 30;
[UIView animateWithDuration:0.5 animations:^{
[self.view layoutIfNeeded];
}];
......
iCemarose/Class/UI/ShopCart/ShopCart.storyboard
......@@ -759,7 +759,7 @@
<constraint firstAttribute="trailing" secondItem="pVN-aG-lfu" secondAttribute="trailing" constant="30" id="mp4-Bl-gsC"/>
</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="meM-14-BFw" userLabel="礼品卡">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="礼品卡" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="meM-14-BFw" userLabel="礼品卡">
<rect key="frame" x="30" y="261" width="45" height="21"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.21960784310000001" green="0.21960784310000001" blue="0.21960784310000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -768,7 +768,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3g3-iU-dSA" userLabel="v礼品卡">
<rect key="frame" x="0.0" y="294" width="374" height="39"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请输入优惠券" textAlignment="natural" lineBreakMode="characterWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2lC-1w-Lfh">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请输入礼品卡" textAlignment="natural" lineBreakMode="characterWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2lC-1w-Lfh">
<rect key="frame" x="30" y="11" width="314" height="17"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="12"/>
<color key="textColor" red="0.22352941179999999" green="0.22352941179999999" blue="0.22352941179999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -995,9 +995,50 @@
<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="YqM-tJ-N7B" userLabel="省">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pGH-lj-do0" userLabel="国家">
<rect key="frame" x="0.0" y="50" width="375" height="45"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="国家" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wz5-BV-uj3">
<rect key="frame" x="34" y="12" width="30" height="21"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="ewk-T1-DCq"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.3294117647" green="0.3294117647" blue="0.3294117647" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HDf-hH-avB" customClass="KWMTextFieldUtil">
<rect key="frame" x="83" y="0.0" width="282" height="45"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="fdK-jr-TuV"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<textInputTraits key="textInputTraits"/>
</textField>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oxw-hq-dE9" userLabel="line">
<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"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="HDf-hH-avB" firstAttribute="centerY" secondItem="pGH-lj-do0" secondAttribute="centerY" id="D46-4g-Ho6"/>
<constraint firstItem="oxw-hq-dE9" firstAttribute="leading" secondItem="wz5-BV-uj3" secondAttribute="leading" id="M34-Sm-PST"/>
<constraint firstItem="wz5-BV-uj3" firstAttribute="centerY" secondItem="pGH-lj-do0" secondAttribute="centerY" id="WBr-LP-SIU"/>
<constraint firstItem="HDf-hH-avB" firstAttribute="leading" secondItem="wz5-BV-uj3" secondAttribute="trailing" constant="19" id="ZKK-R6-8cK"/>
<constraint firstAttribute="bottom" secondItem="oxw-hq-dE9" secondAttribute="bottom" id="b9J-bx-Vem"/>
<constraint firstAttribute="trailing" secondItem="oxw-hq-dE9" secondAttribute="trailing" id="cHy-4Q-ySM"/>
<constraint firstAttribute="height" constant="45" id="h0f-wp-Sf2"/>
<constraint firstAttribute="trailing" secondItem="HDf-hH-avB" secondAttribute="trailing" constant="10" id="i0y-e3-LgK"/>
<constraint firstItem="wz5-BV-uj3" firstAttribute="leading" secondItem="pGH-lj-do0" secondAttribute="leading" constant="34" id="k3A-na-ESZ"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YqM-tJ-N7B" userLabel="省">
<rect key="frame" x="0.0" y="95" width="375" height="45"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="省" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3mF-yh-lFt">
<rect key="frame" x="34" y="12" width="30" height="21"/>
<constraints>
......@@ -1035,7 +1076,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wbJ-R4-9da" userLabel="城市">
<rect key="frame" x="0.0" y="95" width="375" height="45"/>
<rect key="frame" x="0.0" y="140" width="375" height="45"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="城市" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Kv-wW-HKT">
<rect key="frame" x="34" y="12" width="30" height="21"/>
......@@ -1077,7 +1118,7 @@
</variation>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kKQ-8s-sja" userLabel="地址">
<rect key="frame" x="0.0" y="152" width="375" height="45"/>
<rect key="frame" x="0.0" y="197" width="375" height="45"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="地址" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3QH-la-HqC">
<rect key="frame" x="34" y="12" width="30" height="21"/>
......@@ -1114,7 +1155,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mN0-z0-caU" userLabel="地址2">
<rect key="frame" x="0.0" y="197" width="375" height="45"/>
<rect key="frame" x="0.0" y="242" width="375" height="45"/>
<subviews>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="补充" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WUh-k3-hqZ">
<rect key="frame" x="34" y="12" width="30" height="21"/>
......@@ -1151,7 +1192,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2xS-m7-ZFV" userLabel="邮编">
<rect key="frame" x="0.0" y="242" width="375" height="45"/>
<rect key="frame" x="0.0" y="287" width="375" height="45"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="邮编" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iCT-4S-0FZ" userLabel="邮编">
<rect key="frame" x="34" y="12" width="30" height="21"/>
......@@ -1188,7 +1229,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="39g-DE-jHa" userLabel="姓名">
<rect key="frame" x="0.0" y="317" width="375" height="45"/>
<rect key="frame" x="0.0" y="362" width="375" height="45"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="姓名" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7UB-dx-2bZ">
<rect key="frame" x="34" y="12" width="30" height="21"/>
......@@ -1230,7 +1271,7 @@
</variation>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="biG-xU-Kdu" userLabel="电话">
<rect key="frame" x="0.0" y="362" width="375" height="45"/>
<rect key="frame" x="0.0" y="407" width="375" height="45"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="电话" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bxx-wG-LPb">
<rect key="frame" x="34" y="12" width="30" height="21"/>
......@@ -1281,19 +1322,22 @@
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="pGH-lj-do0" secondAttribute="trailing" id="4n3-mI-iUQ"/>
<constraint firstItem="YqM-tJ-N7B" firstAttribute="top" secondItem="pGH-lj-do0" secondAttribute="bottom" id="4ng-Wd-noR"/>
<constraint firstItem="mN0-z0-caU" firstAttribute="top" secondItem="kKQ-8s-sja" secondAttribute="bottom" id="5iO-jx-MfI"/>
<constraint firstAttribute="trailing" secondItem="wbJ-R4-9da" secondAttribute="trailing" id="5lV-KD-Drc"/>
<constraint firstItem="YqM-tJ-N7B" firstAttribute="top" secondItem="Kvk-3s-9rc" secondAttribute="bottom" constant="30" id="6Ju-43-H67"/>
<constraint firstAttribute="trailing" secondItem="2xS-m7-ZFV" secondAttribute="trailing" id="6Kg-5F-FJE"/>
<constraint firstItem="biG-xU-Kdu" firstAttribute="top" secondItem="39g-DE-jHa" secondAttribute="bottom" id="9up-fX-IrH"/>
<constraint firstItem="kKQ-8s-sja" firstAttribute="top" secondItem="wbJ-R4-9da" secondAttribute="bottom" constant="12" id="All-1u-VOV"/>
<constraint firstItem="39g-DE-jHa" firstAttribute="top" secondItem="2xS-m7-ZFV" secondAttribute="bottom" constant="30" id="BV7-Je-QdG"/>
<constraint firstItem="kKQ-8s-sja" firstAttribute="leading" secondItem="hIO-Tk-Vwt" secondAttribute="leading" id="E85-5a-hyM"/>
<constraint firstAttribute="trailing" secondItem="YqM-tJ-N7B" secondAttribute="trailing" id="EPx-Xb-T2w"/>
<constraint firstItem="pGH-lj-do0" firstAttribute="leading" secondItem="hIO-Tk-Vwt" secondAttribute="leading" id="Kc5-BO-t2q"/>
<constraint firstAttribute="trailing" secondItem="biG-xU-Kdu" secondAttribute="trailing" id="Kne-c7-GIH"/>
<constraint firstItem="lZ3-Kp-lbd" firstAttribute="top" secondItem="Kvk-3s-9rc" secondAttribute="bottom" id="M5y-7r-Y83"/>
<constraint firstAttribute="trailing" secondItem="mN0-z0-caU" secondAttribute="trailing" id="MrO-ge-JbN"/>
<constraint firstItem="39g-DE-jHa" firstAttribute="leading" secondItem="hIO-Tk-Vwt" secondAttribute="leading" id="NgE-we-A8Z"/>
<constraint firstItem="pGH-lj-do0" firstAttribute="top" secondItem="Kvk-3s-9rc" secondAttribute="bottom" constant="30" id="QYN-bI-0lX"/>
<constraint firstItem="mN0-z0-caU" firstAttribute="leading" secondItem="hIO-Tk-Vwt" secondAttribute="leading" id="Qz4-44-wcK"/>
<constraint firstAttribute="trailing" secondItem="kKQ-8s-sja" secondAttribute="trailing" id="Re5-gW-1MO"/>
<constraint firstItem="wbJ-R4-9da" firstAttribute="leading" secondItem="hIO-Tk-Vwt" secondAttribute="leading" id="SPK-r5-I91"/>
......@@ -1308,10 +1352,11 @@
</constraints>
</view>
<connections>
<outlet property="heightOfProvinceTop" destination="6Ju-43-H67" id="vUL-Ot-8T9"/>
<outlet property="marginTopOfCountry" destination="QYN-bI-0lX" id="23D-Dk-EBm"/>
<outlet property="tfAddress" destination="E4Y-O9-BjA" id="w6A-jn-eKB"/>
<outlet property="tfAddressDetail" destination="Ad4-zz-DYh" id="CBF-DV-2Zb"/>
<outlet property="tfCity" destination="kd4-0K-k7c" id="427-10-xae"/>
<outlet property="tfCountry" destination="HDf-hH-avB" id="ZYJ-fb-ukz"/>
<outlet property="tfName" destination="DDB-bK-v5E" id="dgo-3y-fAE"/>
<outlet property="tfPhone" destination="zxl-Z1-xai" id="tYv-WK-RmO"/>
<outlet property="tfProvince" destination="bRG-pI-5pS" id="Ejw-Ec-ZTd"/>
......
iCemarose/Class/Util/KWMImageUtil.m
......@@ -212,7 +212,7 @@
if (startRange.location != NSNotFound) {
newImageUrl=[[NSMutableString alloc]initWithString:originalImgUrl];
NSArray<NSString *> *imageWH = [self getImageWH:ImageSize];
NSString *size = [NSString stringWithFormat:@"imageView2/1/w/%@/h/%@/",imageWH[0],imageWH[1]];
NSString *size = [NSString stringWithFormat:@"imageView2/2/w/%@/h/%@/",imageWH[0],imageWH[1]];
[newImageUrl insertString:size atIndex:startRange.location+1];
}
}
......
iCemarose/Class/View/Cell/BaseCell.h 0 → 100644
//
// BaseCell.h
// iCemarose
//
// Created by HouWeiBin on 2017/6/6.
// Copyright © 2017年 kollway. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface BaseCell : UICollectionViewCell
@end
iCemarose/Class/View/Cell/BaseCell.m 0 → 100644
//
// BaseCell.m
// iCemarose
//
// Created by HouWeiBin on 2017/6/6.
// Copyright © 2017年 kollway. All rights reserved.
//
#import "BaseCell.h"
@implementation BaseCell
@end
iCemarose/Info.plist
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.3.2</string>
<string>1.3.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
......@@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>2017053117</string>
<string>2017060617</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>weixin</string>
......
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