补全订单详情

GeliBusinessPlatform/View/Cell/DaiQueRenCell.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="16097" 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"/>
@@ -10,7 +10,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="221" id="KGk-i7-Jjw" customClass="DaiQueRenCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="221" id="KGk-i7-Jjw" customClass="DaiQueRenCell" customModule="TestClass" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="375" height="228.5"/>
             <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">

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

@@ -274,7 +274,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 214*glscale
+        return 224
     }
     
 }

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

@@ -85,7 +85,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 view.removeFromSuperview()
             }
             //MARK:--底部视图，根据数据显示
-            self.btmBtnsTitleArr = self.getOrderBottomBtnTitleStrByStatus(status: (self.dataMdoel?.order_res?.order_status)!)
+            self.btmBtnsTitleArr = self.getOrderBottomBtnTitleStrByStatus(status: (self.dataMdoel?.order_res?.order_status)!, status_d: (self.dataMdoel?.order_res?.order_status_d)!)
             
             if self.btmBtnsTitleArr.count == 0 {
                 self.btmViewH.constant = 0
@@ -1029,13 +1029,17 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
     }
     
     //MARK:--根据数据获取底部按钮操作
-    func getOrderBottomBtnTitleStrByStatus(status:Int) -> Array<String> {
+    func getOrderBottomBtnTitleStrByStatus(status:Int,status_d:Int) -> Array<String> {
         var titleArr: Array<String> = []
         switch status {
-        case 0,1:
+        case 0:
             //               str = "未确定" "待付款"
             titleArr = ["修改价格","打印","确认订单","取消订单"]
             break
+        case 1:
+            //               str = "已确定" "待付款"
+            titleArr = ["修改价格","打印","取消订单"]
+            break
         case 6:
             //               str = "待发货"
             titleArr = ["直接发货","打印","退款"]
@@ -1048,7 +1052,13 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         //订单完成
         case 5:
             //               str = "订单完成"
-            titleArr = ["打印","退款"]
+            if status_d == 53 {
+                titleArr = ["退货","打印","退款"]
+            }else if status_d == 52{
+                titleArr = ["打印","退款"]
+            }else if status_d == 51 {
+                titleArr = ["退货","打印"]
+            }
             
             break
         //订单关闭