From c2a21b2780a6459adc82c0865a1a989316e4fb2d Mon Sep 17 00:00:00 2001
From: zhangxunhui <zhangxunhui@nudt.edu.cn>
Date: Fri, 3 Feb 2023 14:16:09 +0800
Subject: [PATCH 1/2] change getData file

---
 src/forge/GetData/getData.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/forge/GetData/getData.jsx b/src/forge/GetData/getData.jsx
index cc9eac7c..91507124 100644
--- a/src/forge/GetData/getData.jsx
+++ b/src/forge/GetData/getData.jsx
@@ -23,5 +23,5 @@ export const getUser = async (login)=>{
 
 // 获取用户对应项目内的信息（例如：用户对某个项目的贡献情况） author: zxh
 export const getUser4Proj = async (login, projectsId)=>{
-  return (await axios.get(`/users/${login}/hovercard4proj.json?project_name=${projectsId}`)).data;
+  return (await axios.get(`/users/${login}/hovercard4proj.json?project_identifier=${projectsId}`)).data;
 }
\ No newline at end of file

From fcaaef137a2ee45ec027db4c50b1bf1d5f0c1e68 Mon Sep 17 00:00:00 2001
From: zhangxunhui <zhangxunhui@nudt.edu.cn>
Date: Sat, 4 Feb 2023 11:08:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=AF=B9=E4=BD=BF=E7=94=A8=E5=92=8C=E6=9C=AA=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=A1=AE=E6=9D=83=E9=A1=B9=E7=9B=AE=E7=9A=84=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/MessageCount.js |  7 ---
 src/forge/New/Index.js          | 80 +++++++++++++++++----------------
 src/forge/Order/Detail.js       |  9 ++--
 src/forge/Order/order_form.js   | 27 ++++++-----
 4 files changed, 62 insertions(+), 61 deletions(-)

diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 9d5d5ce6..08cd5afb 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -644,13 +644,6 @@ class MessageCount extends Component {
                           value={this.state.body}
                           onChange={this.changbodypr}
                         />
-                        {/*<Input*/}
-                        {/*  type="select"*/}
-                        {/*  placeholder="请选择解决的issue"*/}
-                        {/*  style={{ marginTop: 20 }}*/}
-                        {/*  value={this.state.fix_issue_id}*/}
-                        {/*  onChange={this.changefixissue}*/}
-                        {/*/>*/}
                         <Select
                           id = {'select_project'}
                           style={{ marginTop: 20, width: "500px" }}
diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js
index ef0969e7..f471eac3 100644
--- a/src/forge/New/Index.js
+++ b/src/forge/New/Index.js
@@ -52,7 +52,7 @@ class Index extends Component {
       languageFlag:false,
       ignoreFlag:false,
       licenseFlag:false,
-      show_div:"hidden",
+      display: "none",
     }
   }
   componentDidMount = () => {
@@ -303,13 +303,13 @@ class Index extends Component {
 
   // add by zxh: handleBlockchainChange
   handleBlockchainChange = (event) => {
-    if (this.state.show_div == 'hidden') {
+    if (this.state.display == "none") {
       this.setState({
-        show_div: "visible"
+        display: "block"
       });
     } else {
       this.setState({
-        show_div: "hidden"
+        display: "none"
       });
     }
   }
@@ -578,41 +578,7 @@ class Index extends Component {
                     <Checkbox value="limit">将项目设为私有<span className="font-13 color-grey-9">(只有项目所有人或拥有权限的项目成员才能看到)</span></Checkbox>
                   )}
                 </Form.Item >
-                {/*增加区块链选项，不要求必选，默认是选择的*/}
-                <Form.Item
-                    label="确权"
-                    style={{ margin: "0px" }}
-                    className="privatePart"
-                >
-                  {getFieldDecorator('blockchain')(
-                      <Checkbox value="limit" onClick={this.handleBlockchainChange}>项目加入确权机制<span className="ml15 font-13 color-grey-9">(贡献确权上链并使用权益证明代表贡献)</span></Checkbox>
-                  )}
-                </Form.Item >
-
-                <Form.Item
-                  style={{ margin: "15px", display: "block" }}
-                  className="privatePart"
-                  ref={(blockchain_item => {this.blockchain_item = blockchain_item})}
-                >
-                  <div class="div_flex_row" style={{visibility: this.state.show_div == "visible" ? "visible": "hidden"}}>
-                  {getFieldDecorator('blockchain_token_all', {
-                    rules: [{
-                      required: false, message: '请填写项目token总数(单位:枚)'
-                    }],
-                  })(
-                    <Input type={'number'} min={0} step={1} placeholder="请填写项目token总数(单位:枚)" />
-                  )}
-
-                  {getFieldDecorator('blockchain_init_token', {
-                    rules: [{
-                      required: false, message: '请填写项目创始人获取token的百分比(%)'
-                    }],
-                  })(
-                    <Input type={'number'} min={0} max={100} step={1} placeholder="请填写项目创始人获取token的百分比(%)" />
-                  )}
-                  </div>
-                </Form.Item>
-
+                
                 {
                   projectsType && projectsType === "mirror" &&
                   <Form.Item
@@ -680,6 +646,42 @@ class Index extends Component {
                     )}
                   </Form.Item>
                 }
+
+                {/*增加区块链选项，不要求必选，默认是选择的*/}
+                <Form.Item
+                    label="确权"
+                    style={{ margin: "0px" }}
+                    className="privatePart"
+                >
+                  {getFieldDecorator('blockchain')(
+                      <Checkbox value="limit" onClick={this.handleBlockchainChange}>项目加入确权机制<span className="ml15 font-13 color-grey-9">(贡献确权上链并使用权益证明代表贡献)</span></Checkbox>
+                  )}
+                </Form.Item >
+
+                <Form.Item
+                  style={{ margin: "15px", display: "block" }}
+                  className="privatePart"
+                  ref={(blockchain_item => {this.blockchain_item = blockchain_item})}
+                >
+                  <div class="div_flex_row" style={{display: this.state.display == "block" ? "block": "none"}}>
+                  {getFieldDecorator('blockchain_token_all', {
+                    rules: [{
+                      required: false, message: '请填写项目token总数(单位:枚)'
+                    }],
+                  })(
+                    <Input type={'number'} min={0} step={1} placeholder="请填写项目token总数(单位:枚)" />
+                  )}
+
+                  {getFieldDecorator('blockchain_init_token', {
+                    rules: [{
+                      required: false, message: '请填写项目创始人获取token的百分比(%)'
+                    }],
+                  })(
+                    <Input type={'number'} min={0} max={100} step={1} placeholder="请填写项目创始人获取token的百分比(%)" />
+                  )}
+                  </div>
+                </Form.Item>
+
                 <div className="mt20">
                   注：<span className="ant-form-item-required"></span> 为必填项，否则为选填
                 </div>
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index 15a8e470..23c34c84 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -42,8 +42,8 @@ class Detail extends Component {
   }
 
   componentDidMount = () => {
-    this.getDetail();
     this.getBlockchainTokenNum();
+    this.getDetail();
   };
 
   componentDidUpdate=()=>{
@@ -362,10 +362,13 @@ class Detail extends Component {
                     )}
                 </span>
               </p>
-              <p className="grid-item-left pb15">
+              {
+                this.state.blockchain_token_num != -1 ? <p className="grid-item-left pb15">
                 <span className="issue_detail_info">悬赏金额:</span>
                 <span>{this.state.blockchain_token_num}</span>
-              </p>
+              </p> : ""
+              }
+              
               <p className="grid-item-left pb15">
                 <span className="issue_detail_info">里程碑:</span>
                 <span className="title_overflow">
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index 2121c735..324a1187 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -490,18 +490,21 @@ class order_form extends Component {
             </div>
             <div className="list-left list-left-padding issue-edit-form-right">
               <div className="pd20 background-f issue-form-right">
-                <Form.Item label="悬赏金额">
-                  {getFieldDecorator("issue_token_num", {rules: []})(
-                    <Input
-                      ref={(input) => this.input_token=input}
-                      type={"number"}
-                      min={0}
-                      max={this.state.issue_token_num}
-                      onChange={this.adjustTokenNum.bind(this)}
-                      placeholder="定义悬赏token数量"
-                    />
-                  )}
-                </Form.Item>
+                {issue_chosen && issue_chosen.use_blockchain ?
+                  <Form.Item label="悬赏金额">
+                    {getFieldDecorator("issue_token_num", { rules: [] })(
+                      <Input
+                        ref={(input) => this.input_token = input}
+                        type={"number"}
+                        min={0}
+                        max={this.state.issue_token_num}
+                        onChange={this.adjustTokenNum.bind(this)}
+                        placeholder="定义悬赏token数量"
+                      />
+                    )}
+                  </Form.Item>
+                  : ""}
+                
                 <Form.Item label="指派成员">
                   {getFieldDecorator("assigned_to_id", {rules: []})(
                     <Select