Authored by 孙凯

调整了品类的样式。review by chenlin。

... ... @@ -60,7 +60,7 @@ export default class CategoryList extends Component {
<Text style={styles.subTitle} numberOfLines={1}>
{selectText}
</Text>
</View>
</View>
</TouchableOpacity>
);
}
... ... @@ -80,8 +80,8 @@ export default class CategoryList extends Component {
this.props.currentCateId==rowID&&this.state.offsetx<0?
<Image style={styles.select_icon} source={require('../../images/category_select_icon.png')}/> :null
}
<Image style={styles.arrow} source={require('../../images/shared_enterbuttom_normal.png')}/>
</View>
<Image style={styles.arrow} source={require('../../images/category_arrow.png')}/>
</View>
</TouchableOpacity>
);
}
... ... @@ -106,7 +106,7 @@ export default class CategoryList extends Component {
let subCateList=[];
if(categoryList.get(this.props.currentChannelId)){
cateList=categoryList.get(this.props.currentChannelId).toArray();
}
}
if(categoryList.get(this.props.currentChannelId).get(this.props.currentCateId)){
let currentCate=categoryList.get(this.props.currentChannelId).get(this.props.currentCateId);
subCateList=currentCate.get('sub').toArray();
... ... @@ -122,7 +122,7 @@ export default class CategoryList extends Component {
scrollsToTop={false}
/>
<ListView
style={[styles.subContentContainer, {marginLeft: this.state.offsetx}]}
style={[styles.subContentContainer, {marginLeft: this.state.offsetx}]}
dataSource={this.dataSource.cloneWithRows(subCateList)}
enableEmptySections={true}
renderRow={this.subRenderRow}
... ... @@ -155,7 +155,7 @@ let styles = StyleSheet.create({
backgroundColor: '#f4f4f4',
width: width/2,
height: height - 156,
},
row: {
flexDirection: 'row',
... ... @@ -177,7 +177,7 @@ let styles = StyleSheet.create({
width: width,
height: 0.5,
backgroundColor: '#e0e0e0',
marginLeft: 80,
marginLeft: 70,
},
subSeparator:{
width: width,
... ... @@ -188,6 +188,7 @@ let styles = StyleSheet.create({
title: {
flex: 1,
fontSize: 17,
fontWeight:'bold',
color: '#444444',
},
subTitle: {
... ... @@ -197,14 +198,14 @@ let styles = StyleSheet.create({
},
logo_icon:{
marginRight:20,
width: 40,
height: 40,
width: 30,
height: 30,
},
select_icon: {
position: 'absolute',
left: width/2-6,
top:rowHeight/2-6,
width: 6,
width: 7,
height: 12,
},
... ...
... ... @@ -56,7 +56,7 @@ export default class ChannelSelector extends React.Component {
}
shouldComponentUpdate(nextProps){
if ((nextProps.selectedChannelId == this.props.selectedChannelId)
if ((nextProps.selectedChannelId == this.props.selectedChannelId)
&& (nextProps.selectedChannelValue == this.props.selectedChannelValue)) {
return false;
} else {
... ... @@ -72,7 +72,7 @@ export default class ChannelSelector extends React.Component {
isRowSelected = (rowData.value == this.props.selectedChannelValue);
}
let colorStyle = isRowSelected ? {color: '#444444', fontFamily: 'HelveticaNeue', fontSize: 17} : {color: '#b0b0b0', fontFamily: 'HelveticaNeue-Bold', fontSize: 17,};
let colorStyle = isRowSelected ? {color: '#444444', fontFamily: 'HelveticaNeue', fontSize: 17} : {color: '#b0b0b0', fontFamily: 'HelveticaNeue', fontSize: 17,};
return (
<TouchableOpacity activeOpacity={1} onPress={() => {
... ...