一元捐pc页面解决进入微信扫码页面扫码页面出现灰色蒙版问题，以及在搜狗浏览器用const定义的常量会报错的问题； 后台项目活动发起调整奖品等级在点击发布之后出现红色提示和红色线框的问题；解决移动页面我要捐款按钮出现颜色从橙色变为灰色的问题

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

@@ -768,7 +768,7 @@
                                 <div class="award-detail clearfix">
                                     <span class="fl">数量</span>
                                     <input ng-pattern="/^[1-9]\d*$/" type="text" name="awardAmount" ng-model="award.amount" class="fl form-control" required
-                                           ng-class="{'showEmpty' : submited && activityForm.awardAmount.$error.required}"/>
+                                           ng-class="{'showEmpty': submited && activityForm.awardAmount.$error.required || submited && activityForm.awardAmount.$error.pattern}"/>
 
                                     <span class="error" ng-show="submited && activityForm.awardAmount.$error.required">*活动奖品的数量不能为空</span>
                                     <span class="error" ng-show="submited && activityForm.awardAmount.$error.pattern">*活动奖品的数量不正确</span>
@@ -776,7 +776,7 @@
                                 <div class="award-detail clearfix">
                                     <span class="fl">奖品等级</span>
                                     <input type="text" ng-model="award.awardLevel" maxlength="10" class="fl form-control" required
-                                                       ng-class="{'showEmpty' : submited && !award.awardLevel}"/>
+                                                       ng-class="{'showEmpty': submited && !award.awardLevel}"/>
 
                                     <span class="error" ng-show="submited && !award.awardLevel">*活动奖品的奖品等级不能为空</span>
                                 </div>

donate-service/src/main/webapp/resources/js/mobile/controllers/MobileProjectDetailCtrl.js

