From 633dee9655d25d1a3a4cfed171c8935ecca7e807 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 25 Nov 2021 15:29:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAnumber=E6=88=96=E8=80=85id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index dd72c7617..3466ec358 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -62,7 +62,7 @@ class MergeItem extends Component {
                 <p className="mb15 df" style={{ alignItems: "center" }}>
                   <i className={`iconfont icon-hebingqingqiu1 font-14 mr3 i_${status}`}></i>
                   <Link
-                    to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}`}
+                    to={`/${owner}/${projectsId}/pulls/${item.pull_request_number || item.pull_request_id}`}
                     className="hide-1 font-15 color-grey-3 fwb lineh-30 mr10"
                     style={{ maxWidth: "600px" }}
                   >

From 9299a1667ec75dc3199b8562f5e3b59d8ee97f50 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 26 Nov 2021 10:15:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?gitlink=E9=A6=96=E9=A1=B5style?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/AppConfig.js                      | 2 +-
 src/forge/Main/projecthome/Index.scss | 2 +-
 src/forge/users/Echart/Calendar.jsx   | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/AppConfig.js b/src/AppConfig.js
index 665e85f0f..30eb7e9aa 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -25,7 +25,7 @@ if (isDev) {
   }
   debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
   window.location.search.indexOf('debug=s') !== -1 ? 'student' :
-  window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
+  window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'student'
 }                 
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
diff --git a/src/forge/Main/projecthome/Index.scss b/src/forge/Main/projecthome/Index.scss
index 50b7b5069..80742234d 100644
--- a/src/forge/Main/projecthome/Index.scss
+++ b/src/forge/Main/projecthome/Index.scss
@@ -310,7 +310,6 @@
   margin:0px auto;
   .left{
     width: 850px;
-    box-shadow: 0px 0px 4px 5px rgba(0, 0, 0, 0.02);
     display: flex;
     .leftTypes{
       width: 220px;
@@ -343,6 +342,7 @@
     }
     .leftLists{
       flex:1;
+      box-shadow: 0px 0px 4px 5px rgba(0, 0, 0, 0.02);
       .leftTitles{
         height: 60px;
         display: flex;
diff --git a/src/forge/users/Echart/Calendar.jsx b/src/forge/users/Echart/Calendar.jsx
index 743a0a551..c081f8bde 100644
--- a/src/forge/users/Echart/Calendar.jsx
+++ b/src/forge/users/Echart/Calendar.jsx
@@ -35,9 +35,11 @@ function Calendar({ userLogin , time , chooseTime }) {
     const url = `/users/${userLogin}/headmaps.json`;
     Axios.get(url).then(result=>{
       if(result && result.data){
-        let m = result.data.headmaps;
+        // result.data.headmaps
+        let m = [];
         m.sort(compare('contributions'));
         let max = m[m.length -1].contributions;
+        
         Init(m,max);
       }
     }).catch(error=>{})
@@ -52,6 +54,7 @@ function Calendar({ userLogin , time , chooseTime }) {
   }
 
   function getVirtulData(data) {
+    debugger;
     var date = +echarts.number.parseDate(baginT);
     var end = +echarts.number.parseDate(endT);
     var dayTime = 3600 * 24 * 1000;