Merge pull request '列表样式，合并请求路由值根据接口改为number或者id' (#286) from caishi/forgeplus-react:gitlink_server into gitlink_server

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) {

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;

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" }}
                   >

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;