@@ -6,15 +6,18 @@ define([ 'app/app' ], function(app) {
         var id = $stateParams.id;
         $scope.outTradeNo = $stateParams.outTradeNo;
         $scope.imId = null;
+        $scope.loading = true;
         if (!angular.isUndefined($stateParams.imId)) {
             $scope.imId = $stateParams.imId;
         }
         var init = function () {
 
             Project.getDetailById({ id: id}, {}, function (data) {
+                $scope.loading = false;
                 $scope.project = data;
                 $scope.styCode = $scope.project.introduction;
                 $scope.introduction = $sce.trustAsHtml($scope.styCode);
+                alert($scope.introduction.length());
                 $scope.organization = data.organization;
                 $scope.percentage = data.totalAmount / data.target;
                 // document.write('<script type="text/javascript" src="static/js/mobile/detail.js"></script>');

donate-service/src/main/webapp/resources/js/pay.js

@@ -6,9 +6,8 @@
 // var amount;
 // var payWay;//0支付宝 1微信 2银联
 // var uuid = "10041166";
-
-const userAgent = navigator.userAgent;
-const isMobile = /(iPhone|iPad|Opera Mini|Android.*Mobile|NetFront|PSP|BlackBerry|Windows Phone)/ig.test(userAgent);
+var userAgent = navigator.userAgent;
+var isMobile = /(iPhone|iPad|Opera Mini|Android.*Mobile|NetFront|PSP|BlackBerry|Windows Phone)/ig.test(userAgent);
 
 var pay =function (proId, amount, payWay, imid) {
      var customAmount = $("#custom-amount" + proId).val();

donate-service/src/main/webapp/resources/view/mobile/mobile_project_detail.html

@@ -119,6 +119,8 @@
     }
     .banner img{
         width: 100%;
+        height: 5.2rem;
+        margin: 0 auto;
     }
     .banner .carousel-indicators{
         bottom: 0;
@@ -250,12 +252,23 @@
         font-size: .24rem;
         color: #969696;
     }
+    .project-item .intro-date p.time{
+        float: left;
+        margin-left: .2rem;
+        width: 4.5rem;
+        text-align: left;
+        font-size: .24rem;
+        color: #969696;
+    }
     .project-intro {
         padding: 0 .3rem;
         margin-top: .2rem;
         background: #fff;
         text-align: left;
     }
+    .project-init{
+        margin-bottom: 1.55rem;
+    }
     .project-first{
         margin-top: 0;
     }
@@ -286,6 +299,10 @@
         font-size: .28rem !important ;
         color: #666;
     }
+    .project-intro .bottom .list-show .show-all div{
+        font-size: .28rem !important ;
+        color: #666;
+    }
     .project-intro .bottom .list-show .show-all a{
         width: 100% !important;
     }
@@ -684,6 +701,7 @@
         -webkit-overflow-scrolling: touch;
         outline: 0;
         background: rgba(0,0,0,.5);
+        display: none;
     }
     #myModal{
         display: table;
@@ -754,7 +772,7 @@
                 </div>
                 <div class="intro-detail">
                     <div class="intro-date">
-                        <span>筹款截止日期</span>
+                        <span>筹款时间</span>
                         <p class="time">{{project.startTime | date:'yyyy-MM-dd'}}至&nbsp;{{project.endTime | date:'yyyy-MM-dd'}}</p>
                     </div>
                 </div>
@@ -796,7 +814,7 @@
                     <!--</p>-->
                 <!--</div>-->
             <!--</div>-->
-            <div class="project-intro">
+            <div class="project-intro project-init">
                 <div class="top">
                     <span>执行机构</span>
                 </div>
@@ -810,7 +828,7 @@
             </div>
             <div class="footer">
                 <!--<a href="" class="look"><img src="../static/images/mobile/list-ul.png" alt=""/>查看同类其他项目</a>-->
-                <button type="button" class="attend" ng-disabled="project.overdue == '已结束'">我要捐款</button>
+                <button type="button" class="attend" ng-disabled="project.overdue == '已结束' || loading">我要捐款</button>
             </div>
         </div>
         <!--进度-->
@@ -890,7 +908,7 @@
                     </p>
                 </div>
             </div>
-            <div class="project-intro">
+            <div class="project-intro project-init">
                 <div class="top">
                     <span>机构信息</span>
                 </div>
@@ -957,9 +975,12 @@
                         <div ng-bind-html="introduction">
 
                         </div>
-                        <div class="btnClick">
+                        <div class="btnClick btnDown" style="display:none">
                             展开全文<i class="fa fa-angle-down"></i>
                         </div>
+                        <div class="btnClick btnUp" style="display:none">
+                            收起<i class="fa fa-angle-up"></i>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -982,7 +1003,7 @@
                     <!--</p>-->
                 <!--</div>-->
             <!--</div>-->
-            <div class="project-intro">
+            <div class="project-intro project-init">
                 <div class="top">
                     <span>执行机构</span>
                 </div>
@@ -1061,7 +1082,8 @@
         var $showAll = $('.show-all');
 
         var $height = document.documentElement.clientHeight;
-        console.log($height)
+//        alert($height);
+//        alert($showAll.height());
         if ($height > 700) {
             $showAll.css({
                 'height': '6rem',

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

@@ -127,6 +127,10 @@
             font-size: 14px;
             color: #8c8c8c;
         }
+        .modal-backdrop{
+            position: static !important ;
+            background-color: transparent !important ;
+        }
     </style>
 </head>
 <body>
@@ -148,7 +152,5 @@
 <!--js begin-->
 <script src="/static/lib/jquery/jquery.min.js"></script>
 <script src="/static/lib/bootstrap/js/bootstrap.min.js"></script>
-<script>
-</script>
 </body>
 </html>

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

@@ -670,6 +670,9 @@
     .show{
         display: block;
     }
+    /*.modal-backdrop{*/
+        /*background-color: transparent !important ;*/
+    /*}*/
 </style>
 <body>
 <!-- loading start -->
@@ -751,7 +754,7 @@
                         <span>已筹款：<em ng-bind="project.totalAmount || 0 | number: 2"></em>元<span>（{{percentage * 100 || 0 | number: 2}}%）</span></span>
                     </div>
                     <!--我要捐款-->
-                    <button class="button" data-toggle="modal" data-target="#layer" ng-disabled="!canDonate">我要捐款</button>
+                    <button class="button" data-toggle="modal" data-target="#layer" ng-disabled="!canDonate" data-dismiss="modal">我要捐款</button>
                 </div>
             </div>
         </div>
@@ -777,7 +780,7 @@
                         <p>联系电话：<span ng-bind="project.personTel"></span></p>
                     </div>
                     <div class="button">
-                        <button class="button" data-toggle="modal" data-target="#layer"  ng-disabled="cannotDonate">我要捐款</button>
+                        <button class="button" data-toggle="modal" data-target="#layer"  ng-disabled="!canDonate" data-dismiss="modal">我要捐款</button>
                     </div>
                 </div>
                 <div ng-include src="'static/view/project/project_detail_side.html'"></div>
@@ -852,21 +855,24 @@
     </div>
 </div>
 <script>
-    //    点击切换
-    $('#top').on('click', '.tabNav', function () {
-        var index = $(this).index();
-        $(this).addClass('active').siblings().removeClass('active');
-        $('.bottom').eq(index).addClass('show').siblings().removeClass('show');
-    });
+    $(function(){
 
-    $('.select-money').on('click', function () {
-        $(this).addClass('active').siblings().removeClass('active');
-    });
-    $('.select-way').on('click', function () {
-        $(this).addClass('active').siblings().removeClass('active');
-    });
-    $('.input-money').on('focus', function () {
-        $('.select-money').removeClass('active');
+        //    点击切换
+        $('#top').on('click', '.tabNav', function () {
+            var index = $(this).index();
+            $(this).addClass('active').siblings().removeClass('active');
+            $('.bottom').eq(index).addClass('show').siblings().removeClass('show');
+        });
+
+        $('.select-money').on('click', function () {
+            $(this).addClass('active').siblings().removeClass('active');
+        });
+        $('.select-way').on('click', function () {
+            $(this).addClass('active').siblings().removeClass('active');
+        });
+        $('.input-money').on('focus', function () {
+            $('.select-money').removeClass('active');
+        });
     });
 </script>
 <script type="text/javascript" src="static/js/pay.js"></script>