Skip to content

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

订单详情预售点击补充

parent e190d86e
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 77 deletions
GeliBusinessPlatform.xcworkspace/contents.xcworkspacedata
View file @ cfba0439
......@@ -4,22 +4,6 @@
<FileRef
location = "group:GeliBusinessPlatform.xcodeproj">
</FileRef>
<Group
location = "group:GeliBusinessPlatform/Model/../.."
name = "Products">
<FileRef
location = "build:GeliBusinessPlatform.app"
assignedFileDataType = "com.apple.application-bundle">
</FileRef>
<FileRef
location = "build:GeliBusinessPlatformTests.xctest"
assignedFileDataType = "com.apple.xcode.cfbundle">
</FileRef>
<FileRef
location = "build:GeliBusinessPlatformUITests.xctest"
assignedFileDataType = "com.apple.xcode.cfbundle">
</FileRef>
</Group>
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
......
GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift
View file @ cfba0439
......@@ -203,11 +203,10 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
cell.selectBtn.isSelected = true
}
}
print("deSelectArr.count",deSelectArr.count)
if deSelectArr.count > 0 {
for i in deSelectArr {
if i == indexPath.row {
cell.titleLbl.textColor = UIColor(named: "灰色字体颜色")
cell.titleLbl.textColor = UIColor(named: "#999999")
cell.selectBtn.isUserInteractionEnabled = false
}
}
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ cfba0439
......@@ -40,7 +40,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
let YuShouPart3Arr = ["订单编号","下单时间","订单来源","提货方式","物流公司","运单号","支付方式","支付状态","买家留言","订单备注"]
let isYuShouPart3Arr = ["订单编号","下单时间","订单来源","提货方式","物流公司","运单号","定金支付方式","定金支付状态","尾款支付方式","尾款支付状态","买家留言","订单备注"]
let nonYuShouPart3Arr = ["收货人","联系电话","地址"]
......@@ -53,9 +53,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
let zhiFuStatus = ["未付款","欠款","月结","已付款"]
var zhiFuStatusSelect:Int?//付款状态
// let wuLiuFSArr = ["京东冷链","顺丰冷运","达达速运"]
// let wuLiuFSArr = ["京东冷链","顺丰冷运","达达速运"]
var wuLiuFSArr:Array<String> = []
var wuLiuSelect:Int?//物流选择
@IBOutlet weak var btmViewH: NSLayoutConstraint!
......@@ -63,7 +63,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
@IBOutlet weak var listView: UITableView!
@IBOutlet weak var bottomBgView: UIView!
//MARK: - 定金支付方式
var dj_payWay = 1
var wk_payWay = 1//尾款支付方式
//MARK:--加载数据
var dataMdoel: OrderDetailDataModel? = nil
......@@ -289,9 +291,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
self.listView.reloadData()
}
}) { (erro) in
}
}
//MARK:--编辑订单备注回调数据
func sureGeliAlertTextViewAction(sender: String) {
......@@ -303,9 +305,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
self.listView.reloadData()
}
}) { (erro) in
}
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndBtnCell") as! TitleAndBtnCell
......@@ -357,19 +359,19 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
print(self.dataMdoel?.order_res?.sale_res?.dj_amount)
if self.dataMdoel?.order_res?.sale_res?.dj_pay_status == 1 {
cell.textTF.text = "(已付)" + "￥" + (self.dataMdoel?.order_res?.sale_res?.dj_amount)!
}else{
cell.textTF.text = "￥" + (self.dataMdoel?.order_res?.sale_res?.dj_amount)!
}
break
case 1:
if self.dataMdoel?.order_res?.sale_res?.wk_pay_status == 1 {
cell.textTF.text = "(已付)" + "￥" + (self.dataMdoel?.order_res?.sale_res?.wk_amount)!
}else{
cell.textTF.text = "￥" + (self.dataMdoel?.order_res?.sale_res?.wk_amount)!
}
break
case 2:
......@@ -417,24 +419,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
cell.textTF.isUserInteractionEnabled = false
cell.nameLbl.text = nonYuShouPart3Arr[indexPath.row]
// if self.dataMdoel?.receiving == nil {
cell.textTF.text = "-"
// }else{
// switch indexPath.row {
// case 0:
// cell.textTF.text = (self.dataMdoel?.receiving?.consignee)!
// break
// case 1:
// cell.textTF.text = (self.dataMdoel?.receiving?.mobile)!
// break
// case 2:
// cell.textTF.text = (self.dataMdoel?.receiving?.addr_str)!
// break
// default:
// break
// }
// }
cell.textTF.text = "-"
return cell
case 4:
//MARK:--订单信息cell
......@@ -448,10 +433,8 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
cell.tag = indexPath.row
if isYuShou {
cell.nameLbl.text = isYuShouPart3Arr[indexPath.row]
}else{
cell.nameLbl.text = YuShouPart3Arr[indexPath.row]
}
switch indexPath.row {
......@@ -473,7 +456,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
cell.contentLbl.text = "请输入订单备注"
}
}
break
default:
break
......@@ -483,38 +466,42 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if indexPath.row == 4 || indexPath.row == 6 || indexPath.row == 7 || indexPath.row == (6 + isYushoucount) || indexPath.row == (7 + isYushoucount){
if isYuShou {
cell.nameLbl.text = isYuShouPart3Arr[indexPath.row]
}else{
cell.nameLbl.text = YuShouPart3Arr[indexPath.row]
}
cell.arrowImg.isHidden = false
switch indexPath.row {
case 4:
cell.contentLbl.text = self.dataMdoel?.order_res?.lc_name
break
case 6:
if isYuShou {
cell.contentLbl.text = StringByInt(number: (self.dataMdoel?.order_res?.sale_res?.dj_pay_type!)!)
// dj_payWay = (self.dataMdoel?.order_res?.sale_res?.dj_pay_type!)!
cell.contentLbl.text = zhiFuFangShiArr[dj_payWay]
}else{
cell.contentLbl.text = self.dataMdoel?.order_res?.pay_type_cn
}
break
case 7:
if isYuShou {
cell.contentLbl.text = StringByInt(number: (self.dataMdoel?.order_res?.sale_res?.dj_pay_status!)!)
}else{
cell.contentLbl.text = self.dataMdoel?.order_res?.pay_status_cn
}
cell.arrowImg.isHidden = true
break
case 8:
cell.contentLbl.text = StringByInt(number: (self.dataMdoel?.order_res?.sale_res?.wk_pay_type!)!)
if isYuShou {
// wk_payWay = (self.dataMdoel?.order_res?.sale_res?.wk_pay_type!)!
cell.contentLbl.text = zhiFuFangShiArr[wk_payWay]
}else{
cell.contentLbl.text = StringByInt(number: (self.dataMdoel?.order_res?.sale_res?.wk_pay_type!)!)
}
break
case 9:
cell.contentLbl.text = StringByInt(number: (self.dataMdoel?.order_res?.sale_res?.wk_pay_status!)!)
......@@ -529,10 +516,10 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
cell.textTF.isUserInteractionEnabled = false
if isYuShou {
cell.nameLbl.text = isYuShouPart3Arr[indexPath.row]
}else{
cell.nameLbl.text = YuShouPart3Arr[indexPath.row]
}
switch indexPath.row {
case 0:
......@@ -617,7 +604,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
self.glSelectView = view
}
}
}) { (error) in
}
......@@ -638,7 +625,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
}
break
case "关联客户":
let vc = GuanLianKehuVC()
......@@ -668,18 +655,52 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
//无需处理：根据网络变更
break
case "定金支付方式":
print("定金支付方式")
if glSelectView == nil {
let view = GLAlertSelectView(frame: self.view.bounds)
view.tag = cell.tag
view.titleLbl.text = "请选择定金支付方式"
view.delegate = self
view.dataArr = zhiFuFangShiArr
view.selectNum = dj_payWay
if dj_payWay != 0 {
view.deSelectArr = [0]
}
view.tempNum = view.selectNum
self.view.addSubview(view)
glSelectView = view
}
break
case "尾款支付方式":
print("尾款支付方式")
break
print("尾款支付方式")
print(cell.tag)
if glSelectView == nil {
let view = GLAlertSelectView(frame: self.view.bounds)
view.tag = cell.tag
view.titleLbl.text = "请选择定尾款支付方式"
view.delegate = self
view.dataArr = zhiFuFangShiArr
view.selectNum = wk_payWay
if wk_payWay != 0 {
view.deSelectArr = [0]
}
view.tempNum = view.selectNum
self.view.addSubview(view)
glSelectView = view
}
break
default:
break
}
}
func GLAlertSelectViewClick(selectNum: Int, view: GLAlertSelectView) {
if view.titleLbl.text == "请选择定金支付方式"{
dj_payWay = selectNum
}
if view.titleLbl.text == "请选择定尾款支付方式"{
wk_payWay = selectNum
}
if view.titleLbl.text == "请选择支付方式" {
//MARK:--选择支付方式回调
let UserToken = UserDefaults.standard.value(forKey: "user_token")
......@@ -704,22 +725,22 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}else if selectNum > 1 {
pay_type = selectNum + 7
}
editPayType(["user_token":UserToken as Any,"order_id":orderId as Any,"is_adsale":is_adsale as Any,"amount_type":amount_type,"pay_type":pay_type], success: { (data) in
let dataM = data as! UpDataModel
if dataM.code == 1 {
self.zhiFuSelect = selectNum
self.dataMdoel?.order_res?.pay_type_cn = self.zhiFuFangShiArr[selectNum]
self.listView.reloadData()
}
}) { (error) in
}
}else if view.titleLbl.text == "请选择物流公司"{
let UserToken = UserDefaults.standard.value(forKey: "user_token")
let secltMd = self.lcModel?.data![selectNum]
editField(["user_token":UserToken as Any,"function_id":"46","prval":orderId as Any,"value":secltMd!.lc_id as Any,], success: { (data) in
......@@ -730,7 +751,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
self.listView.reloadData()
}
}) { (erro) in
}
}else{
......@@ -741,9 +762,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
glSelectView?.removeFromSuperview()
glSelectView = nil
}
//MARK: - section delegate
func numberOfSections(in tableView: UITableView) -> Int {
if self.dataMdoel == nil {
......
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