Skip to content

C
Car-iOS-Merchant
Commit 91105394 authored by Sandy's avatar Sandy
Browse files
Options

金额统一保留2位小数、详情界面调整、加油单列表下拉加载数据错误修复

parent c2c94b42
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 46 deletions
Car/Base.lproj/Main.storyboard
View file @ 91105394
...@@ -35,14 +35,14 @@ ...@@ -35,14 +35,14 @@
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="余额:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="psF-nB-Uu1"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="工分：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="psF-nB-Uu1">
<rect key="frame" x="92" y="133" width="42" height="22"/> <rect key="frame" x="92" y="133" width="55.5" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/> <fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥128元" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pkt-Cz-bN7"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥128元" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pkt-Cz-bN7">
<rect key="frame" x="134" y="131.5" width="78" height="26"/> <rect key="frame" x="147.5" y="131.5" width="78" height="26"/>
<fontDescription key="fontDescription" type="system" pointSize="21"/> <fontDescription key="fontDescription" type="system" pointSize="21"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="A4G-MF-BfU" customClass="CardView"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="A4G-MF-BfU" customClass="CardView">
<rect key="frame" x="16" y="159" width="343" height="100"/> <rect key="frame" x="16" y="159" width="343" height="100"/>
<subviews> <subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="orange_card_bg" translatesAutoresizingMaskIntoConstraints="NO" id="d8f-n1-R4G"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="orange_card_bg" translatesAutoresizingMaskIntoConstraints="NO" id="d8f-n1-R4G">
<rect key="frame" x="0.0" y="0.0" width="120" height="100"/> <rect key="frame" x="0.0" y="0.0" width="120" height="100"/>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="车族通·优惠抵用券" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="etR-yz-Sdx"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="车族通·优惠抵用券" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="etR-yz-Sdx">
...@@ -1101,7 +1101,7 @@ ...@@ -1101,7 +1101,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="30"/> <rect key="frame" x="0.0" y="28" width="375" height="30"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WXk-60-mnv" id="Hdv-Fv-6SO"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WXk-60-mnv" id="Hdv-Fv-6SO">
<rect key="frame" x="0.0" y="0.0" width="375" height="29.5"/> <rect key="frame" x="0.0" y="0.0" width="375" height="29"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" tag="1111" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3kb-L7-Q1S"> <label opaque="NO" userInteractionEnabled="NO" tag="1111" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3kb-L7-Q1S">
...@@ -1131,7 +1131,7 @@ ...@@ -1131,7 +1131,7 @@
<rect key="frame" x="0.0" y="58" width="375" height="60"/> <rect key="frame" x="0.0" y="58" width="375" height="60"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="agP-LF-ma6" id="X7Q-g8-dvJ"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="agP-LF-ma6" id="X7Q-g8-dvJ">
<rect key="frame" x="0.0" y="0.0" width="375" height="59.5"/> <rect key="frame" x="0.0" y="0.0" width="375" height="59"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="工分结算" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R4g-d8-qvx"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="工分结算" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R4g-d8-qvx">
...@@ -1239,7 +1239,7 @@ ...@@ -1239,7 +1239,7 @@
</constraints> </constraints>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZRM-pO-n9k" userLabel="station"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZRM-pO-n9k" userLabel="station">
<rect key="frame" x="0.0" y="64" width="375" height="90"/> <rect key="frame" x="0.0" y="64" width="375" height="135"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8J6-ZG-iNX"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8J6-ZG-iNX">
<rect key="frame" x="90" y="0.0" width="285" height="45"/> <rect key="frame" x="90" y="0.0" width="285" height="45"/>
...@@ -1274,13 +1274,7 @@ ...@@ -1274,13 +1274,7 @@
<rect key="frame" x="90" y="45" width="285" height="45"/> <rect key="frame" x="90" y="45" width="285" height="45"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="油品" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NTo-rf-tf0"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="油品" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NTo-rf-tf0">
<rect key="frame" x="142.5" y="0.0" width="142.5" height="45"/> <rect key="frame" x="0.0" y="0.0" width="277" height="45"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="油枪" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z5P-IM-79Z">
<rect key="frame" x="0.0" y="0.0" width="142.5" height="45"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/> <fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
...@@ -1288,22 +1282,17 @@ ...@@ -1288,22 +1282,17 @@
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints> <constraints>
<constraint firstItem="z5P-IM-79Z" firstAttribute="width" secondItem="NTo-rf-tf0" secondAttribute="width" id="5hz-UO-ygI"/> <constraint firstAttribute="trailing" secondItem="NTo-rf-tf0" secondAttribute="trailing" constant="8" id="DCS-Xb-FC0"/>
<constraint firstItem="NTo-rf-tf0" firstAttribute="leading" secondItem="z5P-IM-79Z" secondAttribute="trailing" id="BJa-y3-OEs"/> <constraint firstItem="NTo-rf-tf0" firstAttribute="leading" secondItem="Q1S-Xp-Efq" secondAttribute="leading" id="FyY-NX-4VT"/>
<constraint firstAttribute="trailing" secondItem="NTo-rf-tf0" secondAttribute="trailing" id="DCS-Xb-FC0"/>
<constraint firstItem="z5P-IM-79Z" firstAttribute="top" secondItem="Q1S-Xp-Efq" secondAttribute="top" id="G3G-aK-CPd"/>
<constraint firstAttribute="bottom" secondItem="NTo-rf-tf0" secondAttribute="bottom" id="KMj-AQ-1GT"/> <constraint firstAttribute="bottom" secondItem="NTo-rf-tf0" secondAttribute="bottom" id="KMj-AQ-1GT"/>
<constraint firstItem="NTo-rf-tf0" firstAttribute="top" secondItem="Q1S-Xp-Efq" secondAttribute="top" id="Rtg-HS-I8E"/> <constraint firstItem="NTo-rf-tf0" firstAttribute="top" secondItem="Q1S-Xp-Efq" secondAttribute="top" id="Rtg-HS-I8E"/>
<constraint firstItem="z5P-IM-79Z" firstAttribute="leading" secondItem="Q1S-Xp-Efq" secondAttribute="leading" id="ZHx-yk-4EB"/>
<constraint firstAttribute="bottom" secondItem="z5P-IM-79Z" secondAttribute="bottom" id="nFI-vp-EAH"/>
<constraint firstItem="NTo-rf-tf0" firstAttribute="height" secondItem="z5P-IM-79Z" secondAttribute="height" id="tQx-tx-JPB"/>
</constraints> </constraints>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4N0-Du-0sX"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4N0-Du-0sX">
<rect key="frame" x="0.0" y="0.0" width="90" height="90"/> <rect key="frame" x="0.0" y="0.0" width="90" height="135"/>
<subviews> <subviews>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="oil_detail_station" translatesAutoresizingMaskIntoConstraints="NO" id="inL-Az-u9N"> <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="oil_detail_station" translatesAutoresizingMaskIntoConstraints="NO" id="inL-Az-u9N">
<rect key="frame" x="30" y="30" width="30" height="30"/> <rect key="frame" x="30" y="52.5" width="30" height="30"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="30" id="HEV-XP-wDO"/> <constraint firstAttribute="height" constant="30" id="HEV-XP-wDO"/>
<constraint firstAttribute="width" constant="30" id="NkT-8R-F1f"/> <constraint firstAttribute="width" constant="30" id="NkT-8R-F1f"/>
...@@ -1317,26 +1306,36 @@ ...@@ -1317,26 +1306,36 @@
<constraint firstAttribute="width" constant="90" id="lve-uh-seu"/> <constraint firstAttribute="width" constant="90" id="lve-uh-seu"/>
</constraints> </constraints>
</view> </view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="油枪" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z5P-IM-79Z">
<rect key="frame" x="90" y="90" width="269" height="45"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints> <constraints>
<constraint firstItem="Q1S-Xp-Efq" firstAttribute="height" secondItem="8J6-ZG-iNX" secondAttribute="height" id="1dZ-DT-Ahh"/> <constraint firstItem="Q1S-Xp-Efq" firstAttribute="height" secondItem="8J6-ZG-iNX" secondAttribute="height" id="1dZ-DT-Ahh"/>
<constraint firstAttribute="trailing" secondItem="z5P-IM-79Z" secondAttribute="trailing" constant="16" id="2gE-ai-ggd"/>
<constraint firstItem="z5P-IM-79Z" firstAttribute="top" secondItem="Q1S-Xp-Efq" secondAttribute="bottom" id="4iQ-Q8-Sq6"/>
<constraint firstAttribute="trailing" secondItem="8J6-ZG-iNX" secondAttribute="trailing" id="Bx1-HN-c2w"/> <constraint firstAttribute="trailing" secondItem="8J6-ZG-iNX" secondAttribute="trailing" id="Bx1-HN-c2w"/>
<constraint firstItem="4N0-Du-0sX" firstAttribute="top" secondItem="ZRM-pO-n9k" secondAttribute="top" id="CkK-1s-4lP"/> <constraint firstItem="4N0-Du-0sX" firstAttribute="top" secondItem="ZRM-pO-n9k" secondAttribute="top" id="CkK-1s-4lP"/>
<constraint firstItem="8J6-ZG-iNX" firstAttribute="leading" secondItem="4N0-Du-0sX" secondAttribute="trailing" id="M6S-8E-YDh"/> <constraint firstItem="8J6-ZG-iNX" firstAttribute="leading" secondItem="4N0-Du-0sX" secondAttribute="trailing" id="M6S-8E-YDh"/>
<constraint firstAttribute="bottom" secondItem="Q1S-Xp-Efq" secondAttribute="bottom" id="Njz-To-tRu"/> <constraint firstAttribute="bottom" secondItem="Q1S-Xp-Efq" secondAttribute="bottom" constant="45" id="Njz-To-tRu"/>
<constraint firstAttribute="trailing" secondItem="Q1S-Xp-Efq" secondAttribute="trailing" id="OSo-5e-rTo"/> <constraint firstAttribute="trailing" secondItem="Q1S-Xp-Efq" secondAttribute="trailing" id="OSo-5e-rTo"/>
<constraint firstAttribute="bottom" secondItem="4N0-Du-0sX" secondAttribute="bottom" id="QXU-av-oU3"/> <constraint firstAttribute="bottom" secondItem="4N0-Du-0sX" secondAttribute="bottom" id="QXU-av-oU3"/>
<constraint firstItem="Q1S-Xp-Efq" firstAttribute="top" secondItem="8J6-ZG-iNX" secondAttribute="bottom" id="XGo-Iw-NgO"/> <constraint firstItem="Q1S-Xp-Efq" firstAttribute="top" secondItem="8J6-ZG-iNX" secondAttribute="bottom" id="XGo-Iw-NgO"/>
<constraint firstAttribute="height" constant="90" id="bEK-Iu-vtM"/> <constraint firstAttribute="height" constant="135" id="bEK-Iu-vtM"/>
<constraint firstItem="Q1S-Xp-Efq" firstAttribute="width" secondItem="8J6-ZG-iNX" secondAttribute="width" id="fuq-Df-9hl"/> <constraint firstItem="Q1S-Xp-Efq" firstAttribute="width" secondItem="8J6-ZG-iNX" secondAttribute="width" id="fuq-Df-9hl"/>
<constraint firstItem="8J6-ZG-iNX" firstAttribute="top" secondItem="ZRM-pO-n9k" secondAttribute="top" id="pMu-6C-jQI"/> <constraint firstItem="8J6-ZG-iNX" firstAttribute="top" secondItem="ZRM-pO-n9k" secondAttribute="top" id="pMu-6C-jQI"/>
<constraint firstItem="4N0-Du-0sX" firstAttribute="leading" secondItem="ZRM-pO-n9k" secondAttribute="leading" id="qv8-J5-Qd2"/> <constraint firstItem="4N0-Du-0sX" firstAttribute="leading" secondItem="ZRM-pO-n9k" secondAttribute="leading" id="qv8-J5-Qd2"/>
<constraint firstItem="Q1S-Xp-Efq" firstAttribute="leading" secondItem="8J6-ZG-iNX" secondAttribute="leading" id="rkn-JQ-INW"/> <constraint firstItem="Q1S-Xp-Efq" firstAttribute="leading" secondItem="8J6-ZG-iNX" secondAttribute="leading" id="rkn-JQ-INW"/>
<constraint firstItem="z5P-IM-79Z" firstAttribute="leading" secondItem="4N0-Du-0sX" secondAttribute="trailing" id="xvx-lG-8TK"/>
<constraint firstAttribute="bottom" secondItem="z5P-IM-79Z" secondAttribute="bottom" id="y3v-jT-yfR"/>
</constraints> </constraints>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HBB-5u-l3n" userLabel="customer"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HBB-5u-l3n" userLabel="customer">
<rect key="frame" x="0.0" y="155" width="375" height="110"/> <rect key="frame" x="0.0" y="200" width="375" height="110"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zk0-vl-UkY"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zk0-vl-UkY">
<rect key="frame" x="0.0" y="0.0" width="90" height="110"/> <rect key="frame" x="0.0" y="0.0" width="90" height="110"/>
...@@ -1398,21 +1397,21 @@ ...@@ -1398,21 +1397,21 @@
</constraints> </constraints>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qbD-2t-hfO" userLabel="line"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qbD-2t-hfO" userLabel="line">
<rect key="frame" x="90" y="154" width="269" height="1"/> <rect key="frame" x="90" y="199" width="269" height="1"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="1" id="H6g-8T-kDL"/> <constraint firstAttribute="height" constant="1" id="H6g-8T-kDL"/>
</constraints> </constraints>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KfB-RI-dWc"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KfB-RI-dWc">
<rect key="frame" x="0.0" y="265" width="375" height="10"/> <rect key="frame" x="0.0" y="310" width="375" height="10"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="10" id="F73-vm-RlO"/> <constraint firstAttribute="height" constant="10" id="F73-vm-RlO"/>
</constraints> </constraints>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yXs-xn-o1i"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yXs-xn-o1i">
<rect key="frame" x="0.0" y="275" width="375" height="40"/> <rect key="frame" x="0.0" y="320" width="375" height="40"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="应付金额" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DLG-qu-bMC"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="应付金额" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DLG-qu-bMC">
<rect key="frame" x="16" y="9.5" width="70" height="21"/> <rect key="frame" x="16" y="9.5" width="70" height="21"/>
...@@ -1437,7 +1436,7 @@ ...@@ -1437,7 +1436,7 @@
</constraints> </constraints>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VK3-Ra-jCP"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VK3-Ra-jCP">
<rect key="frame" x="0.0" y="315" width="375" height="40"/> <rect key="frame" x="0.0" y="360" width="375" height="40"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="抵用券" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hRK-gc-RYc"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="抵用券" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hRK-gc-RYc">
<rect key="frame" x="16" y="9.5" width="52" height="21"/> <rect key="frame" x="16" y="9.5" width="52" height="21"/>
...@@ -1462,7 +1461,7 @@ ...@@ -1462,7 +1461,7 @@
</constraints> </constraints>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k67-Tq-zYi"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k67-Tq-zYi">
<rect key="frame" x="0.0" y="355" width="375" height="40"/> <rect key="frame" x="0.0" y="400" width="375" height="40"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="实付金额" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qgF-ci-8zC"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="实付金额" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qgF-ci-8zC">
<rect key="frame" x="16" y="8.5" width="78" height="23"/> <rect key="frame" x="16" y="8.5" width="78" height="23"/>
...@@ -1487,14 +1486,14 @@ ...@@ -1487,14 +1486,14 @@
</constraints> </constraints>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DFP-9u-TZS"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DFP-9u-TZS">
<rect key="frame" x="16" y="395" width="343" height="1"/> <rect key="frame" x="16" y="440" width="343" height="1"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="1" id="WR8-ij-eCe"/> <constraint firstAttribute="height" constant="1" id="WR8-ij-eCe"/>
</constraints> </constraints>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u1q-fg-pu6"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u1q-fg-pu6">
<rect key="frame" x="0.0" y="396" width="375" height="60"/> <rect key="frame" x="0.0" y="441" width="375" height="60"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提成金额" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9cF-8x-InV"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提成金额" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9cF-8x-InV">
<rect key="frame" x="16" y="18.5" width="78" height="23"/> <rect key="frame" x="16" y="18.5" width="78" height="23"/>
...@@ -1519,14 +1518,14 @@ ...@@ -1519,14 +1518,14 @@
</constraints> </constraints>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="p5w-2M-g4g"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="p5w-2M-g4g">
<rect key="frame" x="0.0" y="456" width="375" height="10"/> <rect key="frame" x="0.0" y="501" width="375" height="10"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="10" id="7HL-hr-5dn"/> <constraint firstAttribute="height" constant="10" id="7HL-hr-5dn"/>
</constraints> </constraints>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fmj-Y1-lp4"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fmj-Y1-lp4">
<rect key="frame" x="0.0" y="466" width="375" height="120"/> <rect key="frame" x="0.0" y="511" width="375" height="120"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="是否开票" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6zt-WO-353"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="是否开票" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6zt-WO-353">
<rect key="frame" x="16" y="0.0" width="359" height="40"/> <rect key="frame" x="16" y="0.0" width="359" height="40"/>
...@@ -1639,7 +1638,7 @@ ...@@ -1639,7 +1638,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="7G3-M0-nwt" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="7G3-M0-nwt" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="1335" y="1427"/> <point key="canvasLocation" x="1333.5999999999999" y="1426.2368815592206"/>
</scene> </scene>
<!--Login View Controller--> <!--Login View Controller-->
<scene sceneID="tne-QT-ifu"> <scene sceneID="tne-QT-ifu">
......
Car/CodeClass/LeftView/ViewControllers/BillListViewController.m
View file @ 91105394
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
NSArray *tempSortData = [self.arrData sortedArrayUsingComparator:^NSComparisonResult(id _Nonnull obj1, id _Nonnull obj2) { NSArray *tempSortData = [self.arrData sortedArrayUsingComparator:^NSComparisonResult(id _Nonnull obj1, id _Nonnull obj2) {
StationUserAcctHisEntity *a = (StationUserAcctHisEntity *)obj1; StationUserAcctHisEntity *a = (StationUserAcctHisEntity *)obj1;
StationUserAcctHisEntity *b = (StationUserAcctHisEntity *)obj2; StationUserAcctHisEntity *b = (StationUserAcctHisEntity *)obj2;
return [a.createDate compare:b.createDate]; return [b.createDate compare:a.createDate];
}]; }];
NSArray *months = self.dicMonthData.allKeys; NSArray *months = self.dicMonthData.allKeys;
......
Car/CodeClass/LeftView/ViewControllers/CardViewController.m
View file @ 91105394
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
[self findCard]; [self findCard];
self.cardView.model = self.card; self.cardView.model = self.card;
if ([self.card.state isEqualToString:@"used"]) { if ([self.card.state isEqualToString:@"used"]) {
// self.btnConfirm.enabled = NO; self.btnConfirm.enabled = NO;
} }
} }
...@@ -114,10 +114,13 @@ ...@@ -114,10 +114,13 @@
param.checkManId = kUser.fid; param.checkManId = kUser.fid;
param.checkManName = kUser.realName; param.checkManName = kUser.realName;
param.ticketNumber = self.card.ticketNumber; param.ticketNumber = self.card.ticketNumber;
WS(weakSelf);
[kHttp POST:kCheckTicketUrl parameters:[param toDictionary] complete:^(id _Nullable response, NSError * _Nullable error) { [kHttp POST:kCheckTicketUrl parameters:[param toDictionary] complete:^(id _Nullable response, NSError * _Nullable error) {
[MBProgressHUD j_hideLoadingView]; [MBProgressHUD j_hideLoadingView];
if (kRsSuccess(response)) { if (kRsSuccess(response)) {
[MBProgressHUD j_textOnly:@"销券成功！"]; [MBProgressHUD j_textOnly:@"销券成功！"];
weakSelf.card.state = @"used";
[weakSelf configUIWithCard];
}else{ }else{
kShowRsMsg(response); kShowRsMsg(response);
} }
......
Car/CodeClass/LeftView/ViewControllers/LeftTableViewController.m
View file @ 91105394
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
- (void)configUIWithAcct { - (void)configUIWithAcct {
self.labelName.text = kUser.realName; self.labelName.text = kUser.realName;
self.labelScore.text = [self.acct.balance stringValue]; self.labelScore.text = [CalculateHelper getMoneyStringFrom:self.acct.balance];
} }
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
......
Car/CodeClass/Main/Cells/OrderListTableViewCell.m
View file @ 91105394
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
- (void)configCellArray:(NSMutableArray *)array indexPath:(NSIndexPath *)indexPath { - (void)configCellArray:(NSMutableArray *)array indexPath:(NSIndexPath *)indexPath {
OrderListModel *model = array[indexPath.row]; OrderListModel *model = array[indexPath.row];
self.labelTime.text = [model.payTime substringToIndex:16]; self.labelTime.text = model.payTime;
self.labelStation.text = [NSString stringWithFormat:@"%@ - %@",model.stationName, model.stationUserName]; self.labelStation.text = [NSString stringWithFormat:@"%@ - %@",model.stationName, model.stationUserName];
self.labelOil.text = [NSString stringWithFormat:@"%@ - %@",model.gasItemName, model.oilGunName]; self.labelOil.text = [NSString stringWithFormat:@"%@ - %@",model.gasItemName, model.oilGunName];
self.labelBillNumber.text = model.billNumber; self.labelBillNumber.text = model.billNumber;
......
Car/CodeClass/Main/Models/OrderListModel.m
View file @ 91105394
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
- (NSString *)paymentString { - (NSString *)paymentString {
if (!_paymentString) { if (!_paymentString) {
if ([self.payMethod isEqualToString:@"weixin_pub"]) { if ([self.payMethod isEqualToString:@"weixin_pub"]) {
_paymentString = @"微信"; _paymentString = @"微信支付";
}else if([self.payMethod isEqualToString:@"alipay"]){ }else if([self.payMethod isEqualToString:@"alipay"]){
_paymentString = @"支付宝"; _paymentString = @"支付宝支付";
}else{ }else{
_paymentString = @"未知支付方式"; _paymentString = @"未知支付方式";
}; };
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
if (!_stateString) { if (!_stateString) {
if ([self.state isEqualToString:@"nonpay"]) { if ([self.state isEqualToString:@"nonpay"]) {
_stateString = @"未支付"; _stateString = @"未支付";
}else if ([self.state isEqualToString:@""]){ }else if ([self.state isEqualToString:@"paid"]){
_stateString = @"已支付"; _stateString = @"已支付";
}else{ }else{
_stateString = @"异常状态"; _stateString = @"异常状态";
......
Car/CodeClass/Main/ViewControllers/MainViewController.m
View file @ 91105394
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
} }
- (void)httpRequest { - (void)httpRequest {
CLog(@">>>>>>>>%p",self.navigationController); self.param.pageSize = self.pageSize;
self.param.pageNumber = self.page;
NSDictionary *param = [self.param toDictionary]; NSDictionary *param = [self.param toDictionary];
[MBProgressHUD j_loading:@"加载中…"]; [MBProgressHUD j_loading:@"加载中…"];
WS(weakSelf); WS(weakSelf);
...@@ -64,11 +65,21 @@ ...@@ -64,11 +65,21 @@
} }
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
OrderListTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"OrderListTableViewCell" forIndexPath:indexPath]; OrderListTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"OrderListTableViewCell" forIndexPath:indexPath];
[cell configCellArray:self.arrData indexPath:indexPath]; [cell configCellArray:self.arrData indexPath:indexPath];
return cell; return cell;
} }
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
[super tableView:tableView didSelectRowAtIndexPath:indexPath];
#ifdef DEBUG
[MBProgressHUD j_textOnly:[NSString stringWithFormat:@"%lu",indexPath.row + 1]];
#else
#endif
}
- (void)listDidSelect:(id)model { - (void)listDidSelect:(id)model {
OrderDetailViewController *detailVC = [OrderDetailViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN]; OrderDetailViewController *detailVC = [OrderDetailViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
detailVC.model = model; detailVC.model = model;
......
Car/CodeClass/Main/ViewControllers/OrderDetailViewController.m
View file @ 91105394
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
} }
- (void)configUI { - (void)configUI {
self.title = @"加油单详情";
UIBarButtonItem *rightBtn = [[UIBarButtonItem alloc] initWithTitle:@"重新打印" style:UIBarButtonItemStyleDone target:self action:@selector(actionRePrint)]; UIBarButtonItem *rightBtn = [[UIBarButtonItem alloc] initWithTitle:@"重新打印" style:UIBarButtonItemStyleDone target:self action:@selector(actionRePrint)];
self.navigationItem.rightBarButtonItem = rightBtn; self.navigationItem.rightBarButtonItem = rightBtn;
...@@ -70,8 +71,8 @@ ...@@ -70,8 +71,8 @@
self.labelPayment.text = kStrPrefix(self.model.paymentString, @"支付方式："); self.labelPayment.text = kStrPrefix(self.model.paymentString, @"支付方式：");
self.labelPayTime.text = kStrPrefix(self.model.payTime, @"支付时间："); self.labelPayTime.text = kStrPrefix(self.model.payTime, @"支付时间：");
self.labelPrice.text = kStrPrefix([CalculateHelper getMoneyStringFrom:self.model.total], @"￥"); self.labelPrice.text = kStrPrefix([CalculateHelper getMoneyStringFrom:self.model.total], @"￥");
self.labelVoucher.text = kStrPrefix([self.model.deduct stringValue], @"￥"); self.labelVoucher.text = kStrPrefix([CalculateHelper getMoneyStringFrom:self.model.deduct], @"￥");
self.labelRealPrice.text = kStrPrefix([self.model.realPayTotal stringValue], @"￥"); self.labelRealPrice.text = kStrPrefix([CalculateHelper getMoneyStringFrom:self.model.realPayTotal], @"￥");
self.labelIsInvoice.text = kStrPrefix(self.model.invoiceString, @"是否开票："); self.labelIsInvoice.text = kStrPrefix(self.model.invoiceString, @"是否开票：");
self.labelIsPrint.text = kStrPrefix(self.model.printStateString, @"是否打印："); self.labelIsPrint.text = kStrPrefix(self.model.printStateString, @"是否打印：");
self.labelLatestPrintTime.text = kStrPrefix(self.model.lstPrintedTime, @"最后一次打印时间："); self.labelLatestPrintTime.text = kStrPrefix(self.model.lstPrintedTime, @"最后一次打印时间：");
......
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