完成取消订单原因

GeliBusinessPlatform/View/Cell/OtherInfoTextViewTableViewCell.swift

@@ -8,8 +8,13 @@
 
 import UIKit
 
+protocol OtherInfoTextViewTableViewCellDelegate {
+    func OtherInfoTextViewTableViewCellGetTextContent(sender:String)
+}
+
 class OtherInfoTextViewTableViewCell: UITableViewCell,UITextViewDelegate {
     @IBOutlet weak var nameLbl: UILabel!
+    var delegate:OtherInfoTextViewTableViewCellDelegate?
     
     @IBOutlet weak var bgLeft: NSLayoutConstraint!
     @IBOutlet weak var titleLeft: NSLayoutConstraint!
@@ -34,6 +39,7 @@ class OtherInfoTextViewTableViewCell: UITableViewCell,UITextViewDelegate {
         {
             textView.text = textView.text.subString(start: 0, length: 200)
          }
+        delegate?.OtherInfoTextViewTableViewCellGetTextContent(sender: textView.text)
         return true
     }
     func textViewDidChange(_ textView: UITextView) {
@@ -43,6 +49,7 @@ class OtherInfoTextViewTableViewCell: UITableViewCell,UITextViewDelegate {
                 textView.text = textView.text.subString(start: 0, length: 200)
             }
         }
+        delegate?.OtherInfoTextViewTableViewCellGetTextContent(sender: textView.text)
 
     }
 }

GeliBusinessPlatform/ViewController/货拉拉/取消订单/HuolalaCancelViewController.swift

@@ -9,7 +9,7 @@
 import UIKit
 import LGButton
 
-class HuolalaCancelViewController: BaseViewController ,UITableViewDelegate,UITableViewDataSource{
+class HuolalaCancelViewController: BaseViewController ,UITableViewDelegate,UITableViewDataSource,OtherInfoTextViewTableViewCellDelegate{
     
     @IBOutlet weak var bottomLbl: UILabel!
     var lwbno = ""
@@ -17,6 +17,8 @@ class HuolalaCancelViewController: BaseViewController ,UITableViewDelegate,UITab
     var selectID = 81338860
     var reason_id = 0
     var reason = ""
+    var reasonStr = ""
+
     @IBOutlet weak var listView: UITableView!
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -34,9 +36,16 @@ class HuolalaCancelViewController: BaseViewController ,UITableViewDelegate,UITab
     }
     @IBAction func cancelAction(_ sender: LGButton) {
         if selectID == 81338860 {
-            HUD.flash(.label("请选择取消原因"))
+            HUD.flash(.label("请选择取消原因"),delay: 1.2)
+            return
+        }
+        if reason == "其他" {
+            if reasonStr.count == 0 {
+                HUD.flash(.label("填写选择取消原因"),delay: 1.2)
                 return
             }
+        }
+        
         orderCancelOrder()
     }
     //请求取消原因
@@ -131,6 +140,7 @@ class HuolalaCancelViewController: BaseViewController ,UITableViewDelegate,UITab
                 cell.titleLeft.constant = 15
                 cell.bgLeft.constant = 15
             }
+            cell.delegate = self
         
             return cell
         }
@@ -160,6 +170,9 @@ class HuolalaCancelViewController: BaseViewController ,UITableViewDelegate,UITab
         }
         return cell
     }
+    func OtherInfoTextViewTableViewCellGetTextContent(sender: String) {
+        reasonStr = sender
+    }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let sectionModel = reasonArr[indexPath.section]
         let rowModel =  sectionModel.sub_cat![indexPath.row]
@@ -235,7 +248,13 @@ class HuolalaCancelViewController: BaseViewController ,UITableViewDelegate,UITab
     func orderCancelOrder (){
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
  
-        orderLalamoveCancel(["user_token":UserToken as Any,"lwb_no":lwbno as Any,"reason_id":reason_id as Any,"reason":reason as Any], success: { (data) in
+        var lastReason = reason
+        if reason == "其他" {
+            lastReason = reasonStr
+        }
+        let dict = ["user_token":UserToken as Any,"lwb_no":lwbno as Any,"reason_id":reason_id as Any,"reason":lastReason as Any,"nonce_str":String.randomStr(len:30) as Any]
+
+        orderLalamoveCancel(dict, success: { (data) in
             
             NotificationCenter.default.post(name: NSNotification.Name(rawValue: "HuolalaOrderChange"), object: nil)
 

GeliBusinessPlatform/ViewController/货拉拉/运单详情/WaybillDetailViewController.swift

@@ -288,7 +288,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
             case 10,11,13,2,14:
                 cell.statusLbl.text  = "已完成"
                 cell.statusImgV.image = UIImage.init(named: "货拉拉运单完成")
-            case 3,4,5:
+            case 3,4,5,8:
                 cell.statusLbl.text  = "已取消"
                 cell.statusImgV.image = UIImage.init(named: "货拉拉运单取消")
             default: