活动发起bug修改。

donate-console/src/main/java/com/uas/console/donate/controller/ActivityController.java

@@ -17,6 +17,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.repository.query.Param;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -29,6 +30,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 
@@ -297,9 +299,10 @@ public class ActivityController {
     @RequestMapping(value = "/getActivityRelatedProjects", method = RequestMethod.GET)
     @ResponseBody
     public List<Project> getActivityRelatedProjects(String keyword, String selectedIds) {
-        List<Long> proIds = new ArrayList<>();
+        List<String> proIds = new ArrayList<>();
         if (!StringUtils.isEmpty(selectedIds)) {
-            proIds = JSONObject.parseArray(selectedIds, Long.class);
+            List<String> temp = Arrays.asList(selectedIds.split(","));
+            proIds.addAll(temp);
         }
         return activityService.getActivityRelatedProjects(keyword, proIds);
     }

donate-console/src/main/java/com/uas/console/donate/service/ActivityService.java

@@ -53,7 +53,7 @@ public interface ActivityService {
     Activity openAward(Long activityId);
 
 
-    List<Project> getActivityRelatedProjects(String keyword, List<Long> proIds);
+    List<Project> getActivityRelatedProjects(String keyword, List<String> proIds);
 
 //    Attach uploadPrizeImg(FileUpload fileUpload) throws Exception;
     Attach uploadPrizeImg(MultipartFile file) throws Exception;

donate-console/src/main/java/com/uas/console/donate/service/impl/ActivityServiceImpl.java

@@ -225,12 +225,14 @@ public class ActivityServiceImpl implements ActivityService{
     }
 
     @Override
-    public List<Project> getActivityRelatedProjects(final String keyword, final List<Long> proIds) {
+    public List<Project> getActivityRelatedProjects(final String keyword, final List<String> proIds) {
         // 获取所有已被关联的项目id
         List<BigInteger> relatedIds = projectDao.getProjectIdsRelated();
         if (!CollectionUtils.isEmpty(relatedIds)) {
             for (BigInteger id : relatedIds) {
-                proIds.add(id.longValue());
+                if (null != id) {
+                    proIds.add(id.toString());
+                }
             }
         }
         // 默认返回100条
@@ -245,8 +247,8 @@ public class ActivityServiceImpl implements ActivityService{
                             PredicateUtils.like("orgName", keyword, false)));
                 }
                 if (!CollectionUtils.isEmpty(proIds)) {
-                    for (Long proId : proIds) {
-                        pageInfo.expression(PredicateUtils.ne("id", proId, false));
+                    for (String proId : proIds) {
+                        pageInfo.expression(PredicateUtils.ne("id", Long.valueOf(proId), false));
                     }
                 }
                 query.where(pageInfo.getPredicates(root, query, cb));

donate-console/src/main/webapp/resources/css/base.css

@@ -275,4 +275,31 @@ textarea {
 
 .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
 	background-color: #fff!important ;
+}
+
+/*搜索无结果*/
+.noSearch .img{
+	margin: 50px auto 26px;
+}
+.noSearch .img img{
+	width: 80px;
+	height: 80px;
+}
+.noSearch .txt{
+	margin: 0 auto;
+	text-align: center;
+}
+.noSearch .txt p{
+	margin-bottom: 54px;
+	font-size: 18px;
+	color: #8c8c8c;
+}
+.noSearch .txt a{
+	display: inline-block;
+	width: 140px;
+	height: 36px;
+	line-height: 36px;
+	font-size: 16px;
+	color: #ef613b;
+	border: 1px solid #dcdcdc;
 }

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

@@ -2066,6 +2066,9 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                     resolve: {
                         id: function () {
                             return id;
+                        },
+                        active: function() {
+                            return $scope.active;
                         }
                     }
                 });
@@ -2087,9 +2090,9 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
     /**
      * 活动详情框
      */
-    app.controller('ActivityDetailCtrl', ['$scope', 'Activity', 'toaster', '$modalInstance', 'BaseService', 'id', '$modal',
-        function($scope, Activity, toaster, $modalInstance, BaseService, id, $modal) {
-
+    app.controller('ActivityDetailCtrl', ['$scope', 'Activity', 'toaster', '$modalInstance', 'BaseService', 'id', '$modal', 'active',
+        function($scope, Activity, toaster, $modalInstance, BaseService, id, $modal, active) {
+            $scope.active = active;
 
             var loadData = function() {
                 // 获取项目详情
@@ -2098,10 +2101,6 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                 }, function() {
                     toaster.pop('error', '详情加载失败');
                 });
-
-                Activity.getRelatedProject({id:id}, {}, function(data) {
-                    $scope.relatedProjects = data;
-                });
             };
             loadData();
 
@@ -2135,6 +2134,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                     $scope.activity = data;
                     $scope.awards = data.awards;
                     $scope.selectedProjects = data.projects;
+                    $scope.tempSelectedProjects = angular.copy($scope.selectedProjects);
                     $scope.actImgUrl = data.actImg;
                     $scope.bannerUrl = data.banner;
                 }
@@ -2194,15 +2194,16 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
         };
 
         // 获取项目列表
+        var selectedIds = [];
         var getProject = function() {
-            var selectedIds = [];
             if ([] !== $scope.selectedProjects) {
                 angular.forEach($scope.selectedProjects, function(selectedProject) {
                     selectedIds.push(selectedProject.id);
                 });
             }
-            Activity.getActivityRelatedProjects({keyword: $scope.keyword, selectedIds: selectedIds}, {}, function(data) {
+            Activity.getActivityRelatedProjects({keyword: $scope.keyword, selectedIds: selectedIds}, function(data) {
                 $scope.projects = data;
+                $scope.tempProjects = angular.copy($scope.projects);
             });
         };
         getProject();
@@ -2223,8 +2224,8 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
 
         // 添加选中
         $scope.addSelected = function() {
-            $scope.tempSelectedProjects = angular.copy($scope.selectedProjects);
-            $scope.tempProjects = angular.copy($scope.projects);
+            // $scope.tempSelectedProjects = angular.copy($scope.selectedProjects);
+            // $scope.tempProjects = angular.copy($scope.projects);
             angular.forEach($scope.projects, function(project, index) {
                 if (project.checked) {
                     project.checked = false;
@@ -2246,8 +2247,8 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
 
         // 删除选中
         $scope.deleteSelected = function() {
-            $scope.tempSelectedProjects = angular.copy($scope.selectedProjects);
-            $scope.tempProjects = angular.copy($scope.projects);
+            // $scope.tempSelectedProjects = angular.copy($scope.selectedProjects);
+            // $scope.tempProjects = angular.copy($scope.projects);
             // 存在取消操作，用temp过渡
             // 因为会splice，所以相邻的被选中需要遍历两次
             angular.forEach($scope.selectedProjects, function(project, index) {
@@ -2424,49 +2425,57 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
 
         // 保存 或 提交
         $scope.submit = function(type) {
-            var projectList = [];
-            angular.forEach($scope.selectedProjects, function(project) {
-                projectList.push(project);
-            });
-            $scope.activity.projects = projectList;
-            $scope.activity.awards = $scope.awards;
-            var url;
-            if (type) {
-                url = 'activity/submit';
+            if ($scope.activity.startTime === $scope.activity.endTime) {
+                toaster.pop('info', '开始时间与结束时间不能相同，请修改之后再保存');
+            } else if ($scope.activity.receiveStartTime === $scope.activity.receiveEndTime) {
+                toaster.pop('info', '兑奖开始时间与结束时间不能相同，请修改之后再保存');
             } else {
-                url = 'activity/save';
-            }
-            var data = new FormData();
-            data.append('actImg', $scope.actImg);
-            data.append('banner', $scope.banner);
-            // data.append('award1', $scope.award1);
-            // data.append('award2', $scope.award2);
-            // data.append('award3', $scope.award3);
-            // data.append('award4', $scope.award4);
-            data.append('jsonStr', JSON.stringify($scope.activity));
-            $http({
-                headers: {
-                    'Content-Type': undefined
-                },
-                method : 'POST',
-                processData : false,
-                async: false,
-                url : url,
-                data: data
-            }).success(function (data) {
+                $scope.loading = true;
+                var projectList = [];
+                angular.forEach($scope.selectedProjects, function (project) {
+                    projectList.push(project);
+                });
+                $scope.activity.projects = projectList;
+                $scope.activity.awards = $scope.awards;
+                var url;
                 if (type) {
-                    toaster.pop('success', '发布成功');
+                    url = 'activity/submit';
                 } else {
-                    toaster.pop('success', '保存成功');
+                    url = 'activity/save';
                 }
-                Activity.deletePrizeImgByBatch({path: $scope.deletePath}, {}, function(data) {
+                var data = new FormData();
+                data.append('actImg', $scope.actImg);
+                data.append('banner', $scope.banner);
+                // data.append('award1', $scope.award1);
+                // data.append('award2', $scope.award2);
+                // data.append('award3', $scope.award3);
+                // data.append('award4', $scope.award4);
+                data.append('jsonStr', JSON.stringify($scope.activity));
+                $http({
+                    headers: {
+                        'Content-Type': undefined
+                    },
+                    method: 'POST',
+                    processData: false,
+                    async: false,
+                    url: url,
+                    data: data
+                }).success(function (data) {
+                    if (type) {
+                        toaster.pop('success', '发布成功');
+                    } else {
+                        toaster.pop('success', '保存成功');
+                    }
+                    Activity.deletePrizeImgByBatch({path: $scope.deletePath}, {}, function (data) {
 
+                    });
+                    $scope.loading = false;
+                    window.location.href = '#/activity';
+                }).error(function (data) {
+                    $scope.loadingShow = false;
+                    toaster.pop('error', '出现错误，操作失败');
                 });
-                window.location.href='#/activity';
-            }).error(function (data) {
-                $scope.loadingShow = false;
-                toaster.pop('error', '出现错误，操作失败');
-            });
+            }
         }
 
     }]);

donate-console/src/main/webapp/resources/js/index/services/Activity.js

@@ -38,12 +38,6 @@ define ([ 'ngResource' ], function() {
                 url: 'activity/detail/:id',
                 method: 'GET'
             },
-            // 获取相关项目
-            getRelatedProject: {
-                url: 'activity/getRelatedProject',
-                method: 'GET',
-                isArray: true
-            },
             // 开奖
             openAward : {
                 url: 'activity/openAward',

donate-console/src/main/webapp/resources/view/activity/activity_detail.html

@@ -9,18 +9,18 @@
     <div class="right-nav">
         <span class="active">活动信息</span>
         <span>奖品信息</span>
-        <span>参与名单</span></div>
+        <span ng-if="active == 'done' || active == 'todo'">参与名单</span></div>
     <!--活动信息-->
     <div class="right-list show">
         <div class="list-message">
             <div class="list-body clearfix">
                 <div class="msg-list fl">
                     <span class="fl">活动信息</span>
-                    <span class="fl long">{{activity.startTime | date: 'yyyy-MM-dd'}}&nbsp;至&nbsp;{{activity.endTime | date: 'yyyy-MM-dd'}}</span>
+                    <span class="fl long">{{activity.startTime | date: 'yyyy-MM-dd'}}&nbsp;&nbsp;至&nbsp;&nbsp;{{activity.endTime | date: 'yyyy-MM-dd'}}</span>
                 </div>
                 <div class="msg-list fl">
                     <span class="fl">兑奖时间</span>
-                    <span class="fl long">{{activity.receiveStartTime | date: 'yyyy-MM-dd'}}&nbsp;至&nbsp;{{activity.receiveEndTime | date: 'yyyy-MM-dd'}}</span>
+                    <span class="fl long">{{activity.receiveStartTime | date: 'yyyy-MM-dd'}}&nbsp;&nbsp;至&nbsp;&nbsp;{{activity.receiveEndTime | date: 'yyyy-MM-dd'}}</span>
                 </div>
                 <div class="msg-list fl">
                     <span class="fl">发布人</span>
@@ -32,11 +32,11 @@
                 </div>
                 <div class="msg-list fl">
                     <span class="fl">已筹善款</span>
-                    <span class="fl">{{activity.amount | number : 2 || 0}}元</span>
+                    <span class="fl">{{activity.amount || 0 | number : 2}}元</span>
                 </div>
                 <div class="msg-list fl">
                     <span class="fl">参与人数</span>
-                    <span class="fl" ng-bind="activity.joinedActivity | number"></span>
+                    <span class="fl" ng-bind="activity.joinedPerson || 0 | number"></span>
                 </div>
             </div>
         </div>
@@ -44,7 +44,7 @@
             <div class="list-header">
                 <span>活动介绍</span>
             </div>
-            <div class="list-body" ng-bind-html="activity.summary">
+            <div class="list-body" ng-bind-html="activity.summary" style="margin-bottom: 30px;">
                 <!--<p>1、活动介绍：基层团组织通过学校在校园内公布申请条件，学生及其监护人提出求助申请学校对申请学生进行家访，核实家庭经济状况后-->
                     <!--报县级团委审核，县级团委上报市级团委汇总；</p>-->
                 <!--<p>2、参加条件：确认市级团委汇总地区申请资料后报市青基会；</p>-->
@@ -57,8 +57,8 @@
                 <span>相关项目</span>
             </div>
             <div class="list-body">
-                <div class="project-list" ng-repeat="relatedProject in relatedProjects">
-                    <a href="donate.ubtob.com/project#/detail/{{relatedProject.id}}">{{relatedProject.name}}</a>
+                <div class="project-list" ng-repeat="relatedProject in activity.projects | orderBy :'-id'">
+                    <a href="http://lj.ubtob.com/project#/detail/{{relatedProject.id}}" target="_blank" title="查看项目详情">{{relatedProject.name}}</a>
                 </div>
             </div>
         </div>
@@ -73,29 +73,30 @@
                 </div>
                 <div class="msg-list fl">
                     <span class="fl">中奖概率</span>
-                    <span class="fl" style="width: 310px;">({{activity.chance}})%</span>
+                    <span class="fl" style="width: 310px;">({{activity.chance || 8.88}})%</span>
                 </div>
             </div>
         </div>
         <div class="prise" ng-repeat="award in activity.awards | orderBy: 'amount'">
             <div class="prise-detail">
-                <input type="text" class="award form-control" ng-model="award.name"/>
+                <input type="text" class="award form-control" ng-model="award.awardName" readonly/>
                 <span>{{$index + 1}}</span>
             </div>
             <div class="award-detail clearfix">
                 <span class="fl">数量</span>
-                <input type="text" class="fl form-control" ng-model="award.amount"/>
+                <input type="text" class="fl form-control" ng-model="award.amount" readonly/>
             </div>
             <div class="award-detail clearfix">
                 <span class="fl">奖品等级</span>
-                <input type="text" class="fl form-control" ng-model="award.awardLevel">
+                <input type="text" class="fl form-control" ng-model="award.awardLevel" readonly>
             </div>
             <div class="award-detail clearfix">
                 <span class="fl">赠送方式</span>
-                <select name="" class="form-control" ng-model="award.way">
-                    <option ng-value="1">快递配送</option>
-                    <option ng-value="2">短信通知</option>
-                </select>
+                <input type="text" class="fl form-control" value="{{award.way == 1 ? '快递配送' : '短信通知'}}" readonly>
+                <!--<select name="" class="form-control" ng-model="award.way">-->
+                    <!--<option ng-value="1">快递配送</option>-->
+                    <!--<option ng-value="2">短信通知</option>-->
+                <!--</select>-->
             </div>
             <div class="price">
                 <img src="{{award.img}}" alt="奖品示例图" title="奖品示例图"/>
@@ -116,6 +117,20 @@
                     <td width="110"></td>
                 </tr>
                 </thead>
+                <tbody ng-if="null == activity.activityRecords || activity.activityRecords.length == 0">
+                <tr>
+                    <td colspan="6">
+                        <div class="section noSearch">
+                            <div class="img">
+                                <img src="static/images/noSearch.png" alt=""/>
+                            </div>
+                            <div class="txt">
+                                <p>还没有人参与该活动</p>
+                            </div>
+                        </div>
+                    </td>
+                </tr>
+                </tbody>
                 <tbody ng-repeat="record in activity.activityRecords">
                 <tr>
                     <td></td>

donate-console/src/main/webapp/resources/view/activity/activity_launch.html

@@ -758,7 +758,7 @@
                             <div class="button">
                                 <button ng-click="submit(true)" ng-disabled="activityForm.$invalid || !activity.summary || !actImgUrl || !bannerUrl" class="launch">发布</button>
                                 <button ng-click="submit(false)" class="draft">存为草稿</button>
-                                <span class="clear" ng-click="clearActivity()">清空内容</span>
+                                <span style="color: #5078cb;" class="clear" ng-click="clearActivity()">清空内容</span>
                             </div>
                         </div>
                     </div>

donate-console/src/main/webapp/resources/view/activity/activity_list.html

@@ -803,7 +803,7 @@
         <form class="form-horizontal" method="POST" action="">
             <div class="input-group input-group-sm">
                 <input id="post-search-input" class="form-control" type="search" ng-model="keyword" ng-search="onSearch()" value="" name="" placeholder="请输入关键词">&nbsp;&nbsp;
-                <input id="search-submit" class="btn btn-default btn-sm" type="submit" ng-click="onSearch()" value="搜索">
+                <input id="search-submit" class="btn btn-default btn-sm" type="button" value="搜索" ng-click="onSearch()">
             </div>
         </form>
     </section>

donate-service/src/main/java/com/uas/service/donate/SSOConfiguration.java

@@ -37,7 +37,7 @@ public class SSOConfiguration extends WebMvcConfigurerAdapter {
                 excludePathPatterns("/WEB-INF/**","/**/static/**", "/sso/login/**", "/sso/logout/**",
                         "/", "/project/**", "/activity/**","/carousels/**", "/message/**",
                         "/org/**", "/projectconclude/**", "/projectevolve/**", "/projectfinance/**",
-                        "/projectrecode/**", "/wxpay/**", "/alipay/**", "/mobile", "/index", "/activeCenter",
+                        "/projectrecode/**", "/wxpay/**", "/alipay/**", "/mobile/**", "/index", "/activeCenter",
                         "/app/**");
     }
 

donate-service/src/main/java/com/uas/service/donate/controller/UserController.java

@@ -3,7 +3,11 @@ package com.uas.service.donate.controller;
 import com.uas.service.donate.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
 @RequestMapping("/user")
@@ -12,11 +16,11 @@ public class UserController {
     @Autowired
     private UserService userService;
 
-   /* @RequestMapping(value = "/getUserUUByImId/{imId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/getUserUUByImId/{imId}", method = RequestMethod.GET)
     @ResponseBody
     public ModelMap getUserUUByImId (@PathVariable("imId") Long imId) {
         return new ModelMap("userUU", userService.getUserByImId(imId));
-    }*/
+    }
 
 
 }

donate-service/src/main/webapp/resources/css/base.css

@@ -176,4 +176,31 @@ textarea {
 
 .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
 	background-color: #fff!important ;
+}
+
+/*搜索无结果*/
+.noSearch .img{
+	margin: 50px auto 26px;
+}
+.noSearch .img img{
+	width: 80px;
+	height: 80px;
+}
+.noSearch .txt{
+	margin: 0 auto;
+	text-align: center;
+}
+.noSearch .txt p{
+	margin-bottom: 54px;
+	font-size: 18px;
+	color: #8c8c8c;
+}
+.noSearch .txt a{
+	display: inline-block;
+	width: 140px;
+	height: 36px;
+	line-height: 36px;
+	font-size: 16px;
+	color: #ef613b;
+	border: 1px solid #dcdcdc;
 }

donate-service/src/main/webapp/resources/js/activity/app.js

@@ -26,13 +26,13 @@ define([ 'angularAMD', 'ngRoute', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTab
     }]);
 	app.config(['$stateProvider', '$urlRouterProvider', function($stateProvider, $urlRouterProvider) {
 		$urlRouterProvider.otherwise("/");
-		$stateProvider.state("activity", angularAMD.route({
+		$stateProvider/*.state("activity", angularAMD.route({
 			url : '/',
 			title : '活动中心',
 			templateUrl : 'static/view/activity/activity_list.html',
 			controller : 'ActivityListCtrl',
 			controllerUrl : 'app/controllers/ActivityListCtrl'
-		})).state("detail", angularAMD.route({
+		}))*/.state("detail", angularAMD.route({
             url : '/detail/:id',
             title : '活动详情',
             templateUrl : 'static/view/activity/activity_detail.html',

donate-service/src/main/webapp/resources/js/mobile/app.js

@@ -34,6 +34,10 @@ define([ 'angularAMD', 'ngRoute', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTab
             templateUrl : 'static/view/mobile/mobile_activity_detail.html',
             controller : 'MobileActivityDetailCtrl',
             controllerUrl : 'app/controllers/MobileActivityDetailCtrl'
+        })).state("userAgreement", angularAMD.route({
+            url : '/userAgreement',
+            title : '用户协议',
+            templateUrl : 'static/view/mobile/userAgreement.html'
         }));
     }]);
 

donate-service/src/main/webapp/resources/js/project/app.js

@@ -26,13 +26,13 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
     }]);
 	app.config(['$stateProvider', '$urlRouterProvider', function($stateProvider, $urlRouterProvider) {
 		$urlRouterProvider.otherwise("/");
-		$stateProvider.state("project", angularAMD.route({
+		$stateProvider/*.state("project", angularAMD.route({
 			url : '/',
 			title : '项目列表',
 			templateUrl : 'static/view/project/project_list.html',
 			controller : 'ProjectListCtrl',
 			controllerUrl : 'app/controllers/ProjectListCtrl'
-		})).state("detail", angularAMD.route({
+		}))*/.state("detail", angularAMD.route({
             url : '/detail/:id',
             title : '项目详情',
             templateUrl : 'static/view/project/project_detail.html',

donate-service/src/main/webapp/resources/js/project/controllers/ProjectDetailCtrl.js

@@ -12,7 +12,7 @@ define([ 'app/app' ], function(app) {
             bless: null,
             way: '支付宝'
         };
-        $scope.checked = false;
+        $scope.checked = true;
 
         $scope.reload = function() {
             if ($scope.projectParams.page() == 1)

donate-service/src/main/webapp/resources/view/activity/activity_detail.html

@@ -564,7 +564,7 @@
     <div class="container">
         <div class="section section1">
             <div class="nav">
-                <span><a ui-sref="activity" style="color: #5078cb;">活动列表</a></span>
+                <span><a href="/activeCenter" style="color: #5078cb;">活动列表</a></span>
                 <span>&gt;</span>
                 <span ng-bind="activity.name ? activity.name : '优软一元捐感恩活动'"></span>
             </div>

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

@@ -930,7 +930,7 @@
                         <!--<span class="fl best">我的祝福：</span>
                         <textarea ng-model="projectRecord.bless" cols="30" rows="10" class="fl form-control" maxlength="300"></textarea>-->
                         <div class="fl agree clearfix">
-                            <input type="checkbox" class="fl" required ng-checked="checked" ng-click="changeChecked()"><span class="fl">同意并接受《<a href="/userAgreement" target="_blank" style="color: #5078cb;">优软一元捐用户协议</a>》</span>
+                            <input type="checkbox" class="fl" required ng-checked="checked" ng-click="changeChecked()"><span class="fl">111同意并接受《<a href="/userAgreement" target="_blank" style="color: #5078cb;">优软一元捐用户协议</a>》</span>
                         </div>
                     </div>
                     <button type="button" ng-disabled="donationForm.$invalid || !checked || projectRecord.amount == 0" onclick="pay(angular.element(this).scope().project.id, angular.element(this).scope().projectRecord.amount, angular.element(this).scope().projectRecord.way)" style="margin-top: 15px;">确认捐款</button>