Skip to content

S
SURPRISED
Commit 9f404379 authored by 罗超's avatar 罗超
Browse files
Options

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

parents 8825e2f6 a4d4ca50
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 32 deletions
css/GT_activities.css
View file @ 9f404379
...@@ -130,17 +130,25 @@ p{ ...@@ -130,17 +130,25 @@ p{
position: relative; position: relative;
} }
.img_bg_p1{ /*.img_bg_p1{*/
font-size: 0.3rem; /* font-size: 0.3rem;*/
color: #E03234; /* color: #E03234;*/
margin-left: 1.91rem; /* padding-top: 0.2rem;*/
padding-top: 0.2rem; /*}*/
} /*.img_bg_p2{*/
.img_bg_p2{ /* font-size: 0.14rem;*/
font-size: 0.14rem; /* color: #E03234;*/
color: #E03234; /* height: 0.2rem;*/
margin-left: 1.91rem; /*}*/
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{ .img_btn{
width: 1.18rem; width: 1.18rem;
...@@ -149,7 +157,7 @@ p{ ...@@ -149,7 +157,7 @@ p{
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-left: 2.07rem; /*margin-left: 2.07rem;*/
margin-top: 0.08rem; margin-top: 0.08rem;
} }
.img_btn p{ .img_btn p{
...@@ -178,6 +186,7 @@ p{ ...@@ -178,6 +186,7 @@ p{
top: 0.67rem; top: 0.67rem;
width: 0.81rem; width: 0.81rem;
height: 0.65rem; height: 0.65rem;
display: none;
} }
.box_title_2{ .box_title_2{
width: 90%; width: 90%;
......
html/GT_activities.html
View file @ 9f404379
...@@ -104,12 +104,15 @@ ...@@ -104,12 +104,15 @@
</div> </div>
<div class="img_bg_M"> <div class="img_bg_M">
<p class="img_bg_p1">无敌抵用券</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_p2"></p> <p class="img_bg_p1" style="font-size: 0.3rem;color: #E03234;padding-top: 0.2rem;">无敌抵用券</p>
<div class="img_btn"> <p class="img_bg_p2" style="font-size: 0.14rem;color: #E03234;height: 0.2rem;"></p>
<p></p> <div class="img_btn">
<p></p>
</div>
</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_oupon">
<div class="use_news"> <div class="use_news">
<img src="../images/tx_bg.png" alt=""> <img src="../images/tx_bg.png" alt="">
...@@ -157,7 +160,9 @@ ...@@ -157,7 +160,9 @@
<script type="text/javascript" src="../js/yql.js"></script> <script type="text/javascript" src="../js/yql.js"></script>
<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 userInfo = {};
let platform = "H5"; let platform = "H5";
if (localStorage.u) { if (localStorage.u) {
...@@ -261,13 +266,13 @@ ...@@ -261,13 +266,13 @@
$('.img_btn p').html(res.data.redemptionPrice + '元抢购'); $('.img_btn p').html(res.data.redemptionPrice + '元抢购');
$('.img_btn').css("background-color", "#CCCCCC"); $('.img_btn').css("background-color", "#CCCCCC");
$('.img_btn p').css("color", "#FFFFFF"); $('.img_btn p').css("color", "#FFFFFF");
$(".received_img").attr("src", ""); // $(".received_img").attr("src", "");
let time = ((activityStartDate - nowDate) / 1000).toFixed(0); let time = ((activityStartDate - nowDate) / 1000).toFixed(0);
runtime(time) runtime(time)
} else if (nowDate > activityEndDate) { // 活动时间已过 } 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_M').css("background-image", "url(../images/MJ_200@3x.png)");
$('.img_bg_p1').css("color", "#CCCCCC"); $('.img_bg_p1').css("color", "#CCCCCC");
$('.img_bg_p2').css("color", "#CCCCCC"); $('.img_bg_p2').css("color", "#CCCCCC");
...@@ -303,18 +308,18 @@ ...@@ -303,18 +308,18 @@
if (num > 0) { if (num > 0) {
$('#t1').html('结束倒计时：') $('#t1').html('结束倒计时：')
if (res.data.count != 0) { if (res.data.count != 0) {
$(".received_img").attr("src", ""); // $(".received_img").attr("src", "");
$('.img_btn p').html(res.data.redemptionPrice + '元抢购'); $('.img_btn p').html(res.data.redemptionPrice + '元抢购');
} else { } else {
$('.img_btn p').html('去使用'); $('.img_btn p').html('去使用');
$(".received_img").attr("src", "../images/received@3x.png"); $(".received_img").css('display', "block");
} }
} else { } else {
$(".received_img").attr("src", ""); // $(".received_img").attr("src", "");
$('.img_bg_M').css("background-image", "url(../images/MJ_200@3x.png)"); $('.img_bg_M').css("background-image", "url(../images/MJ_200@3x.png)");
$('.img_bg_p1').css("color", "#CCCCCC"); $('.img_bg_p1').css("color", "#CCCCCC");
$('.img_bg_p2').css("color", "#CCCCCC"); $('.img_bg_p2').css("color", "#CCCCCC");
...@@ -497,4 +502,4 @@ ...@@ -497,4 +502,4 @@
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
html/pay.html
View file @ 9f404379
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
} }
countdown(); countdown();
}) })
var second = 180000; var second = 180;
var payBtn = true; var payBtn = true;
var changesecond = ''; var changesecond = '';
//倒计时 //倒计时
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
if (res.err_msg == "get_brand_wcpay_request:ok") { if (res.err_msg == "get_brand_wcpay_request:ok") {
// 使用以上方式判断前端返回,微信团队郑重提示： // 使用以上方式判断前端返回,微信团队郑重提示：
//res.err_msg将在用户支付成功后返回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
View file @ 9f404379
...@@ -71,7 +71,7 @@ $.fn.dataStatistics = function(options) { ...@@ -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_M').css("background-image", "url(../images/MJ_200@3x.png)");
$('.img_bg_p1').css("color", "#CCCCCC"); $('.img_bg_p1').css("color", "#CCCCCC");
$('.img_bg_p2').css("color", "#CCCCCC"); $('.img_bg_p2').css("color", "#CCCCCC");
...@@ -163,7 +163,7 @@ $.fn.dataStatistics = function(options) { ...@@ -163,7 +163,7 @@ $.fn.dataStatistics = function(options) {
clearInterval(timer2); clearInterval(timer2);
} else if (nowDate >= activityEndDate) { //活动结束 } 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_M').css("background-image", "url(../images/MJ_200@3x.png)");
$('.img_bg_p1').css("color", "#CCCCCC"); $('.img_bg_p1').css("color", "#CCCCCC");
$('.img_bg_p2').css("color", "#CCCCCC"); $('.img_bg_p2').css("color", "#CCCCCC");
...@@ -175,17 +175,17 @@ $.fn.dataStatistics = function(options) { ...@@ -175,17 +175,17 @@ $.fn.dataStatistics = function(options) {
} else { } else {
if (nownumber > 0) { if (nownumber > 0) {
if (res.data.count != 0) { if (res.data.count != 0) {
$(".received_img").attr("src", ""); // $(".received_img").attr("src", "");
$('.img_btn p').html(res.data.redemptionPrice + '元抢购') $('.img_btn p').html(res.data.redemptionPrice + '元抢购')
} else { } else {
$(".received_img").attr("src", "../images/received@3x.png"); $(".received_img").css('display', "block");
$('.img_btn p').html('去使用') $('.img_btn p').html('去使用')
} }
} else { } else {
$(".received_img").attr("src", ""); // $(".received_img").attr("src", "");
$('.img_bg_M').css("background-image", "url(../images/MJ_200@3x.png)"); $('.img_bg_M').css("background-image", "url(../images/MJ_200@3x.png)");
$('.img_bg_p1').css("color", "#CCCCCC"); $('.img_bg_p1').css("color", "#CCCCCC");
$('.img_bg_p2').css("color", "#CCCCCC"); $('.img_bg_p2').css("color", "#CCCCCC");
...@@ -336,4 +336,4 @@ $.fn.dataStatistics = function(options) { ...@@ -336,4 +336,4 @@ $.fn.dataStatistics = function(options) {
} }
}) })
}; };
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment