Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised

css/GT_activities.css

@@ -130,17 +130,25 @@ p{
     position: relative;
 }
 
-.img_bg_p1{
-    font-size: 0.3rem;
-    color: #E03234;
-    margin-left: 1.91rem;
-    padding-top: 0.2rem;
-}
-.img_bg_p2{
-    font-size: 0.14rem;
-    color: #E03234;
-    margin-left: 1.91rem;
-    height: 0.2rem;
+/*.img_bg_p1{*/
+/*    font-size: 0.3rem;*/
+/*    color: #E03234;*/
+/*    padding-top: 0.2rem;*/
+/*}*/
+/*.img_bg_p2{*/
+/*    font-size: 0.14rem;*/
+/*    color: #E03234;*/
+/*    height: 0.2rem;*/
+/*}*/
+.img_btn{
+    width: 1.18rem;
+    height: 0.3rem;
+    background: #FAB001;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    /*margin-left: 2.07rem;*/
+    margin-top: 0.08rem;
 }
 .img_btn{
     width: 1.18rem;
@@ -149,7 +157,7 @@ p{
     display: flex;
     align-items: center;
     justify-content: center;
-    margin-left: 2.07rem;
+    /*margin-left: 2.07rem;*/
     margin-top: 0.08rem;
 }
 .img_btn p{
@@ -178,6 +186,7 @@ p{
     top: 0.67rem;
     width: 0.81rem;
     height: 0.65rem;
+    display: none;
 }
 .box_title_2{
     width: 90%;

html/GT_activities.html

@@ -104,12 +104,15 @@
 
             </div>
             <div class="img_bg_M">
-                <p class="img_bg_p1">无敌抵用券</p>
-                <p class="img_bg_p2"></p>
-                <div class="img_btn">
-                    <p></p>
+                <div class="img_bg_text" style="width: 55%; margin-left: 45%;height: 1.13rem;display: flex;flex-direction: column;align-items: center;">
+                    <p class="img_bg_p1" style="font-size: 0.3rem;color: #E03234;padding-top: 0.2rem;">无敌抵用券</p>
+                    <p class="img_bg_p2" style="font-size: 0.14rem;color: #E03234;height: 0.2rem;"></p>
+                    <div class="img_btn">
+                        <p></p>
+                    </div>
                 </div>
-                <img src="" alt="" class="received_img">
+
+                <img src="../images/received@3x.png" alt="" class="received_img">
                 <div class="use_oupon">
                     <div class="use_news">
                         <img src="../images/tx_bg.png" alt="">
@@ -157,7 +160,9 @@
     <script type="text/javascript" src="../js/yql.js"></script>
 
     <script>
-        let href = window.location.href;
+        // let href = window.location.href;
+        let href='http://127.0.0.1:5500/html/GT_activities.html?customerId=1549&accountId=1182&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NzM0NjY2NjMuMCwiZXhwIjoxNTczNTUzMDYzLjAsInVzZXJJbmZvIjp7InVpZCI6IjExODIiLCJyZXF1ZXN0RnJvbSI6NH19.hX2b2MqSWYmWS0k3YsthxW-T6UxarIm5rdbqCVQtxdQ&secretKey=5d5e16254bd741c486fe2b83b42171d2&platform=app';
+
         let userInfo = {};
         let platform = "H5";
         if (localStorage.u) {
@@ -261,13 +266,13 @@
                         $('.img_btn p').html(res.data.redemptionPrice + '元抢购');
                         $('.img_btn').css("background-color", "#CCCCCC");
                         $('.img_btn p').css("color", "#FFFFFF");
-                        $(".received_img").attr("src", "");
+                        // $(".received_img").attr("src", "");
                         let time = ((activityStartDate - nowDate) / 1000).toFixed(0);
                         runtime(time)
 
                     } else if (nowDate > activityEndDate) { // 活动时间已过
 
-                        $(".received_img").attr("src", "");
+                        // $(".received_img").attr("src", "");
                         $('.img_bg_M').css("background-image", "url(../images/MJ_200@3x.png)");
                         $('.img_bg_p1').css("color", "#CCCCCC");
                         $('.img_bg_p2').css("color", "#CCCCCC");
@@ -303,18 +308,18 @@
                         if (num > 0) {
                             $('#t1').html('结束倒计时：')
                             if (res.data.count != 0) {
-                                $(".received_img").attr("src", "");
+                                // $(".received_img").attr("src", "");
 
                                 $('.img_btn p').html(res.data.redemptionPrice + '元抢购');
 
                             } else {
                                 $('.img_btn p').html('去使用');
-                                $(".received_img").attr("src", "../images/received@3x.png");
+                                $(".received_img").css('display', "block");
 
                             }
                         } else {
 
-                            $(".received_img").attr("src", "");
+                            // $(".received_img").attr("src", "");
                             $('.img_bg_M').css("background-image", "url(../images/MJ_200@3x.png)");
                             $('.img_bg_p1').css("color", "#CCCCCC");
                             $('.img_bg_p2').css("color", "#CCCCCC");
@@ -497,4 +502,4 @@
     </script>
 </body>
 
-</html>
\ No newline at end of file
+</html>

html/pay.html

@@ -182,7 +182,7 @@
         }
         countdown();
     })
-    var second = 180000;
+    var second = 180;
     var payBtn = true;
     var changesecond = '';
     //倒计时
@@ -288,7 +288,7 @@
                 if (res.err_msg == "get_brand_wcpay_request:ok") {
                     // 使用以上方式判断前端返回,微信团队郑重提示：
                     //res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
-                    alert("get_brand_wcpay_request:ok");
+                    window.location.href = 'http://activity.oytour.com/html/paySuccess.html';
                 }
             });
     }

