diff --git a/iCemarose/Assets.xcassets/ic_address.imageset/Contents.json b/iCemarose/Assets.xcassets/ic_address.imageset/Contents.json
new file mode 100644
index 0000000..cb180df
--- /dev/null
+++ b/iCemarose/Assets.xcassets/ic_address.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_address.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iCemarose/Assets.xcassets/ic_address.imageset/ic_address.png b/iCemarose/Assets.xcassets/ic_address.imageset/ic_address.png
new file mode 100644
index 0000000..95c50ef
Binary files /dev/null and b/iCemarose/Assets.xcassets/ic_address.imageset/ic_address.png differ
diff --git a/iCemarose/Base.lproj/LaunchScreen.storyboard b/iCemarose/Base.lproj/LaunchScreen.storyboard
index 719044b..74ff08e 100644
--- a/iCemarose/Base.lproj/LaunchScreen.storyboard
+++ b/iCemarose/Base.lproj/LaunchScreen.storyboard
@@ -35,8 +35,8 @@
                                                     <constraint firstAttribute="height" constant="24" id="x1H-Jw-5lD"/>
                                                 </constraints>
                                             </imageView>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="v 1.5.8" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ytF-B2-drm">
-                                                <rect key="frame" x="168" y="631" width="39" height="16"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="v 1.5.10" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ytF-B2-drm">
+                                                <rect key="frame" x="165" y="631" width="45" height="16"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                 <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
diff --git a/iCemarose/Base.lproj/Main.storyboard b/iCemarose/Base.lproj/Main.storyboard
index b9fd84f..535d44f 100644
--- a/iCemarose/Base.lproj/Main.storyboard
+++ b/iCemarose/Base.lproj/Main.storyboard
@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="n8p-We-k4e">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="n8p-We-k4e">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="PingFang.ttc">
+            <string>PingFangSC-Light</string>
+            <string>PingFangSC-Medium</string>
+            <string>PingFangSC-Regular</string>
+            <string>PingFangSC-Thin</string>
+        </array>
+    </customFonts>
     <scenes>
         <!--MainVC-->
         <scene sceneID="Six-vE-aCz">
@@ -36,7 +44,7 @@
                 <navigationController id="Dep-uy-mbB" userLabel="新品tab" sceneMemberID="viewController">
                     <tabBarItem key="tabBarItem" title="Item" id="uPp-R6-d4y"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="uRI-cY-9Z3">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -53,7 +61,7 @@
                 <navigationController id="D4D-p0-AIx" userLabel="品牌tab" sceneMemberID="viewController">
                     <tabBarItem key="tabBarItem" title="Item" id="oZd-Yl-sa8"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="YEk-G5-i0F">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -70,7 +78,7 @@
                 <navigationController id="ozf-cA-JlG" userLabel="我的tab" sceneMemberID="viewController">
                     <tabBarItem key="tabBarItem" title="Item" id="Yuk-lb-Sd4"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="bFN-W4-nAk">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -118,30 +126,30 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gq6-eo-S0I" userLabel="vOrder">
-                                        <rect key="frame" x="0.0" y="160" width="375" height="60"/>
+                                        <rect key="frame" x="0.0" y="160" width="375" height="50"/>
                                         <subviews>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_mine_list_menu_order" translatesAutoresizingMaskIntoConstraints="NO" id="fpG-89-pY0">
-                                                <rect key="frame" x="20" y="20" width="20" height="20"/>
+                                                <rect key="frame" x="20" y="15" width="20" height="20"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="20" id="4yp-XZ-dyC"/>
                                                     <constraint firstAttribute="width" constant="20" id="u9A-GU-yuf"/>
                                                 </constraints>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的订单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7jz-NW-43D">
-                                                <rect key="frame" x="60" y="20" width="60" height="21"/>
+                                                <rect key="frame" x="60" y="15" width="60" height="21"/>
                                                 <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="15"/>
                                                 <color key="textColor" red="0.22352941176470587" green="0.22352941176470587" blue="0.22352941176470587" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="button_mine_more" translatesAutoresizingMaskIntoConstraints="NO" id="xbQ-Pb-Pmx">
-                                                <rect key="frame" x="349" y="24" width="6" height="13"/>
+                                                <rect key="frame" x="349" y="19" width="6" height="13"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="6" id="C4F-mr-kG5"/>
                                                     <constraint firstAttribute="height" constant="13" id="Ck0-mk-hST"/>
                                                 </constraints>
                                             </imageView>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WNh-sP-Pgj">
-                                                <rect key="frame" x="60" y="59" width="315" height="1"/>
+                                                <rect key="frame" x="60" y="49" width="315" height="1"/>
                                                 <color key="backgroundColor" red="0.84705882352941175" green="0.85882352941176465" blue="0.87058823529411766" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="1" id="7p3-HE-XW0"/>
@@ -150,10 +158,9 @@
                                         </subviews>
                                         <color key="backgroundColor" red="0.95686274509803915" green="0.96078431372549022" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
-                                            <constraint firstAttribute="height" constant="60" id="10j-lf-xaR"/>
+                                            <constraint firstAttribute="height" constant="50" id="10j-lf-xaR"/>
                                             <constraint firstItem="xbQ-Pb-Pmx" firstAttribute="centerY" secondItem="gq6-eo-S0I" secondAttribute="centerY" id="1JR-Oa-5Bp"/>
                                             <constraint firstItem="fpG-89-pY0" firstAttribute="centerY" secondItem="gq6-eo-S0I" secondAttribute="centerY" id="F7g-Jl-f2C"/>
-                                            <constraint firstItem="xbQ-Pb-Pmx" firstAttribute="leading" secondItem="WNh-sP-Pgj" secondAttribute="trailing" id="H90-5X-Mmi"/>
                                             <constraint firstItem="7jz-NW-43D" firstAttribute="centerY" secondItem="gq6-eo-S0I" secondAttribute="centerY" id="MO9-5k-481"/>
                                             <constraint firstAttribute="trailing" secondItem="xbQ-Pb-Pmx" secondAttribute="trailing" constant="20" id="a49-Uf-TA1"/>
                                             <constraint firstItem="WNh-sP-Pgj" firstAttribute="leading" secondItem="gq6-eo-S0I" secondAttribute="leading" constant="60" id="fRN-fA-vn7"/>
@@ -161,20 +168,13 @@
                                             <constraint firstItem="7jz-NW-43D" firstAttribute="leading" secondItem="fpG-89-pY0" secondAttribute="trailing" constant="20" id="g9d-lQ-vDf"/>
                                             <constraint firstAttribute="bottom" secondItem="WNh-sP-Pgj" secondAttribute="bottom" id="lI5-HI-hcX"/>
                                             <constraint firstItem="fpG-89-pY0" firstAttribute="leading" secondItem="gq6-eo-S0I" secondAttribute="leading" constant="20" id="omk-kE-vWD"/>
-                                            <constraint firstItem="WNh-sP-Pgj" firstAttribute="leading" secondItem="7jz-NW-43D" secondAttribute="trailing" id="prc-dR-fbC"/>
                                         </constraints>
-                                        <variation key="default">
-                                            <mask key="constraints">
-                                                <exclude reference="prc-dR-fbC"/>
-                                                <exclude reference="H90-5X-Mmi"/>
-                                            </mask>
-                                        </variation>
                                         <connections>
                                             <outletCollection property="gestureRecognizers" destination="I8a-iq-XYY" appends="YES" id="T3S-8g-NHp"/>
                                         </connections>
                                     </view>
                                     <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZJV-Hx-p4h" userLabel="vGiftcards">
-                                        <rect key="frame" x="0.0" y="220" width="375" height="0.0"/>
+                                        <rect key="frame" x="0.0" y="210" width="375" height="0.0"/>
                                         <subviews>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_mine_list_menu_about us" translatesAutoresizingMaskIntoConstraints="NO" id="kli-Ed-9su">
                                                 <rect key="frame" x="20" y="-10" width="20" height="20"/>
@@ -222,30 +222,30 @@
                                         </connections>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Gq-gg-k4w" userLabel="vAbout">
-                                        <rect key="frame" x="0.0" y="220" width="375" height="60"/>
+                                        <rect key="frame" x="0.0" y="210" width="375" height="50"/>
                                         <subviews>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_mine_list_menu_about us" translatesAutoresizingMaskIntoConstraints="NO" id="fSV-ll-eLK">
-                                                <rect key="frame" x="20" y="20" width="20" height="20"/>
+                                                <rect key="frame" x="20" y="15" width="20" height="20"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="20" id="mHQ-V1-37x"/>
                                                     <constraint firstAttribute="height" constant="20" id="naN-zM-c2y"/>
                                                 </constraints>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="关于我们" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iW5-ov-fth">
-                                                <rect key="frame" x="60" y="20" width="60" height="21"/>
+                                                <rect key="frame" x="60" y="15" width="60" height="21"/>
                                                 <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="15"/>
                                                 <color key="textColor" red="0.22352941179999999" green="0.22352941179999999" blue="0.22352941179999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="button_mine_more" translatesAutoresizingMaskIntoConstraints="NO" id="oKc-Ir-M5Z">
-                                                <rect key="frame" x="349" y="24" width="6" height="13"/>
+                                                <rect key="frame" x="349" y="19" width="6" height="13"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="6" id="BnM-ja-0EQ"/>
                                                     <constraint firstAttribute="height" constant="13" id="xta-r6-u5u"/>
                                                 </constraints>
                                             </imageView>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wXS-V2-TqO">
-                                                <rect key="frame" x="60" y="59" width="315" height="1"/>
+                                                <rect key="frame" x="60" y="49" width="315" height="1"/>
                                                 <color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="1" id="Xow-hA-06D"/>
@@ -257,7 +257,7 @@
                                             <constraint firstItem="oKc-Ir-M5Z" firstAttribute="centerY" secondItem="8Gq-gg-k4w" secondAttribute="centerY" id="AWd-HE-L8g"/>
                                             <constraint firstAttribute="trailing" secondItem="oKc-Ir-M5Z" secondAttribute="trailing" constant="20" id="Kvi-KF-wfo"/>
                                             <constraint firstItem="iW5-ov-fth" firstAttribute="centerY" secondItem="8Gq-gg-k4w" secondAttribute="centerY" id="OGH-Ch-IC4"/>
-                                            <constraint firstAttribute="height" constant="60" id="T6F-dV-jcA"/>
+                                            <constraint firstAttribute="height" constant="50" id="T6F-dV-jcA"/>
                                             <constraint firstItem="wXS-V2-TqO" firstAttribute="leading" secondItem="8Gq-gg-k4w" secondAttribute="leading" constant="60" id="X1U-V0-Xh2"/>
                                             <constraint firstItem="fSV-ll-eLK" firstAttribute="leading" secondItem="8Gq-gg-k4w" secondAttribute="leading" constant="20" id="XkM-xk-n8B"/>
                                             <constraint firstAttribute="trailing" secondItem="wXS-V2-TqO" secondAttribute="trailing" id="g1q-UU-lzL"/>
@@ -270,30 +270,30 @@
                                         </connections>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hXm-vK-Gyb" userLabel="vContect">
-                                        <rect key="frame" x="0.0" y="280" width="375" height="60"/>
+                                        <rect key="frame" x="0.0" y="260" width="375" height="50"/>
                                         <subviews>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_mine_list_contact us" translatesAutoresizingMaskIntoConstraints="NO" id="2xL-Ue-j1U">
-                                                <rect key="frame" x="20" y="20" width="20" height="20"/>
+                                                <rect key="frame" x="20" y="15" width="20" height="20"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="20" id="NOV-Vp-eZd"/>
                                                     <constraint firstAttribute="height" constant="20" id="pDd-5f-gpE"/>
                                                 </constraints>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="联系我们" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fon-DU-W2x">
-                                                <rect key="frame" x="60" y="20" width="60" height="21"/>
+                                                <rect key="frame" x="60" y="15" width="60" height="21"/>
                                                 <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="15"/>
                                                 <color key="textColor" red="0.22352941179999999" green="0.22352941179999999" blue="0.22352941179999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="button_mine_more" translatesAutoresizingMaskIntoConstraints="NO" id="4ec-Cr-06B">
-                                                <rect key="frame" x="349" y="24" width="6" height="13"/>
+                                                <rect key="frame" x="349" y="19" width="6" height="13"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="6" id="9U2-h1-n4F"/>
                                                     <constraint firstAttribute="height" constant="13" id="sFW-tE-VEF"/>
                                                 </constraints>
                                             </imageView>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mjU-gr-Y4Y">
-                                                <rect key="frame" x="60" y="59" width="315" height="1"/>
+                                                <rect key="frame" x="60" y="49" width="315" height="1"/>
                                                 <color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="1" id="wSt-87-Bfb"/>
@@ -307,7 +307,7 @@
                                             <constraint firstItem="2xL-Ue-j1U" firstAttribute="centerY" secondItem="hXm-vK-Gyb" secondAttribute="centerY" id="6Gs-cl-2E6"/>
                                             <constraint firstItem="2xL-Ue-j1U" firstAttribute="leading" secondItem="hXm-vK-Gyb" secondAttribute="leading" constant="20" id="FDH-Vq-Ff9"/>
                                             <constraint firstItem="4ec-Cr-06B" firstAttribute="centerY" secondItem="hXm-vK-Gyb" secondAttribute="centerY" id="VIB-bV-Rge"/>
-                                            <constraint firstAttribute="height" constant="60" id="Xh0-kX-DHp"/>
+                                            <constraint firstAttribute="height" constant="50" id="Xh0-kX-DHp"/>
                                             <constraint firstItem="fon-DU-W2x" firstAttribute="centerY" secondItem="hXm-vK-Gyb" secondAttribute="centerY" id="cWx-Vj-z2v"/>
                                             <constraint firstItem="fon-DU-W2x" firstAttribute="leading" secondItem="2xL-Ue-j1U" secondAttribute="trailing" constant="20" id="jw1-ji-Ls8"/>
                                             <constraint firstAttribute="trailing" secondItem="mjU-gr-Y4Y" secondAttribute="trailing" id="oGX-DU-hwl"/>
@@ -317,30 +317,71 @@
                                             <outletCollection property="gestureRecognizers" destination="hgo-Kr-ZsN" appends="YES" id="5Xd-tn-Uo3"/>
                                         </connections>
                                     </view>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Bnj-mM-yOg" userLabel="vCurrency">
+                                        <rect key="frame" x="0.0" y="310" width="375" height="50"/>
+                                        <subviews>
+                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_money" translatesAutoresizingMaskIntoConstraints="NO" id="XYm-BY-baw">
+                                                <rect key="frame" x="20" y="15" width="20" height="20"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="20" id="Jgv-nE-nFl"/>
+                                                    <constraint firstAttribute="width" constant="20" id="sON-73-XnY"/>
+                                                </constraints>
+                                            </imageView>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择货币" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MQV-ul-qVa">
+                                                <rect key="frame" x="60" y="15" width="60" height="21"/>
+                                                <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="15"/>
+                                                <color key="textColor" red="0.22352941179999999" green="0.22352941179999999" blue="0.22352941179999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="button_mine_more" translatesAutoresizingMaskIntoConstraints="NO" id="jUq-il-D4i">
+                                                <rect key="frame" x="349" y="19" width="6" height="13"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="13" id="fEf-fz-rDT"/>
+                                                    <constraint firstAttribute="width" constant="6" id="vI4-hL-gx4"/>
+                                                </constraints>
+                                            </imageView>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aXy-5g-LeA">
+                                                <rect key="frame" x="60" y="49" width="315" height="1"/>
+                                                <color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="1" id="cTs-ug-Lvq"/>
+                                                </constraints>
+                                            </view>
+                                        </subviews>
+                                        <color key="backgroundColor" red="0.95686274510000002" green="0.96078431369999995" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <gestureRecognizers/>
+                                        <constraints>
+                                            <constraint firstItem="aXy-5g-LeA" firstAttribute="leading" secondItem="Bnj-mM-yOg" secondAttribute="leading" constant="60" id="6AL-u3-zAh"/>
+                                            <constraint firstAttribute="trailing" secondItem="aXy-5g-LeA" secondAttribute="trailing" id="6Iu-0Q-yAa"/>
+                                            <constraint firstAttribute="height" constant="50" id="8Zc-Py-Lm2"/>
+                                            <constraint firstItem="XYm-BY-baw" firstAttribute="centerY" secondItem="Bnj-mM-yOg" secondAttribute="centerY" id="Dib-dO-Kz5"/>
+                                            <constraint firstAttribute="bottom" secondItem="aXy-5g-LeA" secondAttribute="bottom" id="ICM-Fg-T0n"/>
+                                            <constraint firstItem="MQV-ul-qVa" firstAttribute="centerY" secondItem="Bnj-mM-yOg" secondAttribute="centerY" id="K3m-ek-ane"/>
+                                            <constraint firstItem="XYm-BY-baw" firstAttribute="leading" secondItem="Bnj-mM-yOg" secondAttribute="leading" constant="20" id="O5g-PV-GDL"/>
+                                            <constraint firstItem="MQV-ul-qVa" firstAttribute="leading" secondItem="XYm-BY-baw" secondAttribute="trailing" constant="20" id="Uol-8T-QGw"/>
+                                            <constraint firstItem="jUq-il-D4i" firstAttribute="centerY" secondItem="Bnj-mM-yOg" secondAttribute="centerY" id="bvw-Bx-1yz"/>
+                                            <constraint firstAttribute="trailing" secondItem="jUq-il-D4i" secondAttribute="trailing" constant="20" id="uwa-dY-WvT"/>
+                                        </constraints>
+                                        <connections>
+                                            <outletCollection property="gestureRecognizers" destination="tns-4h-lSH" appends="YES" id="QS2-bx-jBg"/>
+                                        </connections>
+                                    </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pPH-sX-qFu" userLabel="vLogout">
-                                        <rect key="frame" x="0.0" y="453" width="375" height="60"/>
+                                        <rect key="frame" x="0.0" y="473" width="375" height="50"/>
                                         <subviews>
                                             <button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="01m-8h-W1G">
-                                                <rect key="frame" x="0.0" y="20" width="375" height="21"/>
+                                                <rect key="frame" x="0.0" y="15" width="375" height="21"/>
                                                 <accessibility key="accessibilityConfiguration">
                                                     <accessibilityTraits key="traits" button="YES" notEnabled="YES"/>
                                                 </accessibility>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="21" id="BWD-kk-NGg"/>
-                                                    <constraint firstAttribute="width" constant="60" id="eRJ-O1-Ks7"/>
-                                                    <constraint firstAttribute="height" constant="21" id="tiI-Bd-Rsq"/>
                                                 </constraints>
                                                 <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="15"/>
                                                 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="5" maxY="0.0"/>
                                                 <state key="normal" title="退出" image="button_mine_log out">
                                                     <color key="titleColor" red="0.22352941176470587" green="0.22352941176470587" blue="0.22352941176470587" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </state>
