Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge

This commit is contained in:
caishi 2020-06-05 20:17:50 +08:00
commit 6f08cf4a73
1 changed files with 3 additions and 2 deletions

View File

@ -66,7 +66,8 @@ class CommonList extends Component {
render() {
const { users, isSpin, total, search, limit, page } = this.state;
const { userType } = this.props;
const { userType, login, current_user } = this.props;
const title_type =( current_user && login === current_user.login) ? "我" : "TA"
const pagination =
total && total > limit ? (
@ -87,7 +88,7 @@ class CommonList extends Component {
<Spin spinning={isSpin}>
<div className="pd20">
<div className="grid-item pb20 bbt">
<h3>{userType === "watch_users" ? "我关注的" : "关注我的"}</h3>
<h3>{userType === "watch_users" ? `${title_type}关注的` : `关注${title_type}`}</h3>
<div className="text-right">
<Search
placeholder="输入名称进行搜索"