模态框返回不关闭问题处理；页面输入非数字跳转报错处理；发布完项目查看跳到未审核分类

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

@@ -56,27 +56,10 @@
                 <ul class="nav navbar-nav">
                     <li class="dropdown user user-menu">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                            <span class="hidden-xs">超级管理员， 您好</span>
+                            <span class="hidden-xs">超级管理员</span>
+                            <span style="margin-left: 20px;">退出</span>
                             <img src="static/images/avatar.jpg" class="user-image">
                         </a>
-                        <ul class="dropdown-menu">
-                            <!-- User image -->
-                            <li class="user-header">
-                                <img src="static/images/avatar.jpg" style="border-radius: 50%;">
-                                <p>超级管理员 - 超级管理员</p>
-                            </li>
-                            <li class="user-footer">
-                                <div class="pull-left">
-                                    <a href="" class="btn btn-default btn-flat">资料</a>
-                                </div>
-                                <div class="pull-left">
-                                    <a href="#" id="login" class="btn btn-default btn-flat">登录</a>
-                                </div>
-                                <div class="pull-right">
-                                    <a href="" class="btn btn-default btn-flat">退出</a>
-                                </div>
-                            </li>
-                        </ul>
                     </li>
                 </ul>
             </div>
@@ -163,7 +146,6 @@
 <script src="static/lib/jquery/jquery.min.js"></script>
 <script src="static/lib/bootstrap/js/bootstrap.min.js"></script>
 <script src="static/lib/js/app.min.js"></script>
-<script src='static/lib/angular/angular.min.js'></script>
 <script type="text/javascript" src="static/lib/require.js"
         data-main="static/js/index/main.js"></script>
 <!--<script src="static/lib/text-angular/textAngular-rangy.min.js"></script>-->
@@ -174,23 +156,23 @@
             data.content && (window.location.href = data.content);
         });
     });
-
-    $(document).ready(function() {
-        var btn = document.getElementsByClassName('dropdown-toggle')[0];
-        console.log(btn);
-        var sib = btn.nextElementSibling;
-        var flag = true;
-        console.log(btn.nextElementSibling);
-        btn.onclick = function () {
-            if (flag) {
-                sib.style.display = 'none';
-                flag = false
-            } else {
-                sib.style.display = 'block';
-                flag = true
-            }
-        }
-    });
+//    // 获取下拉菜单
+//    $(document).ready(function() {
+//        var btn = document.getElementsByClassName('dropdown-toggle')[0];
+//        console.log(btn);
+//        var sib = btn.nextElementSibling;
+//        var flag = true;
+//        console.log(btn.nextElementSibling);
+//        btn.onclick = function () {
+//            if (flag) {
+//                sib.style.display = 'none';
+//                flag = false
+//            } else {
+//                sib.style.display = 'block';
+//                flag = true
+//            }
+//        }
+//    });
 </script>
 </body>
 </html>

donate-console/src/main/webapp/resources/js/common/detail.js

@@ -0,0 +1,16 @@
+/* 项目详情弹窗标签转换 */
+$('.right-nav').on('click', 'span', function () {
+    var index = $(this).index();
+    $(this).addClass('active').siblings().removeClass('active');
+    $('.right-list').eq(index).addClass('show').siblings().removeClass('show');
+});
+
+// 监听浏览器返回键关闭模态框
+$(document).ready(function(e) {
+    var counter = 0;
+    if (window.history && window.history.pushState) {
+        $(window).on('popstate', function () {
+            angular.element(document.getElementById('cancel')).scope().cancel();
+        });
+    }
+});

donate-console/src/main/webapp/resources/js/index/app.js

@@ -187,6 +187,11 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
             };
 
             $scope.active = 'audited';
