25

GeliBusinessPlatform/ViewController/供应商分销商品管理/GYS_FX_Product_VC.swift

@@ -583,7 +583,7 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
                 if model.price_type == 0 {//分销
                     cell.fx_price.text = "分销价:￥\(model.dbt_price!) (佣金:\(model.commission_val_agent!))"
                 }else{
-                    cell.fx_price.text = "供货价:￥\(model.supply_price!) (加价范围:\(model.floor_price!)-\(model.ceiling_price!)"
+                    cell.fx_price.text = "供货价:￥\(model.supply_price!) (加价范围:\(model.floor_price!)-\(model.ceiling_price!))"
                 }
             }
             

GeliBusinessPlatform/ViewController/供应商分销商品管理/ageSetDbtGoods_View.swift

@@ -36,11 +36,13 @@ class ageSetDbtGoods_View: UIView {
     @IBOutlet weak var sell_bg_view: UIView!
     @IBOutlet weak var sell_bg_view_h: NSLayoutConstraint!
     @IBAction func submit_action(_ sender: UIButton) {
-        let num1 = Float(sell_price_tf.text!)
-        let num2 = Float((model?.supply_price!)!)
-        if num1! < num2! {
-            HUD.flash(.label("商品售价不得低于供货价~"), delay: 1.2)
-            return
+        if model?.price_type == 1 {
+            let num1 = Float(sell_price_tf.text!)
+            let num2 = Float((model?.supply_price!)!)
+            if num1! < num2! {
+                HUD.flash(.label("商品售价不得低于供货价~"), delay: 1.2)
+                return
+            }
         }
         delegate?.ageSetDbtGoods_View_submit_action(view: self ,sell_price: sell_price_tf.text,commission: comission_tf.text!)
         close_action(sender)