Commit ef758e3c authored by lujunye's avatar lujunye

根据后台要求修改逻辑

parent cf026f3f
...@@ -553,6 +553,8 @@ class getHllOrderDetailsSalePlatDataModel: Mappable { ...@@ -553,6 +553,8 @@ class getHllOrderDetailsSalePlatDataModel: Mappable {
var order_sn : String? var order_sn : String?
var hll_pay_status_two : Int? var hll_pay_status_two : Int?
var wb_no : String? var wb_no : String?
var bill_price_arr:Float?
var pay_status:Int?
required init?( map: Map) { required init?( map: Map) {
...@@ -562,6 +564,8 @@ class getHllOrderDetailsSalePlatDataModel: Mappable { ...@@ -562,6 +564,8 @@ class getHllOrderDetailsSalePlatDataModel: Mappable {
order_sn <- map["order_sn"] order_sn <- map["order_sn"]
hll_pay_status_two <- map["hll_pay_status_two"] hll_pay_status_two <- map["hll_pay_status_two"]
wb_no <- map["wb_no"] wb_no <- map["wb_no"]
bill_price_arr <- map["bill_price_arr"]
pay_status <- map["pay_status"]
} }
} }
......
...@@ -387,8 +387,10 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo ...@@ -387,8 +387,10 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
print("sureSelectAddressAction") print("sureSelectAddressAction")
if titleLbl?.text == "" { if titleLbl?.text == "" {
HUD.flash(.label("未能识别当前位置,请重新定位"), delay: 1.2)
return return
} }
var dict:Dictionary<String,Any> = Dictionary() var dict:Dictionary<String,Any> = Dictionary()
dict["menPai"] = "\(city)\(districet)\(ad)\(addressDetailTF.text!)" dict["menPai"] = "\(city)\(districet)\(ad)\(addressDetailTF.text!)"
dict["shouHuoRen"] = nameTF.text dict["shouHuoRen"] = nameTF.text
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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"> <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">
<device id="retina6_1" orientation="portrait" appearance="light"/> <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
......
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