+            if ($rootScope.active) {
+                $scope.active = $rootScope.active;
+            }
+            console.log($scope.active);
+            console.log($rootScope.active);
             $scope.keyword = '';
 
             /**
@@ -304,7 +309,6 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
 
             };
 
-
         }]);
 
 
@@ -1147,9 +1151,6 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
      */
     app.controller('ProjectNewCtrl', ['$scope', 'BaseService', 'Project', '$http', 'toaster', '$stateParams', '$rootScope',
         function($scope, BaseService, Project, $http, toaster, $stateParams, $rootScope) {
-        if ($rootScope.active) {
-            $rootScope.active = 'done';
-        }
 
         // 默认捐助领域
         $scope.defaultAreas = ['疾病援助', '扶贫/救灾', '教育/助学' , '环境/动物保护', '其他'];
@@ -1239,16 +1240,20 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
 
         // 保存基础信息
         $scope.saveBaseInfo = function(project) {
-            Project.saveBaseInfo({}, project, function(data) {
-                $scope.project = data;
-                var proId = $scope.project.id;
-                if(proId) {
-                    BaseService.scrollBackToTop();
-                    window.location.href = '#/launchProject/detail/' + proId;
-                }
-            },function(res) {
-                toaster.pop('error', '出现错误，操作失败');
-            });
+            if (project.startTime == project.endTime) {
+               toaster.pop('info', '项目开始时间与结束时间不能相同，请修改之后再保存');
+            } else {
+                Project.saveBaseInfo({}, project, function(data) {
+                    $scope.project = data;
+                    var proId = $scope.project.id;
+                    if(proId) {
+                        BaseService.scrollBackToTop();
+                        window.location.href = '#/launchProject/detail/' + proId;
+                    }
+                },function(res) {
+                    toaster.pop('error', '出现错误，操作失败');
+                });
+            }
         };
 
         // 删除
@@ -1371,6 +1376,12 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
             }
         };
 
+        // 设置active
+        $scope.setActive = function(value) {
+          $rootScope.active = value;
+          // window.location.href = '#/';
+        };
+
         //提交 或 保存
         $scope.saveDetail = function (project, type) {
             var data = new FormData();      //以下为像后台提交图片数据
@@ -1399,8 +1410,8 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
             }).success(function (data) {
                 if (type) {
                     toaster.pop('success', '发布成功');
+                    $rootScope.active = 'unaudited';
                     BaseService.scrollBackToTop();
-                    $rootScope.active = 'todo';
                     window.location.href='#/launchProject/success';
                 } else {
                     toaster.pop('success', '保存成功');

donate-console/src/main/webapp/resources/lib/angular/ng-table.min.js

@@ -393,7 +393,7 @@ function(a) {
         a.put("ng-table/filters/select.html", '<select ng-options="data.id as data.title for data in column.data" ng-model="params.filter()[name]" ng-show="filter==\'select\'" class="filter filter-select form-control" name="{{column.filterName}}"> </select>'),
         a.put("ng-table/filters/text.html", '<input type="text" name="{{column.filterName}}" ng-model="params.filter()[name]" ng-if="filter==\'text\'" class="input-filter form-control"/>'),
         a.put("ng-table/header.html", '<tr> <th ng-repeat="column in $columns" ng-class="{ \'sortable\': parse(column.sortable), \'sort-asc\': params.sorting()[parse(column.sortable)]==\'asc\', \'sort-desc\': params.sorting()[parse(column.sortable)]==\'desc\' }" ng-click="sortBy(column, $event)" ng-show="column.show(this)" ng-init="template=column.headerTemplateURL(this)" class="header {{column.class}}"> <div ng-if="!template" ng-show="!template" ng-bind="parse(column.title)"></div> <div ng-if="template" ng-show="template"><div ng-include="template"></div></div> </th> </tr> <tr ng-show="show_filter" class="ng-table-filters"> <th ng-repeat="column in $columns" ng-show="column.show(this)" class="filter"> <div ng-repeat="(name, filter) in column.filter"> <div ng-if="column.filterTemplateURL" ng-show="column.filterTemplateURL"> <div ng-include="column.filterTemplateURL"></div> </div> <div ng-if="!column.filterTemplateURL" ng-show="!column.filterTemplateURL"> <div ng-include="\'ng-table/filters/\' + filter + \'.html\'"></div> </div> </div> </th> </tr>'),
-        a.put("ng-table/pager.html", '<div class="ng-cloak ng-table-pager" ng-if="params.total() > 1"> <div class="ng-table-counts btn-group pull-right"> <button ng-repeat="count in params.settings().counts" type="button" ng-class="{\'active\':params.count()==count}" ng-click="params.count(count)" class="btn btn-default"> <span ng-bind="count"></span> </button> </div> <ul class="pagination ng-table-pagination"> <li ng-class="{\'disabled\': !page.active}" ng-repeat="page in pages" ng-switch="page.type"> <a ng-switch-when="prev" ng-click="params.page(page.number)">&laquo;上一页</a> <a ng-switch-when="first" ng-click="params.page(page.number)"><span ng-bind="page.number"></span></a> <a ng-switch-when="page" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="more" ng-click="params.page(page.number)">&#8230;</a> <a ng-switch-when="last" ng-click="params.page(page.number)"><span ng-bind="page.number"></span></a> <a ng-switch-when="next" ng-click="params.page(page.number)">下一页&raquo;</a> </li> <li><div class="page-record"><span>共{{params.maxpage()}}页,共{{params.total()}}条;</span><span>到第<input type="text" ng-model="page.number" placeholder="{{params.page()}}"/>页<button ng-click="params.page(page.number)" ng-disabled="page.number > params.maxpage() || page.number < 1 || page.number == params.page()">确定</button></span></div></li></ul> </div>')
+        a.put("ng-table/pager.html", '<div class="ng-cloak ng-table-pager" ng-if="params.total() > 1"> <div class="ng-table-counts btn-group pull-right"> <button ng-repeat="count in params.settings().counts" type="button" ng-class="{\'active\':params.count()==count}" ng-click="params.count(count)" class="btn btn-default"> <span ng-bind="count"></span> </button> </div> <ul class="pagination ng-table-pagination"> <li ng-class="{\'disabled\': !page.active}" ng-repeat="page in pages" ng-switch="page.type"> <a ng-switch-when="prev" ng-click="params.page(page.number)">&laquo;上一页</a> <a ng-switch-when="first" ng-click="params.page(page.number)"><span ng-bind="page.number"></span></a> <a ng-switch-when="page" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="more" ng-click="params.page(page.number)">&#8230;</a> <a ng-switch-when="last" ng-click="params.page(page.number)"><span ng-bind="page.number"></span></a> <a ng-switch-when="next" ng-click="params.page(page.number)">下一页&raquo;</a> </li> <li><div class="page-record"><span>共{{params.maxpage()}}页,共{{params.total()}}条;</span><span>到第<input type="text" ng-pattern="/^[1-9]\\d*$/" ng-model="page.number" placeholder="{{params.page()}}"/>页<button ng-click="params.page(page.number)" ng-disabled="page.number > params.maxpage() || page.number < 1 || page.number == params.page()">确定</button></span></div></li></ul> </div>')
     }]),
     b
 });

donate-console/src/main/webapp/resources/view/project/audit_confirm.html

@@ -37,7 +37,7 @@
                     <div class="reason-header">
                         <p>项目申请驳回</p>
                     </div>
-                    <textarea ng-model="project.refuse" required cols="30" rows="10" placeholder="请输入驳回理由...(列举项目未通过原因)"></textarea>
+                    <textarea ng-model="project.refuse" required cols="30" rows="10" maxlength="200" placeholder="请输入驳回理由...(列举项目未通过原因，不超过200个字)"></textarea>
                 </div>
             </div>
             <div class="footer modal-footer text-right">

donate-console/src/main/webapp/resources/view/project/project_detail.html

@@ -3,9 +3,9 @@
     <!--<div class="container">-->
     <div class="right-header clearfix">
         <div class="fl"><span ng-bind="project.name"></span>
-            <a href="" ng-if="project.status== 1">查看网页</a>
+            <a href="lj.ubtob.com/project#/detail/{{project.id}}" target="_blank" ng-if="project.status== 1">查看网页</a>
         </div>
-        <div class="fr close" ng-click="cancel()">&times;</div>
+        <div class="fr close" id="cancel" ng-click="cancel()">&times;</div>
     </div>
     <!--驳回理由-->
     <div class="reject-reason" ng-if="project.status== 2">
@@ -354,10 +354,21 @@
     </div>
     <!--</div>-->
 </aside>
-<script>
-    $('.right-nav').on('click', 'span', function () {
-        var index = $(this).index();
-        $(this).addClass('active').siblings().removeClass('active');
-        $('.right-list').eq(index).addClass('show').siblings().removeClass('show');
-    });
-</script>
+<!--<script>-->
+    <!--$('.right-nav').on('click', 'span', function () {-->
+        <!--var index = $(this).index();-->
+        <!--$(this).addClass('active').siblings().removeClass('active');-->
+        <!--$('.right-list').eq(index).addClass('show').siblings().removeClass('show');-->
+    <!--});-->
+
+    <!--// 监听浏览器返回键关闭模态框-->
+    <!--$(document).ready(function(e) {-->
+        <!--var counter = 0;-->
+        <!--if (window.history && window.history.pushState) {-->
+            <!--$(window).on('popstate', function () {-->
+                <!--angular.element(document.getElementById('cancel')).scope().cancel();-->
+            <!--});-->
+        <!--}-->
+    <!--});-->
+<!--</script>-->
+<script type="text/javascript" src="static/js/common/detail.js"></script>

donate-console/src/main/webapp/resources/view/project/project_finance.html

@@ -3,7 +3,7 @@
     <!--<div class="container">-->
     <div class="right-header clearfix">
         <div class="fl"><span>{{project.name}}</span></div>
-        <div class="fr close" ng-click="cancel()">&times;</div>
+        <div class="fr close" id="cancel" ng-click="cancel()">&times;</div>
     </div>
     <div class="right-nav"><span class="active" style="margin-left: -62px;">财务信息</span><span>披露录入</span></div>
     <!--财务披露-->
@@ -117,12 +117,4 @@
     </div>
 </aside>
 
-<script>
-    $('.right-nav').on('click', 'span', function () {
-        var index = $(this).index();
-//        console.log(index)
-        $(this).addClass('active').siblings().removeClass('active');
-        $('.right-list').eq(index).addClass('show').siblings().removeClass('show');
-//        console.log($('.right-list').eq(index))
-    });
-</script>
+<script type="text/javascript" src="static/js/common/detail.js"></script>

donate-console/src/main/webapp/resources/view/project/project_launch_1.html

@@ -201,6 +201,7 @@
     .form .text-left a.btn:hover{
         background: #be3b1b;
     }
+
     /*项目详情*/
     .detail .list-item{
         margin-bottom: 40px;
@@ -516,6 +517,292 @@
         border: none;
         outline: none;
     }
