订单详情+新增商品合并

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		9C3AD0BD567C3C122CCE3169 /* Pods_GeliBusinessPlatform.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DA2D518C6159EA47DCD8E0C /* Pods_GeliBusinessPlatform.framework */; };
-		E0040A912465569D00223900 /* SwipeCellKit in Frameworks */ = {isa = PBXBuildFile; productRef = E0040A902465569D00223900 /* SwipeCellKit */; };
 		E00B0B1B24629E99006DC846 /* SJMapCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00B0B1924629E99006DC846 /* SJMapCell.swift */; };
 		E00B0B1C24629E99006DC846 /* SJMapCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00B0B1A24629E99006DC846 /* SJMapCell.xib */; };
 		E00D85DF244561FD00F5F816 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00D85DE244561FD00F5F816 /* AppDelegate.swift */; };
@@ -297,6 +296,8 @@
 		F9023F6E2449A9B100DD5A63 /* TitleAndTFCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9023F6C2449A9B100DD5A63 /* TitleAndTFCell.xib */; };
 		F9023F712449ACA800DD5A63 /* TitleAndSwitchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9023F6F2449ACA800DD5A63 /* TitleAndSwitchCell.swift */; };
 		F9023F722449ACA800DD5A63 /* TitleAndSwitchCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9023F702449ACA800DD5A63 /* TitleAndSwitchCell.xib */; };
+		F905A7D5246CF57700E3A74D /* Parchment in Frameworks */ = {isa = PBXBuildFile; productRef = F905A7D4246CF57700E3A74D /* Parchment */; };
+		F905A7D8246CF82400E3A74D /* SwipeCellKit in Frameworks */ = {isa = PBXBuildFile; productRef = F905A7D7246CF82400E3A74D /* SwipeCellKit */; };
 		F9171EFC245128B200359C2B /* Interface.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9171EFB245128B200359C2B /* Interface.swift */; };
 		F9171F0224513C5B00359C2B /* UpDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9171F0124513C5B00359C2B /* UpDataModel.swift */; };
 		F933F6C02452C68B00189561 /* PKHUDSystemActivityIndicatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F933F6AF2452C68B00189561 /* PKHUDSystemActivityIndicatorView.swift */; };
@@ -405,7 +406,6 @@
 		F956D5B9246A33E2003FF510 /* OrderInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = F956D5B8246A33E2003FF510 /* OrderInterface.swift */; };
 		F956D5BB246A359C003FF510 /* GoodsInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = F956D5BA246A359C003FF510 /* GoodsInterface.swift */; };
 		F956D5C0246A3789003FF510 /* OrderDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F956D5BF246A3789003FF510 /* OrderDetailModel.swift */; };
-		F95A9ED224551D0400867849 /* Parchment in Frameworks */ = {isa = PBXBuildFile; productRef = F95A9ED124551D0400867849 /* Parchment */; };
 		F95A9ED524551DF900867849 /* UIView+constraints.swift in Sources */ = {isa = PBXBuildFile; fileRef = F95A9ED424551DF900867849 /* UIView+constraints.swift */; };
 		F95A9ED8245520E500867849 /* OrderListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F95A9ED6245520E500867849 /* OrderListVC.swift */; };
 		F95A9ED9245520E500867849 /* OrderListVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = F95A9ED7245520E500867849 /* OrderListVC.xib */; };
@@ -443,6 +443,8 @@
 		F9956B22246408A6001A617D /* GoodsClassViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9956B20246408A6001A617D /* GoodsClassViewController.swift */; };
 		F9956B23246408A6001A617D /* GoodsClassViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9956B21246408A6001A617D /* GoodsClassViewController.xib */; };
 		F9956B2524640D34001A617D /* GoodsClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9956B2424640D34001A617D /* GoodsClassModel.swift */; };
+		F9A0E1DD246D198B00D7F26F /* CusListAllModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A0E1DC246D198B00D7F26F /* CusListAllModel.swift */; };
+		F9A0E1DF246D1B1E00D7F26F /* GetGoodsInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A0E1DE246D1B1E00D7F26F /* GetGoodsInfoModel.swift */; };
 		F9DDBE922457BFEC00A32CB2 /* HUDEXT.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9DDBE912457BFEC00A32CB2 /* HUDEXT.swift */; };
 		F9DDBE962457D3EC00A32CB2 /* WebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9DDBE942457D3EC00A32CB2 /* WebViewController.swift */; };
 		F9DDBE972457D3EC00A32CB2 /* WebViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9DDBE952457D3EC00A32CB2 /* WebViewController.xib */; };
@@ -963,6 +965,8 @@
 		F9956B20246408A6001A617D /* GoodsClassViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoodsClassViewController.swift; sourceTree = "<group>"; };
 		F9956B21246408A6001A617D /* GoodsClassViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GoodsClassViewController.xib; sourceTree = "<group>"; };
 		F9956B2424640D34001A617D /* GoodsClassModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoodsClassModel.swift; sourceTree = "<group>"; };
+		F9A0E1DC246D198B00D7F26F /* CusListAllModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CusListAllModel.swift; sourceTree = "<group>"; };
+		F9A0E1DE246D1B1E00D7F26F /* GetGoodsInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetGoodsInfoModel.swift; sourceTree = "<group>"; };
 		F9DDBE912457BFEC00A32CB2 /* HUDEXT.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HUDEXT.swift; sourceTree = "<group>"; };
 		F9DDBE942457D3EC00A32CB2 /* WebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewController.swift; sourceTree = "<group>"; };
 		F9DDBE952457D3EC00A32CB2 /* WebViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = WebViewController.xib; sourceTree = "<group>"; };
@@ -994,9 +998,11 @@
 				E039847A2468F21100DFA56F /* AudioToolbox.framework in Frameworks */,
 				E03984782468F20800DFA56F /* AssetsLibrary.framework in Frameworks */,
 				E0707DD424624A6800E039A8 /* CoreLocation.framework in Frameworks */,
