diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e5de4991..3324518b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,53 +2,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
@@ -72,23 +33,56 @@
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -105,37 +99,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -144,28 +112,37 @@
-
+
-
-
+
+
+
+
+
-
+
-
-
+
+
+
+
+
-
+
-
-
+
+
+
+
+
@@ -181,36 +158,36 @@
- changeStatus
- adjustTokenNum
- id
- console.log
- onInput
- issue_token_num
- setAttribute
- 创建
- 完成度:
- data
- blockchain
- setList(result.data.results);
- componentDidMount
- getBlockchainTokenNum
- start_date
- 项目简介
- blockchain_token_num
- 该合并请求可以进行自动合并操作
- 变基并合并
- 合并请求
- menu
- fix_issue_id
- initOnlineOfflineListener
- 10.13.102.14
- transfer_login
- 合并描述
- localhost:3001
proxy
3007
HEAD
+ changeDesc
+ 请填写项目token总数
+ type
+ type=
+ getElementB
+ setS
+ setState
+ getElementsBy
+ getElement
+ state
+ hidden
+ show_div
+ this.state
+ handleBlockchainChange
+ <Table
+ 请输入转给
+ 历史交易
+ 交易
+ ?
+ 售卖token数量
+ 输入售卖金额
+ selectProjectChange
+ auth
+ 确认收货
+ token_num
+ 请输入转账token
+ token数量
任务
@@ -232,8 +209,6 @@
@@ -465,12 +442,12 @@
-
+
-
+
@@ -485,7 +462,7 @@
-
+
@@ -675,24 +652,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -753,13 +712,6 @@
-
-
-
-
-
-
-
@@ -902,23 +854,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -929,33 +864,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -966,16 +874,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -993,16 +891,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -1024,16 +912,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -1044,15 +922,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js
index 53f62d80..3f013f59 100644
--- a/src/forge/New/Index.js
+++ b/src/forge/New/Index.js
@@ -46,7 +46,8 @@ class Index extends Component {
project_category_name: undefined,
license_name: undefined,
ignore_name: undefined,
- descNum:0
+ descNum:0,
+ show_div:"hidden",
}
}
componentDidMount = () => {
@@ -259,7 +260,15 @@ class Index extends Component {
// add by zxh: handleBlockchainChange
handleBlockchainChange = (event) => {
- console.log("here need the change of display")
+ if (this.state.show_div == 'hidden') {
+ this.setState({
+ show_div: "visible"
+ });
+ } else {
+ this.setState({
+ show_div: "hidden"
+ });
+ }
}
changeDesc=(e)=>{
@@ -516,12 +525,13 @@ class Index extends Component {
className="privatePart"
ref={(blockchain_item => {this.blockchain_item = blockchain_item})}
>
+
{getFieldDecorator('blockchain_token_all', {
rules: [{
required: false, message: '请填写项目token总数(单位:枚)'
}],
})(
-
+
)}
{getFieldDecorator('blockchain_init_token', {
@@ -529,8 +539,9 @@ class Index extends Component {
required: false, message: '请填写项目创始人获取token总数(单位：枚)'
}],
})(
-
+
)}
+
{
diff --git a/src/forge/New/new.css b/src/forge/New/new.css
index fcb6fa8c..8442a70b 100644
--- a/src/forge/New/new.css
+++ b/src/forge/New/new.css
@@ -54,4 +54,9 @@
.newContent_inline > .ant-form-item:nth-child(2){
margin-left:0px
}
+}
+
+.div_flex_row {
+ display: flex;
+ flex-direction: row;
}
\ No newline at end of file
diff --git a/src/forge/users/BlockchainExCre.jsx b/src/forge/users/BlockchainExCre.jsx
index 20e0e0a9..231e2248 100644
--- a/src/forge/users/BlockchainExCre.jsx
+++ b/src/forge/users/BlockchainExCre.jsx
@@ -100,7 +100,7 @@ function BlockchainExCreate(props){
return(
-
+
-
+
-
+
- {/**/}
- {/**/}
- {/**/}
-
-
+
-
+
-
+
)
diff --git a/src/forge/users/BlockchainExHistory.jsx b/src/forge/users/BlockchainExHistory.jsx
index 1b41387e..be8a30d0 100644
--- a/src/forge/users/BlockchainExHistory.jsx
+++ b/src/forge/users/BlockchainExHistory.jsx
@@ -36,17 +36,28 @@ function BlockchainExHistory(props){
{
list && list.length > 0 ?
+ -
+
+
+ {"卖家名"}
+ {"项目创建者/项目名"}
+ {"token数量:价值"}
+ {"买家名"}
+ {"交易创建时间"}
+ {"交易截止时间"}
+
+
{list.map((item,key)=>{
return(
-
{item[3].id}
- {item[0].login}
- {item[1].login + "/" + item[2].name}
- {item[3].token_num + ":" + item[3].money}
- {item[4].login}
- {moment(item[3].created_at).format('YYYY-MM-DD HH:mm:ss')}
- {moment(item[3].updated_at).format('YYYY-MM-DD HH:mm:ss')}
+ {item[0].login}
+ {item[1].login + "/" + item[2].name}
+ {item[3].token_num + ":" + item[3].money}
+ {item[4].login}
+ {moment(item[3].created_at).format('YYYY-MM-DD HH:mm:ss')}
+ {moment(item[3].updated_at).format('YYYY-MM-DD HH:mm:ss')}
)
diff --git a/src/forge/users/BlockchainExList.jsx b/src/forge/users/BlockchainExList.jsx
index 55b460f6..dbdcbe3d 100644
--- a/src/forge/users/BlockchainExList.jsx
+++ b/src/forge/users/BlockchainExList.jsx
@@ -49,15 +49,27 @@ function BlockchainExList(props){
{
list && list.length > 0 ?
+ -
+
+
+ 卖家名
+ 项目创建者/项目名
+ token数
+ 售价
+
+ {
+
+ }
+
{list.map((item,key)=>{
return(
-
{item[3].id}
- {item[0].login}
- {item[1].login + "/" + item[2].name}
- {item[3].token_num}
- {item[3].money}
+ {item[0].login}
+ {item[1].login + "/" + item[2].name}
+ {item[3].token_num}
+ {item[3].money}
{
0 ?
+
+ -
+
+
+ 卖家名
+ 项目创建者/项目名
+ token数量:价值
+ 买家名
+ 交易时间
+
+ {
+
+ }
+
+
{list.map((item,key)=>{
return(
-
{item[3].id}
- {item[0].login}
- {item[1].login + "/" + item[2].name}
- {item[3].token_num + ":" + item[3].token_num}
- {item[4].login}
- {moment(item[3].created_at).format('YYYY-MM-DD HH:mm:ss')}
+ {item[0].login}
+ {item[1].login + "/" + item[2].name}
+ {item[3].token_num + ":" + item[3].money}
+ {item[4].login}
+ {moment(item[3].created_at).format('YYYY-MM-DD HH:mm:ss')}
{
0 ?
+ -
+ 项目创建者/项目名
+ token总量
+ 目标转账用户
+ 转账token数量
+
+
{list.map((item,index)=>{
return(
-
)
diff --git a/src/forge/users/Index.scss b/src/forge/users/Index.scss
index d8d4ecd4..08205385 100644
--- a/src/forge/users/Index.scss
+++ b/src/forge/users/Index.scss
@@ -126,6 +126,48 @@ ul.ant-menu.menuStyle{
color: #28BD6C;
}
}
+.blockchain_proj{
+ display: inline-block;
+ font-size: 12px;
+ height: 22px;
+ width: 150px;
+}
+.blockchain_balance{
+ display: inline-block;
+ font-size: 12px;
+ height: 22px;
+ width: 60px;
+}
+.blockchain_input_to{
+ display: inline-block;
+ font-size: 12px;
+ height: 40px;
+ width: 150px;
+}
+.blockchain_input_num{
+ display: inline-block;
+ font-size: 12px;
+ height: 40px;
+ width: 150px;
+}
+.blockchain_proj_select{
+ display: inline-block;
+ font-size: 12px;
+ height: 40px;
+ width: 220px;
+}
+.blockchain_username{
+ display: inline-block;
+ font-size: 12px;
+ height: 40px;
+ width: 60px;
+}
+.blockchain_time{
+ display: inline-block;
+ font-size: 12px;
+ height: 40px;
+ width: 130px;
+}
.CIList{
padding:0px 30px;
min-height: 400px;