Merge branch 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into youhua-dev

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  H5相关规则
  //  首页身份

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

@@ -27,7 +27,7 @@ class YHHomeIdentityItem {
 
 class YHHomeIdentityListVC: YHBaseViewController {
 
-    var selectSubTab: YHHomeLifeCategoryModel? = nil
+    var detailId: String = ""
     var imgItems:[YHHomeIdentityItem] = []
 
     var scrollContentY: CGFloat = 0.0
@@ -210,7 +210,11 @@ extension YHHomeIdentityListVC: UIScrollViewDelegate {
                 printLog("ABC show: \(self.scrollContentY)")
                 var model = TabBarShareModel()
                 model.showFlag = true
-                model.shareUrl = ""
+                if let product = self.viewModel.detailModel.products.first {
+                    let url = "https://test-hkdiy-h5.galaxy-immi.com/superAppBridge.html#/commodity_info?categoryId=2&levelId=\(self.detailId)&productId=\(product.id)&from=wxapp"
+                    model.shareUrl = url
+                }
+                
                 model.codeUrl = self.viewModel.detailModel.imageURLDefault
                 model.downloadUrl = self.viewModel.detailModel.imageURLDefaultDownload
                 NotificationCenter.default.post(name: YhConstant.YhNotification.changeShareViewStatusOnTabBarNotifiction, object: model)
@@ -234,29 +238,27 @@ extension YHHomeIdentityListVC: UIScrollViewDelegate {
 extension YHHomeIdentityListVC {
     
     func loadData() {
-        if let selectItem = self.selectSubTab  {
-            let params:[String: Any] = ["categoryId": "2",
-                                        "levelId": selectItem.id]
-            self.viewModel.getGoodsCategoryDetail(params: params) {
-                [weak self] success, error in
-                guard let self = self else { return }
-                self.titles.removeAll()
-                self.imgItems.removeAll()
-                for product in self.viewModel.detailModel.products {
-                    self.headImgView.kf.setImage(with: URL(string: product.image), placeholder: UIImage(named: "global_default_image"))
-                    for detail in product.details {
-                        let item = YHHomeIdentityItem()
-                        item.url = detail.image
-                        self.imgItems.append(item)
-                        self.titles.append(detail.name)
-                    }
+        let params:[String: Any] = ["categoryId": "2",
+                                    "levelId": self.detailId]
+        self.viewModel.getGoodsCategoryDetail(params: params) {
+            [weak self] success, error in
+            guard let self = self else { return }
+            self.titles.removeAll()
+            self.imgItems.removeAll()
+            for product in self.viewModel.detailModel.products {
+                self.headImgView.kf.setImage(with: URL(string: product.image), placeholder: UIImage(named: "global_default_image"))
+                for detail in product.details {
+                    let item = YHHomeIdentityItem()
+                    item.url = detail.image
+                    self.imgItems.append(item)
+                    self.titles.append(detail.name)
                 }
-                self.segmentedDataSource.titles = self.titles
-                self.segmentedView.dataSource = self.segmentedDataSource
-                self.segmentedView.reloadDataWithoutListContainer()
-                self.tableView.reloadData()
-                requestImages()
             }
+            self.segmentedDataSource.titles = self.titles
+            self.segmentedView.dataSource = self.segmentedDataSource
+            self.segmentedView.reloadDataWithoutListContainer()
+            self.tableView.reloadData()
+            requestImages()
         }
     }
     

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

@@ -105,7 +105,7 @@ extension YHHomeIdentityViewController {
             self.scrollView.removeSubviews()
             for (index, item) in subTabArr.enumerated() {
                 let vc = YHHomeIdentityListVC()
-                vc.selectSubTab = item
+                vc.detailId = item.id
                 vc.view.frame = CGRect(x: KScreenWidth * Double(index), y: 0, width: KScreenWidth, height: self.scrollView.height)
                 vc.loadData()
                 self.addChild(vc)

galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/C/YHInvatationShareViewController.swift

@@ -118,7 +118,7 @@ extension YHInvatationShareViewController {
     }
     
     func loadData() {
-        if let qrCode = generateQRCode(from: "https://www.baidu.com") {
+        if let qrCode = generateQRCode(from: YHBaseUrlManager.shared.curH5URL() + "superAppBridge/evaluation?channel=lkhtj-app&customer_id=\(YHLoginManager.shared.userModel?.id ?? "")&scene_id=30") {
             // 可以将qrCode设置为UIImageView的image属性来显示二维码
             imageView.image = qrCode
         }

galaxy/galaxy/Classes/Modules/Home(首页)/Life(生活)/C/YHLifeViewController.swift

@@ -142,7 +142,7 @@ extension YHLifeViewController: UITableViewDelegate, UITableViewDataSource {
         let vc = YHH5WebViewVC()
         
         // TODO: - 谢
-        vc.url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/commodity_info?categoryId=2&levelId=5&productId=30&from=wxApp"
+        vc.url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/commodity_info?categoryId=3&levelId=\(selectSubTab?.id ?? "")&productId=\(model.id)&from=wxApp&offsetTop=50"
         vc.isWithBottomViewFlag = true
         vc.isShareToMiniProgramFlag = true
         vc.shareMiniPath = "/serviceHousekeeper/pages/documentEdit/documentEdit"