+
+
+    body{
+        font-family: "Microsoft Yahei", "微软雅黑";
+        box-sizing: border-box;
+    }
+    .clearfix {
+        clear: both;
+    }
+    .skin-blue .content-wrapper .content-header{
+        margin: 0 0 -15px 3px;
+    }
+    .content-header div.all{
+        float: left;
+        margin: 23px 0 10px 0;
+        width: 700px;
+    }
+    .content-header div.all span{
+        position: relative;
+        margin-right: 28px;
+        font-size: 14px;
+        color: #787878;
+        cursor: pointer ;
+    }
+    .content-header div.all span em{
+        font-size: 14px;
+        font-style: normal;
+        color: #787878;
+    }
+    .content-header div.all span.active,.content-header div.all span:hover{
+        font-weight: bold;
+        color: #367fa9;
+    }
+    .content-header div.all span.active em,.content-header div.all span:hover em{
+        font-weight: bold;
+        color: #367fa9;
+    }
+    .content-header div.all span b.line:after{
+        content: '';
+        position: absolute;
+        top: 5px;
+        right: -14px;
+        width: 1px;
+        height: 12px;
+        background: #d2d2d2;
+    }
+    .content-header .form-horizontal{
+        float: right;
+    }
+    .content .jp-left{
+        height: 32px;
+        line-height: 32px;
+    }
+    .content .jp-left span{
+        font-size: 14px;
+        color: #333;
+    }
+    .content .jp-left a{
+        margin-right: 15px;
+        display: inline-block;
+        width: 48px;
+        height: 24px;
+        line-height: 24px;
+        text-align: center;
+        font-size: 14px;
+        color: #367fa9;
+        background: #fff;
+        border: 1px solid #dcdcdc;
+        border-radius: 3px;
+    }
+    .content .jp-left select{
+        margin-right: 28px;
+        width: 150px;
+        height: 32px;
+        border-radius: 0;
+    }
+    .content .boxes {
+        position: relative;
+        margin-top: 4px;
+        border-radius: 3px;
+        background: #ffffff;
+        margin-bottom: 20px;
+        width: 100%;
+        height: 700px;
+        border: 1px solid #dcdcdc;
+        box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+    }
+    .content .boxes-body table{
+        width: 100%;
+        max-width: 100%;
+    }
+    .content .boxes-body table tr{
+        text-align: center;
+        vertical-align: middle ;
+    }
+    .content .boxes-body table tr td:nth-child(2),.content .boxes-body table tr td:nth-child(3){
+        text-align: left;
+    }
+    .content .boxes-body table thead{
+        height: 40px;
+        line-height: 40px;
+        text-align: center;
+    }
+    .content .boxes-body table thead tr{
+        border-bottom: 1px solid #dcdcdc;
+    }
+    .content .boxes-body table thead tr td{
+        font-size: 14px;
+        color: #8c8c8c;
+        font-weight: bold;
+    }
+    .content .boxes-body table tbody{
+        height: 655px;
+    }
+    .content .boxes-body table tbody tr{
+        height: 60px;
+        vertical-align: middle ;
+        cursor: pointer;
+    }
+    .content .boxes-body table tbody tr:nth-child(even){
+        background: #f7f7f7;
+    }
+    .content .boxes-body table tbody tr:hover{
+        background: #f1f5ff;
+    }
+    .content .boxes-body table tbody tr td{
+        padding-top: 6px;
+        font-size: 14px;
+        color: #323232;
+    }
+    .content .boxes-body table tbody tr td div.name{
+        width: 220px;
+    }
+    .content .boxes-body table tbody tr td div.name p {
+        font-size: 14px;
+        font-weight: bold;
+        color: #323232;
+    }
+    .content .boxes-body table tbody tr td div.name:hover p{
+        text-decoration: underline;
+    }
+    /*.content .boxes-body table tbody tr td div.name div{*/
+    /*display: none;*/
+    /*}*/
+    .content .boxes-body table tbody tr:hover td div.name div{
+        margin-top: 5px;
+        display: block;
+    }
+    .content .boxes-body table tbody tr td div.name span{
+        margin-right: 25px;
+        font-size: 14px;
+        color: #367bcf;
+        cursor: pointer;
+    }
+    .content .boxes-body table tbody tr td div.name span:last-child {
+        margin-right: 0;
+    }
+    /*右侧内容部分*/
+    .content-right{
+        margin-top: 50px;
+        position: absolute;
+        top: 0;
+        right: 0;
+        /*width: 50%;*/
+        width: 905px;
+        height: auto;
+        background: #fff;
+        z-index: 100;
+        /*box-shadow: -5px 2px 2px #f0f0f0;*/
+        /*-moz-box-shadow: -5px 2px 2px #f0f0f0;*/
+        /*-o-box-shadow: -5px 2px 2px #f0f0f0;*/
+        /*-webkit-box-shadow: -5px 2px 2px #f0f0f0 ;*/
+    }
+    .right-header{
+        padding: 0 25px;
+        width: 100%;
+        height: 64px;
+        line-height: 64px;
+    }
+    .right-header span{
+        margin-right: 17px;
+        font-size: 24px;
+        color: #333;
+    }
+    .right-header a{
+        font-size: 14px;
+        color: #1a6eb5;
+    }
+    .right-header .close{
+        font-size: 40px;
+    }
+    .right-nav{
+        margin-bottom: 14px;
+        width: 100%;
+        height: 34px;
+        line-height: 34px;
+        background: #e8f0f7;
+    }
+    .right-nav span{
+        margin-right: 50px;
+        padding-bottom: 5px;
+        font-size: 14px;
+        color: #333333;
+        cursor: pointer;
+    }
+
+    .right-nav span:hover,.right-nav span.active{
+        border-bottom: 2px solid #3c8dbc;
+    }
+    .content-right .right-list{
+        width: 100%;
+    }
+    .content-right .right-list table{
+        margin-top: 20px;
+        width: 100%;
+        table-layout: fixed ;
+    }
+
+    .content-right .right-list table thead{
+        width: 100%;
+        height: 40px;
+        line-height: 40px;
+        border: 1px solid #dcdcdc;
+    }
+    .content-right .right-list table thead tr{
+        border: 1px solid #dcdcdc;
+    }
+    .content-right .right-list table thead th{
+        font-size: 14px;
+        color: #8c8c8c;
+        text-align: center;
+    }
+    .content-right .right-list table thead th:nth-child(2){
+        text-align: left;
+    }
+    .content-right .right-list table tbody tr{
+        height: 60px;
+        cursor: pointer;
+    }
+    .content-right .right-list table tbody tr:nth-child(even){
+        background: #f7f7f7;
+    }
+    .content-right .right-list table tbody tr:hover{
+        background: #f1f5ff;
+    }
+    .content-right .right-list table tbody tr td{
+        font-size: 14px;
+        color: #333;
+        text-align: center;
+    }
+    .content-right .right-list table tbody tr td:nth-child(2) {
+        /*font-weight: bold;*/
+        text-align: left;
+    }
+    .content-right .right-list table tbody tr td:nth-child(3) {
+        padding-right: 20px;
+        text-align: right;
+    }
+    /*机构信息*/
+    .right-list .list-message{
+        padding: 0 20px 0 25px;
+    }
+    .right-list .list-header{
+        position: relative;
+        width: 100%;
+        height: 43px;
+        text-align: left;
+        border-bottom: 1px solid #dcdcdc;
+    }
+    .right-list .list-header:first-child {
+        margin-top: -10px;
+    }
+    .right-list .list-header span{
+        margin-left: 15px;
+        font-size: 15px;
+        color: #000;
+    }
+    .right-list .list-header span:before {
+        content: '';
+        position: absolute;
+        top: 13px;
+        left: 0;
+        width: 4px;
+        height: 16px;
+        background: #626262;
+    }
 </style>
 <div class="content-wrapper" style="min-height: 924px;; z-index: 50;">
     <!-- Main content -->
