Skip to content

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

修改详情关联客户cell

parent 825ede9a
Show whitespace changes
Inline Side-by-side
Showing with 123 additions and 25 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 1df3e0bf
......@@ -337,6 +337,8 @@
E0E341EB246E95EE0060AC20 /* PingLunCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0E341E9246E95EE0060AC20 /* PingLunCell.xib */; };
E0E4456924B00F7B00EF788E /* LogisticsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E4456824B00F7B00EF788E /* LogisticsModel.swift */; };
E0E4456B24B0221500EF788E /* LogisticsInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E4456A24B0221500EF788E /* LogisticsInterface.swift */; };
E0E7CB6124C17B9F00A26D3F /* GLKHCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E7CB5F24C17B9F00A26D3F /* GLKHCell.swift */; };
E0E7CB6224C17B9F00A26D3F /* GLKHCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0E7CB6024C17B9F00A26D3F /* GLKHCell.xib */; };
E0E8ABFD246E359700E3BB54 /* GuiGeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E8ABFC246E359700E3BB54 /* GuiGeModel.swift */; };
E0EABAE72487748500F6CA8D /* NewSelectWarehouseVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0EABAE52487748500F6CA8D /* NewSelectWarehouseVC.swift */; };
E0EABAE82487748500F6CA8D /* NewSelectWarehouseVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0EABAE62487748500F6CA8D /* NewSelectWarehouseVC.xib */; };
......@@ -924,6 +926,8 @@
E0E341E9246E95EE0060AC20 /* PingLunCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PingLunCell.xib; sourceTree = "<group>"; };
E0E4456824B00F7B00EF788E /* LogisticsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogisticsModel.swift; sourceTree = "<group>"; };
E0E4456A24B0221500EF788E /* LogisticsInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogisticsInterface.swift; sourceTree = "<group>"; };
E0E7CB5F24C17B9F00A26D3F /* GLKHCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GLKHCell.swift; sourceTree = "<group>"; };
E0E7CB6024C17B9F00A26D3F /* GLKHCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GLKHCell.xib; sourceTree = "<group>"; };
E0E8ABFC246E359700E3BB54 /* GuiGeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuiGeModel.swift; sourceTree = "<group>"; };
E0EABAE52487748500F6CA8D /* NewSelectWarehouseVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewSelectWarehouseVC.swift; sourceTree = "<group>"; };
E0EABAE62487748500F6CA8D /* NewSelectWarehouseVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NewSelectWarehouseVC.xib; sourceTree = "<group>"; };
......@@ -1448,6 +1452,8 @@
E0206330246CE303007A40C4 /* OrderDViewSumFooter.xib */,
E0206332246CE450007A40C4 /* HeaderOnlyTitleView.swift */,
E0206334246CE45A007A40C4 /* HeaderOnlyTitleView.xib */,
E0E7CB5F24C17B9F00A26D3F /* GLKHCell.swift */,
E0E7CB6024C17B9F00A26D3F /* GLKHCell.xib */,
);
path = "订单详情";
sourceTree = "<group>";
......@@ -3116,6 +3122,7 @@
E0F97B1B2451951D001BD600 /* ShangPinGguiGeCell.xib in Resources */,
E07B1E70245929060055BA3C /* GYSGLViewController.xib in Resources */,
E0336DD6244EC40000380BE9 /* CreatNewSpecsViewController.xib in Resources */,
E0E7CB6224C17B9F00A26D3F /* GLKHCell.xib in Resources */,
E0C4F4B6244EE9EE00CC7E2F /* YuShouCell.xib in Resources */,
F95A9EDE24557CD500867849 /* GuanLianKehuVC.xib in Resources */,
E07B1E6C245926330055BA3C /* GYSGLCell.xib in Resources */,
......@@ -3302,6 +3309,7 @@
F956D5A9246A2D9C003FF510 /* LMNLineChain.m in Sources */,
E030DF362485DD3E002764D3 /* NewRKCell.swift in Sources */,
E020632F246CE2F9007A40C4 /* OrderDViewSumFooter.swift in Sources */,
E0E7CB6124C17B9F00A26D3F /* GLKHCell.swift in Sources */,
F95D9CA424493E840080D6E3 /* ShopInfoViewController.swift in Sources */,
E013D7902484D5AF0092DE46 /* NewCKCell.swift in Sources */,
F9171EFC245128B200359C2B /* Interface.swift in Sources */,
......
GeliBusinessPlatform/ViewController/订单详情/GLKHCell.swift 0 → 100644
View file @ 1df3e0bf
//
// GLKHCell.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/7/17.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class GLKHCell: UITableViewCell {
@IBOutlet weak var contentLbl: UILabel!
@IBOutlet weak var nameLbl: UILabel!
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/ViewController/订单详情/GLKHCell.xib 0 → 100644
View file @ 1df3e0bf
<?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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<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"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="GLKHCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="kehu" translatesAutoresizingMaskIntoConstraints="NO" id="fBF-NP-iMf">
<rect key="frame" x="15" y="13" width="17" height="18.5"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="标题" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xEs-UK-3s6">
<rect key="frame" x="37" y="14" width="27" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kh6-Hv-73X">
<rect key="frame" x="272" y="14" width="33" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="多选按钮字体颜色"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="xEs-UK-3s6" firstAttribute="centerY" secondItem="fBF-NP-iMf" secondAttribute="centerY" id="67O-xt-aK2"/>
<constraint firstItem="xEs-UK-3s6" firstAttribute="leading" secondItem="fBF-NP-iMf" secondAttribute="trailing" constant="5" id="D6K-zk-JBP"/>
<constraint firstItem="fBF-NP-iMf" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="FpE-1G-mMn"/>
<constraint firstItem="Kh6-Hv-73X" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="fex-bL-5DG"/>
<constraint firstAttribute="trailing" secondItem="Kh6-Hv-73X" secondAttribute="trailing" constant="15" id="ynq-vm-9UO"/>
<constraint firstItem="fBF-NP-iMf" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="zuD-Li-8Vr"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="contentLbl" destination="Kh6-Hv-73X" id="QlA-TV-Gyo"/>
<outlet property="nameLbl" destination="xEs-UK-3s6" id="li2-bd-2cg"/>
</connections>
<point key="canvasLocation" x="132" y="102"/>
</tableViewCell>
</objects>
<resources>
<image name="kehu" width="17" height="18.5"/>
<namedColor name="多选按钮字体颜色">
<color red="0.41200000047683716" green="0.41200000047683716" blue="0.41200000047683716" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ 1df3e0bf
......@@ -149,7 +149,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
listView.register(UINib(nibName: "XuanZeShangPinCell", bundle: nil), forCellReuseIdentifier: "XuanZeShangPinCell")
listView.register(UINib(nibName: "PingLunCell", bundle: nil), forCellReuseIdentifier: "PingLunCell")
listView.register(UINib(nibName: "GLKHCell", bundle: nil), forCellReuseIdentifier: "GLKHCell")
}
//MARK: - 底部自定义方法
@objc func bottomBtnClick(sender:UIButton){
......@@ -369,6 +369,18 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if !isCaneditLatsData {
return
}
if indexPath.section == 0 {
let vc = GuanLianKehuVC()
vc.delegate = self
vc.order_id = self.orderId
if self.dataMdoel?.order_res?.cus_id != 0 {
vc.cus_id = self.dataMdoel?.order_res?.cus_id
}
self.navigationController?.pushViewController(vc, animated: true)
}
if indexPath.section == 4 {
if indexPath.row == 5{
print("运单号")
......@@ -421,7 +433,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
cell.delegate = self
switch indexPath.section {
case 0:
cell.nameLbl.text = "关联客户"
let cell = tableView.dequeueReusableCell(withIdentifier: "GLKHCell") as! GLKHCell
cell.nameLbl.text = self.dataMdoel?.order_res?.user_name
if self.dataMdoel?.order_res?.cus_id != 0 {
cell.contentLbl.text = self.dataMdoel?.order_res?.cus_name
......@@ -432,14 +446,8 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
cell.contentLbl.text = "-"
}
}
if !isCaneditLatsData {
cell.arrowImg.isHidden = true
cell.contentRight.constant = 15
}else{
cell.arrowImg.isHidden = false
cell.contentRight.constant = 32
}
break
return cell
case 1:
//MARK:--商品cell
let cell = tableView.dequeueReusableCell(withIdentifier: "XuanZeShangPinCell") as! XuanZeShangPinCell
......@@ -810,15 +818,6 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
break
case "关联客户":
let vc = GuanLianKehuVC()
vc.delegate = self
vc.order_id = self.orderId
if self.dataMdoel?.order_res?.cus_id != 0 {
vc.cus_id = self.dataMdoel?.order_res?.cus_id
}
self.navigationController?.pushViewController(vc, animated: true)
break
case "支付方式":
......@@ -1175,7 +1174,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if self.dataMdoel!.order_res?.shipping_status == 1 && self.dataMdoel!.order_res?.pay_status == 0 {
titleArr = ["修改价格","付款码","退货"]
}
// if self.dataMdoel?.order_res.
// if self.dataMdoel?.order_res.
// if self.dataMdoel!.order_res?.shipping_status == 0 && self.dataMdoel!.order_res?.pay_status == 12 {
// titleArr = ["修改价格","付款码","退定金"]
// }
......@@ -1255,11 +1254,11 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
titleArr = ["付款码"]
}
// if self.dataMdoel!.order_res?.pay_status == 0 {
// if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
// titleArr = ["确认收款"]
// }
// }
// if self.dataMdoel!.order_res?.pay_status == 0 {
// if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
// titleArr = ["确认收款"]
// }
// }
break
case 11:
titleArr = ["拒绝退款","同意退款"]
......
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