-                                                <variation key="default">
-                                                    <mask key="constraints">
-                                                        <exclude reference="eRJ-O1-Ks7"/>
-                                                        <exclude reference="tiI-Bd-Rsq"/>
-                                                    </mask>
-                                                </variation>
                                             </button>
                                         </subviews>
                                         <color key="backgroundColor" red="0.95686274510000002" green="0.96078431369999995" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -348,7 +389,7 @@
                                             <constraint firstItem="01m-8h-W1G" firstAttribute="centerX" secondItem="pPH-sX-qFu" secondAttribute="centerX" id="2Hx-ky-Din"/>
                                             <constraint firstItem="01m-8h-W1G" firstAttribute="leading" secondItem="pPH-sX-qFu" secondAttribute="leading" id="F96-iL-hoU"/>
                                             <constraint firstAttribute="trailing" secondItem="01m-8h-W1G" secondAttribute="trailing" id="f6A-9h-byU"/>
-                                            <constraint firstAttribute="height" constant="60" id="kZe-OJ-hZW"/>
+                                            <constraint firstAttribute="height" constant="50" id="kZe-OJ-hZW"/>
                                             <constraint firstItem="01m-8h-W1G" firstAttribute="centerY" secondItem="pPH-sX-qFu" secondAttribute="centerY" id="vh2-E1-nVC"/>
                                             <constraint firstAttribute="trailing" secondItem="01m-8h-W1G" secondAttribute="trailing" constant="270" id="xN0-4v-GYD"/>
                                         </constraints>
@@ -361,43 +402,43 @@
                                             <outletCollection property="gestureRecognizers" destination="DED-9F-c8a" appends="YES" id="xc2-YF-AFB"/>
                                         </connections>
                                     </view>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Bnj-mM-yOg" userLabel="vCurrency">
-                                        <rect key="frame" x="0.0" y="340" width="375" height="60"/>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pN2-co-qot" userLabel="vAddress">
+                                        <rect key="frame" x="0.0" y="360" width="375" height="50"/>
                                         <subviews>
-                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_money" translatesAutoresizingMaskIntoConstraints="NO" id="XYm-BY-baw">
-                                                <rect key="frame" x="20" y="20" width="20" height="20"/>
+                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_address" translatesAutoresizingMaskIntoConstraints="NO" id="ZGH-R9-O0D">
+                                                <rect key="frame" x="20" y="15" width="20" height="20"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="height" constant="20" id="Jgv-nE-nFl"/>
-                                                    <constraint firstAttribute="width" constant="20" id="sON-73-XnY"/>
+                                                    <constraint firstAttribute="width" constant="20" id="dkO-N0-KYB"/>
+                                                    <constraint firstAttribute="height" constant="20" id="khV-hU-MWc"/>
                                                 </constraints>
                                             </imageView>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择货币" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MQV-ul-qVa">
-                                                <rect key="frame" x="60" y="20" width="60" height="21"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="送货地址" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cSQ-js-1Gc">
+                                                <rect key="frame" x="60" y="15" width="60" height="21"/>
                                                 <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="15"/>
                                                 <color key="textColor" red="0.22352941179999999" green="0.22352941179999999" blue="0.22352941179999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="button_mine_more" translatesAutoresizingMaskIntoConstraints="NO" id="jUq-il-D4i">
-                                                <rect key="frame" x="349" y="24" width="6" height="13"/>
+                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="button_mine_more" translatesAutoresizingMaskIntoConstraints="NO" id="QRF-Yy-KMA">
+                                                <rect key="frame" x="349" y="19" width="6" height="13"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="height" constant="13" id="fEf-fz-rDT"/>
-                                                    <constraint firstAttribute="width" constant="6" id="vI4-hL-gx4"/>
+                                                    <constraint firstAttribute="width" constant="6" id="0Rf-KV-2Lv"/>
+                                                    <constraint firstAttribute="height" constant="13" id="TBj-w8-CmY"/>
                                                 </constraints>
                                             </imageView>
                                         </subviews>
                                         <color key="backgroundColor" red="0.95686274510000002" green="0.96078431369999995" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <gestureRecognizers/>
                                         <constraints>
-                                            <constraint firstAttribute="height" constant="60" id="8Zc-Py-Lm2"/>
-                                            <constraint firstItem="XYm-BY-baw" firstAttribute="centerY" secondItem="Bnj-mM-yOg" secondAttribute="centerY" id="Dib-dO-Kz5"/>
-                                            <constraint firstItem="MQV-ul-qVa" firstAttribute="centerY" secondItem="Bnj-mM-yOg" secondAttribute="centerY" id="K3m-ek-ane"/>
-                                            <constraint firstItem="XYm-BY-baw" firstAttribute="leading" secondItem="Bnj-mM-yOg" secondAttribute="leading" constant="20" id="O5g-PV-GDL"/>
-                                            <constraint firstItem="MQV-ul-qVa" firstAttribute="leading" secondItem="XYm-BY-baw" secondAttribute="trailing" constant="20" id="Uol-8T-QGw"/>
-                                            <constraint firstItem="jUq-il-D4i" firstAttribute="centerY" secondItem="Bnj-mM-yOg" secondAttribute="centerY" id="bvw-Bx-1yz"/>
-                                            <constraint firstAttribute="trailing" secondItem="jUq-il-D4i" secondAttribute="trailing" constant="20" id="uwa-dY-WvT"/>
+                                            <constraint firstItem="cSQ-js-1Gc" firstAttribute="leading" secondItem="ZGH-R9-O0D" secondAttribute="trailing" constant="20" id="0qp-be-EgF"/>
+                                            <constraint firstItem="ZGH-R9-O0D" firstAttribute="leading" secondItem="pN2-co-qot" secondAttribute="leading" constant="20" id="6ds-Er-SPY"/>
+                                            <constraint firstItem="ZGH-R9-O0D" firstAttribute="centerY" secondItem="pN2-co-qot" secondAttribute="centerY" id="9av-lv-xOx"/>
+                                            <constraint firstItem="cSQ-js-1Gc" firstAttribute="centerY" secondItem="pN2-co-qot" secondAttribute="centerY" id="Xuw-hJ-Asy"/>
+                                            <constraint firstAttribute="height" constant="50" id="csq-eK-xvp"/>
+                                            <constraint firstAttribute="trailing" secondItem="QRF-Yy-KMA" secondAttribute="trailing" constant="20" id="jO8-mq-hd7"/>
+                                            <constraint firstItem="QRF-Yy-KMA" firstAttribute="centerY" secondItem="pN2-co-qot" secondAttribute="centerY" id="o57-Ri-S4G"/>
                                         </constraints>
                                         <connections>
