Merge branch 'develop' into feature/nanxinlin

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderApplyRefund/View/OrderApplyRefundNoteInfoCell.swift

@@ -7,14 +7,15 @@
 //
 
 import UIKit
+import RxSwift
+import IQKeyboardManagerSwift
 
 class OrderApplyRefundNoteInfoCell: UITableViewCell {
     
-    var orderModel: OrderModel? {
-        didSet {
-            noteLabel.text = orderModel?.remark
-        }
-    }
+    let disposeBag = DisposeBag()
+    
+    typealias NoteTextViewClosure = (_ text: String) -> Void
+    var noteTextViewClosure : NoteTextViewClosure?
     
     class func cellWith(tableView:UITableView,indexPath:IndexPath) -> OrderApplyRefundNoteInfoCell {
         let ID = "OrderApplyRefundNoteInfoCell"
@@ -43,7 +44,7 @@ class OrderApplyRefundNoteInfoCell: UITableViewCell {
     private func setupViews() {
         self.selectionStyle = .none
         addSubview(titleLabel)
-        addSubview(noteLabel)
+        addSubview(noteTextView)
     }
     
     private func setupLayouts() {
@@ -52,9 +53,10 @@ class OrderApplyRefundNoteInfoCell: UITableViewCell {
             make.width.equalTo(56)
             make.height.equalTo(20)
         }
-        noteLabel.snp.makeConstraints { (make) in
+        noteTextView.snp.remakeConstraints { (make) in
             make.top.equalTo(14)
             make.left.equalTo(titleLabel.snp_right).offset(20)
+            make.right.equalToSuperview().offset(-14)
             make.bottom.right.equalTo(-14)
             make.height.greaterThanOrEqualTo(20)
         }
@@ -68,13 +70,23 @@ class OrderApplyRefundNoteInfoCell: UITableViewCell {
         return titleLabel
     }()
     
-    lazy var noteLabel: UILabel = {
-        let noteLabel = UILabel()
-        noteLabel.textColor = k999999Color
-        noteLabel.font = kRegularFont14
-        noteLabel.text = "对于做移动端开发而言，算法，数据结构似乎只用于面试装B用，数据的查找，排序，增加，删除，如果一个for循环不能解决，那么再嵌套一层循环"
-        noteLabel.numberOfLines = 0
-        return noteLabel
+    lazy var noteTextView: IQTextView = {
+        let noteTextView = IQTextView()
+        noteTextView.backgroundColor = kffffffColor
+        noteTextView.textColor = k999999Color
+        noteTextView.font = kRegularFont14
+        noteTextView.placeholder = "输入备注信息..."
+        noteTextView.placeholderTextColor = k999999Color
+        noteTextView.rx.text.orEmpty.changed.subscribe(onNext: {
+            [weak self] (text) in
+
+            self?.noteTextView.text = String(text.prefix(150)) as String
+
+            if let noteTextViewClosure = self?.noteTextViewClosure {
+                noteTextViewClosure(self?.noteTextView.text ?? "")
+            }
+        }).disposed(by: disposeBag)
+        return noteTextView
     }()
     
 }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderApplyRefund/ViewController/OrderApplyRefundController.swift

@@ -32,6 +32,9 @@ class OrderApplyRefundController: BaseViewController {
     // 上传图片数组
     var goodsImageArr = Array<UIImage>()
     
+    // 退款备注信息
+    var refundNote: String = ""
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()
@@ -157,7 +160,10 @@ extension OrderApplyRefundController : UITableViewDelegate, UITableViewDataSourc
             return phoneCell
         case 3:
             let noteCell = OrderApplyRefundNoteInfoCell.cellWith(tableView: tableView, indexPath: indexPath)
-            noteCell.orderModel = orderDetailModel
+            noteCell.noteTextViewClosure = {
+                [weak self] (text) in
+                self?.refundNote = text
+            }
             return noteCell
         case 4:
             let photoCell = OrderApplyRefundPhotoCell.cellWith(tableView: tableView, indexPath: indexPath)
@@ -280,11 +286,6 @@ extension OrderApplyRefundController {
             return
         }
         
-        if goodsImageArr.count == 0 {
-            SwiftProgressHUD.shared().showText("请拍照上传问题")
-            return
-        }
-        
         // 子订单id参数
         var subIdArr: Array<Int> = []
         for productMdl in productArr ?? [] {
@@ -294,11 +295,15 @@ extension OrderApplyRefundController {
         }
         let detailJsonStr = JSON(subIdArr).description
         
-        // 多图上传
-        SwiftMoyaNetWorkServiceConfig.shared().configUploadMultiImgApi(imageArray: goodsImageArr) { [weak self] (imgUrlArr) -> (Void) in
-            let imgJsonStr = JSON(imgUrlArr).description
-            
-            self?.orderPurchaseRefundApi(purchaseId: (self?.orderDetailModel!.purchaseNo)!, mobile: (self?.orderDetailModel!.mobile!)!, refundReason: (self?.selRefundReason!)!, refund_remark: self?.orderDetailModel!.remark ?? "", detail: detailJsonStr, imgs: imgJsonStr)
+        if goodsImageArr.isEmpty {
+            self.orderPurchaseRefundApi(purchaseId: self.orderDetailModel!.purchaseNo!, mobile: self.orderDetailModel!.mobile!, refundReason: self.selRefundReason!, refund_remark: self.refundNote, detail: detailJsonStr, imgs: "")
+        } else {
+            // 多图上传
+            SwiftMoyaNetWorkServiceConfig.shared().configUploadMultiImgApi(imageArray: goodsImageArr) { [weak self] (imgUrlArr) -> (Void) in
+                let imgJsonStr = JSON(imgUrlArr).description
+                
+                self?.orderPurchaseRefundApi(purchaseId: (self?.orderDetailModel!.purchaseNo)!, mobile: (self?.orderDetailModel!.mobile!)!, refundReason: (self?.selRefundReason!)!, refund_remark: self!.refundNote, detail: detailJsonStr, imgs: imgJsonStr)
+            }
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderComment/View/OrderCommentTableViewCell.swift

@@ -39,6 +39,7 @@ class OrderCommentTableViewCell: UITableViewCell {
         didSet {
             // 商品图片
             iconImageView.kf.setImage(with: kURLImage(name: orderModelDetailModel?.productImg ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            starView.value = CGFloat(self.orderModelDetailModel?.starValue ?? 5)
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderComment/ViewController/OrderCommentController.swift

@@ -18,6 +18,10 @@ class OrderCommentController: BaseViewController {
     var orderDetailModel: OrderModel? {
         didSet {
             self.productArr = self.orderDetailModel?.detail
+            // 默认5星评分
+            for (idx, _) in (self.productArr?.enumerated())! {
+                self.productArr![idx].starValue = 5
+            }
             self.tableView.reloadData()
         }
     }
@@ -169,13 +173,6 @@ extension OrderCommentController {
     // 提交评价
     func commitProductComment() {
         
-        for productMdl in productArr! {
-            if productMdl.starValue == 0 {
-                SwiftProgressHUD.shared().showText("请给予商品评分")
-                return
-            }
-        }
-        
 //        // test data
 //        let testMdl: OrderModelDetailModel = (productArr?[0])!
 //        productArr?.append(testMdl)

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderLogistics/ViewController/OrderLogisticsController.swift

@@ -11,6 +11,12 @@ import RxSwift
 
 class OrderLogisticsController: BaseViewController {
     
+    var orderNumber: String? {
+        didSet {
+            numLbl.text = self.orderNumber
+        }
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()
@@ -42,11 +48,7 @@ class OrderLogisticsController: BaseViewController {
             make.centerY.equalToSuperview()
             make.height.equalTo(20)
         }
-        
-        let numLbl = UILabel()
-        numLbl.text = "821xxxxxxxxxxx2001"
-        numLbl.textColor = k333333Color
-        numLbl.font = kRegularFont13
+                
         serialNumView.addSubview(numLbl)
         numLbl.snp.makeConstraints { (make) in
             make.centerY.equalTo(titleLbl.snp_centerY)
@@ -82,6 +84,13 @@ class OrderLogisticsController: BaseViewController {
         return tableView
     }()
     
+    private lazy var numLbl: UILabel = {
+        let numLbl = UILabel()
+        numLbl.textColor = k333333Color
+        numLbl.font = kRegularFont13
+        return numLbl
+    }()
+    
 }
 
 // MARK: - tableView dataSource && delegate

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderPayOrder/View/ShoppingCartPayOrderFooter.swift

@@ -100,7 +100,7 @@ class ShoppingCartPayOrderFooter: BaseView {
         msgTextField.tintColor = kFFA42FColor
         
         msgTextField.rx.text.orEmpty.changed.subscribe(onNext: { [weak self] (text) in
-            self?.msgTextField.text = String(text.prefix(4)) as String
+            self?.msgTextField.text = String(text.prefix(50)) as String
             if let buyerNoteBlock = self?.buyerNoteBlock {
                 buyerNoteBlock(self?.msgTextField.text ?? "")
             }