提交修改

liushiyu
1 parent dc957507
Showing 7 changed files with 105 additions and 7 deletions
metaCode/Classes/Main/MinePage/Controller/CNLiveInfoShowViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAddInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineShopViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineInputMessageView.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderExpressListViewController.swift
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyExpressView.swift
@@ -67,7 +67,7 @@ class CNLiveInfoShowViewController: CNLiveBaseViewController, WKNavigationDelega
                 attrString = "https://wjjh5.cnlive.com/yuanmaYszc.html"
             case .safety:
                 titleName = "内容安全协议"
-                attrString = "https://wjj.ys1.cnliveimg.com/term/cnBNraqxy.html "
+                attrString = "https://wjj.ys1.cnliveimg.com/term/cnBNraqxy.html"
             case .none:
                 break
             }
@@ -326,7 +326,10 @@ extension CNLiveMineAddInfoViewController {
             if listModel.id == 9 {
                 CNLiveMineViewModel.requestApplyShopInfo { [weak self] result, respStatue in
                     if respStatue == .success {
-                        self?.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .one, listModel: listModel, tempArray: []), animated: true)
+                        let model = result as! MineApplyShopInfoModel
+                        if model.state == "0" || model.state == "4" {
+                            self?.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .one, listModel: listModel, tempArray: []), animated: true)
+                        }
                     }
                 }
             } else {
@@ -328,6 +328,8 @@ class CNLiveMineShopViewController : CNLiveBaseViewController, UITextViewDelegat
             }
             var image_one: UIImage!
             var image_two: UIImage!
+            var is_have_image_one: Bool! = false
+            var is_have_image_two: Bool! = false
             var temp_dict_one: NSMutableDictionary!
             var temp_dict_two: NSMutableDictionary!
             for dict in threeArray {
@@ -350,6 +352,17 @@ class CNLiveMineShopViewController : CNLiveBaseViewController, UITextViewDelegat
                     image_two = content as? UIImage
                     temp_dict_two = dict as? NSMutableDictionary
                 }
+                if title as! String == "*店铺LOGO" && content is NSString && (content as! NSString).isNotBlank() {
+                    is_have_image_one = true
+                }
+                if title as! String == "特殊资质" && content is NSString && (content as! NSString).isNotBlank() {
+                    is_have_image_two = true
+                }
+            }
+            if is_have_image_one || is_have_image_two {
+                temp_array.addObjects(from: threeArray as! [Any])
+                uploadWithMessage()
+                return
             }
             UploadManager.uploadImage(imageData: image_one.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
                 temp_dict_one.removeObject(forKey: "content")
@@ -394,6 +407,8 @@ class CNLiveMineShopViewController : CNLiveBaseViewController, UITextViewDelegat
                 DispatchQueue.main.asyncAfter(deadline: .now()+1) { [self] in
                     self.navigationController?.pushViewController(CNLiveMineAuthResultViewController.init(StandListModel.init(), show_type: .detail_shop), animated: true)
                 }
+            } else {
+                self.navigationController
             }
         })
     }
@@ -44,6 +44,8 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
         let array03 : [Dictionary] = [["name":"帮助与反馈","icon":"mine_list_icon_help_feedback"],
                                      ["name":"更多设置","icon":"mine_list_icon_set_more"]]
         dataArray.add(array03)
+        let array04 : [Dictionary] = [["name":"订单列表","icon":"mine_list_icon_help_feedback"]]
+        dataArray.add(array04)
         return dataArray
     }()
  
@@ -166,6 +168,10 @@ extension CNLiveMineViewController {
             self.navigationController?.pushViewController(CNLiveTypeFeedBackViewController.init(show_type: .setting), animated: true)
         }
  
+        if indexPath.section == 4 {
+            self.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true)
+        }
+        
     }
  
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
@@ -56,7 +56,7 @@ class MineInputTextShopCustomView: UIView, UITextViewDelegate, UITextFieldDelega
  
     lazy var moreBtn: UIButton = {
         let moreBtn = UIButton(type: .custom)
-        moreBtn.frame = CGRect(x: 0, y: 0, width: 70, height: 30)
+        moreBtn.frame = CGRect(x: 0, y: 0, width: adapt_length(length: 70), height: adapt_length(length: 30))
         moreBtn.setTitleColor(HexColor("#B4B4B4"), for: .normal)
         moreBtn.titleLabel?.font = BoldFont_16_Fit
         moreBtn.isHidden = true
@@ -41,7 +41,7 @@ class CNLiveShopOrderExpressListViewController: CNLiveBaseViewController, UITabl
         navigationBarHidden = false
         titleName = "物流详情"
  
-//        loadDataSourceAction()
+        loadDataSourceAction()
  
         view.addSubview(tableView)
         tableView.snp.makeConstraints { make in
@@ -7,7 +7,7 @@
  
 import Foundation
  
-class ShopBodyOrderExpressListTableViewCell: UITableViewCell {
+class ShopBodyOrderExpressListTableViewCell: UITableViewCell, UICollectionViewDataSource, UICollectionViewDelegate{
  
     lazy var logoImageView: UIImageView = {
         let logoImageView = UIImageView.init()
@@ -58,10 +58,24 @@ class ShopBodyOrderExpressListTableViewCell: UITableViewCell {
         return expressAddress
     }()
  
+    let kShopBodyOrderExpressListCollectionViewCellIdentifier = "kShopBodyOrderExpressListCollectionViewCellIdentifier"
+    lazy var collectionView: UICollectionView = {
+        let layout = UICollectionViewFlowLayout.init()
+        layout.itemSize = CGSizeMake(adapt_length(length: 65), adapt_length(length: 65))
+        layout.minimumLineSpacing = adapt_length(length: 5)
+        layout.scrollDirection = .horizontal
+        let collectionView = UICollectionView.init(frame: CGRect.zero, collectionViewLayout: layout)
+        collectionView.dataSource = self
+        collectionView.delegate = self
+        collectionView.backgroundColor = .white
+        collectionView.register(ShopBodyOrderExpressListCollectionViewCell.self, forCellWithReuseIdentifier: kShopBodyOrderExpressListCollectionViewCellIdentifier)
+        return collectionView
+    }()
+    
     lazy var totleExpress: UILabel = {
         let totleExpress = UILabel.init()
         totleExpress.textColor = HexColor("#9b9b9b")
-        totleExpress.font = regular_font(pointSize: 12)
+        totleExpress.font = regular_adapt_font(pointSize: 12)
         return totleExpress
     }()
  
@@ -104,6 +118,18 @@ class ShopBodyOrderExpressListTableViewCell: UITableViewCell {
             make.left.equalTo(expressTime.snp.left)
             make.right.equalToSuperview().offset(-adapt_length(length: 15))
         }
+        addSubview(collectionView)
+        collectionView.snp.makeConstraints { make in
+            make.top.equalTo(expressAddress.snp.bottom).offset(adapt_length(length: 15))
+            make.left.equalToSuperview().offset(adapt_length(length: 15))
+            make.right.equalToSuperview().offset(-adapt_length(length: 15))
+            make.height.equalTo(adapt_length(length: 65))
+        }
+        addSubview(totleExpress)
+        totleExpress.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(adapt_length(length: 15))
+            make.bottom.equalToSuperview().offset(-adapt_length(length: 15))
+        }
     }
  
  
@@ -113,7 +139,27 @@ class ShopBodyOrderExpressListTableViewCell: UITableViewCell {
  
     }
  
-    @objc func actionClick() {
+    @objc func actionClick(sender: UIButton) {
+        if !_listModel.express_num!.isNotBlank() {
+            return
+        }
+        
+        let pasteboard = UIPasteboard.general
+        pasteboard.string = _listModel.express_num
+        showMessage(message: "复制成功")
+    }
+    
+    func numberOfSections(in collectionView: UICollectionView) -> Int {
+        return 1
+    }
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return _listModel.detail_goods.count
+    }
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        return UICollectionViewCell.init()
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
  
     }
  
@@ -121,5 +167,33 @@ class ShopBodyOrderExpressListTableViewCell: UITableViewCell {
         fatalError("init(coder:) has not been implemented")
     }
  
+}
+
+class ShopBodyOrderExpressListCollectionViewCell: UICollectionViewCell {
+    
+    lazy var goodsImage: UIImageView = {
+        let goodsImage = UIImageView.init()
+        goodsImage.contentMode = .scaleAspectFill
+        goodsImage.layer.cornerRadius = 6
+        return goodsImage
+    }()
+    
+    lazy var expressNum: UILabel = {
+        let expressNum = UILabel.init()
+        expressNum.font = regular_adapt_font(pointSize: 9)
+        expressNum.textColor = HexColor("#ffffff")
+        expressNum.backgroundColor = HexColor("#000000")
+        expressNum.textAlignment  
+        return expressNum
+    }()
  
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        contentView.backgroundColor = .white
+        
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
 }