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

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

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/YHLifeDetailViewController.swift

@@ -32,7 +32,7 @@ class YHLifeDetailViewController: YHBaseViewController {
                 //分享小程序
                 if let product = self.viewModel.detailModel.products.first {
                     
-                    let path = "/pages/commodityInfo/commodityInfo?categoryId=2&levelId=\(self.detailId)&productId=\(product.id)&from=wxApp"
+                    let path = "/pages/commodityInfo/commodityInfo?categoryId=3&levelId=\(self.detailId)&productId=\(product.id)&from=wxApp"
                     YHShareManager.shared.shareToMiniProgram(path:path, shareTitle: "")
                 }
                 

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

@@ -152,7 +152,8 @@ extension YHLifeViewController: UITableViewDelegate, UITableViewDataSource {
 //        vc.url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/commodity_info?categoryId=2&levelId=5&productId=30&from=wxApp"
 //        vc.isWithBottomViewFlag = true
 //        vc.isShareToMiniProgramFlag = true
-//        vc.shareMiniPath = "/serviceHousekeeper/pages/documentEdit/documentEdit"
+//                vc.shareMiniPath = "/pages/commodityInfo/commodityInfo?categoryId=3&levelId=\(selectSubTab?.id ?? "")&productId=\(model.id)&from=wxApp"
+
 //        
 //        self.navigationController?.pushViewController(vc)
     }

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHH5WebViewVC.swift

@@ -54,7 +54,7 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     //分享到H5或者小程序
     var isShareToMiniProgramFlag : Bool = false //是否分享到小程序 默认分享到h5
     var shareMiniPath : String? //分享到小程序时的 path
-    var shareMiniTitle : String = "好友力荐新品，速来围观，不忘粗心"
+    var shareMiniTitle : String = "好友力荐新品，速来围观，不容错过！"
     
     //分享到H5的情况
     var shareH5Title : String = "20秒极速测分"