diff --git a/src/AppConfig.js b/src/AppConfig.js
index dadadc5f..f80e96ef 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -65,7 +65,7 @@ export function initAxiosInterceptors(props) {
// TODO 避免重复的请求 https://github.com/axios/axios#cancellation
var
proxy = "http://localhost:3000"
- proxy = "https://testforgeplus.trustie.net"
+ // proxy = "https://testforgeplus.trustie.net"
const requestMap = {};
window.setfalseInRequestMap = function (keyName) {
diff --git a/src/forge/sponsor/Sponsor.js b/src/forge/sponsor/Sponsor.js
index 5beba696..627f076e 100644
--- a/src/forge/sponsor/Sponsor.js
+++ b/src/forge/sponsor/Sponsor.js
@@ -1,6 +1,6 @@
import React, { Component } from "react";
import { Link } from "react-router-dom";
-import { Avatar, Tag, Button, Spin, Input, Form} from "antd";
+import { Avatar, Tag, Button, Spin, Input, Form, message} from "antd";
import { Route, Switch } from "react-router-dom";
import { withRouter } from "react-router";
@@ -23,13 +23,13 @@ import '../users/Index.scss';
import "./sponsor.css";
const tempData = [
- {id:1, amount: 5, description: "这能让我感到很开心"},
- {id:2, amount: 10, description: "如果您更加慷慨的话就选择这个"},
- {id:3, amount: 150, description: "这能为我带来相当多的额外收入"},
- {id:4, amount: 250, description: "这能为我带来相当多的额外收入"},
- {id:5, amount: 500, description: "这能为我带来相当多的额外收入"},
- {id:6, amount: 1000, description: "这能为我带来相当多的额外收入"},
- {id:7, amount: 5000, description: "这能为我带来相当多的额外收入"},
+ {id:1, tier: 5, description: "这能让我感到很开心"},
+ {id:2, tier: 10, description: "如果您更加慷慨的话就选择这个"},
+ {id:3, tier: 150, description: "这能为我带来相当多的额外收入"},
+ {id:4, tier: 250, description: "这能为我带来相当多的额外收入"},
+ {id:5, tier: 500, description: "这能为我带来相当多的额外收入"},
+ {id:6, tier: 1000, description: "这能为我带来相当多的额外收入"},
+ {id:7, tier: 5000, description: "这能为我带来相当多的额外收入"},
];
const tempDesc = "我长期从事开源社区相关工作...目前已经开发了多个项目,如xxx, xxxx, ...\n我希望通过资助机制成为全职开源开发者,如果您对我的项目感兴趣,请资助我!"
@@ -98,15 +98,17 @@ class Sponsor extends Component {
description: undefined,
sponsors: undefined,
edit: false,
+ tiers: [],
};
}
componentDidMount = () => {
this.fetchUser();
this.fetchSponsors();
+ this.fetchData();
};
- fetchUser = () => {
+ fetchUser = async () => {
this.setState({
isSpin: true,
});
@@ -114,15 +116,17 @@ class Sponsor extends Component {
const { username } = this.props.match.params;
let url = `/users/${username || (current_user && current_user.login)}.json`;
- axios
+ await axios
.get(url)
.then((result) => {
// TODO: 在这里添加了对用户自我介绍的处理,前后端交互实现后需要删掉
- result.data.description = tempDesc;
+ // result.data.description = tempDesc;
+ console.log(result.data);
this.setState({
- user: result.data,
+ user: result.data,
isSpin: false,
});
+ // console.log(result.data);
})
.catch((error) => {
console.log(error);
@@ -138,6 +142,23 @@ class Sponsor extends Component {
});
}
+ fetchData = () => {
+ let url = `/sponsor_tiers.json`;
+ const user_login = this.props.match.params.username;
+ axios
+ .get(url, {params:{login: user_login}})
+ .then((result) => {
+ // console.log(result.data);
+ // console.log(tempData)
+ this.setState({
+ tiers: result.data
+ })
+ })
+ .catch((error) => {
+ console.log(error);
+ })
+ }
+
editDescription = () => {
this.setState({
edit: true,
@@ -155,13 +176,29 @@ class Sponsor extends Component {
let value = this.formRef.getItemsValue().description;
// console.log(value);
let user = this.state.user;
- if (user){
- user.description = value;
- }
- this.setState({
- user: user,
- edit: false,
- });
+ let url = `/users/${user.user_id}/update_description.json`
+ axios.put(url, {description: value})
+ .then((result) => {
+ user.description = value;
+ this.setState({
+ user: user,
+ edit: false
+ })
+ message.success("修改成功")
+ })
+ .catch(error => {
+ console.log(error);
+ message.error("修改失败")
+ })
+
+
+ // if (user){
+ // user.description = value;
+ // }
+ // this.setState({
+ // user: user,
+ // edit: false,
+ // });
}
visitorTemplate = () => {
@@ -217,10 +254,8 @@ class Sponsor extends Component {
render(){
const { current_user} = this.props;
- const { user, isSpin } = this.state;
+ const { user, isSpin, tiers} = this.state;
const sponsorList = this.sponsorList();
- // console.log("current", current_user)
- // console.log("user", user)
var content = "";
if (current_user && user && user.login !== current_user.login){
@@ -268,7 +303,7 @@ class Sponsor extends Component {