小程序下单，昵称为空，专用用户名称

GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift

@@ -20,7 +20,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
     var orderStatus : Int = 100
     var page : Int = 0
     var isUpData = false
- 
+    
     //MARK:--列表数据源
     var dataArr:Array<OrderListDataModel> = []
     override func viewDidLoad() {
@@ -61,7 +61,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         super.init(nibName: nil, bundle: nil)
         self.title = title
         print("ttit===\(title)")
-     }
+    }
     
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
@@ -78,7 +78,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             dic.removeValue(forKey: "end_time")
         }
         orderList(dic, success: { (data) in
-           
+            
             self.dataArr.removeAll()
             let dataM = data as! OrderListModel
             dataM.data?.forEach({ (model) in
@@ -88,44 +88,44 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             self.tableV?.mj_header?.endRefreshing()
             self.page = 2
             self.tableV.performBatchUpdates({
-                   UIView.animate(views: self.tableV!.visibleCells,
-                                  animations: self.animations, completion: {
-                                   
-                   })
-               }, completion: nil)
+                UIView.animate(views: self.tableV!.visibleCells,
+                               animations: self.animations, completion: {
+                                
+                })
+            }, completion: nil)
         }) { (error) in
             self.tableV?.mj_header?.endRefreshing()
-
+            
         }
-
- 
+        
+        
     }
     //MARK:--加载更多数据
     @objc func loadMoreData(){
         print("加载更多数据")
-
-         let UserToken = UserDefaults.standard.value(forKey: "user_token")
+        
+        let UserToken = UserDefaults.standard.value(forKey: "user_token")
         var dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"order_status":orderStatus,"pay_status":payStatus,"order_source":orderSource,"shipping_status":shippingStatus,"start_time":startTime,"end_time":endTime]
         if endTime == 0 {
             dic.removeValue(forKey: "end_time")
         }
-         orderList(dic, success: { (data) in
+        orderList(dic, success: { (data) in
             self.page += 1
             let dataM = data as! OrderListModel
             dataM.data?.forEach({ (model) in
                 self.dataArr.append(model)
             })
             self.tableV.reloadData()
-
+            
             self.tableV?.mj_footer?.endRefreshing()
-
+            
         }) { (error) in
             self.tableV?.mj_footer?.endRefreshing()
-
+            
         }
-
+        
     }
- 
+    
     //MARK:-- tablev 处理
     var tableV :UITableView!
     var tableSearchV :UITableView! = nil
@@ -143,7 +143,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         tableV.dataSource = self
         tableV.separatorStyle = .none
         tableV?.register(UINib(nibName: "DaiQueRenCell", bundle: nil), forCellReuseIdentifier: "DaiQueRenCell")
-   
+        
         let footerTbV = UIView(frame: CGRect(x: 0, y: 0, width: view.frame.size.width, height: 15*glscale))
         footerTbV.backgroundColor = UIColor.init(named: "app底色")
         tableV.tableFooterView = footerTbV
@@ -170,10 +170,13 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         cell.submitBtn.isHidden = false
         cell.submitBtn.tag = indexPath.row
         cell.cancelBtn.tag = indexPath.row
-        cell.nameLbl.text = rowModel.cus_name
+        cell.nameLbl.text = rowModel.user_name
+        if rowModel.cus_name != nil {
+            cell.nameLbl.text = rowModel.cus_name
+        }
         cell.statusLbl.text = orderStatusStrByInt(leftBtn: cell.cancelBtn, rightBtn: cell.submitBtn, statusNumber: rowModel.order_status!)
         cell.accountLbl.text = rowModel.order_sn
-
+        
         cell.typeLbl.text = orderTypeStrByInt(statusNumber: rowModel.order_type!)
         if rowModel.order_type == 1 {
             cell.typeLbl.isHidden = true
@@ -184,7 +187,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         if rowModel.from == 3 {
             cell.formLbl.isHidden = false
             cell.typeLbl.isHidden = true
-
+            
         }else{
             cell.formLbl.isHidden = true
         }
@@ -197,7 +200,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         cell.countLbl.text = "商品数量：\(rowModel.goods_number!)"
         cell.priceLbl.text = "金额：￥\(rowModel.sum_amount!)"
         cell.delegate = self
-      
+        
         return cell
     }
     //MARK:--如果存在操作是否需要自动刷新？
@@ -228,10 +231,10 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             alertView.rightBtn.tag = rowModel.order_id!
             self.view.window?.addSubview(alertView)
             
-
+            
         }else if sender.titleLabel?.text == "取消订单" {
             isSrueOrder = false
-
+            
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
             alertView.tishiLbl.text = ""
@@ -240,7 +243,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             alertView.rightBtn.tag = rowModel.order_id!
             self.view.window?.addSubview(alertView)
             
-
+            
         }else {
             //跳转订单详情
             let vc = OrderDViewController()
@@ -248,12 +251,12 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             vc.orderId = rowModel.order_id!
             self.navigationController?.pushViewController(vc, animated: true)
         }
-
+        
     }
     func sureGeliAlertViewAction(sender: UIButton) {
         if isSrueOrder {
             let UserToken = UserDefaults.standard.value(forKey: "user_token")
-
+            
             orderConfirm(["user_token":UserToken as Any,"order_id" : sender.tag as Any], success: { (data) in
                 HUD.flash(.labeledSubSuccess(subtitle: "确认成功"),delay: 1.2)
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
@@ -263,18 +266,18 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             }
         }else{
             let UserToken = UserDefaults.standard.value(forKey: "user_token")
-
+            
             orderCancel(["user_token":UserToken as Any,"order_id" : sender.tag as Any], success: { (data) in
                 HUD.flash(.labeledSubSuccess(subtitle: "取消成功"),delay: 1.2)
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
-
+                
                 self.tableV.mj_header?.beginRefreshing()
-
+                
             }) { (error) in
                 
             }
         }
-  
+        
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {