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

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

@@ -1,5 +1,5 @@
 <!--详细内容部分-->
-<aside class="content-right">
+<aside class="content-right" style="padding-bottom: 50px;">
     <!--<div class="container">-->
     <div class="right-header clearfix">
         <div class="fl"><span ng-bind="project.name"></span>
@@ -19,7 +19,7 @@
     </div>
     <div class="right-nav">
         <span class="active"  ng-if="project.status== 1" style="margin-left: -122px;">详细信息</span>
-        <span class="active"  ng-if="project.status== 0"  style="margin-left: -182px;">详细信息</span>
+        <span class="active"  ng-if="project.status== 0"  style="margin-left: -8px;">详细信息</span>
         <span class="active"  ng-if="project.status== 2" style="margin-left: 75px;">详细信息</span>
         <span>图片信息</span>
         <span>机构信息</span>

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

@@ -930,7 +930,7 @@
                             <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>
                         </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)">确认捐款</button>
+                    <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>
                 </div>
             </form>
         </div>