-                                            <outletCollection property="gestureRecognizers" destination="tns-4h-lSH" appends="YES" id="QS2-bx-jBg"/>
+                                            <outletCollection property="gestureRecognizers" destination="irh-cs-V8K" appends="YES" id="0iR-Xy-aam"/>
                                         </connections>
                                     </view>
                                 </subviews>
@@ -408,7 +449,9 @@
                                     <constraint firstItem="gq6-eo-S0I" firstAttribute="top" secondItem="eGQ-6R-Q7T" secondAttribute="bottom" id="D0H-Hb-wJN"/>
                                     <constraint firstAttribute="trailing" secondItem="8Gq-gg-k4w" secondAttribute="trailing" id="Ekc-y8-gE6"/>
                                     <constraint firstItem="ZJV-Hx-p4h" firstAttribute="leading" secondItem="ls4-qX-r5H" secondAttribute="leading" id="HfL-Az-xsa"/>
-                                    <constraint firstAttribute="bottom" secondItem="pPH-sX-qFu" secondAttribute="bottom" constant="40" id="O2b-N3-TYT"/>
+                                    <constraint firstItem="pN2-co-qot" firstAttribute="top" secondItem="Bnj-mM-yOg" secondAttribute="bottom" id="Hy2-L4-A9H"/>
+                                    <constraint firstItem="pN2-co-qot" firstAttribute="leading" secondItem="ls4-qX-r5H" secondAttribute="leading" id="ITI-0c-KY2"/>
+                                    <constraint firstAttribute="bottom" secondItem="pPH-sX-qFu" secondAttribute="bottom" constant="30" id="O2b-N3-TYT"/>
                                     <constraint firstItem="gq6-eo-S0I" firstAttribute="leading" secondItem="ls4-qX-r5H" secondAttribute="leading" id="RbJ-Cr-Phj"/>
                                     <constraint firstItem="8Gq-gg-k4w" firstAttribute="leading" secondItem="ls4-qX-r5H" secondAttribute="leading" id="WXh-Oz-KTE"/>
                                     <constraint firstItem="eGQ-6R-Q7T" firstAttribute="leading" secondItem="ls4-qX-r5H" secondAttribute="leading" id="adJ-MI-GXX"/>
@@ -425,18 +468,19 @@
                                     <constraint firstAttribute="trailing" secondItem="eGQ-6R-Q7T" secondAttribute="trailing" id="uLD-sI-IkP"/>
                                     <constraint firstItem="Bnj-mM-yOg" firstAttribute="leading" secondItem="ls4-qX-r5H" secondAttribute="leading" id="wBZ-2w-KJd"/>
                                     <constraint firstItem="hXm-vK-Gyb" firstAttribute="leading" secondItem="ls4-qX-r5H" secondAttribute="leading" id="wnw-43-awO"/>
+                                    <constraint firstAttribute="trailing" secondItem="pN2-co-qot" secondAttribute="trailing" id="zka-uE-kph"/>
                                 </constraints>
                             </view>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="ls4-qX-r5H" secondAttribute="trailing" id="06Q-8T-vuM"/>
+                            <constraint firstItem="5l7-nT-z4j" firstAttribute="top" secondItem="ls4-qX-r5H" secondAttribute="bottom" id="0C3-EN-PRb"/>
                             <constraint firstItem="ls4-qX-r5H" firstAttribute="leading" secondItem="uAf-YF-rCb" secondAttribute="leading" id="2VA-GB-uiO"/>
                             <constraint firstItem="txb-M1-kuY" firstAttribute="leading" secondItem="uAf-YF-rCb" secondAttribute="leading" id="C5q-J5-Gan"/>
+                            <constraint firstItem="ls4-qX-r5H" firstAttribute="top" secondItem="3dA-q7-JjV" secondAttribute="bottom" constant="1" id="DuG-PV-LII"/>
                             <constraint firstAttribute="bottom" secondItem="ls4-qX-r5H" secondAttribute="bottom" id="Yei-4o-bI2"/>
-                            <constraint firstItem="ls4-qX-r5H" firstAttribute="top" secondItem="3dA-q7-JjV" secondAttribute="bottom" constant="1" id="hM2-bm-iW9"/>
                             <constraint firstAttribute="trailing" secondItem="txb-M1-kuY" secondAttribute="trailing" id="meT-v2-12s"/>
-                            <constraint firstItem="5l7-nT-z4j" firstAttribute="top" secondItem="ls4-qX-r5H" secondAttribute="bottom" id="pqU-G6-Y9Z"/>
                             <constraint firstItem="txb-M1-kuY" firstAttribute="top" secondItem="uAf-YF-rCb" secondAttribute="top" constant="64" id="ziS-49-YAu"/>
                         </constraints>
                         <variation key="default">
@@ -484,6 +528,11 @@
                         <action selector="onClickCurrency:" destination="A2m-KK-eBc" id="WTc-vn-J0q"/>
                     </connections>
                 </tapGestureRecognizer>
+                <tapGestureRecognizer id="irh-cs-V8K" userLabel="topAddress">
+                    <connections>
+                        <action selector="onClickAddress" destination="A2m-KK-eBc" id="ShG-Ow-dL9"/>
+                    </connections>
+                </tapGestureRecognizer>
             </objects>
             <point key="canvasLocation" x="1800.8" y="1360.569715142429"/>
         </scene>
@@ -720,7 +769,7 @@
                 <navigationController id="u8P-hB-9hk" userLabel="首页tab" sceneMemberID="viewController">
                     <tabBarItem key="tabBarItem" title="首页" id="XwP-f8-O3G"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="RA9-LY-7Yg">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -1260,6 +1309,7 @@
     <resources>
         <image name="button_mine_log out" width="19" height="20"/>
         <image name="button_mine_more" width="7" height="14"/>
