Merge branch 'yinhe-live-1212' of...

Merge branch 'yinhe-live-1212' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into yinhe-live-1212

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHVODPlayerViewController.swift

@@ -305,6 +305,7 @@ class YHVODPlayerViewController: YHBasePlayerViewController {
             let vc = YHH5WebViewVC()
             vc.url = tUrl
             vc.isHideNavigationBar = false
+            vc.isFullScreenFlag = false
             goodsListView?.dismiss()
             navigationController?.pushViewController(vc)
         }

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -295,7 +295,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
         }
         
         if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_integral_open {
-            let item = PersonalModuleItem(icon: "mine_item_card", title: "购物车".local, type:.mycart)
+            let item = PersonalModuleItem(icon: "mine_item_cart", title: "购物车".local, type:.mycart)
             items.append(item)
         }