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

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

@@ -285,6 +285,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                     if (data.success) {
                         toaster.pop('success', '操作成功');
                     }
+                    $scope.projectParams.reload();
                 }, function(){
 
                 });
@@ -1454,6 +1455,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                     if (data.success) {
                         toaster.pop('success', '操作成功');
                     }
+                    $scope.projectParams.reload();
                 }, function(){
 
                 });
@@ -1593,6 +1595,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                     if (data.success) {
                         toaster.pop('success', '操作成功');
                     }
+                    $scope.projectParams.reload();
                 }, function(){
 
                 });
@@ -1727,6 +1730,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                     if (data.success) {
                         toaster.pop('success', '操作成功');
                     }
+                    $scope.projectParams.reload();
                 }, function(){
 
                 });
@@ -1914,6 +1918,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                     if (data.success) {
                         toaster.pop('success', '操作成功');
                     }
+                    $scope.activityParams.reload();
                 }, function(){
 
                 });
@@ -2397,6 +2402,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                     if (data.success) {
                         toaster.pop('success', '操作成功');
                     }
+                    $scope.orgParams.reload();
                 }, function(){
 
                 });

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

@@ -613,7 +613,7 @@
 
                                 <div class="form-group clearfix">
                                     <label for="" class="fl">筹款目标</label>
-                                    <input type="text" ng-model="project.target" class="form-control fl" ng-pattern="/^\+?[1-9][0-9]*$/" required>
+                                    <input type="text" ng-model="project.target" class="form-control fl" ng-pattern="/^[1-9]\d{0,8}$/" required>
                                     <span class="fl help-txt">（请输入整数金额，例如：5000）</span>
                                 </div>
                                 <div class="form-group clearfix">

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

@@ -530,7 +530,7 @@
                                     <p>(为了让您的项目在不同终端下均能正常展示，请分别上传PC端和手机端的主图)</p>
                                     <div class="computer">
                                         <span>PC端主图</span>
-                                        <button>上传图片</button>
+                                        <button type="button">上传图片</button>
                                         <input type="file" ng-multiple="false" id="pcImg" accept="image/*" onchange='angular.element(this).scope().fileChanged(this, 0)'>
                                         <em>(最能代表项目的焦点图，图片尺寸不小于500*280px,支持jpg,gif,png格式，不超过10MB)</em>
                                         <div ng-if="null != pcImgUrl" style="max-height: 100px; max-width: 300px">
@@ -609,7 +609,7 @@
                             <div class="list-item clearfix">
                                 <span class="fl">项目简介</span>
                                 <div class="fl simple">
-                                    <textarea name="" cols="30" rows="10" ng-model="project.proSummary" ng-maxlength="270" placeholder="目的简单介绍，不超过270个汉字" required></textarea>
+                                    <textarea name="" cols="30" rows="10" ng-model="project.proSummary" ng-maxlength="27" placeholder="目的简单介绍，不超过27个字" required></textarea>
                                     <br/>
                                 </div>
                             </div>