+				F905A7D5246CF57700E3A74D /* Parchment in Frameworks */,
 				E0707DC72462457200E039A8 /* libz.tbd in Frameworks */,
 				E0F1BE452469220D003015B2 /* libopencore-amrnb.a in Frameworks */,
 				E0707DC52462456C00E039A8 /* libc++.tbd in Frameworks */,
+				F905A7D8246CF82400E3A74D /* SwipeCellKit in Frameworks */,
 				E0707DC32462456100E039A8 /* SystemConfiguration.framework in Frameworks */,
 				E0707DC12462455B00E039A8 /* CoreTelephony.framework in Frameworks */,
 				E0F1BE3D2469220D003015B2 /* RongSight.framework in Frameworks */,
@@ -1009,8 +1015,6 @@
 				E0707DB9246244EB00E039A8 /* AMapLocationKit.framework in Frameworks */,
 				E0707DB8246244EB00E039A8 /* AMapFoundationKit.framework in Frameworks */,
 				E0707DD224624A3700E039A8 /* MAMapKit.framework in Frameworks */,
-				E0040A912465569D00223900 /* SwipeCellKit in Frameworks */,
-				F95A9ED224551D0400867849 /* Parchment in Frameworks */,
 				E0F1BE442469220D003015B2 /* RongIMKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2131,6 +2135,8 @@
 			children = (
 				F956D5B6246A3255003FF510 /* OrderListModel.swift */,
 				F956D5BF246A3789003FF510 /* OrderDetailModel.swift */,
+				F9A0E1DC246D198B00D7F26F /* CusListAllModel.swift */,
+				F9A0E1DE246D1B1E00D7F26F /* GetGoodsInfoModel.swift */,
 			);
 			path = OrderManageModel;
 			sourceTree = "<group>";
@@ -2301,8 +2307,8 @@
 			);
 			name = GeliBusinessPlatform;
 			packageProductDependencies = (
-				F95A9ED124551D0400867849 /* Parchment */,
-				E0040A902465569D00223900 /* SwipeCellKit */,
+				F905A7D4246CF57700E3A74D /* Parchment */,
+				F905A7D7246CF82400E3A74D /* SwipeCellKit */,
 			);
 			productName = GeliBusinessPlatform;
 			productReference = E00D85DB244561FD00F5F816 /* GeliBusinessPlatform.app */;
@@ -2378,8 +2384,8 @@
 			);
 			mainGroup = E00D85D2244561FD00F5F816;
 			packageReferences = (
-				F95A9ED024551D0400867849 /* XCRemoteSwiftPackageReference "Parchment" */,
-				E0040A8F2465569D00223900 /* XCRemoteSwiftPackageReference "SwipeCellKit" */,
+				F905A7D3246CF57700E3A74D /* XCRemoteSwiftPackageReference "Parchment" */,
+				F905A7D6246CF82400E3A74D /* XCRemoteSwiftPackageReference "SwipeCellKit" */,
 			);
 			productRefGroup = E00D85DC244561FD00F5F816 /* Products */;
 			projectDirPath = "";
@@ -2684,6 +2690,7 @@
 				E02C882A2456B4BA00925766 /* WLGZCell.swift in Sources */,
 				F950FDE824518CD800C40530 /* TimeSelectView.swift in Sources */,
 				F933F6C72452C68B00189561 /* PKHUDWideBaseView.swift in Sources */,
+				F9A0E1DF246D1B1E00D7F26F /* GetGoodsInfoModel.swift in Sources */,
 				F94A314B246250DB00FEC38E /* GoodsDetailModel.swift in Sources */,
 				E02DDD85244FDC6A00ABB707 /* TitleAndSwitchHeaderView.swift in Sources */,
 				E0F3C2CB24590C86006F0D1F /* XinZengAndBianJiKeHuViewController.swift in Sources */,
@@ -2721,6 +2728,7 @@
 				F9DDBE962457D3EC00A32CB2 /* WebViewController.swift in Sources */,
 				F956D5AA246A2D9C003FF510 /* LMNBulletsLine.m in Sources */,
 				E06524F924581A7900CA22E2 /* ChuKuCell.swift in Sources */,
+				F9A0E1DD246D198B00D7F26F /* CusListAllModel.swift in Sources */,
 				F9956B2524640D34001A617D /* GoodsClassModel.swift in Sources */,
 				F961D26B24500FF6007FBE70 /* HeaderSelectView.swift in Sources */,
 				E09F4C9D2452BEBB00BE033D /* JiPaiFangShiViewController.swift in Sources */,