+        <image name="ic_address" width="18" height="19"/>
         <image name="ic_mine_list_contact us" width="20" height="16"/>
         <image name="ic_mine_list_menu_about us" width="21" height="20"/>
         <image name="ic_mine_list_menu_order" width="21" height="20"/>
diff --git a/iCemarose/Class/UI/Brand/KWMSearchBrandVC.m b/iCemarose/Class/UI/Brand/KWMSearchBrandVC.m
index a2d3eee..137ea4c 100644
--- a/iCemarose/Class/UI/Brand/KWMSearchBrandVC.m
+++ b/iCemarose/Class/UI/Brand/KWMSearchBrandVC.m
@@ -52,9 +52,20 @@
     self.vLine.backgroundColor = [UIColor colorWithRed:244.0/255 green:245.0/255 blue:247.0/255 alpha:1];
     searchArr = [NSMutableArray array];
     [self initTableView];
+    [self loadStaticData];
     [self RequestBrandsAPI];
 }
 
+- (void) loadStaticData {
+    NSArray *brands = @[@"Amelie Wang",@"Babywalker",@"Beau Loves",@"Billieblush",@"Billybandit",@"Bonpoint",@"Burberry",@"Caramel",@"Chloé",@"Dolce & Gabbana",@"Emile et Ida",@"Fendi",@"Givenchy",@"Gucci",@"Hucklebones",@"Il Gufo",@"Indikidual",@"Karl Lagerfeld Kids",@"Kenzo",@"Lanvin",@"Little Marc Jacobs",@"Loud Apparel",@"Louis Louise",@"Louise Misha",@"Marie-Chantal",@"Marni",@"Mini Melissa",@"Mini Rodini",@"Mischka Aoki",@"Moncler",@"MOSCHINO",@"MSGM",@"Nailmatic",@"Nana Huchy",@"Noukie's",@"Oeuf",@"Patachou",@"Paul Smith",@"PèPè",@"Sons + Daughters Eyewear",@"Stella McCartney Kids",@"Story Loris",@"Tartine et Chocolat",@"The Animals Observatory",@"Tiny Cottons",@"Tip Toey Joey",@"Veja",@"Wolf & Rita",@"Young Versace",@"Zadig & Voltaire"];
+    
+    NSArray  *indexArray= [[brands rx_filterWithBlock:^BOOL(id each) {
+        return each && each != [NSNull null];
+    }] arrayWithPinYinFirstLetterFormat];
+    _dataArray =[NSMutableArray arrayWithArray:indexArray];
+    [self.tbvSearchBrand reloadData];
+}
+
 - (void)initHeaderView{
     _searchBrandView = [[KWMSearchBrandView alloc] initWithFrame:CGRectMake(0, 20, UI_SCREEN_WIDTH, 44)];
     [self.view addSubview:_searchBrandView];
@@ -292,11 +303,11 @@ static NSString *identify = @"KWMSearchBrandsCell";
 - (void)RequestBrandsAPI{
     __weak KWMSearchBrandVC *weakSelf = self;
     void(^failure)(NSURLSessionDataTask *,NSError *) = ^(NSURLSessionDataTask *task,NSError *error){
-        [weakSelf hideLoading];
-        [weakSelf showError:error];
+//        [weakSelf hideLoading];
+//        [weakSelf showError:error];
     };
     void(^success)(NSURLSessionDataTask *,KWMBrandsResult *) = ^(NSURLSessionDataTask *task,KWMBrandsResult *result){
-        [weakSelf hideLoading];
+//        [weakSelf hideLoading];
         if([weakSelf hasCemaroseError:result]){
             return ;
         }
@@ -308,7 +319,7 @@ static NSString *identify = @"KWMSearchBrandsCell";
         [weakSelf.tbvSearchBrand reloadData];
     };
     [self.api getAllBrand:nil success:success failure:failure];
-    [self showLoading];
+//    [self showLoading];
 }
 
 @end
diff --git a/iCemarose/Class/UI/Login/KWMEmailVC.m b/iCemarose/Class/UI/Login/KWMEmailVC.m
index 2071638..56717b2 100644
--- a/iCemarose/Class/UI/Login/KWMEmailVC.m
+++ b/iCemarose/Class/UI/Login/KWMEmailVC.m
@@ -93,11 +93,15 @@
 //点击下一步
 - (IBAction)onClickNextBtn:(id)sender {
     
-    [self emailLogin];
+    [self emailLogin:YES];
     
 }
 
-- (void)emailLogin{
+- (IBAction)signupAction:(id)sender {
+    [self emailLogin:NO];
+}
+
+- (void)emailLogin:(BOOL) islogin{
     if ([KWMStringUtil isEmpty:self.tfEmail.text]) {
         [self showToast:@"请输入邮箱"];
         return;
@@ -110,7 +114,8 @@
     }
     [self setData];
     [self showLoading];
-    if (_customer && _token) {
+//    if (_customer && _token) {
+    if (islogin) {
         [self requestLoginAPI];
     }else{
         [self requestRegisterAPI];
@@ -160,7 +165,7 @@
 
 - (BOOL)textFieldShouldReturn:(UITextField *)textField{
     if (textField.tag == 1002) {
-        [self emailLogin];
+        [self emailLogin:YES];
     }
     return YES;
 }
@@ -199,6 +204,7 @@
 //            NSLog(@"NSHomeDirectory == %@",path);
             
         }else{
+            [self hideLoading];
             [self showError:error];
             if (error.code == 401) {
                 [self showToast:@"密码错误"];
diff --git a/iCemarose/Class/UI/Login/Login.storyboard b/iCemarose/Class/UI/Login/Login.storyboard
index 68a03a6..ec48ac6 100644
--- a/iCemarose/Class/UI/Login/Login.storyboard
+++ b/iCemarose/Class/UI/Login/Login.storyboard
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" 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="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="PingFang.ttc">
+            <string>PingFangSC-Light</string>
+            <string>PingFangSC-Medium</string>
+            <string>PingFangSC-Regular</string>
+        </array>
+    </customFonts>
     <scenes>
         <!--注册-->
         <scene sceneID="6su-a8-JNt">
@@ -1036,7 +1043,7 @@
                                 <constraints>
                                     <constraint firstAttribute="height" constant="44" id="jp3-NO-3f6"/>
                                 </constraints>
-                                <state key="normal" title="下一步">
+                                <state key="normal" title="登陆">
                                     <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
                                 <connections>
@@ -1057,13 +1064,27 @@
                                     <action selector="onClickForgetPasswordBtn:" destination="REn-6o-ZnY" eventType="touchUpInside" id="hbu-0x-Bfq"/>
                                 </connections>
                             </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9c6-ew-bca">
+                                <rect key="frame" x="44" y="599" width="287" height="44"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="44" id="rjk-lv-YEm"/>
+                                </constraints>
+                                <state key="normal" title="注册新帐号">
+                                    <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                </state>
+                                <connections>
+                                    <action selector="signupAction:" destination="REn-6o-ZnY" eventType="touchUpInside" id="Ics-UX-pmd"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="Zxn-i4-X7g" firstAttribute="bottom" secondItem="smV-C2-4Ap" secondAttribute="bottom" id="4jF-52-ti3"/>
                             <constraint firstItem="DMu-Rk-MZg" firstAttribute="centerY" secondItem="smV-C2-4Ap" secondAttribute="centerY" id="E6u-Nb-RMh"/>
                             <constraint firstItem="YUM-QH-hXq" firstAttribute="top" secondItem="Bhz-8A-a2G" secondAttribute="bottom" constant="40" id="ETT-8y-mFE"/>
+                            <constraint firstItem="9c6-ew-bca" firstAttribute="leading" secondItem="4Qb-31-ul2" secondAttribute="leading" constant="44" id="FUp-Yg-v1L"/>
                             <constraint firstItem="GQR-9Z-fvw" firstAttribute="leading" secondItem="4Qb-31-ul2" secondAttribute="leading" constant="44" id="FpO-AV-K87"/>
+                            <constraint firstItem="9c6-ew-bca" firstAttribute="top" secondItem="GQR-9Z-fvw" secondAttribute="bottom" constant="10" id="GBn-hz-WsG"/>
                             <constraint firstItem="0gu-gR-TJ0" firstAttribute="centerX" secondItem="4Qb-31-ul2" secondAttribute="centerX" id="Hvn-cL-MxL"/>
                             <constraint firstItem="VwP-JL-neq" firstAttribute="top" secondItem="4Qb-31-ul2" secondAttribute="top" constant="32" id="Igl-ZD-CMg"/>
                             <constraint firstItem="smV-C2-4Ap" firstAttribute="top" secondItem="4Qb-31-ul2" secondAttribute="top" constant="280" id="KXt-FE-2pI"/>
@@ -1079,6 +1100,7 @@
                             <constraint firstItem="Zxn-i4-X7g" firstAttribute="centerX" secondItem="4Qb-31-ul2" secondAttribute="centerX" id="nGg-pN-wVA"/>
                             <constraint firstItem="vyH-ra-OxA" firstAttribute="centerX" secondItem="4Qb-31-ul2" secondAttribute="centerX" id="sj1-eD-9VW"/>
                             <constraint firstItem="Bhz-8A-a2G" firstAttribute="top" secondItem="Mqf-fp-b8Y" secondAttribute="bottom" id="sv9-Tw-Lkd"/>
+                            <constraint firstAttribute="trailing" secondItem="9c6-ew-bca" secondAttribute="trailing" constant="44" id="x39-GC-ZqE"/>
                             <constraint firstItem="VwP-JL-neq" firstAttribute="leading" secondItem="4Qb-31-ul2" secondAttribute="leading" constant="15" id="xg5-JL-Jed"/>
                             <constraint firstItem="Bhz-8A-a2G" firstAttribute="centerX" secondItem="smV-C2-4Ap" secondAttribute="centerX" id="yLb-dw-rWJ"/>
                         </constraints>
diff --git a/iCemarose/Class/UI/Mine/KWMMineVC.m b/iCemarose/Class/UI/Mine/KWMMineVC.m
index 8e21a7f..95e9804 100644
--- a/iCemarose/Class/UI/Mine/KWMMineVC.m
+++ b/iCemarose/Class/UI/Mine/KWMMineVC.m
@@ -15,6 +15,7 @@
 #import "KWMLoginVC.h"
 #import "KWMMineTitleView.h"
 #import "KWMFilterVC.h"
+#import "KWMSelectAddressVC.h"
 
 @interface KWMMineVC ()
 @property (nonatomic) KWMMineTitleView *vTitle;
@@ -122,6 +123,18 @@
     [self.navigationController pushViewController:contactVC animated:YES];
 }
 
+-(IBAction)onClickAddress {
+    if(!_user.status) {
+        KWMLoginVC *loginVc = (KWMLoginVC *)[KWMBaseVC findControllerBy:[KWMLoginVC kwmTag] fromStoryboard:@"Login"];
+        UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:loginVc];
+        [self presentViewController:nav animated:YES completion:nil];
+    }else{
+        KWMSelectAddressVC *addressVC = (KWMSelectAddressVC *)[KWMBaseVC findControllerBy:[KWMSelectAddressVC kwmTag] fromStoryboard:@"ShopCart"];
+        addressVC.hidesBottomBarWhenPushed = YES;
+        [self.navigationController pushViewController:addressVC animated:YES];
+    }
+}
+
 - (IBAction)onClickLogout:(id)sender {
     if (_user.status) {
         self.btnLogin.userInteractionEnabled = NO;
diff --git a/iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m b/iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m
index b22c431..a16a3dc 100644
--- a/iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m
+++ b/iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m
@@ -319,10 +319,7 @@
 //        }
 //        if(self.address){
             if([self checkAddress:self.address]){
-                KWMSelectAddressVC *addressVC = (KWMSelectAddressVC *)[KWMBaseVC findControllerBy:[KWMSelectAddressVC kwmTag] fromStoryboard:@"ShopCart"];
-                addressVC.checkout = checkout;
-                addressVC.delegate = self;
-                [self.navigationController pushViewController:addressVC animated:YES];
+                [self jumpToSelectAddress];
                 return;
             }
             if([KWMStringUtil isEmpty:self.address.firstName]){
@@ -349,7 +346,12 @@
     }
 }
 
-
+- (void) jumpToSelectAddress {
+    KWMSelectAddressVC *addressVC = (KWMSelectAddressVC *)[KWMBaseVC findControllerBy:[KWMSelectAddressVC kwmTag] fromStoryboard:@"ShopCart"];
+//    addressVC.checkout = checkout;
+    addressVC.delegate = self;
+    [self.navigationController pushViewController:addressVC animated:YES];
+}
 
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
@@ -557,6 +559,9 @@
         // 170922 所有订单全部刷新地址
 //        if (checkout || this.cartCookie) {
             newReq.HTTPMethod = @"PATCH";
+//        checkout.shippingAddress.identifier = nil;
+//        checkout.shippingAddress.provinceCode = nil;
+//        checkout.billingAddress = checkout.shippingAddress;
             [newReq setHTTPBody:[NSJSONSerialization dataWithJSONObject:[checkout jsonDictionaryForCheckout] options:0 error:nil]];
 //        }
         return  newReq;
@@ -568,6 +573,12 @@
         this.checkout = checkout;
         [self flushCheckout:responseObject[@"checkout"]];
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
+        NSDictionary *json = [NSJSONSerialization JSONObjectWithData:[error userInfo][@"com.alamofire.serialization.response.error.data"] options:NSJSONReadingMutableLeaves error:nil];
+        if (json[@"errors"][@"checkout"][@"shipping_address"]) {
+            [this showToast:@"地址出现问题请重新选择"];
+            [this jumpToSelectAddress];
+            return;
+        }
         [this hideLoading];
         [this showError:error];
     }];
@@ -578,9 +589,9 @@
     [self.userDao saveCheckoutCache:dic];
     if (!self.checkout.shippingAddress && self.address) {
         [self kwm_setAddress:self.address];
-    } else if(self.checkout.shippingAddress && !self.checkout.shippingRate) {
+    }// else if(self.checkout.shippingAddress && !self.checkout.shippingRate) {
         [self requestShippingData];
-    }
+    //}
 }
 
 -(void)requestShippingData{
diff --git a/iCemarose/Class/UI/ShopCart/KWMSelectAddressVC.m b/iCemarose/Class/UI/ShopCart/KWMSelectAddressVC.m
index d3d67c6..0ac9739 100644
--- a/iCemarose/Class/UI/ShopCart/KWMSelectAddressVC.m
+++ b/iCemarose/Class/UI/ShopCart/KWMSelectAddressVC.m
@@ -179,7 +179,9 @@
 }
 
 - (void)updateCheckAddress:(BUYAddress *)address{
-    
+    if (self.delegate == nil) {
+        return;
+    }
     NSString *errorMsg = [KWMValidateUtil validateAddress:address];
     if (!errorMsg) {
         [self.delegate kwm_setAddress:address];
@@ -277,6 +279,9 @@
 }
 
 -(BOOL) navigationShouldPopOnBackButton {
+    if (self.delegate == nil) {
+        return YES;
+    }
     self.needAddressView.hidden = NO;
     return NO; // Ignore 'Back' button this time
 }
diff --git a/iCemarose/Class/UI/ShopCart/KWMShopCartVC.m b/iCemarose/Class/UI/ShopCart/KWMShopCartVC.m
index eccd721..ad26fac 100644
--- a/iCemarose/Class/UI/ShopCart/KWMShopCartVC.m
+++ b/iCemarose/Class/UI/ShopCart/KWMShopCartVC.m
@@ -239,7 +239,7 @@
         [this hideLoading];
         
         if(product){
-            KWMVariantsVC *variantsVC = (KWMVariantsVC *)[KWMVariantsVC findControllerBy:[KWMVariantsVC kwmTag] fromStoryboard:@"NewProduct"];
+            KWMVariantsVC  *variantsVC = (KWMVariantsVC *)[KWMVariantsVC findControllerBy:[KWMVariantsVC kwmTag] fromStoryboard:@"NewProduct"];
             variantsVC.product = product;
             variantsVC.delegate = self;
             variantsVC.shopCartModel = shopCartModel;
@@ -269,6 +269,7 @@
 - (void)kwm_addShopWithVariantId:(NSNumber *)identifier quantity:(NSInteger)quantity variant:(BUYProductVariant *) variant buyNow:(BOOL)buyNow callback:(void (^)(BOOL))callback {
     __weak KWMShopCartVC *this = self;
     void(^success)(NSError*,KWMCartResult*) = ^(NSError *error,KWMCartResult *cart){
+        [[KWMShoppingCart sharedInstance] setSync:NO];
         if (!error) {
             [this refresh];
             callback(YES);
@@ -278,23 +279,25 @@
         }
     };
     if (_changeModel.identifier.integerValue == identifier.integerValue) {
+        [[KWMShoppingCart sharedInstance] setSync:YES];
         [[KWMShoppingCart sharedInstance] changeProductWithVariantId:identifier quantity:quantity callback:success];
     }else{
         NSNumber *oldId = @(_changeModel.identifier.integerValue);
-        KWMShopCartModel *model  = _changeModel;
+//        KWMShopCartModel *model  = _changeModel;
         _changeModel = nil;
         NSArray<NSNumber *> *variantIds = @[oldId,identifier];
         NSArray<NSNumber *> *quantities = @[@0,@(quantity)];
+        [[KWMShoppingCart sharedInstance] setSync:YES];
         [[KWMShoppingCart sharedInstance] updateProductWithVariantIds:variantIds quantitties:quantities callback:^(NSError *error, KWMCartResult *cart) {
-            if (!cart.items.firstObject.product_id) {
-                KWMShopCartModel *tmp = cart.items.firstObject;
-                tmp.imageStr = model.imageStr;
-                tmp.size = variant.title;
-                tmp.brand = model.brand;
-                tmp.name = model.name;
-                tmp.price = variant.price;
-                tmp.product_id = model.product_id;
-            }
+//            if (!cart.items.firstObject.product_id) {
+//                KWMShopCartModel *tmp = cart.items.firstObject;
+//                tmp.imageStr = model.imageStr;
+//                tmp.size = variant.title;
+//                tmp.brand = model.brand;
+//                tmp.name = model.name;
+//                tmp.price = variant.price;
+//                tmp.product_id = model.product_id;
+//            }
             success(error,cart);
         }];
 //        [[KWMShoppingCart sharedInstance] deleteProductWithVariantId:oldId callback:^(NSError *error, KWMCartResult *cart) {
diff --git a/iCemarose/Info.plist b/iCemarose/Info.plist
index 3d3f67d..ee2454c 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.8</string>
+	<string>1.5.10</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -56,7 +56,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.5.8.3</string>
+	<string>1.5.10</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>