萨拉的解放路；阿世纪东方；垃圾

GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuCell.xib

@@ -101,7 +101,7 @@
                                 <color key="textColor" name="灰色字体颜色"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="佣金：¥50" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X1B-vl-mvy">
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="佣金：¥50" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X1B-vl-mvy">
                                 <rect key="frame" x="10" y="59" width="55" height="13.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                 <color key="textColor" name="灰色字体颜色"/>

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

@@ -535,7 +535,11 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             //            if (self.dataMdoel?.order_res?.order_status == 6  && self.dataMdoel?.order_res?.from != 3 && self.dataMdoel?.order_res?.from != 5) {
             
             let arr = piCiArr![indexPath.row]
-            
+            if self.dataMdoel?.order_res?.order_type == 5 {
+                cell.yong_jin_lbl.isHidden = false
+            }else{
+                cell.yong_jin_lbl.isHidden = true
+            }
             if arr.count > 0 {
                 cell.non_add_icon.isHidden = true
                 cell.text_line.isHidden = true
@@ -573,13 +577,24 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             
             cell.arrow_img.isHidden = true
             cell.check_button.isHidden = true
-            cell.botton_height.constant = 10
-            if (rowModel?.goods_source!.count)! > 0 {
-                cell.arrow_img.isHidden = false
-                cell.check_button.isHidden = false
-                cell.botton_height.constant = 40
+            //待处理
+            if self.dataMdoel?.order_res?.order_type == 5 {
+                cell.botton_height.constant = 10
+                if (rowModel?.goods_source!.count)! > 0 {
+                    cell.arrow_img.isHidden = false
+                    cell.check_button.isHidden = false
+                    cell.botton_height.constant = 40
+                }
+            }else{
+                cell.botton_height.constant = -13.5
+                if (rowModel?.goods_source!.count)! > 0 {
+                    cell.arrow_img.isHidden = false
+                    cell.check_button.isHidden = false
+                    cell.botton_height.constant = 17.5
+                }
             }
             
+            
             if rowModel?.goods_attr != nil {
                 cell.detailLbl.text =  "规格:" + (rowModel?.goods_attr)!
             }else{
@@ -1324,12 +1339,22 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                     return 340
                 }
                 return 310
+            }else{
+                if self.dataMdoel?.order_res?.order_type == 5 {
+                    if (target?.goods_source!.count)! > 0 {
+                        return 300
+                    }
+                    return 270
+                }else{
+                    if (target?.goods_source!.count)! > 0 {
+                        return 276.5
+                    }
+                    return 246.5
+                }
+                
             }
             
-            if (target?.goods_source!.count)! > 0 {
-                return 300
-            }
-            return 270
+            
         case 4://发票信息heightrow
             if segmentIndex == 0 {
                 return 180