@@ -3216,34 +3224,34 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		E0040A8F2465569D00223900 /* XCRemoteSwiftPackageReference "SwipeCellKit" */ = {
+		F905A7D3246CF57700E3A74D /* XCRemoteSwiftPackageReference "Parchment" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/SwipeCellKit/SwipeCellKit";
+			repositoryURL = "https://github.com/rechsteiner/Parchment";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 2.7.1;
+				minimumVersion = 2.3.0;
 			};
 		};
-		F95A9ED024551D0400867849 /* XCRemoteSwiftPackageReference "Parchment" */ = {
+		F905A7D6246CF82400E3A74D /* XCRemoteSwiftPackageReference "SwipeCellKit" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/rechsteiner/Parchment";
+			repositoryURL = "https://github.com/SwipeCellKit/SwipeCellKit";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 2.3.0;
+				minimumVersion = 2.7.1;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		E0040A902465569D00223900 /* SwipeCellKit */ = {
+		F905A7D4246CF57700E3A74D /* Parchment */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = E0040A8F2465569D00223900 /* XCRemoteSwiftPackageReference "SwipeCellKit" */;
-			productName = SwipeCellKit;
+			package = F905A7D3246CF57700E3A74D /* XCRemoteSwiftPackageReference "Parchment" */;
+			productName = Parchment;
 		};
-		F95A9ED124551D0400867849 /* Parchment */ = {
+		F905A7D7246CF82400E3A74D /* SwipeCellKit */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = F95A9ED024551D0400867849 /* XCRemoteSwiftPackageReference "Parchment" */;
-			productName = Parchment;
+			package = F905A7D6246CF82400E3A74D /* XCRemoteSwiftPackageReference "SwipeCellKit" */;
+			productName = SwipeCellKit;
 		};
 /* End XCSwiftPackageProductDependency section */
 	};

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -67,5 +67,9 @@
 	<string>Order/orderReturnedGoodsAd</string>
 	<key>修改订单支付方式(状态)</key>
 	<string>Order/editPayType</string>
+	<key>获取客户信息</key>
+	<string>Customer/cusListAll</string>
+	<key>获取商品信息</key>
+	<string>Adminorder/getGoodsInfo</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/OrderInterface.swift

@@ -219,3 +219,18 @@ func editPayType(_ params:[String:Any],success:@escaping (_ res:Any)->(),failtur
         failture(error)
     }
 }
