Merge branch 'V6.9.5' of http://git.yoho.cn/mobile/YH_RNComponent into V6.9.5

@@ -74,6 +74,7 @@ export default class ContentListView extends Component {
                 return(
                   <ContentNotifyListCell
                       data={rowData}
+                      jumpToNormalPage={this.props.jumpToNormalPage}
                       jumpToNotifGrassPage={this.props.jumpToNotifGrassPage}
                   />
                 );

@@ -58,14 +58,7 @@ export default class ContentNotifyListCell extends Component {
 
                 :
                   <TouchableOpacity activeOpacity={1} onPress={() =>{
-                      let param = {
-                           action: 'go.h5',
-                           params: {
-                             url:data.link,
-                           }
-                         }
-                      let path = 'http://m.yohobuy.com?openby:yohobuy=' + JSON.stringify(param);
-                      ReactNative.NativeModules.YH_CommonHelper.jumpWithUrl(path);
+                    this.props.jumpToNormalPage && this.props.jumpToNormalPage(data);
                     }} >
                     <View style={styles.contentContainer}>
 

@@ -55,6 +55,7 @@ class ContentListContainer extends Component {
         this._jumpToGrassDetailPage = this._jumpToGrassDetailPage.bind(this);
         this._jumpToNotifGrassPage = this._jumpToNotifGrassPage.bind(this);
         this._hideToastMessage = this._hideToastMessage.bind(this);
+        this._jumpToNormalPage = this._jumpToNormalPage.bind(this);
     }
 
     _updateAttentionAction(data) {
@@ -147,6 +148,20 @@ class ContentListContainer extends Component {
       NativeModules.YH_CommonHelper.jumpWithUrl(path);
     }
 
+    _jumpToNormalPage(data) {
+      if (data && !data.link) {
+        return;
+      }
+      let param = {
+           action: 'go.h5',
+           params: {
+             url:data && data.link,
+           }
+         }
+      let path = 'http://m.yohobuy.com?openby:yohobuy=' + JSON.stringify(param);
+      ReactNative.NativeModules.YH_CommonHelper.jumpWithUrl(path);
+    }
+
     _hideToastMessage() {
       this.props.actions.hideToastMessage();
     }
@@ -174,6 +189,7 @@ class ContentListContainer extends Component {
                   jumpToPersonalGrassPage={this._jumpToPersonalGrassPage}
                   jumpToGrassDetailPage={this._jumpToGrassDetailPage}
                   jumpToNotifGrassPage={this._jumpToNotifGrassPage}
+                  jumpToNormalPage={this._jumpToNormalPage}
               />
 
             </View>