Skip to content

G
GeliBusinessPlatform
Commit 8276368d authored by 刘俊宏's avatar 刘俊宏
Browse files
Options

新增新的上下架接口，修正订单列表UI

parent 14dae756
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 117 deletions
GeliBusinessPlatform/Interface/Interface_Z.plist
View file @ 8276368d
......@@ -218,5 +218,7 @@
<string>Order/refundOrSalesReturn</string>
<key>订单确认收货</key>
<string>Order/confirmReceiving</string>
<key>商品上下/架</key>
<string>Goods/onOff</string>
</dict>
</plist>
GeliBusinessPlatform/Model/Interface.swift
View file @ 8276368d
......@@ -181,3 +181,13 @@ func messageList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failtur
failture(error)
}
}
//MARK:--简单通用操作接口
//params-key(user_token,goods_id ,is_show(1上架，0下架))
func onOff(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("商品上下/架", params, { (rep:DataResponse<UpDataModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
GeliBusinessPlatform/ViewController/商品管理/GoodsManageListVC.swift
View file @ 8276368d
......@@ -465,7 +465,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
func sureGeliAlertViewAction(sender: UIButton) {
if sender.tag == 1001{
editField(["user_token":UserToken as Any,"function_id":"15","prval":changeGoodsResModel!.goods_id as Any,"value":0,], success: { (data) in
onOff(["user_token":UserToken as Any,"goods_id":changeGoodsResModel!.goods_id as Any,"is_show":0], success: { (data) in
let dataM = data as! UpDataModel
if dataM.code == 1 {
HUD.flash(.label("提交成功"), delay: 1.2)
......@@ -478,7 +478,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
}else if sender.tag == 1002 {
editField(["user_token":UserToken as Any,"function_id":"15","prval":changeGoodsResModel!.goods_id as Any,"value":1,], success: { (data) in
onOff(["user_token":UserToken as Any,"goods_id":changeGoodsResModel!.goods_id as Any,"is_show":1], success: { (data) in
let dataM = data as! UpDataModel
if dataM.code == 1 {
HUD.flash(.label("提交成功"), delay: 1.2)
......
GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift
View file @ 8276368d
......@@ -247,7 +247,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
}else if sender.tag == 1003 {
editField(["user_token":UserToken as Any,"function_id":"15","prval":goods_id as Any,"value":1,], success: { (data) in
onOff(["user_token":UserToken as Any,"goods_id":goods_id as Any,"is_show":1], success: { (data) in
let dataM = data as! UpDataModel
if dataM.code == 1 {
HUD.flash(.label("提交成功"), delay: 1.2)
......@@ -263,7 +263,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
}
}else if sender.tag == 1004 {
editField(["user_token":UserToken as Any,"function_id":"15","prval":goods_id as Any,"value":0,], success: { (data) in
onOff(["user_token":UserToken as Any,"goods_id":goods_id as Any,"is_show":0], success: { (data) in
let dataM = data as! UpDataModel
if dataM.code == 1 {
HUD.flash(.label("提交成功"), delay: 1.2)
......
GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift
View file @ 8276368d
......@@ -185,16 +185,8 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "CGDListCell") as! CGDListCell
let rowModel = self.dataArr[indexPath.row]
// cell.leftIcon.isHidden = true
// cell.nameLblLeft.constant = -15
if rowModel.cus_name != nil {
cell.nameLbl.text = rowModel.cus_name!
}else{
if rowModel.user_name != nil {
cell.nameLbl.text = rowModel.user_name!
}
}
cell.orderNumerLbl.text = rowModel.order_sn!
if rowModel.order_status != nil && rowModel.order_status_d != nil && rowModel.goods_before_pay != nil {
......@@ -207,25 +199,38 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
cell.formLbl.isHidden = true
cell.yuShouStatus.isHidden = true
cell.orderNumberRight.constant = 15
if rowModel.order_type == 1 {
cell.yuShouStatus.isHidden = true
}else{
cell.beforeOrderLbl.isHidden = true
if rowModel.order_type == 4 {
cell.yuShouStatus.isHidden = false
cell.orderNumberRight.constant = 56
}else{
cell.yuShouStatus.isHidden = true
}
if rowModel.from == 3 {
cell.formLbl.isHidden = false
cell.orderNumberRight.constant = 78
cell.yuShouStatus.isHidden = true
if cell.yuShouStatus.isHidden {
cell.formNSlayout.constant = 8
}else{
cell.formNSlayout.constant = 8 + 18 + 8
}
}else{
cell.formLbl.isHidden = true
}
if rowModel.order_type == 4 {
cell.formLbl.isHidden = true
cell.orderNumberRight.constant = 56
cell.yuShouStatus.isHidden = false
if rowModel.goods_before_pay == 1 {
cell.beforeOrderLbl.isHidden = false
if cell.yuShouStatus.isHidden && cell.formLbl.isHidden {
cell.beforeNSLayout.constant = 8
}else if cell.yuShouStatus.isHidden && !cell.formLbl.isHidden {
cell.beforeNSLayout.constant = 8 + 18 + 8
}else if !cell.yuShouStatus.isHidden && cell.formLbl.isHidden {
cell.beforeNSLayout.constant = 8 + 18 + 8
}else{
cell.beforeNSLayout.constant = 8 + 18 + 8 + 18 + 8
}
}else{
cell.beforeOrderLbl.isHidden = true
}
var btnStr:Array<String> = []
switch rowModel.order_status {
......@@ -247,12 +252,12 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
case 6://待发货
if rowModel.from == 3 || rowModel.from == 5 {//销售下单
btnStr = ["发货","取消订单并退款"]
if rowModel.pay_status == 0{
if rowModel.pay_status != 2{
btnStr = ["发货","取消订单","确认收款"]
}
}else{
btnStr = ["发货","退款"]
if rowModel.pay_status == 0{
if rowModel.pay_status != 2{
btnStr = ["发货","取消订单"]
}
}
......@@ -267,12 +272,12 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
case 7://待收货
if rowModel.from == 3 || rowModel.from == 5 {//销售下单
btnStr = ["确认收货","退款退货","退款"]
if rowModel.pay_status == 0{//未收款
if rowModel.pay_status != 2{//未收款
btnStr = ["确认收货","确认收款","取消订单"]
}
}else{
btnStr = ["退款"]
if rowModel.pay_status == 0 {
if rowModel.pay_status != 2 {
btnStr = ["取消订单"]
}
if rowModel.goods_before_pay == 1 && orderStatus == 1{
......@@ -294,7 +299,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
break
case 10://已收货
btnStr = ["退款退货"]
if rowModel.pay_status == 0 {
if rowModel.pay_status != 2 {
btnStr = ["取消订单"]
}
if rowModel.from == 3 || rowModel.from == 5 {
......@@ -687,9 +692,9 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
let rowModel = self.dataArr[indexPath.row]
if rowModel.order_goods!.count > 4 {
return CGFloat(200 + (49 * 4))
return CGFloat(185 + (49 * 4))
}
return CGFloat(200 + (49 * rowModel.order_goods!.count))
return CGFloat(185 + (49 * rowModel.order_goods!.count))
}
}
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ 8276368d
......@@ -1199,7 +1199,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
case 1:
// str = "已确定" "待付款"
titleArr = ["修改价格","付款码","取消订单"]
if self.dataMdoel!.order_res?.shipping_status == 1 && self.dataMdoel!.order_res?.pay_status == 0 {
if self.dataMdoel!.order_res?.shipping_status == 1 && self.dataMdoel!.order_res?.pay_status != 2 {
titleArr = ["修改价格","付款码","退货"]
}
// if self.dataMdoel?.order_res.
......@@ -1211,12 +1211,12 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
// str = "待发货"
if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
titleArr = ["取消订单并退款","发货"]
if self.dataMdoel!.order_res?.pay_status == 0{
if self.dataMdoel!.order_res?.pay_status != 2{
titleArr = ["确认收款","取消订单","发货"]
}
}else{
titleArr = ["退款","发货"]
if self.dataMdoel!.order_res?.pay_status == 0{
if self.dataMdoel!.order_res?.pay_status != 2{
titleArr = ["取消订单","发货"]
}
if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
......@@ -1231,12 +1231,12 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
// str = "待收货"
if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
titleArr = ["退款","退款退货","确认收货"]
if self.dataMdoel?.order_res?.pay_status == 0{//未收款
if self.dataMdoel?.order_res?.pay_status != 2{//未收款
titleArr = ["取消订单","确认收款","确认收货"]
}
}else{
titleArr = ["退款"]
if self.dataMdoel?.order_res?.pay_status == 0 {
if self.dataMdoel?.order_res?.pay_status != 2 {
titleArr = ["取消订单"]
}
if self.dataMdoel?.order_res?.goods_before_pay == 1 && lmIdx == 1{
......@@ -1290,7 +1290,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
// str = "订单关闭"str = "已取消" //用户取消（预售
titleArr = ["退款退货"]
if self.dataMdoel!.order_res?.pay_status == 0 {
if self.dataMdoel!.order_res?.pay_status != 2 {
titleArr = ["取消订单"]
}
if self.dataMdoel!.order_res?.from == 3 || self.dataMdoel!.order_res?.from == 5 {
......@@ -1303,7 +1303,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
// if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
// titleArr = ["付款码"]
// }
// if self.dataMdoel!.order_res?.pay_status == 0 {
// if self.dataMdoel!.order_res?.pay_status != 2 {
// if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
// titleArr = ["确认收款"]
// }
......
GeliBusinessPlatform/ViewController/采购单详情/CGDListCell.swift
View file @ 8276368d
......@@ -11,15 +11,13 @@ protocol CGDListCellDelegate {
func allBtnSubmit(sender: UIButton)
}
class CGDListCell: UITableViewCell {
//先货后款图标
@IBOutlet weak var beforeOrderLbl: UILabel!
//销售下单图标
@IBOutlet weak var formLbl: UILabel!
///预售图标
@IBOutlet weak var yuShouStatus: UILabel!
///标题左间距
@IBOutlet weak var nameLblLeft: NSLayoutConstraint!
///图标
@IBOutlet weak var leftIcon: UIImageView!
///列表底图
///列表底图
@IBOutlet weak var listBgView: UIView!
///按钮底图
@IBOutlet weak var btnBgView: UIView!
......@@ -29,13 +27,14 @@ class CGDListCell: UITableViewCell {
@IBOutlet weak var priceLbl: UILabel!
///状态
@IBOutlet weak var statusLbl: UILabel!
///标题
@IBOutlet weak var nameLbl: UILabel!
///时间
@IBOutlet weak var timeLbl: UILabel!
@IBOutlet weak var orderNumerLbl: UILabel!
@IBOutlet weak var orderNumberRight: NSLayoutConstraint!
@IBOutlet weak var formNSlayout: NSLayoutConstraint!
@IBOutlet weak var beforeNSLayout: NSLayoutConstraint!
var delegate:CGDListCellDelegate?
//订单列表数据
......
GeliBusinessPlatform/ViewController/采购单详情/CGDListCell.xib
View file @ 8276368d
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
......@@ -30,23 +30,6 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xNb-6a-mWT">
<rect key="frame" x="15" y="15" width="347" height="186"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="kehu" translatesAutoresizingMaskIntoConstraints="NO" id="HVh-eU-WcT">
<rect key="frame" x="15" y="15" width="15" height="17.5"/>
<constraints>
<constraint firstAttribute="width" constant="15" id="crS-yy-uqC"/>
<constraint firstAttribute="height" constant="17.5" id="q0W-cG-7kX"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="131231231230" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CPQ-JB-dO9">
<rect key="frame" x="35" y="16" width="88" height="16"/>
<constraints>
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="90" id="Jno-Ez-xfr"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="40" id="h2R-4R-NZP"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7hI-Mv-St2">
<rect key="frame" x="0.0" y="47.5" width="347" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
......@@ -55,7 +38,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wn2-a8-osu">
<rect key="frame" x="0.0" y="69" width="347" height="117"/>
<rect key="frame" x="0.0" y="86" width="347" height="100"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="af6-jB-Vui">
<rect key="frame" x="0.0" y="0.0" width="347" height="2"/>
......@@ -65,7 +48,7 @@
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="金额" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gXv-WF-NRU">
<rect key="frame" x="305" y="40.5" width="27" height="18.5"/>
<rect key="frame" x="305" y="17" width="27" height="18.5"/>
<constraints>
<constraint firstAttribute="height" constant="18.5" id="5rE-x3-Uxn"/>
</constraints>
......@@ -74,36 +57,30 @@
<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="aXp-oN-Cl6">
<rect key="frame" x="238.5" y="42" width="66.5" height="16"/>
<rect key="frame" x="238.5" y="18.5" width="66.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<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="J1p-oh-7KC">
<rect key="frame" x="214.5" y="42" width="14" height="16"/>
<rect key="frame" x="214.5" y="18.5" width="14" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="#F57575"/>
<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="Fv7-Qm-wPF">
<rect key="frame" x="190.5" y="42" width="14" height="16"/>
<rect key="frame" x="190.5" y="18.5" width="14" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KO3-dv-aSL">
<rect key="frame" x="15" y="73" width="317" height="30"/>
<rect key="frame" x="15" y="49.5" width="317" height="30"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="MiX-0n-brC"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="状态" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2ga-12-xdH">
<rect key="frame" x="305" y="15" width="27" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="#F57575"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
......@@ -111,37 +88,47 @@
<constraint firstItem="Fv7-Qm-wPF" firstAttribute="centerY" secondItem="J1p-oh-7KC" secondAttribute="centerY" id="3db-dH-3ub"/>
<constraint firstAttribute="trailing" secondItem="af6-jB-Vui" secondAttribute="trailing" id="Cnv-3g-kB6"/>
<constraint firstItem="af6-jB-Vui" firstAttribute="leading" secondItem="wn2-a8-osu" secondAttribute="leading" id="DTm-bN-EPt"/>
<constraint firstItem="2ga-12-xdH" firstAttribute="top" secondItem="af6-jB-Vui" secondAttribute="bottom" constant="13" id="ENJ-PM-BMD"/>
<constraint firstItem="af6-jB-Vui" firstAttribute="top" secondItem="wn2-a8-osu" secondAttribute="top" id="Nmq-m0-EW7"/>
<constraint firstAttribute="trailing" secondItem="gXv-WF-NRU" secondAttribute="trailing" constant="15" id="Tdo-O5-wyT"/>
<constraint firstAttribute="trailing" secondItem="2ga-12-xdH" secondAttribute="trailing" constant="15" id="XL0-tq-Sl3"/>
<constraint firstAttribute="height" constant="117" id="Ylm-gS-js9"/>
<constraint firstAttribute="height" constant="100" id="Ylm-gS-js9"/>
<constraint firstItem="J1p-oh-7KC" firstAttribute="leading" secondItem="Fv7-Qm-wPF" secondAttribute="trailing" constant="10" id="b43-p1-5Zg"/>
<constraint firstItem="KO3-dv-aSL" firstAttribute="top" secondItem="J1p-oh-7KC" secondAttribute="bottom" constant="15" id="dfn-NZ-e5n"/>
<constraint firstItem="J1p-oh-7KC" firstAttribute="centerY" secondItem="aXp-oN-Cl6" secondAttribute="centerY" id="iAf-xT-2J7"/>
<constraint firstAttribute="trailing" secondItem="KO3-dv-aSL" secondAttribute="trailing" constant="15" id="k9b-gf-KIS"/>
<constraint firstItem="gXv-WF-NRU" firstAttribute="top" secondItem="af6-jB-Vui" secondAttribute="bottom" constant="38.5" id="mPQ-UT-IsZ"/>
<constraint firstItem="gXv-WF-NRU" firstAttribute="top" secondItem="af6-jB-Vui" secondAttribute="bottom" constant="15" id="mPQ-UT-IsZ"/>
<constraint firstItem="aXp-oN-Cl6" firstAttribute="centerY" secondItem="gXv-WF-NRU" secondAttribute="centerY" id="nhU-dI-6vF"/>
<constraint firstItem="gXv-WF-NRU" firstAttribute="leading" secondItem="aXp-oN-Cl6" secondAttribute="trailing" id="ri8-3x-KS8"/>
<constraint firstItem="KO3-dv-aSL" firstAttribute="leading" secondItem="wn2-a8-osu" secondAttribute="leading" constant="15" id="w8g-dV-0Of"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZEQ-bR-jNZ">
<rect key="frame" x="0.0" y="48.5" width="347" height="20.5"/>
<rect key="frame" x="0.0" y="48.5" width="347" height="37.5"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
</view>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="销售下单" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zir-Fk-Cq5">
<rect key="frame" x="278" y="15" width="54" height="18"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4323434234r234242424" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UuD-5H-NJZ">
<rect key="frame" x="15" y="15" width="158" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<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="2ga-12-xdH">
<rect key="frame" x="305" y="15" width="27" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="#F57575"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="预" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EDV-Hx-uUd">
<rect key="frame" x="181" y="14" width="18" height="18"/>
<constraints>
<constraint firstAttribute="width" constant="54" id="9x2-BF-Sve"/>
<constraint firstAttribute="height" constant="18" id="hy5-P0-9On"/>
<constraint firstAttribute="width" constant="18" id="nwB-FA-cEV"/>
<constraint firstAttribute="height" constant="18" id="spk-OB-7Gy"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" name="蓝色字体颜色"/>
<color key="textColor" name="企业、预售字体"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="borderColor">
<color key="value" name="蓝色字体颜色"/>
<color key="value" name="企业、预售字体"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
<real key="value" value="1"/>
......@@ -151,18 +138,18 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="预售" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ekx-rs-uaM">
<rect key="frame" x="300" y="15" width="32" height="18"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="销" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EYa-rE-5f1">
<rect key="frame" x="181" y="14" width="18" height="18"/>
<constraints>
<constraint firstAttribute="width" constant="32" id="1mA-0g-vBh"/>
<constraint firstAttribute="height" constant="18" id="Vzh-Zb-Z5I"/>
<constraint firstAttribute="width" constant="18" id="4h9-IX-zzQ"/>
<constraint firstAttribute="height" constant="18" id="sRH-DP-xAG"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" name="企业、预售字体"/>
<color key="textColor" name="密码错误字体颜色"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="borderColor">
<color key="value" name="企业、预售字体"/>
<color key="value" name="密码错误字体颜色"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
<real key="value" value="1"/>
......@@ -172,34 +159,48 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4323434234r234242424" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UuD-5H-NJZ">
<rect key="frame" x="174" y="16" width="158" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="货" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ra8-fK-01B">
<rect key="frame" x="181" y="14" width="18" height="18"/>
<constraints>
<constraint firstAttribute="width" constant="18" id="TpF-98-8qi"/>
<constraint firstAttribute="height" constant="18" id="jDH-y0-6Uf"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" name="蓝色字体颜色"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="borderColor">
<color key="value" name="蓝色字体颜色"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
<real key="value" value="1"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="2"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="EDV-Hx-uUd" firstAttribute="leading" secondItem="UuD-5H-NJZ" secondAttribute="trailing" constant="8" id="2Ob-KX-6kc"/>
<constraint firstItem="ZEQ-bR-jNZ" firstAttribute="leading" secondItem="xNb-6a-mWT" secondAttribute="leading" id="3H6-Mf-efn"/>
<constraint firstItem="HVh-eU-WcT" firstAttribute="top" secondItem="xNb-6a-mWT" secondAttribute="top" constant="15" id="3vl-Na-tUS"/>
<constraint firstAttribute="trailing" secondItem="2ga-12-xdH" secondAttribute="trailing" constant="15" id="4RU-wh-9NS"/>
<constraint firstItem="wn2-a8-osu" firstAttribute="top" secondItem="ZEQ-bR-jNZ" secondAttribute="bottom" id="4nM-v6-4eY"/>
<constraint firstItem="UuD-5H-NJZ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="CPQ-JB-dO9" secondAttribute="trailing" constant="5" id="ADQ-aj-VhR"/>
<constraint firstItem="UuD-5H-NJZ" firstAttribute="centerY" secondItem="HVh-eU-WcT" secondAttribute="centerY" id="GE2-bZ-CEn"/>
<constraint firstAttribute="trailing" secondItem="UuD-5H-NJZ" secondAttribute="trailing" constant="15" id="Gbe-hd-ENe"/>
<constraint firstItem="HVh-eU-WcT" firstAttribute="leading" secondItem="xNb-6a-mWT" secondAttribute="leading" constant="15" id="I5S-Pm-VYW"/>
<constraint firstItem="UuD-5H-NJZ" firstAttribute="leading" secondItem="xNb-6a-mWT" secondAttribute="leading" constant="15" id="GJF-Lx-lC7"/>
<constraint firstItem="EYa-rE-5f1" firstAttribute="leading" secondItem="UuD-5H-NJZ" secondAttribute="trailing" constant="8" id="M7p-4e-nDr"/>
<constraint firstAttribute="trailing" secondItem="7hI-Mv-St2" secondAttribute="trailing" id="OFd-nP-Oac"/>
<constraint firstAttribute="trailing" secondItem="ekx-rs-uaM" secondAttribute="trailing" constant="15" id="Ou3-Ad-CKj"/>
<constraint firstItem="EYa-rE-5f1" firstAttribute="centerY" secondItem="UuD-5H-NJZ" secondAttribute="centerY" id="RZD-vN-Pw4"/>
<constraint firstAttribute="bottom" secondItem="wn2-a8-osu" secondAttribute="bottom" id="RkH-CY-G70"/>
<constraint firstItem="CPQ-JB-dO9" firstAttribute="centerY" secondItem="HVh-eU-WcT" secondAttribute="centerY" id="SAL-fU-SIA"/>
<constraint firstAttribute="trailing" secondItem="Zir-Fk-Cq5" secondAttribute="trailing" constant="15" id="STv-nb-6Vw"/>
<constraint firstItem="wn2-a8-osu" firstAttribute="leading" secondItem="xNb-6a-mWT" secondAttribute="leading" id="WxW-JQ-CYI"/>
<constraint firstItem="CPQ-JB-dO9" firstAttribute="leading" secondItem="HVh-eU-WcT" secondAttribute="trailing" constant="5" id="aZJ-Hv-anu"/>
<constraint firstItem="ekx-rs-uaM" firstAttribute="centerY" secondItem="HVh-eU-WcT" secondAttribute="centerY" id="jha-tT-l79"/>
<constraint firstItem="Zir-Fk-Cq5" firstAttribute="centerY" secondItem="HVh-eU-WcT" secondAttribute="centerY" id="pOY-qL-gXq"/>
<constraint firstItem="UuD-5H-NJZ" firstAttribute="top" secondItem="xNb-6a-mWT" secondAttribute="top" constant="15" id="bv7-Bc-VDD"/>
<constraint firstItem="ra8-fK-01B" firstAttribute="centerY" secondItem="UuD-5H-NJZ" secondAttribute="centerY" id="ghA-qx-OLC"/>
<constraint firstItem="EDV-Hx-uUd" firstAttribute="centerY" secondItem="UuD-5H-NJZ" secondAttribute="centerY" id="jFs-2y-FMu"/>
<constraint firstItem="7hI-Mv-St2" firstAttribute="top" secondItem="UuD-5H-NJZ" secondAttribute="bottom" constant="16.5" id="mj0-yO-mIg"/>
<constraint firstItem="ra8-fK-01B" firstAttribute="leading" secondItem="UuD-5H-NJZ" secondAttribute="trailing" constant="8" id="pqA-LR-toh"/>
<constraint firstAttribute="trailing" secondItem="ZEQ-bR-jNZ" secondAttribute="trailing" id="qLc-bo-y4p"/>
<constraint firstItem="2ga-12-xdH" firstAttribute="centerY" secondItem="UuD-5H-NJZ" secondAttribute="centerY" id="she-aG-UPi"/>
<constraint firstItem="ZEQ-bR-jNZ" firstAttribute="top" secondItem="7hI-Mv-St2" secondAttribute="bottom" id="tlx-vS-U17"/>
<constraint firstItem="7hI-Mv-St2" firstAttribute="top" secondItem="HVh-eU-WcT" secondAttribute="bottom" constant="15" id="tp0-bW-35O"/>
<constraint firstAttribute="trailing" secondItem="wn2-a8-osu" secondAttribute="trailing" id="vCW-9V-dfX"/>
<constraint firstItem="7hI-Mv-St2" firstAttribute="leading" secondItem="xNb-6a-mWT" secondAttribute="leading" id="zgN-X2-PS5"/>
</constraints>
......@@ -223,24 +224,23 @@
<color key="backgroundColor" name="app底色"/>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="beforeNSLayout" destination="pqA-LR-toh" id="htj-oB-rhX"/>
<outlet property="beforeOrderLbl" destination="ra8-fK-01B" id="GYr-4Z-5cD"/>
<outlet property="btnBgView" destination="KO3-dv-aSL" id="FKG-4d-9rD"/>
<outlet property="countLbl" destination="J1p-oh-7KC" id="brI-AH-qUH"/>
<outlet property="formLbl" destination="Zir-Fk-Cq5" id="umP-9h-1on"/>
<outlet property="leftIcon" destination="HVh-eU-WcT" id="dMO-qL-wPe"/>
<outlet property="formLbl" destination="EYa-rE-5f1" id="lzb-f9-iPa"/>
<outlet property="formNSlayout" destination="M7p-4e-nDr" id="Icl-kz-R4U"/>
<outlet property="listBgView" destination="ZEQ-bR-jNZ" id="tlg-VJ-Qsv"/>
<outlet property="nameLbl" destination="CPQ-JB-dO9" id="iu0-NX-a71"/>
<outlet property="orderNumberRight" destination="Gbe-hd-ENe" id="Ss7-Kf-hKd"/>
<outlet property="orderNumerLbl" destination="UuD-5H-NJZ" id="sef-jY-IB7"/>
<outlet property="priceLbl" destination="gXv-WF-NRU" id="VRb-af-Nta"/>
<outlet property="statusLbl" destination="2ga-12-xdH" id="rf1-RB-YLe"/>
<outlet property="timeLbl" destination="3yk-m6-Ebz" id="vn8-8A-1YE"/>
<outlet property="yuShouStatus" destination="ekx-rs-uaM" id="O20-FR-ggQ"/>
<outlet property="yuShouStatus" destination="EDV-Hx-uUd" id="9Ne-Bm-ibc"/>
</connections>
<point key="canvasLocation" x="132.60869565217394" y="112.83482142857142"/>
<point key="canvasLocation" x="-40" y="-57"/>
</tableViewCell>
</objects>
<resources>
<image name="kehu" width="17" height="18.5"/>
<namedColor name="#F57575">
<color red="0.96100002527236938" green="0.45899999141693115" blue="0.45899999141693115" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
......@@ -253,6 +253,9 @@
<namedColor name="企业、预售字体">
<color red="1" green="0.68999999761581421" blue="0.47099998593330383" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="密码错误字体颜色">
<color red="0.88999998569488525" green="0.27799999713897705" blue="0.27799999713897705" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
......
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