Skip to content

G
GeliBusinessPlatform
Commit ce652027 authored by 刘俊宏's avatar 刘俊宏
Browse files
Options

删除订单详情的 物流公司和运单号栏目

parent 3b26fe5e
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 41 deletions
GeliBusinessPlatform/View/Cell/TitleAndTFCell.xib
View file @ ce652027
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
......@@ -32,7 +32,7 @@
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入内容" textAlignment="right" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Q6V-I9-aNd">
<rect key="frame" x="70" y="15.5" width="290" height="19"/>
<rect key="frame" x="70" y="16.5" width="290" height="17.5"/>
<color key="textColor" name="标题字颜色"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits"/>
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ ce652027
......@@ -42,8 +42,12 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
var yuShouTitleArr = ["定金：","尾款：","商品合计：","物流费用：","其它费用："]
var nonYuShouTitleArr = ["商品合计：","物流费用：","其它费用："]
let YuShouPart3Arr = ["订单编号","下单时间","订单来源","提货方式","物流公司","运单号","支付方式","支付状态","买家留言","订单备注"]
let isYuShouPart3Arr = ["订单编号","下单时间","订单来源","提货方式","物流公司","运单号","定金支付方式","定金支付状态","尾款支付方式","尾款支付状态","买家留言","订单备注"]
//旧的
// let YuShouPart3Arr = ["订单编号","下单时间","订单来源","提货方式","物流公司","运单号","支付方式","支付状态","买家留言","订单备注"]
// let isYuShouPart3Arr = ["订单编号","下单时间","订单来源","提货方式","物流公司","运单号","定金支付方式","定金支付状态","尾款支付方式","尾款支付状态","买家留言","订单备注"]
//新的
let YuShouPart3Arr = ["订单编号","下单时间","订单来源","提货方式","支付方式","支付状态","买家留言","订单备注"]
let isYuShouPart3Arr = ["订单编号","下单时间","订单来源","提货方式","定金支付方式","定金支付状态","尾款支付方式","尾款支付状态","买家留言","订单备注"]
let nonYuShouPart3Arr = ["收货人","联系电话","地址"]
......@@ -390,17 +394,12 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
//订单信息操作
if indexPath.section == 5 {
if indexPath.row == 5{
print("运单号")
let alterView = GeliAlertTextFiled(frame: self.view.window!.bounds)
alterView.delegate = self
self.view.window?.addSubview(alterView)
}
var isYushoucount = 0
if isYuShou {
isYushoucount = 2
}
if indexPath.row == 9 + isYushoucount{
if indexPath.row == 7 + isYushoucount{
print("备注")
let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
alterView.delegate = self
......@@ -458,6 +457,8 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
case 2:
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
cell.textTF.isUserInteractionEnabled = false
cell.line.isHidden = false
if isYuShou {
cell.nameLbl.text = yuShouTitleArr[indexPath.row]
cell.textTF.text = yuShouTitleArr[indexPath.row]
......@@ -538,6 +539,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
cell.textTF.isUserInteractionEnabled = false
cell.nameLbl.text = nonYuShouPart3Arr[indexPath.row]
cell.line.isHidden = false
cell.textTF.text = "-"
if self.dataMdoel?.receiving != nil {
switch indexPath.row {
......@@ -579,7 +581,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if isYuShou {
isYushoucount = 2
}
if indexPath.row == 5 || indexPath.row == (9 + isYushoucount){
if indexPath.row == (7 + isYushoucount){
let cell = tableView.dequeueReusableCell(withIdentifier: "PingLunCell") as! PingLunCell
cell.tag = indexPath.row
......@@ -590,21 +592,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
switch indexPath.row {
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 9:
case 7:
cell.contentLbl.text = self.dataMdoel?.order_res?.order_postscript
if self.dataMdoel?.order_res?.order_postscript == nil {
cell.contentLbl.text = "-"
......@@ -630,7 +618,8 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
return cell
}
if indexPath.row == 4 || indexPath.row == 6 || indexPath.row == 7 || indexPath.row == (6 + isYushoucount) || indexPath.row == (7 + isYushoucount){
if indexPath.row == 4 || indexPath.row == 5 || indexPath.row == (4 + isYushoucount) || indexPath.row == (5 + isYushoucount){
if isYuShou {
cell.nameLbl.text = isYuShouPart3Arr[indexPath.row]
}else{
......@@ -640,12 +629,12 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
cell.arrowImg.isHidden = false
cell.contentRight.constant = 32
if indexPath.row == 9 {
if indexPath.row == 7 {
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 == 7 {
}else if indexPath.row == 5 {
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
......@@ -661,9 +650,6 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
switch indexPath.row {
case 4:
cell.contentLbl.text = self.dataMdoel?.order_res?.lc_name
break
case 6:
if isYuShou {
cell.contentLbl.text = self.dataMdoel?.order_res?.sale_res?.dj_pay_type_cn
......@@ -672,7 +658,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
break
case 7:
case 5:
if isYuShou {
cell.contentLbl.text = self.dataMdoel?.order_res?.sale_res?.dj_pay_status_cn
......@@ -683,14 +669,14 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
cell.arrowImg.isHidden = true
cell.contentRight.constant = 15
break
case 8:
case 6:
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 9:
case 7:
cell.contentLbl.text = self.dataMdoel?.order_res?.sale_res?.wk_pay_status_cn
cell.arrowImg.isHidden = true
cell.contentRight.constant = 15
......@@ -713,6 +699,8 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
cell.textTF.isUserInteractionEnabled = false
cell.line.isHidden = false
if isYuShou {
cell.nameLbl.text = isYuShouPart3Arr[indexPath.row]
......@@ -737,7 +725,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
cell.textTF.text = "自提"
}
break
case (8 + isYushoucount):
case (6 + isYushoucount):
cell.textTF.text = self.dataMdoel?.order_res?.postscript
break
......@@ -1070,16 +1058,16 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
case 3://收货人信息section
if self.dataMdoel?.order_res?.shipping_type == 1{
return 3
return nonYuShouPart3Arr.count
}
return 0
case 4://发票信息section
return 1
case 5://订单信息section
if isYuShou {
return 12
return isYuShouPart3Arr.count
}else{
return 10
return YuShouPart3Arr.count
}
default:
return 0
......
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