js/jquery.dataStatistics.js

@@ -71,7 +71,7 @@ $.fn.dataStatistics = function(options) {
 
 
 
-            $(".received_img").attr("src", "");
+            // $(".received_img").attr("src", "");
             $('.img_bg_M').css("background-image", "url(../images/MJ_200@3x.png)");
             $('.img_bg_p1').css("color", "#CCCCCC");
             $('.img_bg_p2').css("color", "#CCCCCC");
@@ -163,7 +163,7 @@ $.fn.dataStatistics = function(options) {
                                 clearInterval(timer2);
                             } else if (nowDate >= activityEndDate) { //活动结束
 
-                                $(".received_img").attr("src", "");
+                                // $(".received_img").attr("src", "");
                                 $('.img_bg_M').css("background-image", "url(../images/MJ_200@3x.png)");
                                 $('.img_bg_p1').css("color", "#CCCCCC");
                                 $('.img_bg_p2').css("color", "#CCCCCC");
@@ -175,17 +175,17 @@ $.fn.dataStatistics = function(options) {
                             } else {
                                 if (nownumber > 0) {
                                     if (res.data.count != 0) {
-                                        $(".received_img").attr("src", "");
+                                        // $(".received_img").attr("src", "");
                                         $('.img_btn p').html(res.data.redemptionPrice + '元抢购')
                                     } else {
-                                        $(".received_img").attr("src", "../images/received@3x.png");
+                                        $(".received_img").css('display', "block");
                                         $('.img_btn p').html('去使用')
 
 
 
                                     }
                                 } else {
-                                    $(".received_img").attr("src", "");
+                                    // $(".received_img").attr("src", "");
                                     $('.img_bg_M').css("background-image", "url(../images/MJ_200@3x.png)");
                                     $('.img_bg_p1').css("color", "#CCCCCC");
                                     $('.img_bg_p2').css("color", "#CCCCCC");
@@ -336,4 +336,4 @@ $.fn.dataStatistics = function(options) {
         }
 
     })
-};
\ No newline at end of file
+};