订单列表

GeliBusinessPlatform/ViewController/采购单详情/CGDListCell.swift

@@ -135,30 +135,31 @@ class CGDListCell: UITableViewCell {
             rightBtn.layer.borderColor = UIColor.init(named: "按钮渐变色上")?.cgColor
             rightBtn.setTitleColor(UIColor.init(named: "按钮渐变色上"), for: .normal)
             rightBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
-            rightBtn.layer.cornerRadius = 2
-            if str  == "查看详情"{
-                rightBtn.setTitle("查看详情", for: .normal)
-            }else if str  == "确认订单"{
-                rightBtn.setTitle("确认订单", for: .normal)
-                rightBtn.setTitleColor(UIColor.white, for: .normal)
-                rightBtn.backgroundColor = UIColor.init(named: "按钮渐变色上")
-                rightBtn.layer.borderColor = UIColor.init(named: "按钮渐变色上")?.cgColor
-            }else if str  == "取消订单"{
-                rightBtn.setTitle("取消订单", for: .normal)
-            }else if str  == "付款码"{
-                rightBtn.setTitle("付款码", for: .normal)
-            }
+            rightBtn.layer.cornerRadius = 3
+            rightBtn.setTitle(str, for: .normal)
+
             btnBgView.addSubview(rightBtn)
             if tempBtn == nil {
                 rightBtn.snp.makeConstraints { (make) in
-                    make.width.equalTo(82*glscale)
+                    if str.count > 4 {
+                        make.width.equalTo(110*glscale)
+                    }else{
+                        make.width.equalTo(80*glscale)
+                    }
                     make.height.equalTo(30)
                     make.right.equalTo(0)
                     make.top.equalTo(0)
                 }
+                rightBtn.setTitleColor(UIColor.white, for: .normal)
+                rightBtn.backgroundColor = UIColor.init(named: "按钮渐变色上")
+                rightBtn.layer.borderColor = UIColor.init(named: "按钮渐变色上")?.cgColor
             }else{
                 rightBtn.snp.makeConstraints { (make) in
-                    make.width.equalTo(82*glscale)
+                    if str.count > 4 {
+                        make.width.equalTo(110*glscale)
+                    }else{
+                        make.width.equalTo(80*glscale)
+                    }
                     make.height.equalTo(30)
                     make.right.equalTo(tempBtn!.snp_left).offset(-15)
                     make.top.equalTo(0)