u

iCemarose/Assets.xcassets/ic_product_14day.imageset/Contents.json → iCemarose/Assets.xcassets/ic_product_7day.imageset/Contents.json

@@ -6,12 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_product_14day@2x.png",
+      "filename" : "52.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_product_14day@3x.png",
+      "filename" : "78.png",
       "scale" : "3x"
     }
   ],

iCemarose/Class/UI/NewProduct/Cell/KWMFirstDetailView.xib

@@ -105,15 +105,15 @@
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="efc-dz-O7V" userLabel="14天退换">
                                             <rect key="frame" x="121" y="98" width="100" height="30"/>
                                             <subviews>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_product_14day" translatesAutoresizingMaskIntoConstraints="NO" id="jxm-XE-ewW">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_product_7day" translatesAutoresizingMaskIntoConstraints="NO" id="jxm-XE-ewW">
                                                     <rect key="frame" x="0.0" y="4" width="24" height="22"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="24" id="6LP-3V-BBJ"/>
                                                         <constraint firstAttribute="height" constant="22" id="eN2-by-SKX"/>
                                                     </constraints>
                                                 </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="14天退换" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LIh-x6-zk9">
-                                                    <rect key="frame" x="34" y="7.5" width="48" height="17"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="7天退换" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LIh-x6-zk9">
+                                                    <rect key="frame" x="34" y="7.5" width="43" height="17"/>
                                                     <fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="12"/>
                                                     <color key="textColor" red="0.1529411765" green="0.14901960780000001" blue="0.21176470589999999" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -317,7 +317,7 @@
     </objects>
     <resources>
         <image name="button_mine_more" width="7" height="14"/>
-        <image name="ic_product_14day" width="26" height="23"/>
+        <image name="ic_product_7day" width="26" height="23"/>
         <image name="ic_product_gift" width="22" height="23"/>
         <image name="ic_product_real" width="22" height="23"/>
     </resources>

iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m

@@ -575,7 +575,9 @@
 -(void) flushCheckout:(NSDictionary *) dic {
     [self initData];
     [self.userDao saveCheckoutCache:dic];
-    if(self.checkout.shippingAddress && !self.checkout.shippingRate) {
+    if (!self.checkout.shippingAddress && self.address) {
+        [self kwm_setAddress:self.address];
+    } else if(self.checkout.shippingAddress && !self.checkout.shippingRate) {
         [self requestShippingData];
     }
 }