+//MARK:--获取客户信息
+/**
+params-key:
+
+user_token(验证token)
+ 
+*/
+func cusListAll(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("获取客户信息", params, { (rep:DataResponse<CusListAllModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}

GeliBusinessPlatform/Model/OrderManageModel/CusListAllModel.swift

+//
+//  CusListAllModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/5/14.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+//获取客户信息
+class CusListAllModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : Array<CusListAllDataModel>?
+
+    required init?( map: Map) {
+
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class CusListAllDataModel: Mappable {
+    var cus_id : Int?  //客户id
+    var cus_name : String?   //客户名
+    var company : String?  //公司名
+    var cus_type : Int?  //客户类型： 1个人 2企业
+    var user_name : String?  //客户绑定的用户名
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        cus_id <- map["cus_id"]
+        cus_name <- map["cus_name"]
+        company <- map["company"]
+        cus_type <- map["cus_type"]
+        user_name <- map["user_name"]
+
+     }
+    
+}

GeliBusinessPlatform/Model/OrderManageModel/GetGoodsInfoModel.swift

+//
+//  GetGoodsInfoModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/5/14.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation

GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift

@@ -24,9 +24,9 @@ class OrderDetailModel: Mappable {
     }
 }
 class OrderDetailDataModel: Mappable {
-    var order_res : Array<GoodsResModel>?  //商品数据
-    var order_goods : Array<GoodsResModel>?  //商品数据
-    var receiving : Array<GoodsResModel>?  //商品数据
+    var order_res : OrderDetailResModel?  //订单信息
+    var order_goods : Array<OrderDetailGoodsModel>?  //订单商品
+    var receiving :OrderDetailReceivingModel?  //收货信息
 
     required init?( map: Map) {
         
@@ -47,6 +47,8 @@ class OrderDetailResModel: Mappable {
     var goods_amount : String?
     var order_amount : String?
     var discount_amount : String?
+    var logistics_price : String? //物流费用
+    var other_price : String?//其他费用
     var sum_amount : String?  //订单合计价格
     var from : String?
     var lc_id : String?
@@ -62,6 +64,9 @@ class OrderDetailResModel: Mappable {
     var from_cn : String?     //订单来源中文
     var pay_type_cn : String?     //支付方式中文
     var pay_status_cn : String?  //支付状态中文
+    var order_type : Int?//订单类型 1普通2期货3团购4预售
+    var order_status : Int?//订单状态
+    var order_status_d : Int?//订单详细状态
 
     required init?( map: Map) {
 
@@ -91,8 +96,52 @@ class OrderDetailResModel: Mappable {
         from_cn <- map["from_cn"]
         pay_type_cn <- map["pay_type_cn"]
         pay_status_cn <- map["pay_status_cn"]
+        order_type <- map["order_type"]
+        order_status <- map["order_status"]
+        order_status_d <- map["order_status_d"]
+        logistics_price <- map["logistics_price"]
+        other_price <- map["other_price"]
+
+    }
+}
+func orderStatusStrByInt(statusNumber:Int) -> String? {
+    var str = ""
+    switch statusNumber {
+    case 0:
+        str = "未确定"
+ 
+        break
+    //待付款
+    case 1:
+        str = "待付款"
+ 
+        break
+    case 6:
+        str = "待发货"
+        break
+    case 7:
+        str = "待收货"
+        break
+    //订单完成
+    case 5:
+        str = "订单完成"
+        break
+    //订单关闭
+    case 8:
+        str = "订单关闭"
+        break
+    //已取消
+    case 2:
+        str = "已取消" //用户取消（预售
+        break
+    default:
+        break
+        
     }
+    return str
 }
+
+
 class OrderDetailGoodsModel: Mappable {
     var og_id:Int?  //订单商品号
     var goods_id : Int? //商品id

GeliBusinessPlatform/SceneDelegate.swift

@@ -88,7 +88,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
         // Create the SwiftUI view that provides the window contents.
         
         tabBarController.viewControllers = [v1, v2, v3, v4, v5]
-//        tabBarController.selectedIndex = 2
+        tabBarController.selectedIndex = 1
         
         let contentView = tabBarController
         if let windowScene = sceneC as? UIWindowScene {

GeliBusinessPlatform/View/Cell/GuanLianKeHuCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <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"/>
@@ -33,7 +33,6 @@
                         <rect key="frame" x="95" y="15" width="42" height="18.5"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="18.5" id="FLa-W0-nr3"/>
-                            <constraint firstAttribute="width" constant="42" id="MRk-8r-uhY"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <color key="textColor" name="标题字颜色"/>
@@ -49,7 +48,6 @@
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="reciver" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QI3-nS-9hL">
                         <rect key="frame" x="160.5" y="15" width="42" height="18.5"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="42" id="PBi-wq-5YM"/>
                             <constraint firstAttribute="height" constant="18.5" id="ln6-6M-b4L"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
@@ -77,27 +75,6 @@
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="企业" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Vq-Jz-GTW">
-                        <rect key="frame" x="137" y="41.5" width="32" height="17"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="17" id="Eb7-L3-66T"/>
-                            <constraint firstAttribute="width" constant="32" id="wub-97-un4"/>
-                        </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                        <color key="textColor" name="企业、预售字体"/>
-                        <nil key="highlightedColor"/>
-                        <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
-                                <color key="value" name="企业、预售字体"/>
-                            </userDefinedRuntimeAttribute>
-                            <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
-                                <real key="value" value="1"/>
-                            </userDefinedRuntimeAttribute>
-                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                <real key="value" value="3"/>
-                            </userDefinedRuntimeAttribute>
-                        </userDefinedRuntimeAttributes>
-                    </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="湛江丰源水产有限公司" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vLg-1W-z2S">
                         <rect key="frame" x="95" y="63.5" width="245" height="15"/>
                         <constraints>
@@ -132,6 +109,27 @@
                             <constraint firstAttribute="height" constant="1" id="hct-Td-2CF"/>
                         </constraints>
                     </view>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="企业" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Vq-Jz-GTW">
+                        <rect key="frame" x="95" y="41.5" width="32" height="17"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="17" id="Eb7-L3-66T"/>
+                            <constraint firstAttribute="width" constant="32" id="wub-97-un4"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                        <color key="textColor" name="企业、预售字体"/>
+                        <nil key="highlightedColor"/>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                <color key="value" name="企业、预售字体"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                <real key="value" value="1"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                <real key="value" value="3"/>
+                            </userDefinedRuntimeAttribute>
+                        </userDefinedRuntimeAttributes>
+                    </label>
                 </subviews>
                 <constraints>
                     <constraint firstItem="QI3-nS-9hL" firstAttribute="centerY" secondItem="llc-wu-Qjo" secondAttribute="centerY" id="3cI-Bb-s4F"/>
@@ -144,7 +142,6 @@
                     <constraint firstItem="ljV-Gc-YnI" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="GCg-gX-SYB"/>
                     <constraint firstItem="k7A-Qs-Puc" firstAttribute="leading" secondItem="WR0-yV-WjT" secondAttribute="trailing" constant="10" id="Jdc-Ll-m3r"/>
                     <constraint firstAttribute="trailingMargin" secondItem="vLg-1W-z2S" secondAttribute="trailing" constant="15" id="KOW-Bj-cOn"/>
-                    <constraint firstItem="5Vq-Jz-GTW" firstAttribute="leading" secondItem="YvY-yP-Zr7" secondAttribute="trailing" constant="10" id="Opx-Ak-iTq"/>
                     <constraint firstItem="YvY-yP-Zr7" firstAttribute="leading" secondItem="WR0-yV-WjT" secondAttribute="trailing" constant="10" id="PZD-FR-vo1"/>
                     <constraint firstItem="5Vq-Jz-GTW" firstAttribute="centerY" secondItem="YvY-yP-Zr7" secondAttribute="centerY" id="WUM-7S-6Tq"/>
                     <constraint firstAttribute="bottom" secondItem="ljV-Gc-YnI" secondAttribute="bottom" id="WeE-ry-Kge"/>
@@ -155,6 +152,7 @@
                     <constraint firstItem="llc-wu-Qjo" firstAttribute="centerY" secondItem="k7A-Qs-Puc" secondAttribute="centerY" id="kfs-Cj-xiI"/>
                     <constraint firstItem="WR0-yV-WjT" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="kra-Qt-lhu"/>
                     <constraint firstItem="F70-8y-cQB" firstAttribute="centerY" secondItem="WR0-yV-WjT" secondAttribute="centerY" id="p4k-Zt-rJK"/>
+                    <constraint firstItem="5Vq-Jz-GTW" firstAttribute="leading" secondItem="WR0-yV-WjT" secondAttribute="trailing" constant="10" id="tav-3L-1yQ"/>
                     <constraint firstItem="llc-wu-Qjo" firstAttribute="leading" secondItem="k7A-Qs-Puc" secondAttribute="trailing" constant="4" id="veA-rN-M0X"/>
                     <constraint firstItem="vLg-1W-z2S" firstAttribute="top" secondItem="YvY-yP-Zr7" secondAttribute="bottom" constant="5" id="vrn-r3-pdX"/>
                 </constraints>

GeliBusinessPlatform/ViewController/商品分类/GoodsClassViewController.swift

@@ -227,7 +227,7 @@ class GoodsClassViewController: BaseViewController , UITableViewDelegate, UITabl
             }
     
             let reloadSet = IndexSet.init(arrayLiteral: indexPath.section)
-            tableV.reloadSections(reloadSet, with: .automatic)
+            tableV.reloadData()
  
         }
     }

GeliBusinessPlatform/ViewController/商品管理/GoodsManageListVC.swift

@@ -418,24 +418,30 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
         if rowModel.is_show == 0 {
             if isTrue {
                 //"下架"
-                editField(["user_token":"","function_id":"15","prval":"goods_id","value":"0",], success: { (data) in
-                    self.loadData()
-                }) { (erro) in
-                    
-                }
+                print("下架下架下架")
+//                editField(["user_token":"","function_id":"15","prval":"goods_id","value":"0",], success: { (data) in
+//                    self.loadData()
+//                }) { (erro) in
+//
+//                }
             }else{
                 //"入库"
+                print("入库--入库")
+
             }
         }else if rowModel.is_show == 1{
             if isTrue {
                 //"入库"
+                print("入库===入库")
             }else{
                 //"上架"
-                editField(["user_token":"","function_id":"15","prval":rowModel.goods_id,"value":"1",], success: { (data) in
-                    self.loadData()
-                }) { (erro) in
+                print("上架上架上架上架")
 
-                }
+//                editField(["user_token":"","function_id":"15","prval":rowModel.goods_id,"value":"1",], success: { (data) in
+//                    self.loadData()
+//                }) { (erro) in
+//                    
+//                }
             }
         }
     }

GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift

@@ -21,19 +21,6 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
     var page : Int = 0
     var isUpData = false
  
-    var selectData:String = ""{
-        didSet{
-            print("筛选条件=---")
-            //动效刷新
-            tableV.reloadData()
-            tableV.performBatchUpdates({
-                   UIView.animate(views: self.tableV!.visibleCells,
-                                  animations: self.animations, completion: {
-                                   
-                   })
-               }, completion: nil)
-        }
-    }
     //MARK:--列表数据源
     var dataArr:Array<OrderListDataModel> = []
     override func viewDidLoad() {
@@ -96,7 +83,12 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             self.tableV.reloadData()
             self.tableV?.mj_header?.endRefreshing()
             self.page = 2
+            self.tableV.performBatchUpdates({
+                   UIView.animate(views: self.tableV!.visibleCells,
+                                  animations: self.animations, completion: {
                                    
+                   })
+               }, completion: nil)
         }) { (error) in
             self.tableV?.mj_header?.endRefreshing()
 
@@ -130,7 +122,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
     var tableV :UITableView!
     var tableSearchV :UITableView! = nil
     
-    private let animations = [AnimationType.from(direction: .bottom, offset: 150*glscale)]
+    private let animations = [AnimationType.from(direction: .bottom, offset: 300*glscale)]
     
     func setTabv() {
         tableV = UITableView()

GeliBusinessPlatform/ViewController/订单管理/关联客户/GuanLianKehuVC.swift

@@ -8,23 +8,27 @@
 
 import UIKit
 import ViewAnimator
-@objc protocol GuanLianKehuVCDelegate {
-    @objc optional func btnSelect(keHuData:Any)
+import LGButton
+
+protocol GuanLianKehuVCDelegate {
+    func GuanLianKehuSelect(keHuData:CusListAllDataModel)
 }
 class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataSource,GuanLianKeHuCellDelegate{
     var delegate:GuanLianKehuVCDelegate?
     
-    var selectIdx:Int?//暂代关联客户数据
+    var selectIdx:Int? = nil//暂代关联客户数据
     
-    @IBAction func submitAction(_ sender: Any) {
+    @IBAction func submitAction(_ sender: LGButton) {
         print("确定")
         if selectIdx != nil{
-            delegate?.btnSelect?(keHuData: selectIdx)
+            
+            self.delegate?.GuanLianKehuSelect(keHuData: self.dataArr[selectIdx!])
             self.navigationController?.popViewController(animated: true)
         }else{
             HUD.flash(.label("请选择关联客户"), delay: 1.2)
         }
     }
+    
     @IBOutlet weak var contentView: UIView!
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -32,6 +36,26 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
         self.view.addSubview(navbar)
         setTabv()
     }
+    //MARK:--传入已选客户
+    var cus_id:Int? = nil
+    //MARK:--列表数据源
+    var dataArr:Array<CusListAllDataModel> = []
+    //MARK:--加载数据
+    @objc func loadData () {
+        let UserToken = UserDefaults.standard.value(forKey: "user_token")
+        cusListAll(["user_token":UserToken as Any], success: { (data) in
+            self.dataArr.removeAll()
+            let dataM = data as! CusListAllModel
+            dataM.data?.forEach({ (model) in
+                self.dataArr.append(model)
+            })
+            self.tableV.reloadData()
+            self.tableV?.mj_header?.endRefreshing()
+        }) { (error) in
+            
+        }
+    }
+    
     var tableV :UITableView!
     
     private let animations = [AnimationType.from(direction: .bottom, offset: 150*glscale)]
@@ -52,17 +76,40 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
         footerTbV.backgroundColor = UIColor.init(named: "白色背景色")
         tableV.tableFooterView = footerTbV
         
-        
+        //下拉刷新相关设置
+        headerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadData))
+        self.tableV!.mj_header = headerMJ
+        self.tableV.mj_header?.beginRefreshing()
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
-        return 3
+        return dataArr.count
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "GuanLianKeHuCell") as! GuanLianKeHuCell
         cell.delegate = self
         cell.tag = indexPath.row
+        
+        let rowModel = self.dataArr[indexPath.row]
+        cell.senderLbl.text = rowModel.cus_name
+        cell.receiverLbl.text = rowModel.user_name
+        if rowModel.cus_type == 1 {
+            cell.personLbl.isHidden = false
+            cell.companyLbl.isHidden = true
+        }else{
+            cell.personLbl.isHidden = true
+            cell.companyLbl.isHidden = false
+        }
+        cell.detailLbl.text = rowModel.company
+        
+        if cus_id != nil {
+            if cus_id == rowModel.cus_id {
+                cell.imgBtn.isSelected = true
+                selectIdx = indexPath.row
+            }
+        }
+        
         return cell
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {

GeliBusinessPlatform/ViewController/订单管理/关联客户/GuanLianKehuVC.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <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"/>
@@ -19,18 +19,14 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="US6-R4-qxF" customClass="LGButton" customModule="LGButton">
-                    <rect key="frame" x="0.0" y="813" width="414" height="49"/>
-                    <color key="backgroundColor" name="蓝色字体颜色"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="49" id="5xr-Qj-HWT"/>
-                    </constraints>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3TM-jG-VM2">
+                    <rect key="frame" x="0.0" y="44" width="414" height="769"/>
+                    <color key="backgroundColor" name="白色背景色"/>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YKd-bD-avz" customClass="LGButton" customModule="LGButton">
+                    <rect key="frame" x="0.0" y="813" width="414" height="83"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                     <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="isSkeletonable" value="YES"/>
-                        <userDefinedRuntimeAttribute type="string" keyPath="titleString" value="确定"/>
-                        <userDefinedRuntimeAttribute type="number" keyPath="titleFontSize">
-                            <real key="value" value="17"/>
-                        </userDefinedRuntimeAttribute>
                         <userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
                             <color key="value" name="按钮渐变色上"/>
                         </userDefinedRuntimeAttribute>
@@ -39,36 +35,39 @@
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                     <connections>
-                        <action selector="submitAction:" destination="-1" eventType="touchUpInside" id="i1h-Ro-dcZ"/>
+                        <action selector="submitAction:" destination="-1" eventType="touchUpInside" id="ajM-Wd-f7v"/>
                     </connections>
                 </view>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fUh-0E-kXZ">
-                    <rect key="frame" x="0.0" y="862" width="414" height="50"/>
-                    <color key="backgroundColor" name="按钮渐变色下,字体颜色"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xiH-O8-cNV">
+                    <rect key="frame" x="0.0" y="813" width="414" height="49"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="50" id="6jk-sA-tZb"/>
+                        <constraint firstAttribute="height" constant="49" id="A03-0x-HL7"/>
                     </constraints>
-                    <state key="normal">
-                        <color key="titleColor" name="按钮渐变色下,字体颜色"/>
-                    </state>
-                </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3TM-jG-VM2">
-                    <rect key="frame" x="0.0" y="44" width="414" height="769"/>
-                    <color key="backgroundColor" name="白色背景色"/>
-                </view>
+                    <attributedString key="attributedText">
+                        <fragment content="确定">
+                            <attributes>
+                                <color key="NSColor" name="白色背景色"/>
+                                <font key="NSFont" size="17" name="PingFangSC-Medium"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                    </attributedString>
+                    <nil key="highlightedColor"/>
+                </label>
             </subviews>
             <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
             <constraints>
-                <constraint firstItem="fUh-0E-kXZ" firstAttribute="top" secondItem="US6-R4-qxF" secondAttribute="bottom" id="4oc-7X-nPj"/>
+                <constraint firstAttribute="bottom" secondItem="YKd-bD-avz" secondAttribute="bottom" id="1tt-vZ-qy7"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="xiH-O8-cNV" secondAttribute="trailing" id="3M5-Wl-Z78"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="3TM-jG-VM2" secondAttribute="trailing" id="4tF-Ah-gJ7"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="xiH-O8-cNV" secondAttribute="bottom" id="AGO-O3-b7S"/>
+                <constraint firstItem="YKd-bD-avz" firstAttribute="top" secondItem="3TM-jG-VM2" secondAttribute="bottom" id="Afo-4Q-0Ae"/>
                 <constraint firstItem="3TM-jG-VM2" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="Hqt-Qn-BQ9"/>
                 <constraint firstItem="3TM-jG-VM2" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="Ics-t0-UuG"/>
-                <constraint firstItem="fUh-0E-kXZ" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="LJ8-2p-TWo"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="US6-R4-qxF" secondAttribute="trailing" id="U01-EV-dom"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="US6-R4-qxF" secondAttribute="bottom" id="XWg-QJ-Det"/>
-                <constraint firstItem="US6-R4-qxF" firstAttribute="top" secondItem="3TM-jG-VM2" secondAttribute="bottom" id="fqZ-Ea-rhD"/>
-                <constraint firstAttribute="trailing" secondItem="fUh-0E-kXZ" secondAttribute="trailing" id="wmN-Jb-mVD"/>
-                <constraint firstItem="US6-R4-qxF" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="xio-WK-uuf"/>
+                <constraint firstItem="YKd-bD-avz" firstAttribute="top" secondItem="xiH-O8-cNV" secondAttribute="top" id="bKE-lf-XfE"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="YKd-bD-avz" secondAttribute="trailing" id="esk-4d-ys9"/>
+                <constraint firstItem="YKd-bD-avz" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="mWk-CS-2Up"/>
+                <constraint firstItem="xiH-O8-cNV" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="rjg-po-6wf"/>
             </constraints>
             <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
             <point key="canvasLocation" x="131.8840579710145" y="134.59821428571428"/>
@@ -84,8 +83,8 @@
         <namedColor name="白色背景色">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
-        <namedColor name="蓝色字体颜色">
-            <color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        <namedColor name="白色背景色">
+            <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>

GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift

@@ -28,10 +28,34 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
     var cell5Height = 18.5
     var cell9Height = 18.5
     var cellH:CGFloat = 30.5
+    
+    //MARK:--加载数据
+    var dataMdoel: OrderDetailDataModel? = nil
+    func loadData() {
+        HUD.flash(.progress)
+        let UserToken = UserDefaults.standard.value(forKey: "user_token")
+        orderDetail(["user_token":UserToken as Any,"order_id":orderId as Any], success: { (data) in
+            HUD.hide(animated: true)
+            let dataM = data as! OrderDetailModel
+            self.dataMdoel = dataM.data
+            if self.dataMdoel?.order_res?.order_type == 4 {
+                self.isYuShou = true
+            }else{
+                self.isYuShou = false
+
+            }
+            self.listView.reloadData()
+            
+        }) { (error) in
+        
+        }
+    }
     override func viewDidLoad() {
         super.viewDidLoad()
         navbar.title = "订单详情"
         self.view.addSubview(navbar)
+        loadData()
+        
         SetTopFrameView(view: listView, btmView: bottomView)
         // Do any additional setup after loading the view.
         
@@ -57,100 +81,33 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             }
         }
     }
-    //MARK: - 自定义方法
+    //MARK: - 底部自定义方法
     @objc func bottomBtnClick(sender:UIButton){
         print(sender.titleLabel?.text)
     }
-    //MARK: - header delegate
-    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        switch section {
-        case 1:
-            return 49
-        case 2:
-            return 1
-        case 3:
-            return 39
-        case 4:
-            return 39
-        default:
-            return 10
-        }
 
-    }
-    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        let view = UIView()
-        switch section {
-        case 1:
-            let view = TitleAndLblView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 49))
-            view.nameLbl.text = "订单状态"
-            //订单状态
-            view.contentLbl.text = "待付款"
-            return view
-        case 3:
-            let view = HeaderOnlyTitleView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 39))
-            if isYuShou {
-                view.nameLbl.text = "订单信息"
-            }else{
-                view.nameLbl.text = "收货信息"
-            }
-            return view
-        case 4:
-            let view = HeaderOnlyTitleView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 39))
-            view.nameLbl.text = "订单信息"
-            return view
-        default:
-            break
-        }
-        return view
-    }
-    //MARK: - footer delegate
-    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
-        switch section {
-        case 1:
-            if isYuShou == false {
-                if dataArr.count > 2 {
-                    return 33.5
-                }else{
-                    return 0.01
-                }
-            }else{
-                return 0.01
-            }
-        case 2:
-            return 59
-        default:
-            break
-        }
-        return 10
-    }
     func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
         let view = UIView()
         switch section {
         case 1:
             if isYuShou == false {
-                if dataArr.count > 2 {
+                if (self.dataMdoel?.order_goods?.count)! > 2 {
                     let view = OrderDViewFooterView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 33.5))
                     view.delegate = self
-                    view.nameLbl.text = "查看全部（共\(dataArr.count)个商品）"
+                    view.nameLbl.text = "查看全部（共\(self.dataMdoel?.order_goods?.count)个商品）"
                     return view
                 }
             }
         case 2:
             let view = OrderDViewSumFooter(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 59))
