Merge branch '5.8.0-0.44.0' of http://git.yoho.cn/mobile/YH_RNComponent into 5.8.0-0.44.0

@@ -143,11 +143,11 @@ export default class Detail extends Component {
                 let data = rowData?rowData.get('data'):null;
                 let url = data?data.get('src'):'';
                 let title = data?data.get('video_intro'):'';
-                let cover_image = rowData?rowData.get('cover_image'):'';
+                let cover_image = data?data.get('cover_image'):'';
 
                 return (
-                    <View style={{width: width - 20,height: 315,backgroundColor: 'white'}}>
-                        <YH_Video style={{width: width - 20,height: 300}} url={url} title={title} />
+                    <View style={styles.videoView}>
+                        <YH_Video style={styles.video} url={url} title={title} cover={cover_image} />
                         <View style={styles.placeholder}/>
                     </View>
                 );
@@ -302,6 +302,7 @@ export default class Detail extends Component {
                                enablesReturnKeyAutomatically = {true}
                                onSubmitEditing = {this._onSubmitEditing}
                                clearButtonMode = 'while-editing'
+                               underlineColorAndroid = "transparent"
                                ref = 'textInput'/>
                         <TouchableOpacity onPress={()=>{
                             this.props.onPressConcerns&&this.props.onPressConcerns(isFavor=='Y'?'N':'Y')}
@@ -354,6 +355,7 @@ let styles = StyleSheet.create({
         marginLeft: 10,
         marginTop: 10,
         borderRadius: 5,
+        padding: 0,
     },
     favIcon: {
         height: 20,
@@ -371,6 +373,16 @@ let styles = StyleSheet.create({
         height: 20,
         width: 20,
     },
+    videoView: {
+        width: width - 20,
+        height: Math.ceil((width-20)*(430./730.)) + 15,
+        backgroundColor: 'white',
+    },
+    video: {
+        width: width - 20,
+        height: Math.ceil((width-20)*(430./730.)),
+        backgroundColor: 'white',
+    },
     placeholder: {
         width,
         height: 15,

@@ -64,6 +64,11 @@ export default class SingleImage extends React.Component {
 
         tagList = tagList.concat(tagListGlobal);
 
+        let tagListLimit = template_name?template_name.get('tagListLimit'):null;
+        tagListLimit = tagListLimit?tagListLimit.toJS():[];
+
+        tagList = tagList.concat(tagListLimit);
+
         if (tagList.constructor != Array) {
             tagList = [];
         }

@@ -344,6 +344,10 @@ export function goodsProductBySkns(item, contentIndex) {
 			skns.push(item9.id);
 		});
 
+		item.dataLimit && item.dataLimit.map((item11) => {
+			skns.push(item11.id);
+		});
+
 		if (!skns) {
 			return;
 		}
@@ -451,6 +455,10 @@ export function recommendProductBySkns(item, contentIndex) {
 			skns.push(item9.product_skn);
 		});
 
+		item.dataLimit && item.dataLimit.map((item11) => {
+			skns.push(item11.id);
+		});
+
 		if (!skns) {
 			return;
 		}

@@ -239,6 +239,8 @@ export default function detailReducer(state=initialState, action) {
     		return state.setIn(['commentsList', 'page'], 0)
 				.setIn(['commentsList', 'total_page'], 0)
 				.setIn(['commentsList', 'total'], 0)
+				.setIn(['commentsList', 'isFetching'], false)
+				.setIn(['commentsList', 'error'], null)
 				.setIn(['commentsList', 'endReached'], false);
     	}
 		//资讯添加评论