From b03d8c2f0782a1d7d2b453ad10d02b17e8f2fd63 Mon Sep 17 00:00:00 2001 From: qyzh Date: Wed, 9 Jun 2021 11:03:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E5=9B=BE=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=AB=AF=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/users/Infos.js | 2 +- src/forge/users/sponsor/SponsorManagement.js | 72 ++++++++--- .../users/sponsor/charts/coinChangeCharts.js | 79 ++++++------ .../users/sponsor/charts/sponsorBarChart.js | 16 ++- src/forge/users/sponsor/communityData.js | 112 +++++++++++------- src/forge/users/sponsor/wallet.js | 9 +- 6 files changed, 185 insertions(+), 105 deletions(-) diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js index 6199c42a9..dd5d18010 100644 --- a/src/forge/users/Infos.js +++ b/src/forge/users/Infos.js @@ -409,7 +409,7 @@ class Infos extends Component { )} - {current_user && user && user.login == current_user.login && ( + {current_user && user && user.login == current_user.login && current_user.admin &&(
); } diff --git a/src/forge/users/sponsor/charts/sponsorBarChart.js b/src/forge/users/sponsor/charts/sponsorBarChart.js index b286eba92..90494c688 100644 --- a/src/forge/users/sponsor/charts/sponsorBarChart.js +++ b/src/forge/users/sponsor/charts/sponsorBarChart.js @@ -36,8 +36,9 @@ class SponsorBarCharts extends Component { super(props); this.state = { crosshairValues: [] - }; - } + }; + console.log(this.props) + } componentWillReceiveProps = () => { this.setState({ @@ -46,12 +47,15 @@ class SponsorBarCharts extends Component { } render() { - const DATA = this.props.is_sponsor?data2:data; - + const chartsData = this.props.is_sponsor?this.props.data.outcome:this.props.data.income; + var max = 0; + for(var i=0; i {/* */} - + - + diff --git a/src/forge/users/sponsor/communityData.js b/src/forge/users/sponsor/communityData.js index 27fb248ae..53d4124c7 100644 --- a/src/forge/users/sponsor/communityData.js +++ b/src/forge/users/sponsor/communityData.js @@ -2,51 +2,69 @@ import React, { Component } from 'react'; import {XYPlot, VerticalBarSeries, LineSeries, VerticalGridLines, HorizontalGridLines, XAxis, YAxis, Crosshair, DiscreteColorLegend} from 'react-vis'; // import DiscreteColorLegend from 'legends/discrete-color-legend'; import "./charts/style.scss"; +import "../../Main/list.css"; +import "../../UsersList/list.css"; +import "../../sponsor/sponsor.css"; +import "../new_user.css" +import axios from "axios"; +import { isSupported } from 'clipboard'; -const ONE_DAY = 86400000; -const d = new Date().getTime()-ONE_DAY*7; - -const data = [ - {x: new Date(d+ONE_DAY).toLocaleDateString(), y: 6}, - {x: new Date(d+ONE_DAY*2).toLocaleDateString(), y: 5}, - {x: new Date(d+ONE_DAY*3).toLocaleDateString(), y: 3}, - {x: new Date(d+ONE_DAY*4).toLocaleDateString(), y: 3}, - {x: new Date(d+ONE_DAY*5).toLocaleDateString(), y: 4}, - {x: new Date(d+ONE_DAY*6).toLocaleDateString(), y: 5}, - {x: new Date(d+ONE_DAY*7).toLocaleDateString(), y: 4}, -]; - -const data2 = [ - {x: new Date(d+ONE_DAY).toLocaleDateString(), y: 4}, - {x: new Date(d+ONE_DAY*2).toLocaleDateString(), y: 3}, - {x: new Date(d+ONE_DAY*3).toLocaleDateString(), y: 1}, - {x: new Date(d+ONE_DAY*4).toLocaleDateString(), y: 2}, - {x: new Date(d+ONE_DAY*5).toLocaleDateString(), y: 1}, - {x: new Date(d+ONE_DAY*6).toLocaleDateString(), y: 3}, - {x: new Date(d+ONE_DAY*7).toLocaleDateString(), y: 2}, -]; - -const data3 = [ - {x: new Date(d+ONE_DAY).toLocaleDateString(), y: 6}, - {x: new Date(d+ONE_DAY*2).toLocaleDateString(), y: 5}, - {x: new Date(d+ONE_DAY*3).toLocaleDateString(), y: 3}, - {x: new Date(d+ONE_DAY*4).toLocaleDateString(), y: 3}, - {x: new Date(d+ONE_DAY*5).toLocaleDateString(), y: 4}, - {x: new Date(d+ONE_DAY*6).toLocaleDateString(), y: 5}, - {x: new Date(d+ONE_DAY*7).toLocaleDateString(), y: 4}, -]; const ITEMS = [ + {title: '资助者数量', strokeWidth: 13}, {title: '受资助人数', strokeWidth: 13}, - {title: '资助者数量', strokeWidth: 13} ]; class SponsorDataCharts extends Component { constructor(props) { super(props); this.state = { - crosshairValues: [] + crosshairValues: [], + sponsor: [], + sponsored: [], + nums: [], }; - } + } + + componentDidMount = () => { + this.get_chart_data(); + } + + get_chart_data = () => { + this.setState({ + isSpin: true + }) + + let url = `/sponsorships/community_data.json`; + axios.get(url) + .then((result) => { + this.setState({ + sponsor: result.data.sponsor, + sponsored: result.data.sponsored, + isSpin: false, + }) + }) + .catch((error) => { + console.log(error); + this.setState({ + isSpin: false, + }); + }); + + url = `/wallets/community_data.json`; + axios.get(url) + .then((result) => { + this.setState({ + nums: result.data, + isSpin: false, + }) + }) + .catch((error) => { + console.log(error); + this.setState({ + isSpin: false, + }); + }); + }; componentWillReceiveProps = () => { this.setState({ @@ -56,14 +74,22 @@ class SponsorDataCharts extends Component { render() { // const DATA = this.props.is_sponsor?data2:data; - + const {sponsor, sponsored, nums} = this.state; + var max1 = 0; + for(var i=0; i -

平台资助者/受资助人数

+

平台资助者/受资助人数

@@ -77,13 +103,13 @@ class SponsorDataCharts extends Component { ticks: {stroke: '#ADDDE1'}, text: {stroke: 'none', fill: '#6b6b76', fontWeight: 600} }}/> - - + + -

平台资助交易数量

+

平台资助交易数量

@@ -97,7 +123,7 @@ class SponsorDataCharts extends Component { ticks: {stroke: '#ADDDE1'}, text: {stroke: 'none', fill: '#6b6b76', fontWeight: 600} }}/> - + ); diff --git a/src/forge/users/sponsor/wallet.js b/src/forge/users/sponsor/wallet.js index e67ed46f7..992d8a8d3 100644 --- a/src/forge/users/sponsor/wallet.js +++ b/src/forge/users/sponsor/wallet.js @@ -35,8 +35,7 @@ class Wallet extends Component { category: "all", balance: 50, saerch: undefined, - chartsData1: undefined, - chartsData2: undefined, + chartsData: {income:[], outcome:[]}, }; } @@ -68,7 +67,7 @@ class Wallet extends Component { }}) .then((result) => { this.setState({ - chartsData1: result.data, + chartsData: result.data, isSpin: false, }) }) @@ -203,7 +202,7 @@ class Wallet extends Component { render() { const { current_user, user } = this.props; - const { category , sort_by, chartsData1 } = this.state; + const { category , sort_by, chartsData } = this.state; const { displayList, coinChangeList, isSpin, total, search, limit, page, balance} = this.state; const coinChangeItem = displayList && displayList.length > 0 ? @@ -215,7 +214,7 @@ class Wallet extends Component { ; const displayComponent = - category === "charts"? + category === "charts"? : coinChangeItem;