diff --git a/Class/View/CollectListView.js b/Class/View/CollectListView.js index a8ef73f..8d3ef36 100644 --- a/Class/View/CollectListView.js +++ b/Class/View/CollectListView.js @@ -68,7 +68,6 @@ export default class CollectListView extends Component{ }); }); } - render(){ return ( - 随机 + 首页 ) } @@ -48,8 +49,7 @@ export default class RandListView extends Component{ } //数据查询. fetchData(){ - var page = Math.random() * 1000; - page = Math.floor(page); + var url = REQUEST_URL + '?page=' + page; return new Promise((resolve, reject)=>{ fetch(url) @@ -58,11 +58,19 @@ export default class RandListView extends Component{ reject(error); }) .then((responseData) => { + if(responseData){ + var movieArr = dataSource; + for (var i in responseData.datas) { + movieArr.push(responseData.datas[i]); + }; + if(page === 1){ + dataSource = responseData.datas; + } this.setState({ - dataSource: this.state.dataSource.cloneWithRows(responseData.datas), + dataSource: this.state.dataSource.cloneWithRows(dataSource), }); - resolve(responseData.datas); + resolve(responseData.datas); }else{ reject('none'); } @@ -72,14 +80,22 @@ export default class RandListView extends Component{ }) } - + loadMore(){ + page++; + return this.fetchData(); + } + refreshData(){ + page = 1; + } render(){ return ( + fetchData={this.fetchData.bind(this)} + loadMore={this.loadMore.bind(this)} + refreshData={this.refreshData.bind(this)}/> ); } diff --git a/Class/View/MyListView.js b/Class/View/MyListView.js index 9d3f925..094d926 100644 --- a/Class/View/MyListView.js +++ b/Class/View/MyListView.js @@ -54,6 +54,10 @@ export default class MyListView extends Component{ } onRefresh(){ + if (typeof this.props.refreshData === 'function') { + console.log('shuaxing') + this.props.refreshData() + } this.myfetchData(); } //数据查询. @@ -76,6 +80,15 @@ export default class MyListView extends Component{ }); }); } + onEndReached(){ + if (typeof this.props.loadMore === 'function') { + this.props.loadMore().then((responseData)=>{ + },(error)=>{ + AlertIOS.alert('没有更多数据'); + }); + }; + + } render(){ // return this.renderLoadingView(); @@ -88,10 +101,11 @@ export default class MyListView extends Component{ dataSource={this.props.dataSource} renderRow={this.renderMovie.bind(this)} renderSeparator={this.renderMovieRow} + onEndReached={this.onEndReached.bind(this)} refreshControl={