+            view.priceLbl.text = "￥" + (self.dataMdoel?.order_res!.sum_amount)!
             return view
         default:
             break
         }
         return view
     }
-    //MARK: - section delegate
-    func numberOfSections(in tableView: UITableView) -> Int {
-        if isYuShou {
-            return 4
-        }else{
-            return 5
-        }
-    }
+
     //MARK: - cell delegate
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndBtnCell") as! TitleAndBtnCell
@@ -158,10 +115,16 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         switch indexPath.section {
         case 0:
             cell.nameLbl.text = "关联客户"
+            if self.dataMdoel?.order_res?.cus_id != 0 {
+                cell.contentLbl.text = self.dataMdoel?.order_res?.cus_name
+            }else{
+                //如果不刷新请求，那么就更新本地，建议还是刷新
                 cell.contentLbl.text = "请选择关联客户"
+            }
             
             break
         case 1:
+            //MARK:--商品cell
             let cell = tableView.dequeueReusableCell(withIdentifier: "XuanZeShangPinCell") as! XuanZeShangPinCell
             cell.priceLbl.isHidden = false
             cell.detailLbl2.isHidden = true
@@ -172,20 +135,42 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             if indexPath.row == 1 {
                 cell.lineView.isHidden = true
             }
+            //MARK:--暂时不显示CELL图片
+//            cell.imageView.
+            let rowModel = self.dataMdoel?.order_goods![indexPath.row]
+            
+            cell.nameLbl.text = rowModel?.goods_name
+            cell.detailLbl.text = rowModel?.goods_attr
+            cell.priceLbl.text = "￥" + (rowModel?.goods_price!)!
+ 
             return cell
         case 2:
             let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
             cell.textTF.isUserInteractionEnabled = false
             if isYuShou {
-                cell.nameLbl.text = nonYuShouPart3Arr[indexPath.row]
-                cell.textTF.text = nonYuShouPart3Arr[indexPath.row]
+                cell.nameLbl.text = yuShouTitleArr[indexPath.row]
+                cell.textTF.text = yuShouTitleArr[indexPath.row]
                 cell.delegate = self
                 if indexPath.row == yuShouTitleArr.count - 1 {
                     cell.line.isHidden = true
                 }
             }else{
+                //MARK:--商品合计，物流费用，其他费用 cell
                 cell.nameLbl.text = nonYuShouTitleArr[indexPath.row]
-                cell.textTF.text = nonYuShouTitleArr[indexPath.row]
+                switch indexPath.row {
+                case 0:
+                    cell.textTF.text = "￥" + (self.dataMdoel?.order_res?.goods_amount)!
+                    break
+                case 1:
+                    cell.textTF.text = "￥" + (self.dataMdoel?.order_res?.logistics_price)!
+                    break
+                case 2:
+                    cell.textTF.text = "￥" + (self.dataMdoel?.order_res?.other_price)!
+                    break
+                default:
+                    break
+
+                }
                 cell.delegate = self
                 if indexPath.row == nonYuShouTitleArr.count - 1 {
                     cell.line.isHidden = true
@@ -196,8 +181,8 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             if isYuShou {
                 let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
                 cell.textTF.isUserInteractionEnabled = false
-                cell.nameLbl.text = nonYuShouPart3Arr[indexPath.row]
-                cell.textTF.text = nonYuShouPart3Arr[indexPath.row]
+                cell.nameLbl.text = YuShouPart3Arr[indexPath.row]
+                cell.textTF.text = YuShouPart3Arr[indexPath.row]
                 return cell
             }else{
                 if indexPath.row == 4 || indexPath.row == 5 || indexPath.row == 9 {
@@ -231,10 +216,25 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                     }
                     return cell
                 }
+                //MARK:--收货人信息cell
                 let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
                 cell.textTF.isUserInteractionEnabled = false
-                cell.nameLbl.text = YuShouPart3Arr[indexPath.row]
-                cell.textTF.text = YuShouPart3Arr[indexPath.row]
+                cell.nameLbl.text = nonYuShouPart3Arr[indexPath.row]
+                
+                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
+
+                      }
                 return cell
             }
         case 4:
@@ -279,7 +279,142 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         }
         return cell
     }
