From d03ecac72eeca82a9b57dab0f662e2f802b650f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 26 May 2023 09:42:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=AF=BE=E9=A2=98=E5=A5=96=E9=87=91?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/glcc/apply/taskApply.jsx | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/glcc/apply/taskApply.jsx b/src/glcc/apply/taskApply.jsx
index c8068ed0c..a263f9bd2 100644
--- a/src/glcc/apply/taskApply.jsx
+++ b/src/glcc/apply/taskApply.jsx
@@ -11,6 +11,17 @@ function TaskApply(props) {
     {id: 2, name: "中"},
     {id: 3, name: "高"}
   ]
+  // 奖金
+  const rewardList = [
+    {id: 12000},
+    {id: 11000},
+    {id: 10000},
+    {id: 9000},
+    {id: 8000},
+    {id: 7000},
+    {id: 6000},
+    {id: 0},
+  ]
 
   return(
     <div className="taskApplyForm">
@@ -40,16 +51,19 @@ function TaskApply(props) {
         {helper('课题奖金',
           '',
           `taskReward${taskKey}`,
-          [{ required: true, message: "请输入课题奖金" },
-          {pattern: /^[1-9]+[0-9]*]*$/, message: "请输入正整数" },
-          { validator: (rule,val,callback) =>{
-            if(val>=6000 && val<=12000){
-              callback();
-            }else{
-              callback("区间为6000-12000元");
-            }
-          }}],
-          <Input placeholder="请输入课题奖金" disabled = {disabled} className={disabled? "disabledInput":""}/>
+          [{ required: true, message: "请选择课题奖金" },
+          // {pattern: /^[1-9]+[0-9]*]*$/, message: "请输入正整数" },
+          // { validator: (rule,val,callback) =>{
+          //   if(val>=6000 && val<=12000){
+          //     callback();
+          //   }else{
+          //     callback("区间为6000-12000元");
+          //   }
+          // }}
+          ],
+          <Select placeholder="请根据课题难度选择奖金" disabled = {disabled} className={disabled? "disabledInput":""}>
+            {rewardList && rewardList.map(item=> {return <Option value={item.id} key={item.id}>{item.id}</Option>})}
+          </Select>
         )}
         {helper('导师姓名',
           '',

From f1ce471b4eb91aeda4936f0d99cb3c74dfbdd22b Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 31 May 2023 09:34:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/New/Index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js
index 812aed4ad..8ade2df05 100644
--- a/src/forge/New/Index.js
+++ b/src/forge/New/Index.js
@@ -398,7 +398,7 @@ class Index extends Component {
                         <Input placeholder="请输入需要导入到本项目的仓库地址" onBlur={this.ChangeAddr} />
                       )}
                     </Form.Item>
-                    <p className="formTip color-orange">示例：https://github.com/facebook/reack.git</p>
+                    <p className="formTip color-orange">示例：https://github.com/Stability-AI/StableStudio.git</p>
                   </React.Fragment>
                 }
                 {

From 710f01829655272e463ca248c8d63725b125f428 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 31 May 2023 10:20:03 +0800
Subject: [PATCH 3/3] remove unneed

---
 src/forge/Head/Header.js | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 20fec8ceb..9269faf0d 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -311,22 +311,7 @@ class NewHeader extends Component {
                 {
                   settings.navbar && settings.navbar.map((item, key) => {
                     var new_link = item.link;
-                    // var user_login = current_user && current_user.login;
                     var is_hidden = item.hidden;
-                    // if (new_link && (new_link.indexOf("courses") > -1 || new_link.indexOf("contests") > -1)) {
-                    //   if (user_login) {
-                    //     if (new_link.indexOf("courses") > -1) {
-                    //       new_link = new_link.replace(/courses/g, user_login + "/courses")
-                    //     } else if (new_link.indexOf("contests") > -1) {
-                    //       new_link = new_link.replace(/contests/g, user_login + "/contests")
-                    //     }
-                    //   } else {
-                    //     is_hidden = true
-                    //   }
-                    // }
-                    // if (user_login && (new_link && new_link.indexOf("homes") > -1)) {
-                    //   new_link = new_link.replace(/homes/g, user_login + "/user_activities")
-                    // }
                     var waiLian = (new_link && str.filter(item=>new_link.indexOf(item)>-1) );
                     var wl = waiLian && waiLian.length>0;
                     return (