From 44d529e8673e850eecfd5c8ff3ec3208c4eeaa01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Mon, 27 Sep 2021 13:09:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/CoderRootCommit.js | 4 ++--
 src/forge/Main/Diff.jsx           | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js
index 7f0b270b9..183523888 100644
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@@ -157,7 +157,7 @@ class CoderRootCommit extends Component{
                       <div className="commitList-item f-wrap-between">
                         <div>
                           <AlignTop>
-                            <div className="commitDesc"><Link to={{pathname:`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}/${branch}`, query:{commitpage:page}}} className="font-14 color-grey-3 font-bd">{item.message}</Link></div>
+                            <div className="commitDesc"><Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}/${branch}?page=${page}`} className="font-14 color-grey-3 font-bd">{item.message}</Link></div>
                           </AlignTop>
                           <p className="f-wrap-alignCenter mt15">
                             <User
@@ -174,7 +174,7 @@ class CoderRootCommit extends Component{
                             <div>
                               <span className="treecopy-cont shadow">
                                 <img src={Tree} alt="sha" width={"16px"}/>
-                                <Link to={{pathname:`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}/${branch}`, query:{commitpage:page}}}>{truncateCommitId(`${item.sha}`)}</Link>
+                                <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}/${branch}?page=${page}`}>{truncateCommitId(`${item.sha}`)}</Link>
                                 <input type="text" id={`value${k}`} value={`${truncateCommitId(`${item.sha}`)}`} disabled/>
                               </span>
                               <CopyTool beforeText="复制commit id" afterText="复制成功" inputId={`value${k}`}/>
diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx
index 8da712383..98321b278 100644
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@@ -43,14 +43,17 @@ const Infos = styled.div`
   }
 `;
 //提交详情页
-export default ( match , history, location) => {
+export default (  location) => {
+  console.log(match);
+  const {match , history } = props;
   const [data, setData] = useState({undefined});
   const [commit, setCommit] = useState(undefined);
   const [parents, setParents] = useState(undefined);
   const [committer, setCommitter] = useState(undefined);
   const [isSpin, setIsSpin] = useState(true);
   console.log('----------', location && location.query && location.query.commitpage);
-  const { sha , projectsId, owner, branchName } = match.params;
+  const { sha , projectsId, owner, branchName } = match && match.params;
+  console.log(sha);
   useEffect(() => {
     if (projectsId && owner && sha) {
       const url = `/${owner}/${projectsId}/commits/${sha}.json`;