Skip to content

G
GeliBusinessPlatform
Commit 4ab3e84a authored by lujunye's avatar lujunye
Browse files
Options

详情样式修改

parent cb170a49
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 59 deletions
GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewRKVc.swift
View file @ 4ab3e84a
...@@ -49,7 +49,8 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne ...@@ -49,7 +49,8 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
}) })
var goods_bannerStr:String = "" var goods_bannerStr:String = ""
if lastGoodsBanner.count > 0 { if lastGoodsBanner.count > 0 {
goods_bannerStr = dataChangeString(sender: lastGoodsBanner) // goods_bannerStr = dataChangeString(sender: lastGoodsBanner)
goods_bannerStr = lastGoodsBanner.joined(separator: ",")
} }
report_sn = view.report_sn_tf.text! report_sn = view.report_sn_tf.text!
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuCell.swift
View file @ 4ab3e84a
...@@ -13,6 +13,8 @@ protocol DaiKeXiaDanGouWuCellDelegate { ...@@ -13,6 +13,8 @@ protocol DaiKeXiaDanGouWuCellDelegate {
func DaiKeXiaDanGouWuCell_check(cell:DaiKeXiaDanGouWuCell) func DaiKeXiaDanGouWuCell_check(cell:DaiKeXiaDanGouWuCell)
} }
class DaiKeXiaDanGouWuCell: UITableViewCell,UITextViewDelegate { class DaiKeXiaDanGouWuCell: UITableViewCell,UITextViewDelegate {
@IBOutlet weak var dj_wk_view: UIView!
@IBOutlet weak var dj_wk_top: NSLayoutConstraint!
@IBOutlet weak var btm_line: UIView! @IBOutlet weak var btm_line: UIView!
@IBOutlet weak var arrow_img: UIImageView! @IBOutlet weak var arrow_img: UIImageView!
@IBOutlet weak var check_button: UIButton! @IBOutlet weak var check_button: UIButton!
...@@ -23,14 +25,19 @@ class DaiKeXiaDanGouWuCell: UITableViewCell,UITextViewDelegate { ...@@ -23,14 +25,19 @@ class DaiKeXiaDanGouWuCell: UITableViewCell,UITextViewDelegate {
@IBOutlet weak var changeBtn: UIButton! @IBOutlet weak var changeBtn: UIButton!
@IBOutlet weak var count_lbl: UILabel! @IBOutlet weak var count_lbl: UILabel!
@IBOutlet weak var btmLIneWidth: NSLayoutConstraint! @IBOutlet weak var btmLIneWidth: NSLayoutConstraint!
@IBOutlet weak var detailLbl2: UILabel!
@IBOutlet weak var delBtn: UIButton! @IBOutlet weak var delBtn: UIButton!
@IBOutlet weak var delImg: UIImageView! @IBOutlet weak var delImg: UIImageView!
@IBOutlet weak var totalPriceLbl: UILabel!
@IBOutlet weak var priceLbl: UILabel! @IBOutlet weak var yong_jin_lbl: UILabel!
@IBOutlet weak var xiao_ji_lbl: UILabel!
@IBOutlet weak var detailLbl: UILabel! @IBOutlet weak var detailLbl: UILabel!
@IBOutlet weak var titleLbl: UILabel! @IBOutlet weak var titleLbl: UILabel!
@IBOutlet weak var diLbl: UILabel! @IBOutlet weak var dan_jia_lbl: UILabel!
@IBOutlet weak var dj_wk_height: NSLayoutConstraint!
@IBOutlet weak var ding_jin_lbl: UILabel!
@IBOutlet weak var wei_kuan_lbl: UILabel!
override func layoutSubviews() { override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
if isFx{ if isFx{
...@@ -42,8 +49,11 @@ class DaiKeXiaDanGouWuCell: UITableViewCell,UITextViewDelegate { ...@@ -42,8 +49,11 @@ class DaiKeXiaDanGouWuCell: UITableViewCell,UITextViewDelegate {
edit_img.isHidden = true edit_img.isHidden = true
delImg.isHidden = true delImg.isHidden = true
delBtn.isHidden = true delBtn.isHidden = true
diLbl.isHidden = false dan_jia_lbl.isHidden = false
priceLbl.isHidden = false xiao_ji_lbl.isHidden = false
dj_wk_top.constant = 0
dj_wk_height.constant = 0
dj_wk_view.isHidden = true
} }
} }
@IBOutlet weak var yu_shou_img: UIImageView! @IBOutlet weak var yu_shou_img: UIImageView!
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuCell.xib
View file @ 4ab3e84a
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="DaiKeXiaDanGouWuCell" customModule="TestClass" customModuleProvider="target"> <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="DaiKeXiaDanGouWuCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="250"/> <rect key="frame" x="0.0" y="0.0" width="375" height="305"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="375" height="250"/> <rect key="frame" x="0.0" y="0.0" width="375" height="305"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oAm-E1-HwQ"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oAm-E1-HwQ">
<rect key="frame" x="15" y="249" width="360" height="1"/> <rect key="frame" x="15" y="304" width="360" height="1"/>
<color key="backgroundColor" name="灰色分界线"/> <color key="backgroundColor" name="灰色分界线"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="1" id="END-QU-37t"/> <constraint firstAttribute="height" constant="1" id="END-QU-37t"/>
...@@ -93,35 +93,35 @@ ...@@ -93,35 +93,35 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WMj-FN-Sws"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WMj-FN-Sws">
<rect key="frame" x="15" y="125" width="345" height="109"/> <rect key="frame" x="15" y="125" width="345" height="164"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5kg/箱/袋" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LBB-wB-bMd"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="规格：400g*60包/件" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LBB-wB-bMd">
<rect key="frame" x="10" y="10" width="49" height="13.5"/> <rect key="frame" x="10" y="10" width="107" height="13.5"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/> <fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" name="灰色字体颜色"/> <color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥260.00*12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X1B-vl-mvy"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="佣金：¥50" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X1B-vl-mvy">
<rect key="frame" x="10" y="49" width="61.5" height="13.5"/> <rect key="frame" x="10" y="59" width="55" height="13.5"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/> <fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" name="灰色字体颜色"/> <color key="textColor" name="灰色字体颜色"/>
<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="WVL-NG-HsK"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="点击填写备注" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WVL-NG-HsK">
<rect key="frame" x="38.5" y="71.5" width="78" height="18.5"/> <rect key="frame" x="38.5" y="121.5" width="78" height="18.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/> <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="蓝色字体颜色"/> <color key="textColor" name="蓝色字体颜色"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bianji" translatesAutoresizingMaskIntoConstraints="NO" id="Dmd-Un-AkZ"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bianji" translatesAutoresizingMaskIntoConstraints="NO" id="Dmd-Un-AkZ">
<rect key="frame" x="10" y="72.5" width="16" height="16"/> <rect key="frame" x="10" y="122.5" width="16" height="16"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="16" id="MMn-yf-xWV"/> <constraint firstAttribute="width" constant="16" id="MMn-yf-xWV"/>
<constraint firstAttribute="height" constant="16" id="muF-aA-q6u"/> <constraint firstAttribute="height" constant="16" id="muF-aA-q6u"/>
</constraints> </constraints>
</imageView> </imageView>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="CW3-oD-5Hm"> <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="CW3-oD-5Hm">
<rect key="frame" x="36" y="65" width="299" height="36"/> <rect key="frame" x="36" y="115" width="299" height="36"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="36" id="sxT-0i-iXD"/> <constraint firstAttribute="height" constant="36" id="sxT-0i-iXD"/>
...@@ -131,31 +131,31 @@ ...@@ -131,31 +131,31 @@
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView> </textView>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="备注：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ykh-Oc-5e6"> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="备注：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ykh-Oc-5e6">
<rect key="frame" x="10" y="73" width="33" height="15.5"/> <rect key="frame" x="10" y="123" width="33" height="15.5"/>
<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" name="灰色字体颜色"/> <color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥51153.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rio-TZ-iyo"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小计:¥515212.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rio-TZ-iyo">
<rect key="frame" x="283.5" y="28.5" width="51.5" height="15.5"/> <rect key="frame" x="252" y="33.5" width="83" height="15.5"/>
<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" name="灰色字体颜色"/> <color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥51153.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JyG-Tf-6Jd"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="单价：46.5" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JyG-Tf-6Jd">
<rect key="frame" x="283.5" y="9" width="51.5" height="15.5"/> <rect key="frame" x="279" y="9" width="56" height="15.5"/>
<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" name="灰色字体颜色"/> <color key="textColor" name="灰色字体颜色"/>
<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="3f3-RV-d16"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="数量：15件" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3f3-RV-d16">
<rect key="frame" x="10" y="28.5" width="22" height="15.5"/> <rect key="frame" x="10" y="33.5" width="55.5" height="15.5"/>
<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" name="灰色字体颜色"/> <color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DvI-Hk-ZNE"> <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DvI-Hk-ZNE">
<rect key="frame" x="244" y="40.5" width="78" height="31"/> <rect key="frame" x="244" y="86" width="78" height="31"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/> <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<state key="normal" title="查看溯源信息"> <state key="normal" title="查看溯源信息">
<color key="titleColor" name="#F57575"/> <color key="titleColor" name="#F57575"/>
...@@ -164,38 +164,74 @@ ...@@ -164,38 +164,74 @@
<action selector="check_action:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="WR3-RW-mnT"/> <action selector="check_action:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="WR3-RW-mnT"/>
</connections> </connections>
</button> </button>
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="red_arrow" translatesAutoresizingMaskIntoConstraints="NO" id="2p2-7L-Hi7"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="red_arrow" translatesAutoresizingMaskIntoConstraints="NO" id="2p2-7L-Hi7">
<rect key="frame" x="327" y="52.5" width="3" height="7"/> <rect key="frame" x="327" y="98" width="3" height="7"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="3" id="Dwj-HF-JHh"/> <constraint firstAttribute="width" constant="3" id="Dwj-HF-JHh"/>
<constraint firstAttribute="height" constant="7" id="IWn-Vh-ajY"/> <constraint firstAttribute="height" constant="7" id="IWn-Vh-ajY"/>
</constraints> </constraints>
</imageView> </imageView>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eKk-wu-XQi">
<rect key="frame" x="10" y="82.5" width="320" height="0.0"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="定金：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hpw-Ue-F2i">
<rect key="frame" x="0.0" y="0.0" width="320" height="15"/>
<constraints>
<constraint firstAttribute="height" constant="15" id="IDi-vj-C7s"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
<color key="textColor" name="灰色字体颜色"/>
<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="6Xr-MY-QEo">
<rect key="frame" x="0.0" y="-15" width="320" height="15"/>
<constraints>
<constraint firstAttribute="height" constant="15" id="SOW-XF-9Ja"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
<color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" name="app底色"/>
<constraints>
<constraint firstItem="hpw-Ue-F2i" firstAttribute="top" secondItem="eKk-wu-XQi" secondAttribute="top" id="80J-u9-Q7E"/>
<constraint firstAttribute="trailing" secondItem="hpw-Ue-F2i" secondAttribute="trailing" id="JcG-Gn-WwC"/>
<constraint firstAttribute="trailing" secondItem="6Xr-MY-QEo" secondAttribute="trailing" id="SeE-H7-LbZ"/>
<constraint firstItem="6Xr-MY-QEo" firstAttribute="leading" secondItem="eKk-wu-XQi" secondAttribute="leading" id="YgS-Qh-Mmi"/>
<constraint firstAttribute="bottom" secondItem="6Xr-MY-QEo" secondAttribute="bottom" id="pO2-Ju-hru"/>
<constraint firstAttribute="height" id="vTr-T8-QNe"/>
<constraint firstItem="hpw-Ue-F2i" firstAttribute="leading" secondItem="eKk-wu-XQi" secondAttribute="leading" id="xUx-Dd-oSy"/>
</constraints>
</view>
</subviews> </subviews>
<color key="backgroundColor" name="app底色"/> <color key="backgroundColor" name="app底色"/>
<constraints> <constraints>
<constraint firstItem="Dmd-Un-AkZ" firstAttribute="top" secondItem="X1B-vl-mvy" secondAttribute="bottom" constant="10" id="5Ig-Ek-Czg"/> <constraint firstItem="CW3-oD-5Hm" firstAttribute="top" secondItem="2p2-7L-Hi7" secondAttribute="bottom" constant="10" id="0h4-hS-U5y"/>
<constraint firstItem="Dmd-Un-AkZ" firstAttribute="top" secondItem="eKk-wu-XQi" secondAttribute="bottom" constant="40" id="5Ig-Ek-Czg"/>
<constraint firstItem="DvI-Hk-ZNE" firstAttribute="centerY" secondItem="2p2-7L-Hi7" secondAttribute="centerY" id="5fA-6C-jzM"/>
<constraint firstAttribute="trailing" secondItem="CW3-oD-5Hm" secondAttribute="trailing" constant="10" id="6vz-aS-Foq"/> <constraint firstAttribute="trailing" secondItem="CW3-oD-5Hm" secondAttribute="trailing" constant="10" id="6vz-aS-Foq"/>
<constraint firstItem="CW3-oD-5Hm" firstAttribute="leading" secondItem="Dmd-Un-AkZ" secondAttribute="trailing" constant="10" id="7n2-Vb-3XY"/> <constraint firstItem="CW3-oD-5Hm" firstAttribute="leading" secondItem="Dmd-Un-AkZ" secondAttribute="trailing" constant="10" id="7n2-Vb-3XY"/>
<constraint firstAttribute="trailing" secondItem="JyG-Tf-6Jd" secondAttribute="trailing" constant="10" id="9AX-WF-nFt"/> <constraint firstAttribute="trailing" secondItem="JyG-Tf-6Jd" secondAttribute="trailing" constant="10" id="9AX-WF-nFt"/>
<constraint firstItem="DvI-Hk-ZNE" firstAttribute="centerY" secondItem="X1B-vl-mvy" secondAttribute="centerY" id="C4k-rd-zb7"/> <constraint firstItem="X1B-vl-mvy" firstAttribute="top" secondItem="3f3-RV-d16" secondAttribute="bottom" constant="10" id="G0k-U9-DVo"/>
<constraint firstItem="X1B-vl-mvy" firstAttribute="top" secondItem="3f3-RV-d16" secondAttribute="bottom" constant="5" id="G0k-U9-DVo"/>
<constraint firstItem="LBB-wB-bMd" firstAttribute="leading" secondItem="WMj-FN-Sws" secondAttribute="leading" constant="10" id="L6M-kd-Qvr"/> <constraint firstItem="LBB-wB-bMd" firstAttribute="leading" secondItem="WMj-FN-Sws" secondAttribute="leading" constant="10" id="L6M-kd-Qvr"/>
<constraint firstItem="Rio-TZ-iyo" firstAttribute="centerY" secondItem="3f3-RV-d16" secondAttribute="centerY" id="MHT-Tf-HPF"/> <constraint firstItem="Rio-TZ-iyo" firstAttribute="centerY" secondItem="3f3-RV-d16" secondAttribute="centerY" id="MHT-Tf-HPF"/>
<constraint firstItem="3f3-RV-d16" firstAttribute="top" secondItem="LBB-wB-bMd" secondAttribute="bottom" constant="5" id="RhT-R5-aDU"/> <constraint firstItem="3f3-RV-d16" firstAttribute="top" secondItem="LBB-wB-bMd" secondAttribute="bottom" constant="10" id="RhT-R5-aDU"/>
<constraint firstItem="2p2-7L-Hi7" firstAttribute="leading" secondItem="DvI-Hk-ZNE" secondAttribute="trailing" constant="5" id="T3l-7I-23e"/> <constraint firstItem="2p2-7L-Hi7" firstAttribute="leading" secondItem="DvI-Hk-ZNE" secondAttribute="trailing" constant="5" id="T3l-7I-23e"/>
<constraint firstItem="WVL-NG-HsK" firstAttribute="centerY" secondItem="Dmd-Un-AkZ" secondAttribute="centerY" id="VEI-Ck-HWY"/> <constraint firstItem="WVL-NG-HsK" firstAttribute="centerY" secondItem="Dmd-Un-AkZ" secondAttribute="centerY" id="VEI-Ck-HWY"/>
<constraint firstItem="2p2-7L-Hi7" firstAttribute="centerY" secondItem="DvI-Hk-ZNE" secondAttribute="centerY" id="XFT-vs-Mev"/>
<constraint firstItem="LBB-wB-bMd" firstAttribute="top" secondItem="WMj-FN-Sws" secondAttribute="top" constant="10" id="Xri-zi-cci"/> <constraint firstItem="LBB-wB-bMd" firstAttribute="top" secondItem="WMj-FN-Sws" secondAttribute="top" constant="10" id="Xri-zi-cci"/>
<constraint firstItem="CW3-oD-5Hm" firstAttribute="centerY" secondItem="Dmd-Un-AkZ" secondAttribute="centerY" constant="2.5" id="ZiM-2r-dAw"/> <constraint firstItem="CW3-oD-5Hm" firstAttribute="centerY" secondItem="Dmd-Un-AkZ" secondAttribute="centerY" constant="2.5" id="ZiM-2r-dAw"/>
<constraint firstItem="Dmd-Un-AkZ" firstAttribute="leading" secondItem="WMj-FN-Sws" secondAttribute="leading" constant="10" id="a7j-vt-r1P"/> <constraint firstItem="Dmd-Un-AkZ" firstAttribute="leading" secondItem="WMj-FN-Sws" secondAttribute="leading" constant="10" id="a7j-vt-r1P"/>
<constraint firstAttribute="trailing" secondItem="2p2-7L-Hi7" secondAttribute="trailing" constant="15" id="bVc-mK-6cd"/> <constraint firstAttribute="trailing" secondItem="2p2-7L-Hi7" secondAttribute="trailing" constant="15" id="bVc-mK-6cd"/>
<constraint firstItem="eKk-wu-XQi" firstAttribute="leading" secondItem="WMj-FN-Sws" secondAttribute="leading" constant="10" id="bi9-vj-Clv"/>
<constraint firstItem="ykh-Oc-5e6" firstAttribute="centerY" secondItem="Dmd-Un-AkZ" secondAttribute="centerY" id="cCR-3w-9NS"/> <constraint firstItem="ykh-Oc-5e6" firstAttribute="centerY" secondItem="Dmd-Un-AkZ" secondAttribute="centerY" id="cCR-3w-9NS"/>
<constraint firstItem="eKk-wu-XQi" firstAttribute="top" secondItem="X1B-vl-mvy" secondAttribute="bottom" constant="10" id="ccd-dk-iCZ"/>
<constraint firstItem="ykh-Oc-5e6" firstAttribute="leading" secondItem="WMj-FN-Sws" secondAttribute="leading" constant="10" id="das-yY-Rxy"/> <constraint firstItem="ykh-Oc-5e6" firstAttribute="leading" secondItem="WMj-FN-Sws" secondAttribute="leading" constant="10" id="das-yY-Rxy"/>
<constraint firstItem="JyG-Tf-6Jd" firstAttribute="centerY" secondItem="LBB-wB-bMd" secondAttribute="centerY" id="lKC-hA-bwp"/> <constraint firstItem="JyG-Tf-6Jd" firstAttribute="centerY" secondItem="LBB-wB-bMd" secondAttribute="centerY" id="lKC-hA-bwp"/>
<constraint firstAttribute="trailing" secondItem="Rio-TZ-iyo" secondAttribute="trailing" constant="10" id="qNT-67-znW"/> <constraint firstAttribute="trailing" secondItem="Rio-TZ-iyo" secondAttribute="trailing" constant="10" id="qNT-67-znW"/>
<constraint firstItem="X1B-vl-mvy" firstAttribute="leading" secondItem="WMj-FN-Sws" secondAttribute="leading" constant="10" id="rJS-l5-dkz"/> <constraint firstItem="X1B-vl-mvy" firstAttribute="leading" secondItem="WMj-FN-Sws" secondAttribute="leading" constant="10" id="rJS-l5-dkz"/>
<constraint firstItem="3f3-RV-d16" firstAttribute="leading" secondItem="WMj-FN-Sws" secondAttribute="leading" constant="10" id="sAa-RD-lf2"/> <constraint firstItem="3f3-RV-d16" firstAttribute="leading" secondItem="WMj-FN-Sws" secondAttribute="leading" constant="10" id="sAa-RD-lf2"/>
<constraint firstAttribute="trailing" secondItem="eKk-wu-XQi" secondAttribute="trailing" constant="15" id="uDu-r1-rox"/>
<constraint firstItem="WVL-NG-HsK" firstAttribute="leading" secondItem="Dmd-Un-AkZ" secondAttribute="trailing" constant="12.5" id="zlW-a1-QVz"/> <constraint firstItem="WVL-NG-HsK" firstAttribute="leading" secondItem="Dmd-Un-AkZ" secondAttribute="trailing" constant="12.5" id="zlW-a1-QVz"/>
</constraints> </constraints>
<userDefinedRuntimeAttributes> <userDefinedRuntimeAttributes>
...@@ -239,17 +275,21 @@ ...@@ -239,17 +275,21 @@
<outlet property="check_button" destination="DvI-Hk-ZNE" id="egI-io-mdA"/> <outlet property="check_button" destination="DvI-Hk-ZNE" id="egI-io-mdA"/>
<outlet property="content_tv" destination="CW3-oD-5Hm" id="FqB-Cg-d4n"/> <outlet property="content_tv" destination="CW3-oD-5Hm" id="FqB-Cg-d4n"/>
<outlet property="count_lbl" destination="3f3-RV-d16" id="mVi-eZ-CLv"/> <outlet property="count_lbl" destination="3f3-RV-d16" id="mVi-eZ-CLv"/>
<outlet property="dan_jia_lbl" destination="JyG-Tf-6Jd" id="3Vp-4A-nQa"/>
<outlet property="delBtn" destination="eKc-LO-OD0" id="sTb-4h-fLY"/> <outlet property="delBtn" destination="eKc-LO-OD0" id="sTb-4h-fLY"/>
<outlet property="delImg" destination="ftv-xQ-eXW" id="CON-aC-p5Y"/> <outlet property="delImg" destination="ftv-xQ-eXW" id="CON-aC-p5Y"/>
<outlet property="detailLbl" destination="LBB-wB-bMd" id="Z5L-Om-fG8"/> <outlet property="detailLbl" destination="LBB-wB-bMd" id="Z5L-Om-fG8"/>
<outlet property="detailLbl2" destination="X1B-vl-mvy" id="h0s-3d-jnl"/> <outlet property="ding_jin_lbl" destination="hpw-Ue-F2i" id="K7I-B7-5Ft"/>
<outlet property="diLbl" destination="JyG-Tf-6Jd" id="loL-0t-j6w"/> <outlet property="dj_wk_height" destination="vTr-T8-QNe" id="AP4-PP-DKd"/>
<outlet property="dj_wk_top" destination="ccd-dk-iCZ" id="DHR-0U-cSi"/>
<outlet property="dj_wk_view" destination="eKk-wu-XQi" id="9l4-al-Jgh"/>
<outlet property="edit_img" destination="Dmd-Un-AkZ" id="Wem-3z-XGv"/> <outlet property="edit_img" destination="Dmd-Un-AkZ" id="Wem-3z-XGv"/>
<outlet property="holder_lbl" destination="WVL-NG-HsK" id="mrt-aR-lOQ"/> <outlet property="holder_lbl" destination="WVL-NG-HsK" id="mrt-aR-lOQ"/>
<outlet property="imgView" destination="AWX-Qu-0ML" id="BQH-fG-eL9"/> <outlet property="imgView" destination="AWX-Qu-0ML" id="BQH-fG-eL9"/>
<outlet property="priceLbl" destination="Rio-TZ-iyo" id="Ivg-2f-C6y"/>
<outlet property="titleLbl" destination="HYf-UQ-mHg" id="bMC-Ni-Yjv"/> <outlet property="titleLbl" destination="HYf-UQ-mHg" id="bMC-Ni-Yjv"/>
<outlet property="totalPriceLbl" destination="Rio-TZ-iyo" id="l5M-Ih-fxa"/> <outlet property="wei_kuan_lbl" destination="6Xr-MY-QEo" id="hu1-bI-zGd"/>
<outlet property="xiao_ji_lbl" destination="Rio-TZ-iyo" id="4Uh-GN-8oj"/>
<outlet property="yong_jin_lbl" destination="X1B-vl-mvy" id="3Vm-LZ-a7G"/>
<outlet property="yu_shou_img" destination="2zV-nI-93U" id="uFW-s4-KdR"/> <outlet property="yu_shou_img" destination="2zV-nI-93U" id="uFW-s4-KdR"/>
</connections> </connections>
<point key="canvasLocation" x="131.15942028985509" y="121.20535714285714"/> <point key="canvasLocation" x="131.15942028985509" y="121.20535714285714"/>
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuViewController.swift
View file @ 4ab3e84a
...@@ -189,22 +189,27 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U ...@@ -189,22 +189,27 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
cell.detailLbl.text = "\(cellData.spec_str!)/\(cellData.unit!)" cell.detailLbl.text = "\(cellData.spec_str!)/\(cellData.unit!)"
let pStr = cellData.target_Price as! NSString let pStr = cellData.target_Price as! NSString
let p = pStr.floatValue * Float(cellData.target_Count!) let p = pStr.floatValue * Float(cellData.target_Count!)
cell.detailLbl2.text = "小计:￥" + String(format: "%.2f", p) cell.xiao_ji_lbl.text = "小计:￥" + String(format: "%.2f", p)
let priceStr = cellData.target_Price?.replacingOccurrences(of: "", with: ",") as! NSString let priceStr = cellData.target_Price?.replacingOccurrences(of: "", with: ",") as! NSString
let totalP = priceStr.floatValue * Float(cellData.target_Count!) let totalP = priceStr.floatValue * Float(cellData.target_Count!)
cell.totalPriceLbl.text = "\(totalP)" cell.xiao_ji_lbl.text = "\(totalP)"
if orderType == 1 { if orderType == 1 {
cell.dj_wk_top.constant = 10
cell.dj_wk_height.constant = 40
cell.dj_wk_view.isHidden = false
cell.yu_shou_img.isHidden = false cell.yu_shou_img.isHidden = false
cell.diLbl.isHidden = false cell.dan_jia_lbl.isHidden = false
cell.priceLbl.isHidden = false cell.xiao_ji_lbl.isHidden = false
cell.diLbl.text = "定金:￥" + djTFstr cell.ding_jin_lbl.text = "定金:￥" + djTFstr
cell.priceLbl.text = "尾款:￥" + wkTFstr cell.wei_kuan_lbl.text = "尾款:￥" + wkTFstr
}else { }else {
// cell.totalPriceLbl.text = "¥\(priceStr.floatValue * countStr.floatValue)" // cell.totalPriceLbl.text = "¥\(priceStr.floatValue * countStr.floatValue)"
cell.diLbl.isHidden = true cell.xiao_ji_lbl.isHidden = true
cell.dj_wk_top.constant = 0
cell.dj_wk_height.constant = 0
cell.dj_wk_view.isHidden = true
} }
return cell return cell
...@@ -689,7 +694,10 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U ...@@ -689,7 +694,10 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.section == 1 { if indexPath.section == 1 {
return 250 if orderType == 1 {
return 340
}
return 300
} }
if indexPath.section == 2 {//新增预售 if indexPath.section == 2 {//新增预售
if orderType == 1 { if orderType == 1 {
......
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageDetailViewController.swift
View file @ 4ab3e84a
...@@ -86,7 +86,6 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate, ...@@ -86,7 +86,6 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
let dataM = data as! OrderDetailModel let dataM = data as! OrderDetailModel
self.dataMdoel = dataM.data self.dataMdoel = dataM.data
self.listView.reloadData() self.listView.reloadData()
}) { (error) in }) { (error) in
self.listView.isHidden = true self.listView.isHidden = true
} }
...@@ -96,7 +95,6 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate, ...@@ -96,7 +95,6 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
let dataM = data as! OrderDetailModel let dataM = data as! OrderDetailModel
self.dataMdoel = dataM.data self.dataMdoel = dataM.data
self.listView.reloadData() self.listView.reloadData()
}) { (error) in }) { (error) in
self.listView.isHidden = true self.listView.isHidden = true
} }
...@@ -152,12 +150,12 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate, ...@@ -152,12 +150,12 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
}else{ }else{
cell.detailLbl.text = "规格:-" cell.detailLbl.text = "规格:-"
} }
cell.count_lbl.text = "单价:" + (rowModel?.goods_price)! cell.dan_jia_lbl.text = "单价:" + (rowModel?.goods_price)!
cell.priceLbl.text = "数量:" + StringByInt(number: (rowModel?.cart_number!)!) cell.count_lbl.text = "数量:" + StringByInt(number: (rowModel?.cart_number!)!)
cell.diLbl.text = "佣金:￥" + (rowModel?.commission_val)! cell.yong_jin_lbl.text = "佣金:￥" + (rowModel?.commission_val)!
let s_p = rowModel?.goods_price as! NSString let s_p = rowModel?.goods_price as! NSString
let p_count = Float((rowModel?.cart_number)!) * s_p.floatValue let p_count = Float((rowModel?.cart_number)!) * s_p.floatValue
cell.detailLbl2.text = "小计:" + String(format: "%.2f", p_count) cell.xiao_ji_lbl.text = "小计:" + String(format: "%.2f", p_count)
cell.delegate = self cell.delegate = self
cell.tag = indexPath.row cell.tag = indexPath.row
...@@ -256,7 +254,7 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate, ...@@ -256,7 +254,7 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
} }
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.section == 1 { if indexPath.section == 1 {
return 210 return 300
} }
return 49 return 49
} }
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ 4ab3e84a
...@@ -511,15 +511,22 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa ...@@ -511,15 +511,22 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
cell.detailLbl.text = "规格:-" cell.detailLbl.text = "规格:-"
} }
if isYuShou { if isYuShou {
cell.diLbl.isHidden = false cell.dj_wk_top.constant = 10
cell.priceLbl.isHidden = false cell.dj_wk_height.constant = 40
cell.dj_wk_view.isHidden = false
cell.dan_jia_lbl.isHidden = false
cell.xiao_ji_lbl.isHidden = false
cell.yu_shou_img.isHidden = false cell.yu_shou_img.isHidden = false
cell.diLbl.text = "定金:￥" + (self.dataMdoel?.order_res?.sale_res?.dj_amount)! cell.ding_jin_lbl.text = "定金:￥" + (self.dataMdoel?.order_res?.sale_res?.dj_amount)!
cell.priceLbl.text = "尾款:￥" + (self.dataMdoel?.order_res?.sale_res?.wk_amount)! cell.wei_kuan_lbl.text = "尾款:￥" + (self.dataMdoel?.order_res?.sale_res?.wk_amount)!
}else{
cell.dj_wk_top.constant = 0
cell.dj_wk_height.constant = 0
cell.dj_wk_view.isHidden = true
} }
cell.count_lbl.text = "数量:" + StringByInt(number: (rowModel?.cart_number!)!) cell.count_lbl.text = "数量:" + StringByInt(number: (rowModel?.cart_number!)!)
cell.detailLbl2.text = "小计:￥" + (self.dataMdoel?.order_res?.goods_amount)! cell.xiao_ji_lbl.text = "小计:￥" + (self.dataMdoel?.order_res?.goods_amount)!
return cell return cell
case 2: case 2:
...@@ -1216,7 +1223,10 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa ...@@ -1216,7 +1223,10 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
switch indexPath.section { switch indexPath.section {
case 1://商品展示heightrow case 1://商品展示heightrow
return 250 if isYuShou {
return 340
}
return 300
case 4://发票信息heightrow case 4://发票信息heightrow
if segmentIndex == 0 { if segmentIndex == 0 {
return 180 return 180
......
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