Skip to content

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

新增日历选择

parent d7b9155c
Show whitespace changes
Inline Side-by-side
Showing with 300 additions and 25 deletions
GeliBusinessPlatform/Model/printOrderInterface.swift
View file @ 4f1e2f8e
......@@ -32,6 +32,11 @@ func printOrder(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture
district_id 区id
mobile 手机
consignee 联系人
address_str 地址
odd_numbers 单号
add_time_year 年
add_time_month 月
add_time_day 日
*/
func printUrl(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("打印订单链接", params, { (rep:DataResponse<printUrl_Model>) in
......
GeliBusinessPlatform/Model/printOrder_model/printOrderModel.swift
View file @ 4f1e2f8e
......@@ -50,6 +50,11 @@ class printOrder_data_res_model: Mappable {
var consignee :String?//联系人
var odd_numbers:String?//单号
var add_time_year:String?//年
var add_time_month:String?//月
var add_time_day:String?//日
required init?( map: Map) {
}
......@@ -68,6 +73,11 @@ class printOrder_data_res_model: Mappable {
consignee <- map["consignee"]
address_str <- map["address_str"]
odd_numbers <- map["odd_numbers"]
add_time_year <- map["add_time_year"]
add_time_month <- map["add_time_month"]
add_time_day <- map["add_time_day"]
}
}
......
GeliBusinessPlatform/View/AlertView/GLTimeSelectView.swift
View file @ 4f1e2f8e
......@@ -16,6 +16,10 @@ protocol GLTimeSelectViewDelegate {
}
class GLTimeSelectView: UIView, UIPickerViewDelegate, UIPickerViewDataSource {
var isOnlyDay = false
@IBOutlet weak var btns_bg_view_height: NSLayoutConstraint!
@IBOutlet weak var picker_height: NSLayoutConstraint!
@IBOutlet weak var btns_bg_view: UIView!
@IBOutlet weak var year_btn: UIButton!
@IBOutlet weak var day_btn: UIButton!
@IBOutlet weak var month_btn: UIButton!
......@@ -26,6 +30,7 @@ class GLTimeSelectView: UIView, UIPickerViewDelegate, UIPickerViewDataSource {
return nums
}
var nums = 3
@IBAction func date_type_select(_ sender: UIButton) {
sender.backgroundColor = UIColor(named: "按钮渐变色下,字体颜色")
switch sender.tag {
......@@ -305,6 +310,11 @@ class GLTimeSelectView: UIView, UIPickerViewDelegate, UIPickerViewDataSource {
}
override func layoutSubviews() {
super.layoutSubviews()
if isOnlyDay {
btns_bg_view.isHidden = true
btns_bg_view_height.constant = 0
picker_height.constant = 306
}
if dateStr.count == 4 {
time_picker.selectRow(yearSelect, inComponent: 0, animated: false)
}else if dateStr.count > 4 && dateStr.count <= 7 {
......
GeliBusinessPlatform/View/AlertView/GLTimeSelectView.xib
View file @ 4f1e2f8e
......@@ -12,8 +12,11 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GLTimeSelectView" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="btns_bg_view" destination="le1-mF-XJ6" id="Ug8-MC-0Hw"/>
<outlet property="btns_bg_view_height" destination="tjb-c8-xPf" id="pn8-wl-Dii"/>
<outlet property="day_btn" destination="ceY-oa-13U" id="uSo-OJ-hg1"/>
<outlet property="month_btn" destination="oSG-cV-kWh" id="zNz-d2-IKR"/>
<outlet property="picker_height" destination="rAH-Nf-3jn" id="9FA-8E-uer"/>
<outlet property="time_picker" destination="Jpg-4u-rve" id="qbp-1Z-eqA"/>
<outlet property="year_btn" destination="hkT-4d-9sn" id="axP-ug-5eJ"/>
</connections>
......
GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.swift
View file @ 4f1e2f8e
......@@ -127,7 +127,6 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
//MARK:--jpushServiceNotification
@objc func jpushServiceNotification(notion:Notification) {
let dict = notion.userInfo! as NSDictionary
print("123123 ==",dict.allKeys)
let vc = MsgCenterViewController()
self.navigationController?.pushViewController(vc, animated: true)
}
......
GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.xib
View file @ 4f1e2f8e
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
......@@ -50,9 +50,6 @@
<constraint firstAttribute="width" constant="17" id="g7b-8f-Rof"/>
</constraints>
<state key="normal" image="edit"/>
<connections>
<action selector="editAction:" destination="-1" eventType="touchUpInside" id="rHD-r5-zZh"/>
</connections>
</button>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DwS-q4-jGe">
<rect key="frame" x="15" y="70" width="0.0" height="75"/>
......@@ -81,7 +78,7 @@
<color key="textColor" name="白色背景色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1dW-Zl-K3m">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1dW-Zl-K3m">
<rect key="frame" x="25" y="107" width="345" height="0.0"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
......@@ -109,6 +106,16 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</tableView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lnY-1q-WyE">
<rect key="frame" x="316" y="0.0" width="59" height="80"/>
<constraints>
<constraint firstAttribute="width" constant="59" id="Zpz-VQ-3Zy"/>
<constraint firstAttribute="height" constant="80" id="mWm-SD-1zp"/>
</constraints>
<connections>
<action selector="editAction:" destination="-1" eventType="touchUpInside" id="mzV-Ka-XJc"/>
</connections>
</button>
</subviews>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -118,6 +125,7 @@
<constraint firstItem="DwS-q4-jGe" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="15" id="7sM-zc-klQ"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="fgk-Rc-0oD" secondAttribute="trailing" constant="5" id="CYa-VC-enH"/>
<constraint firstItem="1dW-Zl-K3m" firstAttribute="leading" secondItem="fgk-Rc-0oD" secondAttribute="leading" id="EIK-Gd-lLv"/>
<constraint firstItem="lnY-1q-WyE" firstAttribute="top" secondItem="XS7-um-ERL" secondAttribute="bottom" id="EIq-jt-qce"/>
<constraint firstItem="fgk-Rc-0oD" firstAttribute="leading" secondItem="DwS-q4-jGe" secondAttribute="trailing" constant="10" id="K68-Yb-HVk"/>
<constraint firstAttribute="trailing" secondItem="1dW-Zl-K3m" secondAttribute="trailing" constant="5" id="O0f-DO-rMy"/>
<constraint firstItem="5jU-Ew-dGr" firstAttribute="top" secondItem="DwS-q4-jGe" secondAttribute="bottom" constant="30" id="OJH-Vp-JzG"/>
......@@ -127,6 +135,7 @@
<constraint firstItem="1dW-Zl-K3m" firstAttribute="leading" secondItem="DwS-q4-jGe" secondAttribute="trailing" constant="10" id="bgX-1r-ER4"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="HeU-V1-6DM" secondAttribute="trailing" id="gHU-E2-SuW"/>
<constraint firstItem="XS7-um-ERL" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" constant="-60" id="hST-i2-ChZ"/>
<constraint firstItem="lnY-1q-WyE" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="iEi-ez-p0H"/>
<constraint firstItem="HeU-V1-6DM" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="mg9-jE-IY9"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="5jU-Ew-dGr" secondAttribute="trailing" constant="15" id="rzW-MO-fAP"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="cLg-xh-ou1" secondAttribute="trailing" constant="15" id="sHN-S7-6ms"/>
......
GeliBusinessPlatform/ViewController/打印订单/PrintListMgVc.swift
View file @ 4f1e2f8e
......@@ -102,6 +102,10 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
"mobile":vc.phone_str as Any,
"consignee":vc.consignee_str as Any,
"address_str":vc.detail_adr_str as Any,
"odd_numbers":vc.order_num_str as Any,
"add_time_year":vc.year as Any,
"add_time_month":vc.month as Any,
"add_time_day":vc.day as Any,
"print_type":vc.type as Any
]
}else{
......@@ -114,6 +118,10 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
"mobile":vc.phone_str as Any,
"consignee":vc.consignee_str as Any,
"address_str":vc.detail_adr_str as Any,
"odd_numbers":vc.order_num_str as Any,
"add_time_year":vc.year as Any,
"add_time_month":vc.month as Any,
"add_time_day":vc.day as Any,
"print_type":vc.type as Any
]
}
......@@ -168,6 +176,15 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
if printData?.address_str != nil {
vc.detail_adr_str = (printData?.address_str)!
}
if printData?.odd_numbers != nil {
vc.order_num_str = (printData?.odd_numbers)!
}
if printData?.add_time_year != nil {
vc.year = (printData?.add_time_year)!
vc.month = (printData?.add_time_month)!
vc.day = (printData?.add_time_day)!
}
}
}
}
......
GeliBusinessPlatform/ViewController/打印订单/PrintViewController.swift
View file @ 4f1e2f8e
......@@ -9,7 +9,27 @@
import UIKit
import SwiftyJSON
class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,print_bottom_cellDelegate, UIPickerViewDataSource, UIPickerViewDelegate{
class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,print_bottom_cellDelegate, UIPickerViewDataSource, UIPickerViewDelegate,GLTimeSelectViewDelegate{
func GLTimeSelectViewSelectFinish(date: String) {
let date_arr = date.components(separatedBy: "-")
year = date_arr[0]
month = date_arr[1]
day = date_arr[2]
list_view.reloadData()
}
func GLTimeSelectViewClose() {
}
func print_bottom_cell_time_select() {
let vc = GLTimeSelectView(frame: self.view.window!.bounds)
vc.isOnlyDay = true
vc.delegate = self
vc.dateStr = year + "-" + month + "-" + day
self.view.window?.addSubview(vc)
}
let UserToken = UserDefaults.standard.value(forKey: "user_token")
var order_id = 0
var type = 1
......@@ -320,6 +340,11 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
var detail_adr_str = ""
var phone_str = ""
var consignee_str = ""
var order_num_str = ""
var year = ""
var month = ""
var day = ""
func print_bottom_cell_text_respose(tag: Int, text: String) {
print(tag,text)
......@@ -333,9 +358,12 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
case 2:
phone_str = text
break
default:
case 3:
consignee_str = text
break
default:
order_num_str = text
break
}
}
......@@ -379,9 +407,8 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
init(title: String, content: String) {
super.init(nibName: nil, bundle: nil)
self.title = title
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
......@@ -398,6 +425,10 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
"mobile":phone_str as Any,
"consignee":consignee_str as Any,
"address_str":detail_adr_str as Any,
"odd_numbers":order_num_str as Any,
"add_time_year":year as Any,
"add_time_month":month as Any,
"add_time_day":day as Any,
"print_type":type as Any
]
......@@ -438,6 +469,10 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
cell.adr_tf.text = detail_adr_str
cell.phone_tf.text = phone_str
cell.consignee_tf.text = consignee_str
cell.order_number_tf.text = order_num_str
cell.year_lbl.text = year
cell.month_lbl.text = month
cell.day_lbl.text = day
return cell
}
......@@ -445,6 +480,6 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
if indexPath.row == 0 {
return 215
}
return 644
return 803
}
}
GeliBusinessPlatform/ViewController/打印订单/print_bottom_cell.swift
View file @ 4f1e2f8e
......@@ -10,6 +10,7 @@ import UIKit
protocol print_bottom_cellDelegate {
func print_bottom_cell_select_place_action()
func print_bottom_cell_text_respose(tag:Int,text:String)
func print_bottom_cell_time_select()
}
class print_bottom_cell: UITableViewCell {
......@@ -22,19 +23,30 @@ class print_bottom_cell: UITableViewCell {
@IBAction func adr_select(_ sender: UIButton) {
delegate?.print_bottom_cell_select_place_action()
}
@IBAction func time_select_action(_ sender: UIButton) {
delegate?.print_bottom_cell_time_select()
}
@IBOutlet weak var day_lbl: UILabel!
@IBOutlet weak var month_lbl: UILabel!
@IBOutlet weak var year_lbl: UILabel!
@IBOutlet weak var order_number_tf: UITextField!
@IBOutlet weak var middle_bg: UIView!
@IBOutlet weak var top_bg: UIView!
@IBOutlet weak var btm_bg: UIView!
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
top_bg.layer.masksToBounds = false
middle_bg.layer.masksToBounds = false
btm_bg.layer.masksToBounds = false
// Initialization code
payer_tf.tag = 0
adr_tf.tag = 1
phone_tf.tag = 2
consignee_tf.tag = 3
order_number_tf.tag = 4
order_number_tf.addTarget(self, action: #selector(textChange(tf:)), for: .allEditingEvents)
payer_tf.addTarget(self, action: #selector(textChange(tf:)), for: .allEditingEvents)
adr_tf.addTarget(self, action: #selector(textChange(tf:)), for: .allEditingEvents)
phone_tf.addTarget(self, action: #selector(textChange(tf:)), for: .allEditingEvents)
......
GeliBusinessPlatform/ViewController/打印订单/print_bottom_cell.xib
View file @ 4f1e2f8e
......@@ -13,10 +13,10 @@
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="print_bottom_cell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="644"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="803"/>
<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">
<rect key="frame" x="0.0" y="0.0" width="375" height="644"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="803"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*请确认订货单信息再确认打印" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YPS-BH-sdR">
......@@ -41,10 +41,10 @@
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dline" translatesAutoresizingMaskIntoConstraints="NO" id="20q-zI-OyC">
<rect key="frame" x="15" y="69" width="315" height="1"/>
<rect key="frame" x="15" y="71.5" width="315" height="1"/>
<color key="backgroundColor" red="0.98039215690000003" green="1" blue="1" alpha="0.54173085389999998" colorSpace="custom" customColorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="pZ3-rq-THO"/>
<constraint firstAttribute="height" constant="1" id="1eu-un-v4D"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FM：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Bu-B9-THd">
......@@ -66,18 +66,18 @@
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="5CF-08-7yF" firstAttribute="top" secondItem="Iwj-Ub-0Qj" secondAttribute="bottom" constant="7" id="0Ag-1I-EM8"/>
<constraint firstItem="20q-zI-OyC" firstAttribute="leading" secondItem="SAd-bP-2BG" secondAttribute="leading" constant="15" id="56G-4E-eJM"/>
<constraint firstAttribute="trailing" secondItem="wL5-Yr-Phn" secondAttribute="trailing" constant="15" id="Ao6-nn-MsU"/>
<constraint firstItem="5CF-08-7yF" firstAttribute="leading" secondItem="Iwj-Ub-0Qj" secondAttribute="leading" id="B9u-fB-G6E"/>
<constraint firstItem="3Bu-B9-THd" firstAttribute="top" secondItem="20q-zI-OyC" secondAttribute="bottom" constant="12.5" id="BqB-BQ-Ez1"/>
<constraint firstItem="wL5-Yr-Phn" firstAttribute="leading" secondItem="SAd-bP-2BG" secondAttribute="leading" constant="15" id="DeV-xJ-bcv"/>
<constraint firstItem="wL5-Yr-Phn" firstAttribute="top" secondItem="3Bu-B9-THd" secondAttribute="bottom" constant="2" id="DlC-z1-gZ2"/>
<constraint firstItem="20q-zI-OyC" firstAttribute="centerY" secondItem="SAd-bP-2BG" secondAttribute="centerY" id="JLS-27-VFF"/>
<constraint firstItem="Iwj-Ub-0Qj" firstAttribute="top" secondItem="SAd-bP-2BG" secondAttribute="top" constant="10" id="Vcl-sN-Xtr"/>
<constraint firstItem="3Bu-B9-THd" firstAttribute="leading" secondItem="SAd-bP-2BG" secondAttribute="leading" constant="15" id="Vlo-vg-kCJ"/>
<constraint firstItem="20q-zI-OyC" firstAttribute="top" secondItem="5CF-08-7yF" secondAttribute="bottom" constant="15" id="bIO-Xf-Zna"/>
<constraint firstItem="3Bu-B9-THd" firstAttribute="top" secondItem="20q-zI-OyC" secondAttribute="bottom" constant="15" id="fGL-YM-cvu"/>
<constraint firstItem="Iwj-Ub-0Qj" firstAttribute="leading" secondItem="SAd-bP-2BG" secondAttribute="leading" constant="15" id="kki-dB-28l"/>
<constraint firstAttribute="trailing" secondItem="20q-zI-OyC" secondAttribute="trailing" constant="15" id="nJZ-ft-SK8"/>
<constraint firstAttribute="height" constant="144" id="puo-vR-vWs"/>
<constraint firstAttribute="trailing" secondItem="20q-zI-OyC" secondAttribute="trailing" constant="15" id="vuc-xS-3eQ"/>
<constraint firstItem="20q-zI-OyC" firstAttribute="leading" secondItem="SAd-bP-2BG" secondAttribute="leading" constant="15" id="q4F-fQ-9To"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="borderColor">
......@@ -104,7 +104,7 @@
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="H9o-Fl-UmR">
<rect key="frame" x="15" y="199.5" width="345" height="419.5"/>
<rect key="frame" x="15" y="358.5" width="345" height="419.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请把货品发到以下地址" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sO3-BH-ta0">
<rect key="frame" x="15" y="10" width="150" height="21"/>
......@@ -341,15 +341,184 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="v5v-s2-zt9" userLabel="middle_view">
<rect key="frame" x="15" y="199.5" width="345" height="144"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="单号（可编辑）" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="q8g-pV-AB4">
<rect key="frame" x="15" y="10" width="91" height="18.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入单号" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="1qs-0q-PZF">
<rect key="frame" x="15" y="31.5" width="315" height="34"/>
<constraints>
<constraint firstAttribute="height" constant="34" id="aNO-NC-6Uo"/>
</constraints>
<color key="textColor" name="标题字颜色"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<textInputTraits key="textInputTraits"/>
</textField>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dline" translatesAutoresizingMaskIntoConstraints="NO" id="d6R-CK-Mfj">
<rect key="frame" x="0.0" y="70.5" width="345" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="HVS-M7-7kd"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订购时间（可编辑时间）" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wxm-du-Xp2">
<rect key="frame" x="15" y="81.5" width="143" height="18.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" 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="LxO-fE-4PN">
<rect key="frame" x="15" y="107" width="43.5" height="18.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2021" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v6s-Zd-vCk">
<rect key="frame" x="58.5" y="107" width="29" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" 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="lvm-xk-pPP">
<rect key="frame" x="89.5" y="107" width="13" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="02" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Egs-GV-X4F">
<rect key="frame" x="104.5" y="107" width="16" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" 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="DKI-HC-iaf">
<rect key="frame" x="122.5" y="107" width="13" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="14" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1fD-6c-uhU">
<rect key="frame" x="137.5" y="107" width="14" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" 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="0pw-E0-aLK">
<rect key="frame" x="153.5" y="107" width="143" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HCj-dX-KuS">
<rect key="frame" x="58.5" y="124" width="29" height="1"/>
<color key="backgroundColor" name="#F57575"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="2us-qJ-CL5"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lXW-bb-TL8">
<rect key="frame" x="104.5" y="124" width="16" height="1"/>
<color key="backgroundColor" name="#F57575"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="ac1-hv-fNr"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6lR-xr-X2W">
<rect key="frame" x="137.5" y="124" width="14" height="1"/>
<color key="backgroundColor" name="#F57575"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="EjC-kJ-GwW"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gav-OH-527">
<rect key="frame" x="15" y="100" width="315" height="44"/>
<connections>
<action selector="time_select_action:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="rC2-Wz-eNo"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="lvm-xk-pPP" firstAttribute="leading" secondItem="v6s-Zd-vCk" secondAttribute="trailing" constant="2" id="4ZK-sz-aRg"/>
<constraint firstItem="gav-OH-527" firstAttribute="top" secondItem="wxm-du-Xp2" secondAttribute="bottom" id="4o7-FG-Bcf"/>
<constraint firstItem="6lR-xr-X2W" firstAttribute="width" secondItem="1fD-6c-uhU" secondAttribute="width" id="4pn-dG-mEv"/>
<constraint firstItem="v6s-Zd-vCk" firstAttribute="centerY" secondItem="LxO-fE-4PN" secondAttribute="centerY" id="7ig-vd-lMD"/>
<constraint firstItem="d6R-CK-Mfj" firstAttribute="leading" secondItem="v5v-s2-zt9" secondAttribute="leading" id="8M8-ig-cBJ"/>
<constraint firstItem="HCj-dX-KuS" firstAttribute="trailing" secondItem="v6s-Zd-vCk" secondAttribute="trailing" id="AVC-5e-myh"/>
<constraint firstItem="0pw-E0-aLK" firstAttribute="leading" secondItem="1fD-6c-uhU" secondAttribute="trailing" constant="2" id="AYh-30-633"/>
<constraint firstItem="1fD-6c-uhU" firstAttribute="leading" secondItem="DKI-HC-iaf" secondAttribute="trailing" constant="2" id="EEa-Jq-QPk"/>
<constraint firstItem="wxm-du-Xp2" firstAttribute="top" secondItem="d6R-CK-Mfj" secondAttribute="bottom" constant="10" id="GIW-0I-qhY"/>
<constraint firstItem="HCj-dX-KuS" firstAttribute="centerX" secondItem="v6s-Zd-vCk" secondAttribute="centerX" id="HbC-Su-EAN"/>
<constraint firstAttribute="bottom" secondItem="gav-OH-527" secondAttribute="bottom" id="Hwt-AY-g02"/>
<constraint firstItem="q8g-pV-AB4" firstAttribute="top" secondItem="v5v-s2-zt9" secondAttribute="top" constant="10" id="IVu-iT-BMZ"/>
<constraint firstItem="HCj-dX-KuS" firstAttribute="top" secondItem="v6s-Zd-vCk" secondAttribute="bottom" constant="-2" id="JZr-AA-rPI"/>
<constraint firstItem="q8g-pV-AB4" firstAttribute="leading" secondItem="v5v-s2-zt9" secondAttribute="leading" constant="15" id="K6W-QE-YOO"/>
<constraint firstItem="Egs-GV-X4F" firstAttribute="centerY" secondItem="lvm-xk-pPP" secondAttribute="centerY" id="LEm-qr-gmY"/>
<constraint firstItem="DKI-HC-iaf" firstAttribute="centerY" secondItem="Egs-GV-X4F" secondAttribute="centerY" id="LGB-iK-fsS"/>
<constraint firstItem="lXW-bb-TL8" firstAttribute="width" secondItem="Egs-GV-X4F" secondAttribute="width" id="Lbv-eW-1AR"/>
<constraint firstItem="v6s-Zd-vCk" firstAttribute="leading" secondItem="LxO-fE-4PN" secondAttribute="trailing" id="M85-Il-4co"/>
<constraint firstItem="lXW-bb-TL8" firstAttribute="centerX" secondItem="Egs-GV-X4F" secondAttribute="centerX" id="Ptc-fY-7Ye"/>
<constraint firstItem="Egs-GV-X4F" firstAttribute="leading" secondItem="lvm-xk-pPP" secondAttribute="trailing" constant="2" id="Sgd-dK-VjX"/>
<constraint firstAttribute="height" constant="144" id="XfD-Ry-zuM"/>
<constraint firstItem="0pw-E0-aLK" firstAttribute="centerY" secondItem="1fD-6c-uhU" secondAttribute="centerY" id="cAE-Hi-bf1"/>
<constraint firstAttribute="trailing" secondItem="gav-OH-527" secondAttribute="trailing" constant="15" id="coC-C8-u4z"/>
<constraint firstItem="LxO-fE-4PN" firstAttribute="leading" secondItem="v5v-s2-zt9" secondAttribute="leading" constant="15" id="dJJ-hP-esr"/>
<constraint firstItem="1qs-0q-PZF" firstAttribute="leading" secondItem="v5v-s2-zt9" secondAttribute="leading" constant="15" id="dSZ-v7-LVI"/>
<constraint firstItem="d6R-CK-Mfj" firstAttribute="top" secondItem="1qs-0q-PZF" secondAttribute="bottom" constant="5" id="dhs-JP-9Gi"/>
<constraint firstItem="6lR-xr-X2W" firstAttribute="centerX" secondItem="1fD-6c-uhU" secondAttribute="centerX" id="gNQ-ke-OpK"/>
<constraint firstItem="gav-OH-527" firstAttribute="leading" secondItem="v5v-s2-zt9" secondAttribute="leading" constant="15" id="gzF-qM-lOW"/>
<constraint firstItem="1qs-0q-PZF" firstAttribute="top" secondItem="q8g-pV-AB4" secondAttribute="bottom" constant="3" id="hg1-Y6-EG9"/>
<constraint firstItem="wxm-du-Xp2" firstAttribute="leading" secondItem="v5v-s2-zt9" secondAttribute="leading" constant="15" id="jsV-eE-Cak"/>
<constraint firstItem="6lR-xr-X2W" firstAttribute="centerY" secondItem="HCj-dX-KuS" secondAttribute="centerY" id="k4b-kE-LDE"/>
<constraint firstItem="lXW-bb-TL8" firstAttribute="centerY" secondItem="HCj-dX-KuS" secondAttribute="centerY" id="prT-QI-UY4"/>
<constraint firstAttribute="trailing" secondItem="d6R-CK-Mfj" secondAttribute="trailing" id="qe4-V9-4u7"/>
<constraint firstItem="lvm-xk-pPP" firstAttribute="centerY" secondItem="v6s-Zd-vCk" secondAttribute="centerY" id="s0C-So-g0T"/>
<constraint firstItem="HCj-dX-KuS" firstAttribute="leading" secondItem="v6s-Zd-vCk" secondAttribute="leading" id="s1P-io-6jc"/>
<constraint firstItem="LxO-fE-4PN" firstAttribute="top" secondItem="wxm-du-Xp2" secondAttribute="bottom" constant="7" id="sPd-lj-ZTc"/>
<constraint firstItem="DKI-HC-iaf" firstAttribute="leading" secondItem="Egs-GV-X4F" secondAttribute="trailing" constant="2" id="vch-FO-W2Q"/>
<constraint firstItem="1fD-6c-uhU" firstAttribute="centerY" secondItem="DKI-HC-iaf" secondAttribute="centerY" id="w0P-8Y-hWJ"/>
<constraint firstAttribute="trailing" secondItem="1qs-0q-PZF" secondAttribute="trailing" constant="15" id="wZn-Yr-mu9"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="borderColor">
<color key="value" name="#B6ADAD"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
<real key="value" value="1"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="shadowColor">
<color key="value" name="#B6ADAD"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="5"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="size" keyPath="shadowOffset">
<size key="value" width="1" height="0.0"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="shadowOpacity">
<real key="value" value="0.5"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="shadowRadius">
<real key="value" value="5"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
</subviews>
<constraints>
<constraint firstItem="YPS-BH-sdR" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="10" id="6cw-ys-x5o"/>
<constraint firstItem="SAd-bP-2BG" firstAttribute="top" secondItem="YPS-BH-sdR" secondAttribute="bottom" constant="15" id="Cq7-U4-hkq"/>
<constraint firstItem="v5v-s2-zt9" firstAttribute="top" secondItem="SAd-bP-2BG" secondAttribute="bottom" constant="15" id="I7y-64-Nex"/>
<constraint firstAttribute="bottom" secondItem="H9o-Fl-UmR" secondAttribute="bottom" constant="25" id="QWl-HY-O1h"/>
<constraint firstItem="H9o-Fl-UmR" firstAttribute="top" secondItem="SAd-bP-2BG" secondAttribute="bottom" constant="15" id="RKe-es-LYw"/>
<constraint firstItem="v5v-s2-zt9" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="R3B-v5-U7x"/>
<constraint firstItem="H9o-Fl-UmR" firstAttribute="top" secondItem="v5v-s2-zt9" secondAttribute="bottom" constant="15" id="RKe-es-LYw"/>
<constraint firstItem="H9o-Fl-UmR" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="UXE-aV-Qdw"/>
<constraint firstAttribute="trailing" secondItem="H9o-Fl-UmR" secondAttribute="trailing" constant="15" id="VtN-l8-Ws2"/>
<constraint firstItem="SAd-bP-2BG" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="XvR-AT-j9t"/>
<constraint firstAttribute="trailing" secondItem="v5v-s2-zt9" secondAttribute="trailing" constant="15" id="fyA-Fm-wPT"/>
<constraint firstAttribute="trailing" secondItem="SAd-bP-2BG" secondAttribute="trailing" constant="15" id="hT8-BX-WS0"/>
<constraint firstItem="YPS-BH-sdR" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="w1r-Fs-ZJL"/>
</constraints>
......@@ -360,11 +529,16 @@
<outlet property="adr_tf" destination="jiF-F7-HDQ" id="EKO-dE-F6M"/>
<outlet property="btm_bg" destination="H9o-Fl-UmR" id="NKR-ur-O5q"/>
<outlet property="consignee_tf" destination="SHz-wb-OzF" id="OOx-5t-DuY"/>
<outlet property="day_lbl" destination="1fD-6c-uhU" id="FAY-fO-Wwm"/>
<outlet property="middle_bg" destination="v5v-s2-zt9" id="XPF-Mn-tRs"/>
<outlet property="month_lbl" destination="Egs-GV-X4F" id="LDQ-29-nlO"/>
<outlet property="order_number_tf" destination="1qs-0q-PZF" id="mBw-7w-Qap"/>
<outlet property="payer_tf" destination="wL5-Yr-Phn" id="f83-HW-0zy"/>
<outlet property="phone_tf" destination="1EG-8Y-For" id="D9Y-cJ-4xS"/>
<outlet property="top_bg" destination="SAd-bP-2BG" id="Tpm-AX-ZUM"/>
<outlet property="year_lbl" destination="v6s-Zd-vCk" id="ITL-HV-Vrb"/>
</connections>
<point key="canvasLocation" x="139.85507246376812" y="96.428571428571431"/>
<point key="canvasLocation" x="139.85507246376812" y="96.09375"/>
</tableViewCell>
</objects>
<resources>
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ 4f1e2f8e
......@@ -106,7 +106,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}else{
self.bottomView.isHidden = false
self.bottomBgView.isHidden = false
if IS_IPHONE_X == false {
self.btmOffset.constant = 0
}
for i in 0 ..< self.btmBtnsTitleArr.count{
let title = self.btmBtnsTitleArr[i]
let width = fullScreenWidth / CGFloat(self.btmBtnsTitleArr.count)
......@@ -118,7 +120,6 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
btn.addTarget(self, action: #selector(self.bottomBtnClick(sender:)), for: .touchUpInside)
self.bottomView.addSubview(btn)
self.bottomView.backgroundColor = UIColor.init(named: "按钮渐变色上")
self.bottomBgView.backgroundColor = UIColor.init(named: "按钮渐变色上")
......
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