+    func CommendCellSendStr(content: String,cell:CommendCell) {
+        print("CommendCellSendStr")
+    }
+    func OrderDViewFooterViewBtnClick() {
+        print("查看全部商品")
+        let vc = ShowAlGoodsViewController()
+        self.navigationController?.pushViewController(vc, animated: true)
+    }
+    
+    var selectKeHuData:CusListAllDataModel? = nil
+    func GuanLianKehuSelect(keHuData: CusListAllDataModel) {
+        print("选择的关联客户",keHuData)
+        self.selectKeHuData = keHuData
+        self.dataMdoel?.order_res?.cus_id = self.selectKeHuData?.cus_id
+        self.dataMdoel?.order_res?.cus_name = self.selectKeHuData?.cus_name
+    }
+    func btnClick(content: String, cell: TitleAndBtnCell) {
+        switch cell.nameLbl.text {
+        case "关联客户":
+            let vc = GuanLianKehuVC()
+            vc.delegate = self
+ 
+            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 "支付方式":
+            print("abc")
+            break
+        case "支付状态":
+            print("123")
+            break
+        default:
+            break
+        }
+    }
+    
+    //MARK: - section delegate
+    func numberOfSections(in tableView: UITableView) -> Int {
+        if self.dataMdoel == nil {
+            return 0
+        }
+        if isYuShou {
+            return 4
+        }else{
+            return 5
+        }
+    }
 
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if self.dataMdoel == nil {
+            return 0
+        }
+        switch section {
+        case 0:return 1
+        case 1:
+            if isYuShou{
+                return 1
+            }else{
+                var num = 0
+                if self.dataMdoel != nil {
+                    if (self.dataMdoel?.order_goods?.count)! < 2 {
+                           num = (self.dataMdoel?.order_goods?.count)!
+                       }else{
+                           num = 2
+                       }
+                }
+   
+                return num
+            }
+        case 2:
+            if isYuShou{
+                return 5
+            }else{
+                return 3
+            }
+        case 3:
+            if isYuShou{
+                return 10
+            }else{
+                return 3
+            }
+        case 4:
+            return 10
+        default:
+            return 10
+        }
+    }
+ 
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let view = UIView()
+        switch section {
+        case 1:
+            let view = TitleAndLblView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 49))
+            view.nameLbl.text = "订单状态"
+            //订单状态
+            view.contentLbl.text = orderStatusStrByInt(statusNumber: (self.dataMdoel?.order_res?.order_status)!)
+            return view
+        case 3:
+            let view = HeaderOnlyTitleView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 39))
+            if isYuShou {
+                view.nameLbl.text = "订单信息"
+            }else{
+                view.nameLbl.text = "收货信息"
+            }
+            return view
+        case 4:
+            let view = HeaderOnlyTitleView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 39))
+            view.nameLbl.text = "订单信息"
+            return view
+        default:
+            break
+        }
+        return view
+    }
+    //MARK: - footer delegate
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        switch section {
+        case 1:
+            if isYuShou == false {
+                if dataArr.count > 2 {
+                    return 33.5
+                }else{
+                    return 0.01
+                }
+            }else{
+                return 0.01
+            }
+        case 2:
+            return 59
+        default:
+            break
+        }
+        return 10
+    }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         switch indexPath.section {
         case 1:
@@ -312,38 +447,22 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         }
         return 49
     }
