Gitlink
/
forgeplus-react
0
0
Fork 37
Code Issues Pull Requests 5 Releases 1 Wiki Activity

Merge branch 'newVersion_forge' into dev_devOps

This commit is contained in:
caishi 2020-09-23 16:19:21 +08:00
parent 53e444d85e 2e6acd0024
commit c052cf715b
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/forge/Order/order.js
View File

@ -471,7 +471,7 @@ class order extends Component {
})
const { checkedValue } = this.state;
const { projectsId , owner } = this.props.match.params;
const url = `/projects/${owner}/${projectsId}/issues/clean.json`;
const url = `/${owner}/${projectsId}/issues/clean.json`;
axios.post(url, {
ids: checkedValue
}).then(result => {

9
src/forge/UsersList/user_list.js
View File

@ -5,7 +5,7 @@ import { Button } from "antd";
import "./list.css";
class UserList extends Component {
renderList = (users, userClass, current_user) => {
renderList = (users, userClass, current_user, type_title) => {
if (users && users.length > 0) {
return users.map((item, key) => {
return (
@ -34,7 +34,7 @@ class UserList extends Component {
</div>
<div className="font-12 text-gray grid-item pb5">
<i className="iconfont icon-shijian user-join-time"></i>
<span className="ml4">加入时间：{item.format_time}</span>
<span className="ml4">{type_title === '点赞列表' ? "点赞" : type_title === "关注列表" ? "关注":'fork'}时间：{item.format_time}</span>
</div>
{
current_user && current_user.login === item.login ?
@ -50,10 +50,9 @@ class UserList extends Component {
}
}
render() {
const { users, userClass, current_user } = this.props;
const { users, userClass, current_user , type_title } = this.props;
return (
this.renderList(users, userClass, current_user)
this.renderList(users, userClass, current_user, type_title)
);
}
}