diff --git a/src/my/MyFriend.tsx b/src/my/MyFriend.tsx index a22e7ef..931fb1e 100644 --- a/src/my/MyFriend.tsx +++ b/src/my/MyFriend.tsx @@ -109,7 +109,7 @@ export class MyFriend extends React.Component< /** * 查找用户 */ - queryUser(name:string){ + queryUser(name:string,page:number){ if(!name){ this.setState({ @@ -122,7 +122,9 @@ export class MyFriend extends React.Component< switch (res.customResult) { case PageDataMessage.ok: that.setState({ - userList: res.dataList + userList: page===1?res.dataList||[]:(that.state.userList||[]).concat(res.dataList||[]), + page: res.page, + scrollTip: page > 1 ? '成功加载第' + page + '页数据' : null, }) break } @@ -187,7 +189,7 @@ export class MyFriend extends React.Component< this.setState({ queryUser:e.target.value }) - this.queryUser(e.target.value) + this.queryUser(e.target.value,1) }}/> diff --git a/src/my/MyHelp.tsx b/src/my/MyHelp.tsx index 9dba00e..93e51c0 100644 --- a/src/my/MyHelp.tsx +++ b/src/my/MyHelp.tsx @@ -137,7 +137,7 @@ export class MyHelp extends React.Component<{ switch (res.customResult) { case PageDataMessage.ok: that.setState({ - data: (that.state.data||[]).concat(res.dataList||[]), + data: page===1?res.dataList||[]:(that.state.data||[]).concat(res.dataList||[]), page: res.page, scrollTip: page > 1 ? '成功加载第' + page + '页数据' : null, }) diff --git a/src/my/MyLeaveWord.tsx b/src/my/MyLeaveWord.tsx index ddb6831..f0e53f9 100644 --- a/src/my/MyLeaveWord.tsx +++ b/src/my/MyLeaveWord.tsx @@ -64,7 +64,7 @@ export class MyLeaveWord extends React.Component< switch (res.customResult) { case PageDataMessage.ok: that.setState({ - data: (that.state.data||[]).concat(res.dataList||[]), + data: page===1?res.dataList||[]:(that.state.data||[]).concat(res.dataList||[]), page: res.page, scrollTip: page > 1 ? '成功加载第' + page + '页数据' : null, }) diff --git a/src/my/SeekHelp.tsx b/src/my/SeekHelp.tsx index dae18b5..3d96c0c 100644 --- a/src/my/SeekHelp.tsx +++ b/src/my/SeekHelp.tsx @@ -75,7 +75,7 @@ export class SeekHelp extends React.Component<{ user:string }, switch (res.customResult) { case PageDataMessage.ok: that.setState({ - data: (that.state.data||[]).concat(res.dataList||[]), + data: page===1?res.dataList||[]:(that.state.data||[]).concat(res.dataList||[]), page: res.page, scrollTip: page > 1 ? '成功加载第' + page + '页数据' : null, }) diff --git a/src/public.tsx b/src/public.tsx index b658220..c981f2b 100644 --- a/src/public.tsx +++ b/src/public.tsx @@ -89,7 +89,7 @@ export function loadMyFriend(name:string,that:React.Component,page:numb switch (res.customResult) { case PageDataMessage.ok: that.setState({ - friendList: (that.state.friendList||[]).concat(res.dataList||[]), + friendList: page===1?res.dataList||[]:(that.state.friendList||[]).concat(res.dataList||[]), page: res.page, scrollTip: page > 1 ? '成功加载第' + page + '页数据' : null, }) diff --git a/src/sub/IndexMenu.tsx b/src/sub/IndexMenu.tsx index cc30496..6be5b0b 100644 --- a/src/sub/IndexMenu.tsx +++ b/src/sub/IndexMenu.tsx @@ -68,9 +68,10 @@ export class IndexMenu extends React.Component<{ cookies:Cookies }, });break; case PageDataMessage.ok: that.setState({ - activityList:res.dataList, - page:res.page - });break + activityList: page===1?res.dataList||[]:(that.state.activityList||[]).concat(res.dataList||[]), + page: res.page, + }) + break case PageDataMessage.empty: that.setState({ activityList:[], diff --git a/src/sub/Volunteer.tsx b/src/sub/Volunteer.tsx index 4a7e7a4..62e00da 100644 --- a/src/sub/Volunteer.tsx +++ b/src/sub/Volunteer.tsx @@ -54,9 +54,10 @@ export class Volunteer extends React.Component<{ undefined?:undefined }, },new FindUserTransform(),function(res:FindUserRes){ switch (res.customResult) { case PageDataMessage.ok: + that.setState({ - volunteerList:res.dataList, - page:res.page, + volunteerList: page===1?res.dataList||[]:(that.state.volunteerList||[]).concat(res.dataList||[]), + page: res.page, form:{ keyword:that.state.form.keyword, serviceAddress:that.state.form.serviceAddress