-    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    
+    //MARK: - header delegate
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
         switch section {
-        case 0:return 1
         case 1:
-            if isYuShou{
-                return 1
-            }else{
-                var num = 0
-                if dataArr.count < 2 {
-                    num = dataArr.count
-                }else{
-                    num = 2
-                }
-                return num
-            }
+            return 49
         case 2:
-            if isYuShou{
-                return 5
-            }else{
-                return 3
-            }
+            return 1
         case 3:
-            if isYuShou{
-                return 10
-            }else{
-                return 3
-            }
+            return 39
         case 4:
-            return 10
+            return 39
         default:
             return 10
         }
+        
     }
     //MARK: - 自定义 delegate
     func CommendCellSendH(height: CGFloat,cell:CommendCell) {
@@ -363,32 +482,4 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         listView.beginUpdates()
         listView.endUpdates()
     }
-    func CommendCellSendStr(content: String,cell:CommendCell) {
-        print("CommendCellSendStr")
-    }
-    func OrderDViewFooterViewBtnClick() {
-        print("查看全部商品")
-        let vc = ShowAlGoodsViewController()
-        self.navigationController?.pushViewController(vc, animated: true)
-    }
-    func btnSelect(keHuData:Any) {
-        print("选择的关联客户",keHuData)
-    }
-    func btnClick(content: String, cell: TitleAndBtnCell) {
-        switch cell.nameLbl.text {
-        case "关联客户":
-            let vc = GuanLianKehuVC()
-            vc.delegate = self
-            self.navigationController?.pushViewController(vc, animated: true)
-            break
-        case "支付方式":
-            print("abc")
-            break
-        case "支付状态":
-            print("123")
-            break
-        default:
-            break
-        }
-    }
 }