16

GeliBusinessPlatform/ViewController/分销订单管理/RetailManageDetailViewController.swift

@@ -158,7 +158,10 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
 
             cell.count_lbl.text = "单价:" + (rowModel?.goods_price)!
             cell.yong_jin_lbl.text = "小计:" + String(format: "%.2f", p_count)
-            cell.dan_jia_lbl.text =  "提成:￥" + (rowModel?.commission_val)!
+            cell.dan_jia_lbl.text =  "提成:-" 
+            if rowModel?.commission_val != nil {
+                cell.dan_jia_lbl.text =  "提成:￥" + (rowModel?.commission_val)!
+            }
             cell.xiao_ji_lbl.text = "数量:" +  StringByInt(number: (rowModel?.cart_number!)!)
             cell.delegate = self
             cell.tag = indexPath.row

GeliBusinessPlatform/ViewController/分销订单管理/RetailManageViewController.swift

@@ -152,13 +152,10 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
     }
     
     @objc func didselectCellHorF(sender:UITapGestureRecognizer){
-        
         let vc = RetailManageDetailViewController()
         let goodArrModel = self.dataArr[sender.view!.tag]
         vc.orderId = goodArrModel.order_id
         self.navigationController?.pushViewController(vc, animated: true)
-        
-        
     }
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         let headerV = UIView()

GeliBusinessPlatform/ViewController/工作中心/WorkItemTableViewCell.swift

@@ -122,7 +122,6 @@ class WorkItemTableViewCell: UITableViewCell , UICollectionViewDelegate, UIColle
             
             if rowModel.app_icon == nil {
                 cell.itemImgV.image  = UIImage.init(named: "worktest1")
-                
             }else{
                 if isOften {
                     if rowModel.app_icon_bg != nil {