Skip to content

I
ios1x
Commit ddae4359 by lee
Options

修正价格显示问题

parent b142b254
Showing with 107 additions and 73 deletions
iCemarose/Class/UI/Brand/Cell/KWMBrandCaramelCell.xib
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait"> <device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/> <adaptation id="fullscreen"/>
</device> </device>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/> <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
...@@ -25,20 +25,33 @@ ...@@ -25,20 +25,33 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mqq-7B-Jxb"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mqq-7B-Jxb">
<rect key="frame" x="0.0" y="238" width="253" height="20"/> <rect key="frame" x="0.0" y="238" width="253" height="20"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rHe-RI-s23">
<rect key="frame" x="95.5" y="0.0" width="62" height="20"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥490" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jvi-Aq-w6H"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥490" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jvi-Aq-w6H">
<rect key="frame" x="94.5" y="0.0" width="34" height="20"/> <rect key="frame" x="0.0" y="4" width="26.5" height="15.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="14"/> <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
<color key="textColor" red="0.59215686274509804" green="0.59215686274509804" blue="0.59215686274509804" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.59215686274509804" green="0.59215686274509804" blue="0.59215686274509804" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥245" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E7i-ea-CUz"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥245" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E7i-ea-CUz">
<rect key="frame" x="131.5" y="0.0" width="34" height="20"/> <rect key="frame" x="30.5" y="1" width="31.5" height="18.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="14"/> <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" red="0.93620756956247186" green="0.51558040528244498" blue="0.57831882668510759" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.93620756956247186" green="0.51558040528244498" blue="0.57831882668510759" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="E7i-ea-CUz" firstAttribute="bottom" secondItem="Jvi-Aq-w6H" secondAttribute="bottom" id="Egv-zV-U7d"/>
<constraint firstItem="E7i-ea-CUz" firstAttribute="centerY" secondItem="rHe-RI-s23" secondAttribute="centerY" id="Ptx-ey-MCo"/>
<constraint firstItem="Jvi-Aq-w6H" firstAttribute="leading" secondItem="rHe-RI-s23" secondAttribute="leading" id="XmK-ek-GLA"/>
<constraint firstItem="E7i-ea-CUz" firstAttribute="leading" secondItem="Jvi-Aq-w6H" secondAttribute="trailing" constant="4" id="aCG-xx-G6A"/>
<constraint firstAttribute="trailing" secondItem="E7i-ea-CUz" secondAttribute="trailing" id="k65-ch-zTW"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pmY-07-Srx"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pmY-07-Srx">
<rect key="frame" x="203" y="-3" width="30" height="27"/> <rect key="frame" x="215" y="-3" width="30" height="27"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="26.699999999999999" id="Qg1-JT-SYJ"/> <constraint firstAttribute="height" constant="26.699999999999999" id="Qg1-JT-SYJ"/>
<constraint firstAttribute="width" constant="30" id="ucm-GR-eST"/> <constraint firstAttribute="width" constant="30" id="ucm-GR-eST"/>
...@@ -51,15 +64,12 @@ ...@@ -51,15 +64,12 @@
</button> </button>
</subviews> </subviews>
<constraints> <constraints>
<constraint firstItem="rHe-RI-s23" firstAttribute="centerX" secondItem="Mqq-7B-Jxb" secondAttribute="centerX" id="2Da-QF-isx"/>
<constraint firstAttribute="bottom" secondItem="rHe-RI-s23" secondAttribute="bottom" id="6ju-Kd-DE9"/>
<constraint firstItem="rHe-RI-s23" firstAttribute="top" secondItem="Mqq-7B-Jxb" secondAttribute="top" id="7BO-Sz-c9m"/>
<constraint firstAttribute="height" constant="20" id="BMZ-EM-soG"/> <constraint firstAttribute="height" constant="20" id="BMZ-EM-soG"/>
<constraint firstAttribute="bottom" secondItem="E7i-ea-CUz" secondAttribute="bottom" id="HQw-vn-nba"/>
<constraint firstItem="pmY-07-Srx" firstAttribute="centerY" secondItem="Mqq-7B-Jxb" secondAttribute="centerY" id="Hse-Zr-9dq"/> <constraint firstItem="pmY-07-Srx" firstAttribute="centerY" secondItem="Mqq-7B-Jxb" secondAttribute="centerY" id="Hse-Zr-9dq"/>
<constraint firstItem="E7i-ea-CUz" firstAttribute="top" secondItem="Mqq-7B-Jxb" secondAttribute="top" id="JgQ-JY-fZ6"/> <constraint firstAttribute="trailing" secondItem="pmY-07-Srx" secondAttribute="trailing" constant="8" id="YkJ-Cp-nmc"/>
<constraint firstAttribute="trailing" secondItem="pmY-07-Srx" secondAttribute="trailing" constant="20" id="YkJ-Cp-nmc"/>
<constraint firstItem="Jvi-Aq-w6H" firstAttribute="centerX" secondItem="Mqq-7B-Jxb" secondAttribute="centerX" constant="-15" id="fvY-BZ-oOu"/>
<constraint firstItem="Jvi-Aq-w6H" firstAttribute="top" secondItem="Mqq-7B-Jxb" secondAttribute="top" id="loN-5i-y6j"/>
<constraint firstAttribute="bottom" secondItem="Jvi-Aq-w6H" secondAttribute="bottom" id="m3V-fj-YT6"/>
<constraint firstItem="E7i-ea-CUz" firstAttribute="leading" secondItem="Jvi-Aq-w6H" secondAttribute="trailing" constant="3" id="wB0-G9-Fw2"/>
</constraints> </constraints>
</view> </view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="标题" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fcb-nU-huG"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="标题" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fcb-nU-huG">
...@@ -124,20 +134,33 @@ ...@@ -124,20 +134,33 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QLe-tK-m6q"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QLe-tK-m6q">
<rect key="frame" x="0.0" y="238" width="253" height="20"/> <rect key="frame" x="0.0" y="238" width="253" height="20"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥245" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d6z-Hd-24O"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yf3-Mh-Tql">
<rect key="frame" x="131.5" y="0.0" width="34" height="20"/> <rect key="frame" x="95.5" y="0.0" width="62" height="20"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="14"/> <subviews>
<color key="textColor" red="0.94509803921568625" green="0.5725490196078431" blue="0.60392156862745094" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥490" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iey-XZ-k0o"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥490" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iey-XZ-k0o">
<rect key="frame" x="94.5" y="0.0" width="34" height="20"/> <rect key="frame" x="0.0" y="4" width="26.5" height="15.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="14"/> <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
<color key="textColor" red="0.59215686274509804" green="0.59215686274509804" blue="0.59215686274509804" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.59215686274509804" green="0.59215686274509804" blue="0.59215686274509804" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥245" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d6z-Hd-24O">
<rect key="frame" x="30.5" y="1" width="31.5" height="18.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" red="0.94509803921568625" green="0.5725490196078431" blue="0.60392156862745094" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="d6z-Hd-24O" secondAttribute="trailing" id="8AV-Hd-0B4"/>
<constraint firstItem="d6z-Hd-24O" firstAttribute="bottom" secondItem="iey-XZ-k0o" secondAttribute="bottom" id="PU0-cd-4Iz"/>
<constraint firstItem="iey-XZ-k0o" firstAttribute="leading" secondItem="Yf3-Mh-Tql" secondAttribute="leading" id="WXo-XF-MLq"/>
<constraint firstItem="d6z-Hd-24O" firstAttribute="centerY" secondItem="Yf3-Mh-Tql" secondAttribute="centerY" id="Z5l-HQ-GoZ"/>
<constraint firstItem="d6z-Hd-24O" firstAttribute="leading" secondItem="iey-XZ-k0o" secondAttribute="trailing" constant="4" id="oHC-sZ-Ovn"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q7B-p8-IEb"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q7B-p8-IEb">
<rect key="frame" x="203" y="-3" width="30" height="27"/> <rect key="frame" x="215" y="-3" width="30" height="27"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="26.699999999999999" id="3St-4c-ern"/> <constraint firstAttribute="height" constant="26.699999999999999" id="3St-4c-ern"/>
<constraint firstAttribute="width" constant="30" id="xwC-Wh-HI8"/> <constraint firstAttribute="width" constant="30" id="xwC-Wh-HI8"/>
...@@ -150,15 +173,12 @@ ...@@ -150,15 +173,12 @@
</button> </button>
</subviews> </subviews>
<constraints> <constraints>
<constraint firstAttribute="bottom" secondItem="d6z-Hd-24O" secondAttribute="bottom" id="2Z0-Af-cYp"/> <constraint firstItem="Yf3-Mh-Tql" firstAttribute="centerX" secondItem="QLe-tK-m6q" secondAttribute="centerX" id="Ds3-PA-3tj"/>
<constraint firstAttribute="trailing" secondItem="q7B-p8-IEb" secondAttribute="trailing" constant="20" id="Rgp-zj-ZMa"/> <constraint firstAttribute="trailing" secondItem="q7B-p8-IEb" secondAttribute="trailing" constant="8" id="Rgp-zj-ZMa"/>
<constraint firstAttribute="bottom" secondItem="iey-XZ-k0o" secondAttribute="bottom" id="VVF-qH-Pgv"/>
<constraint firstItem="iey-XZ-k0o" firstAttribute="top" secondItem="QLe-tK-m6q" secondAttribute="top" id="anQ-9v-8et"/>
<constraint firstAttribute="height" constant="20" id="bzZ-6I-QK0"/> <constraint firstAttribute="height" constant="20" id="bzZ-6I-QK0"/>
<constraint firstItem="q7B-p8-IEb" firstAttribute="centerY" secondItem="QLe-tK-m6q" secondAttribute="centerY" id="dGp-o8-wIE"/> <constraint firstItem="q7B-p8-IEb" firstAttribute="centerY" secondItem="QLe-tK-m6q" secondAttribute="centerY" id="dGp-o8-wIE"/>
<constraint firstItem="d6z-Hd-24O" firstAttribute="top" secondItem="QLe-tK-m6q" secondAttribute="top" id="omC-XO-1h7"/> <constraint firstAttribute="bottom" secondItem="Yf3-Mh-Tql" secondAttribute="bottom" id="f8v-ns-sZq"/>
<constraint firstItem="iey-XZ-k0o" firstAttribute="centerX" secondItem="QLe-tK-m6q" secondAttribute="centerX" constant="-15" id="rkl-57-l6c"/> <constraint firstItem="Yf3-Mh-Tql" firstAttribute="top" secondItem="QLe-tK-m6q" secondAttribute="top" id="wh4-UU-nOH"/>
<constraint firstItem="d6z-Hd-24O" firstAttribute="leading" secondItem="iey-XZ-k0o" secondAttribute="trailing" constant="3" id="slR-12-eas"/>
</constraints> </constraints>
</view> </view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="品牌名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oWH-xh-dgI"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="品牌名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oWH-xh-dgI">
...@@ -254,8 +274,6 @@ ...@@ -254,8 +274,6 @@
<outlet property="lbDiscountRight" destination="d6z-Hd-24O" id="DKe-3J-rXV"/> <outlet property="lbDiscountRight" destination="d6z-Hd-24O" id="DKe-3J-rXV"/>
<outlet property="lbPriceLeft" destination="Jvi-Aq-w6H" id="CF3-ge-D0b"/> <outlet property="lbPriceLeft" destination="Jvi-Aq-w6H" id="CF3-ge-D0b"/>
<outlet property="lbPriceRight" destination="iey-XZ-k0o" id="UpO-GV-0UI"/> <outlet property="lbPriceRight" destination="iey-XZ-k0o" id="UpO-GV-0UI"/>
<outlet property="priceLeft" destination="fvY-BZ-oOu" id="KiG-3u-TjF"/>
<outlet property="priceRight" destination="rkl-57-l6c" id="Pye-Oj-zGr"/>
<outlet property="vLBackground" destination="zbE-Fw-w5n" id="RmP-j9-G3z"/> <outlet property="vLBackground" destination="zbE-Fw-w5n" id="RmP-j9-G3z"/>
<outlet property="vRBackground" destination="Jdb-5C-Hyq" id="K7p-VN-9Kq"/> <outlet property="vRBackground" destination="Jdb-5C-Hyq" id="K7p-VN-9Kq"/>
<outlet property="vRootLeft" destination="D60-df-PZU" id="H7A-tN-zpr"/> <outlet property="vRootLeft" destination="D60-df-PZU" id="H7A-tN-zpr"/>
......
iCemarose/Class/UI/Product/Cell/KWMCollectionCell.m
...@@ -12,6 +12,12 @@ ...@@ -12,6 +12,12 @@
#import "KWMStringUtil.h" #import "KWMStringUtil.h"
#import "BUYProductVariant+Currency.h" #import "BUYProductVariant+Currency.h"
@interface KWMCollectionCell ()
@property (nonatomic, weak) IBOutlet NSLayoutConstraint *priceSpace;
@end
@implementation KWMCollectionCell @implementation KWMCollectionCell
- (void)awakeFromNib { - (void)awakeFromNib {
...@@ -34,9 +40,10 @@ ...@@ -34,9 +40,10 @@
return; return;
} }
self.lbPrice.hidden = NO; self.lbPrice.hidden = NO;
self.discountLeft.constant = 5; self.priceSpace.constant = 4;
self.lbPrice.textAlignment = NSTextAlignmentRight; // self.discountLeft.constant = 5;
self.lbDiscount.textAlignment = NSTextAlignmentLeft; // self.lbPrice.textAlignment = NSTextAlignmentRight;
// self.lbDiscount.textAlignment = NSTextAlignmentLeft;
NSString *priceString,*discountStr; NSString *priceString,*discountStr;
if (productVariant.compareAtPrice) { if (productVariant.compareAtPrice) {
...@@ -47,8 +54,9 @@ ...@@ -47,8 +54,9 @@
self.lbPrice.attributedText = attribtStr; self.lbPrice.attributedText = attribtStr;
}else{ }else{
self.lbPrice.hidden = YES; self.lbPrice.hidden = YES;
self.discountLeft.constant = -28; self.priceSpace.constant = 0;
self.lbDiscount.textAlignment = NSTextAlignmentCenter; // self.discountLeft.constant = -28;
// self.lbDiscount.textAlignment = NSTextAlignmentCenter;
} }
// discountStr = [NSString stringWithFormat:@"¥%@",[KWMStringUtil getEUR2CNYstring:productVariant.price]]; // discountStr = [NSString stringWithFormat:@"¥%@",[KWMStringUtil getEUR2CNYstring:productVariant.price]];
discountStr = productVariant.priceFormatted; discountStr = productVariant.priceFormatted;
......
iCemarose/Class/UI/Product/Cell/KWMCollectionCell.xib
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait"> <device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/> <adaptation id="fullscreen"/>
</device> </device>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>
...@@ -24,60 +24,69 @@ ...@@ -24,60 +24,69 @@
</imageView> </imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j4S-Pj-0Jm" userLabel="vBg"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j4S-Pj-0Jm" userLabel="vBg">
<rect key="frame" x="10" y="10" width="114" height="160"/> <rect key="frame" x="10" y="10" width="114" height="160"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <subviews>
</view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oJs-ty-mTn">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="252" image="ic_loading" translatesAutoresizingMaskIntoConstraints="NO" id="4Y5-kT-G7g"> <rect key="frame" x="32" y="139" width="50.5" height="21"/>
<rect key="frame" x="10" y="10" width="114" height="119"/> <subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="119" id="HR0-ZC-axP"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="114" id="U9w-nj-aat"/>
<constraint firstAttribute="width" constant="114" id="lIt-OH-a04"/>
<constraint firstAttribute="height" constant="119" id="pUI-ib-Q7Z"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="品牌" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LfZ-kv-Lcb">
<rect key="frame" x="20" y="138" width="94" height="11"/>
<fontDescription key="fontDescription" type="system" pointSize="9"/>
<color key="textColor" red="0.3411764705882353" green="0.3411764705882353" blue="0.3411764705882353" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥245" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mdo-JD-RUh"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥245" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mdo-JD-RUh">
<rect key="frame" x="6" y="149" width="56" height="21"/> <rect key="frame" x="0.0" y="0.0" width="22" height="21"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="21" id="yF7-l7-tAI"/> <constraint firstAttribute="height" constant="21" id="yF7-l7-tAI"/>
<constraint firstAttribute="width" constant="56" id="zz5-Ch-rvd"/>
</constraints> </constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/> <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="9"/>
<color key="textColor" red="0.59215686270000001" green="0.59215686270000001" blue="0.59215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.59215686270000001" green="0.59215686270000001" blue="0.59215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥123" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QJA-H1-mJd"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥123" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QJA-H1-mJd">
<rect key="frame" x="73" y="149" width="56" height="21"/> <rect key="frame" x="26" y="0.0" width="24.5" height="21"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="21" id="0b6-83-YzE"/> <constraint firstAttribute="height" constant="21" id="0b6-83-YzE"/>
<constraint firstAttribute="width" constant="56" id="lJz-kd-LgE"/>
</constraints> </constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/> <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
<color key="textColor" red="0.94509803921568625" green="0.5725490196078431" blue="0.60392156862745094" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.94509803921568625" green="0.5725490196078431" blue="0.60392156862745094" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lFU-Ys-wsX" userLabel="vLine"> </subviews>
<rect key="frame" x="67" y="149" width="1" height="21"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="21" id="jTL-CW-ckL"/> <constraint firstAttribute="bottom" secondItem="QJA-H1-mJd" secondAttribute="bottom" id="4nY-ED-oHv"/>
<constraint firstAttribute="width" constant="1" id="kfj-cF-OQX"/> <constraint firstAttribute="height" constant="21" id="59a-u7-lnJ"/>
<constraint firstAttribute="trailing" secondItem="QJA-H1-mJd" secondAttribute="trailing" id="6rA-ZV-twP"/>
<constraint firstAttribute="bottom" secondItem="mdo-JD-RUh" secondAttribute="bottom" id="Ug7-jo-2N4"/>
<constraint firstItem="mdo-JD-RUh" firstAttribute="leading" secondItem="oJs-ty-mTn" secondAttribute="leading" id="Yis-Ri-xd4"/>
<constraint firstItem="QJA-H1-mJd" firstAttribute="leading" secondItem="mdo-JD-RUh" secondAttribute="trailing" constant="4" id="gHK-yL-dZ3"/>
</constraints> </constraints>
</view> </view>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="oJs-ty-mTn" firstAttribute="centerX" secondItem="j4S-Pj-0Jm" secondAttribute="centerX" id="Mfc-7F-OHL"/>
<constraint firstAttribute="bottom" secondItem="oJs-ty-mTn" secondAttribute="bottom" id="SIq-l9-u3Y"/>
</constraints>
</view>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="252" image="ic_loading" translatesAutoresizingMaskIntoConstraints="NO" id="4Y5-kT-G7g">
<rect key="frame" x="10" y="10" width="114" height="119"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="119" id="HR0-ZC-axP"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="114" id="U9w-nj-aat"/>
<constraint firstAttribute="width" constant="114" id="lIt-OH-a04"/>
<constraint firstAttribute="height" constant="119" id="pUI-ib-Q7Z"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="品牌" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LfZ-kv-Lcb">
<rect key="frame" x="20" y="138" width="94" height="11"/>
<fontDescription key="fontDescription" type="system" pointSize="9"/>
<color key="textColor" red="0.3411764705882353" green="0.3411764705882353" blue="0.3411764705882353" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</view> </view>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints> <constraints>
<constraint firstItem="QJA-H1-mJd" firstAttribute="leading" secondItem="lFU-Ys-wsX" secondAttribute="trailing" constant="5" id="0cR-s6-MDA"/>
<constraint firstItem="LfZ-kv-Lcb" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="20" id="4FC-Uc-GOl"/> <constraint firstItem="LfZ-kv-Lcb" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="20" id="4FC-Uc-GOl"/>
<constraint firstItem="4Y5-kT-G7g" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="10" id="5Ri-3a-lVo"/> <constraint firstItem="4Y5-kT-G7g" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="10" id="5Ri-3a-lVo"/>
<constraint firstItem="4Y5-kT-G7g" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="10" id="85s-gm-OFy"/> <constraint firstItem="4Y5-kT-G7g" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="10" id="85s-gm-OFy"/>
<constraint firstItem="lFU-Ys-wsX" firstAttribute="leading" secondItem="mdo-JD-RUh" secondAttribute="trailing" constant="5" id="BaH-iV-M3b"/>
<constraint firstItem="j4S-Pj-0Jm" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="10" id="Bkd-4C-LiV"/> <constraint firstItem="j4S-Pj-0Jm" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="10" id="Bkd-4C-LiV"/>
<constraint firstItem="j4S-Pj-0Jm" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="10" id="Dkb-sp-DPv"/> <constraint firstItem="j4S-Pj-0Jm" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="10" id="Dkb-sp-DPv"/>
<constraint firstItem="LfZ-kv-Lcb" firstAttribute="top" secondItem="4Y5-kT-G7g" secondAttribute="bottom" constant="9" id="Hih-1i-3KV"/> <constraint firstItem="LfZ-kv-Lcb" firstAttribute="top" secondItem="4Y5-kT-G7g" secondAttribute="bottom" constant="9" id="Hih-1i-3KV"/>
...@@ -87,20 +96,16 @@ ...@@ -87,20 +96,16 @@
<constraint firstItem="Lqb-dN-SOP" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="cjj-Hs-hsD"/> <constraint firstItem="Lqb-dN-SOP" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="cjj-Hs-hsD"/>
<constraint firstItem="Lqb-dN-SOP" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="dE5-5Y-muD"/> <constraint firstItem="Lqb-dN-SOP" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="dE5-5Y-muD"/>
<constraint firstAttribute="trailing" secondItem="j4S-Pj-0Jm" secondAttribute="trailing" constant="10" id="iMA-ja-UYW"/> <constraint firstAttribute="trailing" secondItem="j4S-Pj-0Jm" secondAttribute="trailing" constant="10" id="iMA-ja-UYW"/>
<constraint firstItem="lFU-Ys-wsX" firstAttribute="top" secondItem="mdo-JD-RUh" secondAttribute="top" id="iuT-PW-rJB"/>
<constraint firstItem="lFU-Ys-wsX" firstAttribute="centerX" secondItem="gTV-IL-0wX" secondAttribute="centerX" id="j4i-lO-vY9"/>
<constraint firstAttribute="trailing" secondItem="Lqb-dN-SOP" secondAttribute="trailing" id="l8a-QN-k7a"/> <constraint firstAttribute="trailing" secondItem="Lqb-dN-SOP" secondAttribute="trailing" id="l8a-QN-k7a"/>
<constraint firstAttribute="bottom" secondItem="Lqb-dN-SOP" secondAttribute="bottom" id="lT8-Mv-gJt"/> <constraint firstAttribute="bottom" secondItem="Lqb-dN-SOP" secondAttribute="bottom" id="lT8-Mv-gJt"/>
<constraint firstAttribute="bottom" secondItem="QJA-H1-mJd" secondAttribute="bottom" constant="10" id="rx6-PR-yCt"/>
<constraint firstAttribute="bottom" secondItem="mdo-JD-RUh" secondAttribute="bottom" constant="10" id="toa-qM-Dmu"/>
</constraints> </constraints>
<size key="customSize" width="199" height="202"/> <size key="customSize" width="199" height="202"/>
<connections> <connections>
<outlet property="discountLeft" destination="0cR-s6-MDA" id="qnp-wp-FII"/>
<outlet property="ivCollectionCell" destination="4Y5-kT-G7g" id="l2b-mP-win"/> <outlet property="ivCollectionCell" destination="4Y5-kT-G7g" id="l2b-mP-win"/>
<outlet property="lbBrand" destination="LfZ-kv-Lcb" id="oKA-x9-tjo"/> <outlet property="lbBrand" destination="LfZ-kv-Lcb" id="oKA-x9-tjo"/>
<outlet property="lbDiscount" destination="QJA-H1-mJd" id="qCj-cg-ksd"/> <outlet property="lbDiscount" destination="QJA-H1-mJd" id="qCj-cg-ksd"/>
<outlet property="lbPrice" destination="mdo-JD-RUh" id="wFN-oq-HYR"/> <outlet property="lbPrice" destination="mdo-JD-RUh" id="wFN-oq-HYR"/>
<outlet property="priceSpace" destination="gHK-yL-dZ3" id="ITE-eD-QTF"/>
</connections> </connections>
<point key="canvasLocation" x="56" y="115"/> <point key="canvasLocation" x="56" y="115"/>
</collectionViewCell> </collectionViewCell>
......
iCemarose/Class/Util/KWMCurrencyUtil.m
...@@ -48,12 +48,15 @@ ...@@ -48,12 +48,15 @@
return [[KWMUserDao shareDao] currencyCode]; return [[KWMUserDao shareDao] currencyCode];
} }
- (NSString *)priceFormattedByCurrencyCode:(NSDecimalNumber *) price { - (NSString *)priceFormattedByCurrencyCode:(NSDecimalNumber *) price {
// return [[[self numberFormatter] stringFromNumber:[self calcPriceByCurrencyCode:self.price]] stringByReplacingOccurrencesOfRegex:@"\\.00" withString:@""]; // return [[[self numberFormatter] stringFromNumber:[self calcPriceByCurrencyCode:self.price]] stringByReplacingOccurrencesOfRegex:@"\\.00" withString:@""];
// return [self fixFormatted:[[self numberFormatter] stringFromNumber:[NSDecimalNumber decimalNumberWithString:@"88888.88"]]];
return [self fixFormatted:[[self numberFormatter] stringFromNumber:[self calcPriceByCurrencyCode:price]]]; return [self fixFormatted:[[self numberFormatter] stringFromNumber:[self calcPriceByCurrencyCode:price]]];
} }
- (NSString *)priceFormatted:(NSDecimalNumber *)price { - (NSString *)priceFormatted:(NSDecimalNumber *)price {
// return [self fixFormatted:[[self numberFormatter] stringFromNumber:[NSDecimalNumber decimalNumberWithString:@"88888.88"]]];
return [self fixFormatted:[[self numberFormatter] stringFromNumber:price]]; return [self fixFormatted:[[self numberFormatter] stringFromNumber:price]];
} }
......
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