diff --git a/src/entity.ts b/src/entity.ts index 558f7c4..b1291c4 100644 --- a/src/entity.ts +++ b/src/entity.ts @@ -343,6 +343,8 @@ export enum ActivityStatus { export interface LeaveWord { // 留言用户id userId:string; + //留言id + leaveWordId:number; // 留言用户姓名 name:string; // 留言用户头像 diff --git a/src/interface.ts b/src/interface.ts index 063a953..e9e5bc4 100644 --- a/src/interface.ts +++ b/src/interface.ts @@ -21,7 +21,13 @@ export const API={ //更新密码 updatePwd:prefix.user+"/updatePwd", //查看留言 - leaveWord:prefix.user+"/find/leaveWord" + leaveWord:prefix.user+"/find/leaveWord", + //发送好友邀请 + friend:prefix.user+"/friend", + //拒绝好友邀请 + refuse:prefix.user+"/refuse", + //同意好友邀请 + agree:prefix.user+"/agree" }, main:{ activity: { diff --git a/src/my/MyInfo.tsx b/src/my/MyInfo.tsx index 039219d..8527b5a 100644 --- a/src/my/MyInfo.tsx +++ b/src/my/MyInfo.tsx @@ -188,7 +188,19 @@ export class MyInfo extends React.Component< * 添加好友 */ addFriend(){ - + let that=this + request(API.account.friend,Method.POST, {targetUserId:this.props.userId},new EmptyBodyTransform(),function (res:JSONResponse) { + switch (res.customResult) { + case SimpleMessage.ok: + that.setState({ + result:

成功发送邀请

+ });break + case SimpleMessage.fail: + that.setState({ + result:

发送好友邀请失败,请联系管理员

+ });break + } + }) } /** diff --git a/src/my/MyLeaveWord.tsx b/src/my/MyLeaveWord.tsx index 88079db..0534a03 100644 --- a/src/my/MyLeaveWord.tsx +++ b/src/my/MyLeaveWord.tsx @@ -5,8 +5,8 @@ import {Tooltip} from "@material-ui/core"; import {MyDialog} from "../ui/MyDialog"; import {MyInfo} from "./MyInfo"; import {Activity} from "../ui/Activity"; -import {API, Method, prefix, request} from "../interface"; -import {LeaveWordRes, LeaveWordTransform, PageDataMessage} from "../result"; +import {API, JSONResponse, Method, prefix, request} from "../interface"; +import {EmptyBodyTransform, LeaveWordRes, LeaveWordTransform, PageDataMessage, SimpleMessage} from "../result"; /** * 我的留言 @@ -33,7 +33,7 @@ export class MyLeaveWord extends React.Component< super(props); this.state={ - result:

留言列表加载中

, + result: null, activityId: null, data:[], openUserInfo:false @@ -61,6 +61,7 @@ export class MyLeaveWord extends React.Component< that.setState({ result:

留言列表加载失败

}) + break } }) } @@ -79,6 +80,55 @@ export class MyLeaveWord extends React.Component< } } + /** + * 拒绝好友邀请 + * @param id + */ + doRefuse(id:number){ + let that=this + request(API.account.refuse+"/"+id,Method.POST, {},new EmptyBodyTransform(),function (res:JSONResponse) { + switch (res.customResult) { + case SimpleMessage.ok: + that.setState({ + result:

成功拒绝邀请

+ }) + that.loadLeaveWord(1) + break + case SimpleMessage.fail: + that.setState({ + result:

拒绝邀请失败,请联系管理员

+ }) + break + } + }) + } + + /** + * 同意好友邀请 + * @param data + */ + doAgree(data:LeaveWord){ + let that=this + request(API.account.agree,Method.POST, { + leaveWordId:data.leaveWordId+"", + sourceUserId:data.userId + },new EmptyBodyTransform(),function (res:JSONResponse) { + switch (res.customResult) { + case SimpleMessage.ok: + that.setState({ + result:

添加好友成功

+ }) + break + case SimpleMessage.fail: + that.loadLeaveWord(1) + that.setState({ + result:

添加好友失败,请联系管理员

+ }) + break + } + }) + } + /** * 解析留言 * @param data @@ -108,8 +158,8 @@ export class MyLeaveWord extends React.Component<

{data.info}

- - + +
} @@ -142,7 +192,7 @@ export class MyLeaveWord extends React.Component< render() { return (
- {this.state.data?this.state.data.map((data,index) =>this.getData(data,index)):this.state.result} + {this.state.data?this.state.data.length===0?

没有留言记录

:this.state.data.map((data,index) =>this.getData(data,index)):

留言加载中

} } open={this.state.openUserInfo} onClose={()=>this.setState({openUserInfo:false})}/> @@ -150,6 +200,11 @@ export class MyLeaveWord extends React.Component< } open={this.state.activityId!=null} titleId="view-activity" menuName="活动详情" onClose={()=>this.setState({activityId:null})}/> + + + this.setState({ + result:null + })}/>
) }