@@ -643,7 +930,7 @@
                                     </div>
                                 </div>
                                 <div class="text-left">
-                                    <button type="button" ng-disabled="baseInfoForm.$invalid || !checked" ng-click="saveBaseInfo(project)" class="btn">保存，下一步</button>
+                                    <button type="button" ng-disabled="baseInfoForm.$invalid || !checked || !project.area || !project.population" ng-click="saveBaseInfo(project)" class="btn">保存，下一步</button>
                                 </div>
                             </form>
                         </div>

donate-console/src/main/webapp/resources/view/project/project_launch_3.html

@@ -515,7 +515,7 @@
                     <div class="detail">
                         <div class="complete"><img src="static/images/over.png" alt=""/><span>项目已提交!</span></div>
                         <p class="txt-intro">公益项目需要经过专业机构的后台评审，评审无异议后将会发布到平台上。</p>
-                        <div class="look"><a ui-sref="project">查看项目</a></div>
+                        <div class="look"><a ng-click="setActive('unaudited')" ui-sref="project">查看项目</a></div>
                         <!--<a href="/" class="return">返回首页&gt;</a>-->
                     </div>
                 </div>

donate-console/src/main/webapp/resources/view/project/project_list.html

@@ -330,12 +330,12 @@
         text-indent: 2em;
         line-height: 21px;
     }
-    .msg-list .project-txt .project-intro img{
-        margin: 30px 0;
-        width: 500px;
-        height: 235px;
-        border: 1px solid #e1e1e1;
-    }
+    /*.msg-list .project-txt .project-intro img{*/
+        /*margin: 30px 0;*/
+        /*width: 500px;*/
+        /*height: 235px;*/
+        /*border: 1px solid #e1e1e1;*/
+    /*}*/
     .msg-list .project-txt .projectIntro{
         margin-bottom: 45px;
     }
@@ -725,9 +725,9 @@
         <h1>项目列表</h1>
         <div class="row content-row clearfix">
             <div class="all">
-                <span class="active" ng-click="setState('audited')">已审核<em>({{auditedNum}})</em><b class="line"></b></span>
-                <span ng-click="setState('unaudited')">未审核<em>({{unauditedNum}})</em><b class="line"></b></span>
-                <span ng-click="setState('disagreed')">未通过<em>({{disagreedNum}})</em></span>
+                <span ng-class="{'active' : active == 'audited'}" ng-click="setState('audited')">已审核<em>({{auditedNum}})</em><b class="line"></b></span>
+                <span ng-class="{'active' : active == 'unaudited'}" ng-click="setState('unaudited')">未审核<em>({{unauditedNum}})</em><b class="line"></b></span>
+                <span ng-class="{'active' : active == 'disagreed'}" ng-click="setState('disagreed')">未通过<em>({{disagreedNum}})</em></span>
             </div>
             <!--<form class="form-horizontal" method="POST" action="">-->
             <div class="input-group input-group-sm fr">
@@ -745,8 +745,8 @@
                     <div class="jp-left">
                         <select class="form-control input-sm jp-width120" ng-model="selectedArea" ng-change="reload()" ng-init="selectedArea = '全部'">
                             <option ng-value="'全部'">全部</option>
