From dccbd6735d460dfae9cd6c96cbd67e4761d1d501 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 2 Apr 2021 11:57:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E5=88=97=E8=A1=A8=E9=87=8C?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E4=BA=A4=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BD=9C?=
 =?UTF-8?q?=E8=80=85=E5=A4=B4=E5=83=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/DevOps/Structure.jsx |  3 ++-
 src/forge/Source/Index.jsx     | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/forge/DevOps/Structure.jsx b/src/forge/DevOps/Structure.jsx
index 45f734bdf..5bfe00621 100644
--- a/src/forge/DevOps/Structure.jsx
+++ b/src/forge/DevOps/Structure.jsx
@@ -58,6 +58,7 @@ function Structure(props,ref){
           return {
             ...item,
             author:item.author && item.author.name,
+            image_url:item.author && item.author.image_url,
             message: {
               branch: item.branch_target,
               message: item.message,
@@ -244,7 +245,7 @@ function Structure(props,ref){
               {meg.sha && <span className="color-orange">{meg.sha}</span>}
             </div>
             <AlignCenter>
-              <img style={{borderRadius:"50%",marginRight:"10px",width:"25px",height:"25px"}} src={`${current_user && getUrl(`/images/${current_user.image_url}`)}`} />
+              <img style={{borderRadius:"50%",marginRight:"10px",width:"25px",height:"25px"}} alt="" src={`${item.image_url && getUrl(`/images/${item.image_url}`)}`} />
               <div className="task-hide ml5" style={{ maxWidth: "300px" }}>
                 {meg.message}
               </div>
diff --git a/src/forge/Source/Index.jsx b/src/forge/Source/Index.jsx
index 9f1c81c14..bcc27acda 100644
--- a/src/forge/Source/Index.jsx
+++ b/src/forge/Source/Index.jsx
@@ -13,9 +13,9 @@ const sort = [
   "按引用排序"
 ]
 const limit = 15;
-const https = 'http://117.50.100.12:8001';
+const https = 'https://testfiles.trustie.net';
 function Index(props){
-  const [ sortValue , setSortValue ] = useState(1);
+  const [ sortValue , setSortValue ] = useState(0);
   const [ page , setPage ] = useState(1);
   const [ total , setTotal ] = useState(0);
   const [ search , setSearch ] = useState(undefined);
@@ -28,7 +28,7 @@ function Index(props){
     if(owner && repo_id){
       getData();
     }
-  },[repo_id,owner,search,sort,page])
+  },[repo_id,owner,search,sortValue,page])
 
   function getData(){
     const url = https +`/api/project/achievement/`;
@@ -38,7 +38,7 @@ function Index(props){
         curPage:page,
         pageSize:limit,
         name:search,
-        sort:sortValue,
+        sort:sortValue+1,
       }
     }).then(result=>{
       if(result && result.data){
@@ -54,6 +54,7 @@ function Index(props){
 
   // 切换排序方式
   function changeSort(e,index){
+    console.log(index);
     setSortValue(index);
   }
 
@@ -63,7 +64,7 @@ function Index(props){
       {
         sort && sort.map((item,key)=>{
           return(
-            <Menu.Item onClick={(e)=>changeSort(e,key+1)} value={key} className={key+1 === sortValue ?"color-blue":""}>{item}</Menu.Item>     
+            <Menu.Item onClick={(e)=>changeSort(e,key)} value={key} className={key=== sortValue ?"color-blue":""}>{item}</Menu.Item>     
           )
         })
       }