Merge branch 'xiezhaolin' into develop

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -116,7 +116,14 @@ extension YHHomePageViewController: UICollectionViewDelegate, UICollectionViewDa
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: YHHomeCollectionViewCell.cellReuseIdentifier, for: indexPath) as! YHHomeCollectionViewCell
         cell.listModel = self.viewModel.arrHomeNewsData[indexPath.row]
         return cell
-        
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        let model = self.viewModel.arrHomeNewsData[indexPath.row]
+        let vc = YHHomeWebViewController()
+        vc.url = "https://test-hkdiy-h5.galaxy-immi.com/articleDetail.html?id=3000"
+        vc.id = model?.id ?? 0
+        self.navigationController?.pushViewController(vc)
     }
 }
 

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift

@@ -14,7 +14,8 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
     var webview = WKWebView()
     var progBar = UIProgressView()
     var bottomView: YHHomeWebBottomView!
-    var url = "https://upload-cdn.galaxy-immi.com/crm/production/1620271613711.pdf"
+    var url = ""
+    var id: Int = 0
     
     override func viewDidLoad() {
         super.viewDidLoad()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift

@@ -75,7 +75,7 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
                     }
                     self.bottomView.isHidden = true
                 }
-                if self.viewModel.mainModel?.writing_document.doc_sign.supplement_id == 0 {
+                if self.viewModel.mainModel?.writing_document.status ?? 0 < 6 {
                     //没有doc_sign
                     self.stepView.currentIndex = 0
                     self.bottomView.isHidden = true
@@ -313,7 +313,8 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
                 guard let self = self else { return }
                 if success {
                     YHHUD.flash(message: "提交成功")
-                    self.navigationController?.popViewController()
+                    self.getData()
+//                    self.navigationController?.popViewController()
                 }
             }
         }