修复冲突。review by 盖剑秋。

@@ -158,24 +158,6 @@ class CategoryBContainer extends Component {
         }
     }
 
-    _onPressHotRecommendItem(url, index = 0) {
-        if (url && url.length) {
-            ReactNative.NativeModules.YH_CommonHelper.jumpWithUrl(url);
-
-            //埋点
-            let {currentChannelId, currentCateId} = this.props.categoryB;
-            let params = {
-                TAB_ID: currentChannelId + '',
-                F_ID: "1004",
-                F_NAME: "热门推荐",
-                F_INDEX: "2",
-                L1_CATE: currentCateId + '',
-                I_INDEX: parseInt(index) + 1 + '',
-            };
-            NativeModules.YH_CommonHelper.logEvent('YB_CATEGORY_CAT_FLR_C', params);
-        }
-    }
-
     _onPressCategoryBMore() {
         let {currentChannelId, currentCateId} = this.props.categoryB;
         this.props.actions.pressCategoryBMore(currentCateId);
@@ -193,9 +175,7 @@ class CategoryBContainer extends Component {
         NativeModules.YH_CommonHelper.logEvent('YB_CATEGORY_CAT_FLR_C', params);
     }
 
-<<<<<<< HEAD
 
-=======
     _onPressHotRecommendItem(url, index = 0, subcategoryId) {
         if (url && url.length) {
             ReactNative.NativeModules.YH_CommonHelper.jumpWithUrl(url);
@@ -209,14 +189,13 @@ class CategoryBContainer extends Component {
             TAB_ID: currentChannelId + '',
             F_ID: "1004",
             F_NAME: "热门推荐",
-            F_INDEX: "4",
+            F_INDEX: "2",
             L1_CATE: currentCateId + '',
             L2_CATE: subcategoryId + '',
             I_INDEX: parseInt(index) + 1 + '',
         };
         NativeModules.YH_CommonHelper.logEvent('YB_CATEGORY_CAT_FLR_C', params);
     }
->>>>>>> Part of log event. reviewed by 陈老板.
 
     _onPressHotCategoryItem(value, index) {
         let {currentChannelId, currentCateId, currentCateValue} = this.props.categoryB;