-                            <option ng-value="'环保/保护动物'">环保/保护动物</option>
-                            <option ng-value="'疾病救助'">疾病救助</option>
+                            <option ng-value="'环境/动物保护'">环境/动物保护</option>
+                            <option ng-value="'疾病援助'">疾病援助</option>
                             <option ng-value="'扶贫/救灾'">扶贫/救灾</option>
                             <option ng-value="'教育/助学'">教育/助学</option>
                         </select>

donate-console/src/main/webapp/resources/view/project/project_list_finance.html

@@ -330,12 +330,12 @@
         text-indent: 2em;
         line-height: 21px;
     }
-    .msg-list .project-txt .project-intro img{
-        margin: 30px 0;
-        width: 500px;
-        height: 235px;
-        border: 1px solid #e1e1e1;
-    }
+    /*.msg-list .project-txt .project-intro img{*/
+        /*margin: 30px 0;*/
+        /*width: 500px;*/
+        /*height: 235px;*/
+        /*border: 1px solid #e1e1e1;*/
+    /*}*/
     .msg-list .project-txt .projectIntro{
         margin-bottom: 45px;
     }

donate-console/src/main/webapp/resources/view/project/project_list_management.html

@@ -330,12 +330,12 @@
         text-indent: 2em;
         line-height: 21px;
     }
-    .msg-list .project-txt .project-intro img{
-        margin: 30px 0;
-        width: 500px;
-        height: 235px;
-        border: 1px solid #e1e1e1;
-    }
+    /*.msg-list .project-txt .project-intro img{*/
+        /*margin: 30px 0;*/
+        /*width: 500px;*/
+        /*height: 235px;*/
+        /*border: 1px solid #e1e1e1;*/
+    /*}*/
     .msg-list .project-txt .projectIntro{
         margin-bottom: 45px;
     }

donate-console/src/main/webapp/resources/view/project/project_list_report.html

@@ -331,12 +331,12 @@
         text-indent: 2em;
         line-height: 21px;
     }
-    .msg-list .project-txt .project-intro img{
-        margin: 30px 0;
-        width: 500px;
-        height: 235px;
-        border: 1px solid #e1e1e1;
-    }
+    /*.msg-list .project-txt .project-intro img{*/
+        /*margin: 30px 0;*/
+        /*width: 500px;*/
+        /*height: 235px;*/
+        /*border: 1px solid #e1e1e1;*/
+    /*}*/
     .msg-list .project-txt .projectIntro{
         margin-bottom: 45px;
     }

donate-console/src/main/webapp/resources/view/project/project_management.html

@@ -2,7 +2,7 @@
 <aside class="content-right">
     <div class="right-header clearfix">
         <div class="fl"><span ng-bind="project.name"></span></div>
-        <div class="fr close" ng-click="cancel()">&times;</div>
+        <div class="fr close" id="cancel" ng-click="cancel()">&times;</div>
     </div>
     <div class="right-nav"><span style="margin-left: -188px;" class="active">结项报告</span></div>
     <!--结项报告-->
@@ -43,12 +43,4 @@
         </form>
     </div>
 </aside>
-<script>
-    $('.right-nav').on('click', 'span', function () {
-        var index = $(this).index();
-//        console.log(index)
-        $(this).addClass('active').siblings().removeClass('active');
-        $('.right-list').eq(index).addClass('show').siblings().removeClass('show');
-//        console.log($('.right-list').eq(index))
-    });
-</script>
+<script type="text/javascript" src="static/js/common/detail.js"></script>

donate-console/src/main/webapp/resources/view/project/project_report.html

@@ -4,7 +4,7 @@
     <!--<div class="container">-->
     <div class="right-header clearfix">
         <div class="fl"><span>{{project.name}}</span></div>
-        <div class="fr close" ng-click="cancel()">&times;</div>
+        <div class="fr close" id="cancel" ng-click="cancel()">&times;</div>
     </div>
     <div class="right-nav"><span class="active" style="margin-left: -70px;">项目进度</span><span>进度录入</span></div>
     <!--项目进度-->
@@ -39,10 +39,4 @@
     </div>
     <!--</div>-->
 </aside>
-<script>
-    $('.right-nav').on('click', 'span', function () {
-        var index = $(this).index();
-        $(this).addClass('active').siblings().removeClass('active');
-        $('.right-list').eq(index).addClass('show').siblings().removeClass('show');
-    });
-</script>
+<script type="text/javascript" src="static/js/common/detail.js"></script>