mobile / YH_RNComponent · Commits

Go to a project

Authored by yoho-js001
Commit bb477b08d90cb86ba4b269fe28b928955238fb22 1 parent fe573ac3

Fix conflict.

Inline Side-by-side
Showing 2 changed files with 0 additions and 9 deletions
@@ -50,8 +50,6 @@ export default class Brand extends Component { @@ -50,8 +50,6 @@ export default class Brand extends Component {
50 50
51 scrollToSection(index,sectionID){ 51 scrollToSection(index,sectionID){
52 let item = this.sectionDataKey[sectionID]; 52 let item = this.sectionDataKey[sectionID];
53 - console.log('........');  
54 - console.log(item);  
55 if (item) { 53 if (item) {
56 if (!item.y) { 54 if (!item.y) {
57 this.needScrollSection = sectionID; 55 this.needScrollSection = sectionID;
@@ -95,13 +93,9 @@ export default class Brand extends Component { @@ -95,13 +93,9 @@ export default class Brand extends Component {
95 if (this.props.brandFliter == 0) { 93 if (this.props.brandFliter == 0) {
96 let title = sectionID == '0-9' ? '0' : sectionID; 94 let title = sectionID == '0-9' ? '0' : sectionID;
97 return ( 95 return (
98 -  
99 -  
100 <View onLayout={this.onLayout.bind(this, sectionID)}> 96 <View onLayout={this.onLayout.bind(this, sectionID)}>
101 <BLKBrandCell title={title} rowData={rowData} onPressBrandItem={this.props.onPressBrandItem}/> 97 <BLKBrandCell title={title} rowData={rowData} onPressBrandItem={this.props.onPressBrandItem}/>
102 </View> 98 </View>
103 -  
104 -  
105 ); 99 );
106 } else { 100 } else {
107 return ( 101 return (
@@ -50,7 +50,6 @@ export default class Brand extends Component { @@ -50,7 +50,6 @@ export default class Brand extends Component {
50 50
51 scrollToSection(index,sectionID){ 51 scrollToSection(index,sectionID){
52 let item = this.sectionDataKey[sectionID]; 52 let item = this.sectionDataKey[sectionID];
53 - console.log(item);  
54 if (item) { 53 if (item) {
55 if (!item.y) { 54 if (!item.y) {
56 this.needScrollSection = sectionID; 55 this.needScrollSection = sectionID;
@@ -65,8 +64,6 @@ export default class Brand extends Component { @@ -65,8 +64,6 @@ export default class Brand extends Component {
65 64
66 onLayout(sectionID, e) { 65 onLayout(sectionID, e) {
67 let {y} = e.nativeEvent.layout; 66 let {y} = e.nativeEvent.layout;
68 - console.log(sectionID);  
69 - console.log(y);  
70 if (this.sectionDataKey && this.sectionDataKey[sectionID].y != y) { 67 if (this.sectionDataKey && this.sectionDataKey[sectionID].y != y) {
71 this.sectionDataKey[sectionID].y = y; 68 this.sectionDataKey[sectionID].y = y;
72 this.props.setBrandData && this.props.setBrandData(this.sectionDataKey, this.props.selectedChannelId); 69 this.props.setBrandData && this.props.setBrandData(this.sectionDataKey, this.props.selectedChannelId);