diff --git a/GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate b/GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate index bd6f30565cd3beb8d0dabc73ae76051cfdbd2450..d0c71f42a56aa5c9b2fbd9d279d00b5970a7133b 100644 Binary files a/GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate and b/GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git "a/GeliBusinessPlatform/ViewController/\344\273\243\345\256\242\344\270\213\345\215\225\357\274\210\350\264\255\347\211\251\357\274\211/DaiKeXiaDanGouWuCell.xib" "b/GeliBusinessPlatform/ViewController/\344\273\243\345\256\242\344\270\213\345\215\225\357\274\210\350\264\255\347\211\251\357\274\211/DaiKeXiaDanGouWuCell.xib" index 207538037473dd4634039a00efc5be2182e71098..968df8d47c7af6cd26e59f23b005b8ce213ffbaa 100644 --- "a/GeliBusinessPlatform/ViewController/\344\273\243\345\256\242\344\270\213\345\215\225\357\274\210\350\264\255\347\211\251\357\274\211/DaiKeXiaDanGouWuCell.xib" +++ "b/GeliBusinessPlatform/ViewController/\344\273\243\345\256\242\344\270\213\345\215\225\357\274\210\350\264\255\347\211\251\357\274\211/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="ç°è‰²å—体颜色"/> diff --git "a/GeliBusinessPlatform/ViewController/\350\256\242\345\215\225\350\257\246\346\203\205/OrderDViewController.swift" "b/GeliBusinessPlatform/ViewController/\350\256\242\345\215\225\350\257\246\346\203\205/OrderDViewController.swift" index 13767d5ecd4ef01ff2b3bb617186795a66a9b381..7d3ae8ed90fe09987034cc59e5390659e4360766 100644 --- "a/GeliBusinessPlatform/ViewController/\350\256\242\345\215\225\350\257\246\346\203\205/OrderDViewController.swift" +++ "b/GeliBusinessPlatform/ViewController/\350\256\242\345\215\225\350\257\246\346\203\205/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