Skip to content

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

补回物流公司，运单号显示

parent 2af5c9a1
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 14 deletions
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ 91b39340
......@@ -104,8 +104,8 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
// let YuShouPart3Arr = ["订单编号","下单时间","订单来源","提货方式","物流公司","运单号","支付方式","支付状态","买家留言","订单备注"]
// let isYuShouPart3Arr = ["订单编号","下单时间","订单来源","提货方式","物流公司","运单号","定金支付方式","定金支付状态","尾款支付方式","尾款支付状态","买家留言","订单备注"]
//新的
let YuShouPart3Arr = ["订单编号","下单时间","订单来源","关联凭证","提货方式","支付方式","支付状态","买家留言","订单备注"]
let isYuShouPart3Arr = ["订单编号","下单时间","订单来源","关联凭证","提货方式","定金支付方式","定金支付状态","尾款支付方式","尾款支付状态","买家留言","订单备注"]
let YuShouPart3Arr = ["订单编号","下单时间","订单来源","关联凭证","物流公司","运单号","提货方式","支付方式","支付状态","买家留言","订单备注"]
let isYuShouPart3Arr = ["订单编号","下单时间","订单来源","关联凭证","物流公司","运单号","提货方式","定金支付方式","定金支付状态","尾款支付方式","尾款支付状态","买家留言","订单备注"]
let nonYuShouPart3Arr = ["收货人","联系电话","地址"]
......@@ -668,7 +668,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if isYuShou {
isYushoucount = 2
}
if indexPath.row == (8 + isYushoucount){
if indexPath.row == 5 || indexPath.row == (10 + isYushoucount){
let cell = tableView.dequeueReusableCell(withIdentifier: "PingLunCell") as! PingLunCell
cell.tag = indexPath.row
......@@ -679,7 +679,21 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
switch indexPath.row {
case 8:
case 5:
cell.contentLbl.text = self.dataMdoel?.order_res?.lwb_no
if self.dataMdoel?.order_res?.lwb_no == nil {
cell.contentLbl.text = "-"
}else if cell.contentLbl.text?.count == 0 {
cell.contentLbl.text = "请输入物流单号"
if !isCaneditLatsData {
//MARK:-不能进行修改了
cell.contentLbl.text = "-"
}
}
break
case 10:
cell.contentLbl.text = self.dataMdoel?.order_res?.order_postscript
if self.dataMdoel?.order_res?.order_postscript == nil {
cell.contentLbl.text = "-"
......@@ -705,7 +719,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
return cell
}
if indexPath.row == 5 || indexPath.row == 6 || indexPath.row == (5 + isYushoucount) || indexPath.row == (6 + isYushoucount){
if indexPath.row == 4 || indexPath.row == 7 || indexPath.row == 8 || indexPath.row == (7 + isYushoucount) || indexPath.row == (8 + isYushoucount){
if isYuShou {
cell.nameLbl.text = isYuShouPart3Arr[indexPath.row]
......@@ -716,12 +730,12 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
cell.arrowImg.isHidden = false
cell.contentRight.constant = 32
if indexPath.row == 8 {
if indexPath.row == 10 {
if self.dataMdoel?.order_res?.sale_res?.wk_pay_type == 11 || self.dataMdoel?.order_res?.sale_res?.wk_pay_type == 12 {
cell.arrowImg.isHidden = true
cell.contentRight.constant = 15
}
}else if indexPath.row == 6 {
}else if indexPath.row == 8 {
if isYuShou {
if self.dataMdoel?.order_res?.sale_res?.dj_pay_type == 11 || self.dataMdoel?.order_res?.sale_res?.dj_pay_type == 12 {
cell.arrowImg.isHidden = true
......@@ -736,16 +750,18 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
switch indexPath.row {
case 5:
case 4:
cell.contentLbl.text = self.dataMdoel?.order_res?.lc_name
break
case 7:
if isYuShou {
cell.contentLbl.text = self.dataMdoel?.order_res?.sale_res?.dj_pay_type_cn
}else{
cell.contentLbl.text = self.dataMdoel?.order_res?.pay_type_cn
}
break
case 6:
case 8:
if isYuShou {
cell.contentLbl.text = self.dataMdoel?.order_res?.sale_res?.dj_pay_status_cn
......@@ -756,14 +772,14 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
cell.arrowImg.isHidden = true
cell.contentRight.constant = 15
break
case 7:
case 9:
if isYuShou {
cell.contentLbl.text = self.dataMdoel?.order_res?.sale_res?.wk_pay_type_cn
}else{
cell.contentLbl.text = StringByInt(number: (self.dataMdoel?.order_res?.sale_res?.wk_pay_type!)!)
}
break
case 8:
case 10:
cell.contentLbl.text = self.dataMdoel?.order_res?.sale_res?.wk_pay_status_cn
cell.arrowImg.isHidden = true
cell.contentRight.constant = 15
......@@ -811,14 +827,15 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
case 3:
cell.textTF.text = self.dataMdoel?.order_res?.order_associated_code
break
case 4:
case 6:
if self.dataMdoel?.order_res?.shipping_type == 1 {
cell.textTF.text = "派送"
}else{
cell.textTF.text = "自提"
}
break
case (7 + isYushoucount):
case (9 + isYushoucount):
cell.textTF.text = self.dataMdoel?.order_res?.postscript
break
......
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