新增日历选择

GeliBusinessPlatform/Model/printOrderInterface.swift

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

 <?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

@@ -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

@@ -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

@@ -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/订单详情/OrderDViewController.swift

@@ -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: "按钮渐变色上")