图片展示修改完成

GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift

@@ -283,7 +283,7 @@ class OrderDetailGoodsSourceModel: Mappable {
     
     var report_id:Int?//检测报告id
     var ven_name : String?  //供应商名称
-    var report_picture : String?//检测报告
+    var report_picture : Array<String>?//检测报告
     var product_origin : String?   //产品产地
    
 

GeliBusinessPlatform/ViewController/分销订单管理/RetailManageDetailViewController.swift

@@ -16,14 +16,13 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
         }
         let browser = JXPhotoBrowser()
         browser.numberOfItems = {
-            1
+            (view.data?.report_picture!.count)!
         }
         browser.pageIndex = 0
         browser.reloadCellAtIndex = { context in
             let browserCell = context.cell as? JXPhotoBrowserImageCell
-            let url = URL(string:SERVERCE_ImageHost + (view.data?.report_picture)!)
+            let url = URL(string:SERVERCE_ImageHost + (view.data?.report_picture![context.index])!)
             browserCell?.imageView.sd_setImage(with: url, placeholderImage: nil, options: [], completed: { (_, _, _, _) in
-                
                 browserCell?.setNeedsLayout()
             })
         }

GeliBusinessPlatform/ViewController/溯源/Add_Report_View.swift

@@ -28,7 +28,7 @@ class Add_Report_View: UIView {
             item.removeFromSuperview()
         }
         
-        btm_view.addSubview(scrollView)
+        btm_view.insertSubview(scrollView, at: btm_view.subviews.count-1)
     
         scrollView.frame = CGRect(x: 15, y: add_img_btn.frame.maxY+20, width: ScreenWidth - 30, height: 100.5)
         
@@ -111,7 +111,7 @@ class Add_Report_View: UIView {
     }
     @IBOutlet weak var select_img: UIImageView!
     @IBAction func select_type_action(_ sender: UIButton) {
-        select_view.isHidden = false
+        select_view.isHidden = !select_view.isHidden
     }
     @IBAction func close_action(_ sender: UIButton) {
         self.removeFromSuperview()

GeliBusinessPlatform/ViewController/溯源/S_Y_View.swift

@@ -22,7 +22,8 @@ class S_Y_View: UIView {
                 ru_ku_time_lbl.text = data?.add_time
                 pi_ci_number_lbl.text = StringByInt(number:(data?.batch_id)!)
                 gys_name_lbl.text = data?.ven_name
-                check_img.sd_setImage(with:URL(string:SERVERCE_ImageHost +  ((data?.report_picture)!)!))
+                
+                check_img.sd_setImage(with:URL(string:SERVERCE_ImageHost +  ((data?.report_picture?.first)!)!))
             }
         }
     }

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

@@ -518,7 +518,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             alertView.saveImgID = rowModel.order_id!
             self.view.window?.addSubview(alertView)
             
-        }else {
+        }else{
             //跳转订单详情
             let vc = OrderDViewController()
             vc.delegate = self
@@ -706,6 +706,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         let vc = OrderDViewController()
         vc.delegate = self
         vc.orderId = rowModel.order_id!
+//        vc.orderId = 12637
         vc.order_type = rowModel.order_type
         vc.lmIdx = orderStatus
         self.navigationController?.pushViewController(vc, animated: true)

GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift

@@ -28,16 +28,18 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
     }
     func S_Y_View_Check_Detail(view: S_Y_View) {
         print("查看溯源")
+        if view.data == nil {
+            return
+        }
         let browser = JXPhotoBrowser()
         browser.numberOfItems = {
-            1
+            (view.data?.report_picture!.count)!
         }
         browser.pageIndex = 0
         browser.reloadCellAtIndex = { context in
             let browserCell = context.cell as? JXPhotoBrowserImageCell
-            let url = URL(string:SERVERCE_ImageHost + (view.data?.report_picture)!)
+            let url = URL(string:SERVERCE_ImageHost + (view.data?.report_picture![context.index])!)
             browserCell?.imageView.sd_setImage(with: url, placeholderImage: nil, options: [], completed: { (_, _, _, _) in
-               
                 browserCell?.setNeedsLayout()
             })
         }