补充分销产品逻辑

GeliBusinessPlatform/View/AlertView/DistributorSettingAlertView.swift

@@ -75,22 +75,33 @@ class DistributorSettingAlertView: UIView {
     }
     
     @IBAction func sureAction(_ sender: UIButton) {
+        if canYuBtn.isSelected {
+            if  (payTF.text?.count == 0 || moneyTx.text?.count == 0){
+                HUD.flash(.label("请输入数据~"), delay: 1.2)
+                return
+            }
+        }
+        
         //确定
         var operation_type = 1
         if nonCanYuBtn.isSelected {
             operation_type = 2
         }
         
-        var commission_type = 2
+        var commission_type = 1
         var commission_per = ""
         var commission_val = ""
         if payJueBtn.isSelected  {
-            commission_type = 1
+            commission_type = 2
             commission_val = payTF.text!
+            if (commission_val as! NSString).floatValue > (moneyTx.text as! NSString).floatValue{
+                HUD.flash(.label("佣金大于分销价~"), delay: 1.2)
+                payTF.text! = ""
+                return
+            }
         }else{
             commission_per = payTF.text!
         }
-        
         delegate?.DistributorSettingAlertViewSubmitAction(tag: self.tag, operation_type: operation_type, dbt_price: moneyTx.text!, commission_type: commission_type, commission_per: commission_per, commission_val: commission_val,view:self)
     }
     

GeliBusinessPlatform/View/AlertView/DistributorSettingAlertView.xib

@@ -47,7 +47,7 @@
                                                 <action selector="nonCanyuAction:" destination="-1" eventType="touchUpInside" id="YDM-1c-mCK"/>
                                             </connections>
                                         </button>
-                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f2v-Db-np2">
+                                        <button opaque="NO" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f2v-Db-np2">
                                             <rect key="frame" x="86" y="15" width="54" height="19"/>
                                             <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                                             <state key="normal" title="  参与" image="yuxuan">

GeliBusinessPlatform/ViewController/分销商品管理/FX_Product_GuanLiVC.swift

@@ -17,6 +17,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
         self.view.addSubview(vc)
     }
     func DistributorSettingAlertViewSubmitAction(tag: Int, operation_type: Int, dbt_price: String, commission_type: Int, commission_per: String, commission_val: String,view:DistributorSettingAlertView) {
+        HUD.flash(.progress)
         if is_Edit {
             var sku_id = ""
             for i in 0 ..< selectItem.count {
@@ -43,6 +44,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
                 self.edit_bottom_view_H.constant = 49
                 self.selectItem.removeAll()
                 self.home_list_tbv.mj_header?.beginRefreshing()
+                HUD.hide()
             } failture: { (err) in
             }
             
@@ -60,6 +62,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
             HUD.flash(.label("设置成功~"), delay: 1.2)
             view.removeFromSuperview()
             self.home_list_tbv.mj_header?.beginRefreshing()
+            HUD.hide()
         } failture: { (err) in
         }
     }