Merge remote-tracking branch 'origin/dev' into dev

donate-console/src/main/webapp/WEB-INF/views/index.html

@@ -44,7 +44,7 @@
     <!--顶部导航-->
     <header class="main-header">
         <!-- Logo -->
-        <a href="" class="logo" target="_blank">
+        <a href="/index" class="logo">
             <span class="logo-mini"><b>UAS</b></span>
             <span class="logo-lg"><b>一元捐后台系统</b></span>
         </a>
@@ -89,7 +89,7 @@
                 <li class="jpress_block"></li>
                 <li class="treeview active" id="dashboard">
                     <!-- 加一元捐首页链接 -->
-                    <a href="">
+                    <a href="http://lj.ubtob.com" target="_blank">
                         <i class="fa fa-home"></i>
                         <span>一元捐首页</span>
                     </a>

donate-service/src/main/webapp/resources/js/common/query/Project.js

@@ -59,11 +59,12 @@ define ([ 'ngResource' ], function() {
             },
             // 获取所有项目进度
             getSchedules: {
-                url:'projectEvolve/getEvolves/:proId',
+                url:'projectevolve/getEvolves/:proId',
                 method: 'GET',
                 params: {
                     proId : 'proId'
-                }
+                },
+                isArray: true
             },
             // 获取报告
             getProReport: {