Authored by 孙凯

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

@@ -60,7 +60,7 @@ export default class CategoryList extends Component { @@ -60,7 +60,7 @@ export default class CategoryList extends Component {
60 <Text style={styles.subTitle} numberOfLines={1}> 60 <Text style={styles.subTitle} numberOfLines={1}>
61 {selectText} 61 {selectText}
62 </Text> 62 </Text>
63 - </View> 63 + </View>
64 </TouchableOpacity> 64 </TouchableOpacity>
65 ); 65 );
66 } 66 }
@@ -80,8 +80,8 @@ export default class CategoryList extends Component { @@ -80,8 +80,8 @@ export default class CategoryList extends Component {
80 this.props.currentCateId==rowID&&this.state.offsetx<0? 80 this.props.currentCateId==rowID&&this.state.offsetx<0?
81 <Image style={styles.select_icon} source={require('../../images/category_select_icon.png')}/> :null 81 <Image style={styles.select_icon} source={require('../../images/category_select_icon.png')}/> :null
82 } 82 }
83 - <Image style={styles.arrow} source={require('../../images/shared_enterbuttom_normal.png')}/>  
84 - </View> 83 + <Image style={styles.arrow} source={require('../../images/category_arrow.png')}/>
  84 + </View>
85 </TouchableOpacity> 85 </TouchableOpacity>
86 ); 86 );
87 } 87 }
@@ -106,7 +106,7 @@ export default class CategoryList extends Component { @@ -106,7 +106,7 @@ export default class CategoryList extends Component {
106 let subCateList=[]; 106 let subCateList=[];
107 if(categoryList.get(this.props.currentChannelId)){ 107 if(categoryList.get(this.props.currentChannelId)){
108 cateList=categoryList.get(this.props.currentChannelId).toArray(); 108 cateList=categoryList.get(this.props.currentChannelId).toArray();
109 - } 109 + }
110 if(categoryList.get(this.props.currentChannelId).get(this.props.currentCateId)){ 110 if(categoryList.get(this.props.currentChannelId).get(this.props.currentCateId)){
111 let currentCate=categoryList.get(this.props.currentChannelId).get(this.props.currentCateId); 111 let currentCate=categoryList.get(this.props.currentChannelId).get(this.props.currentCateId);
112 subCateList=currentCate.get('sub').toArray(); 112 subCateList=currentCate.get('sub').toArray();
@@ -122,7 +122,7 @@ export default class CategoryList extends Component { @@ -122,7 +122,7 @@ export default class CategoryList extends Component {
122 scrollsToTop={false} 122 scrollsToTop={false}
123 /> 123 />
124 <ListView 124 <ListView
125 - style={[styles.subContentContainer, {marginLeft: this.state.offsetx}]} 125 + style={[styles.subContentContainer, {marginLeft: this.state.offsetx}]}
126 dataSource={this.dataSource.cloneWithRows(subCateList)} 126 dataSource={this.dataSource.cloneWithRows(subCateList)}
127 enableEmptySections={true} 127 enableEmptySections={true}
128 renderRow={this.subRenderRow} 128 renderRow={this.subRenderRow}
@@ -155,7 +155,7 @@ let styles = StyleSheet.create({ @@ -155,7 +155,7 @@ let styles = StyleSheet.create({
155 backgroundColor: '#f4f4f4', 155 backgroundColor: '#f4f4f4',
156 width: width/2, 156 width: width/2,
157 height: height - 156, 157 height: height - 156,
158 - 158 +
159 }, 159 },
160 row: { 160 row: {
161 flexDirection: 'row', 161 flexDirection: 'row',
@@ -177,7 +177,7 @@ let styles = StyleSheet.create({ @@ -177,7 +177,7 @@ let styles = StyleSheet.create({
177 width: width, 177 width: width,
178 height: 0.5, 178 height: 0.5,
179 backgroundColor: '#e0e0e0', 179 backgroundColor: '#e0e0e0',
180 - marginLeft: 80, 180 + marginLeft: 70,
181 }, 181 },
182 subSeparator:{ 182 subSeparator:{
183 width: width, 183 width: width,
@@ -188,6 +188,7 @@ let styles = StyleSheet.create({ @@ -188,6 +188,7 @@ let styles = StyleSheet.create({
188 title: { 188 title: {
189 flex: 1, 189 flex: 1,
190 fontSize: 17, 190 fontSize: 17,
  191 + fontWeight:'bold',
191 color: '#444444', 192 color: '#444444',
192 }, 193 },
193 subTitle: { 194 subTitle: {
@@ -197,14 +198,14 @@ let styles = StyleSheet.create({ @@ -197,14 +198,14 @@ let styles = StyleSheet.create({
197 }, 198 },
198 logo_icon:{ 199 logo_icon:{
199 marginRight:20, 200 marginRight:20,
200 - width: 40,  
201 - height: 40, 201 + width: 30,
  202 + height: 30,
202 }, 203 },
203 select_icon: { 204 select_icon: {
204 position: 'absolute', 205 position: 'absolute',
205 left: width/2-6, 206 left: width/2-6,
206 top:rowHeight/2-6, 207 top:rowHeight/2-6,
207 - width: 6, 208 + width: 7,
208 height: 12, 209 height: 12,
209 210
210 }, 211 },
@@ -56,7 +56,7 @@ export default class ChannelSelector extends React.Component { @@ -56,7 +56,7 @@ export default class ChannelSelector extends React.Component {
56 } 56 }
57 57
58 shouldComponentUpdate(nextProps){ 58 shouldComponentUpdate(nextProps){
59 - if ((nextProps.selectedChannelId == this.props.selectedChannelId) 59 + if ((nextProps.selectedChannelId == this.props.selectedChannelId)
60 && (nextProps.selectedChannelValue == this.props.selectedChannelValue)) { 60 && (nextProps.selectedChannelValue == this.props.selectedChannelValue)) {
61 return false; 61 return false;
62 } else { 62 } else {
@@ -72,7 +72,7 @@ export default class ChannelSelector extends React.Component { @@ -72,7 +72,7 @@ export default class ChannelSelector extends React.Component {
72 isRowSelected = (rowData.value == this.props.selectedChannelValue); 72 isRowSelected = (rowData.value == this.props.selectedChannelValue);
73 } 73 }
74 74
75 - let colorStyle = isRowSelected ? {color: '#444444', fontFamily: 'HelveticaNeue', fontSize: 17} : {color: '#b0b0b0', fontFamily: 'HelveticaNeue-Bold', fontSize: 17,}; 75 + let colorStyle = isRowSelected ? {color: '#444444', fontFamily: 'HelveticaNeue', fontSize: 17} : {color: '#b0b0b0', fontFamily: 'HelveticaNeue', fontSize: 17,};
76 76
77 return ( 77 return (
78 <TouchableOpacity activeOpacity={1} onPress={() => { 78 <TouchableOpacity activeOpacity={1} onPress={() => {