Merge branch 'feature/dev_Chris' into develop

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

@@ -75,7 +75,7 @@ class OrderApplyRefundNoteInfoCell: UITableViewCell {
         noteTextView.backgroundColor = kffffffColor
         noteTextView.textColor = k999999Color
         noteTextView.font = kRegularFont14
-        noteTextView.placeholder = "输入备注信息..."
+        noteTextView.placeholder = "如需部分商品退款请备注退款商品的名称和数量，如订单疑问可通过“我的”联系社长哦"
         noteTextView.placeholderTextColor = k999999Color
         noteTextView.rx.text.orEmpty.changed.subscribe(onNext: {
             [weak self] (text) in

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

@@ -155,6 +155,7 @@ extension OrderApplyRefundPhotoCell: UICollectionViewDelegateFlowLayout,UICollec
         if imgCount < maxImageCount && indexPath.row == imgCount {
             // 添加图片
             let cell = OrderCommentDefaultCollectionCell.cellWith(collectionView: collectionView, indexPath: indexPath)
+            cell.noteStr = "上传凭证"
             return cell
         } else {
             // 展示图片

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

@@ -19,6 +19,12 @@ class OrderCommentDefaultCollectionCell: UICollectionViewCell {
         }
     }
     
+    var noteStr: String? {
+        didSet {
+            titleLabel.text = noteStr
+        }
+    }
+    
     class func cellWith(collectionView:UICollectionView,indexPath:IndexPath) -> OrderCommentDefaultCollectionCell {
         let ID = "OrderCommentDefaultCollectionCell.swift"
         collectionView.register(OrderCommentDefaultCollectionCell.self, forCellWithReuseIdentifier: ID)
@@ -94,7 +100,6 @@ class OrderCommentDefaultCollectionCell: UICollectionViewCell {
     
     private lazy var titleLabel: UILabel = {
         let titleLabel = UILabel()
-        titleLabel.text = "添加照片"
         titleLabel.textColor = k666666Color
         titleLabel.font = kRegularFont12
         titleLabel.textAlignment = .center

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

@@ -226,6 +226,7 @@ extension OrderCommentTableViewCell: UICollectionViewDelegateFlowLayout,UICollec
         if imgCount < maxImageCount && indexPath.row == imgCount {
             // 添加图片
             let aCell = OrderCommentDefaultCollectionCell.cellWith(collectionView: collectionView, indexPath: indexPath)
+            aCell.noteStr = "添加照片"
             return aCell
         } else {
             // 展示图片