Skip to content

S
SURPRISED
Commit 37f0e92c authored by 罗超's avatar 罗超
Browse files
Options

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

# Conflicts:
#	html/GT_activities.html
parents 1b27b065 cafb97ea
Hide whitespace changes
Inline Side-by-side
Showing with 242 additions and 15 deletions
html/GT_activities.html
View file @ 37f0e92c
...@@ -381,6 +381,15 @@ ...@@ -381,6 +381,15 @@
activityStartDate: activityStartDate, activityStartDate: activityStartDate,
activityEndDate: activityEndDate, activityEndDate: activityEndDate,
}); //刚进入页面不执行动画 }); //刚进入页面不执行动画
$('.explain p').html('活动规则' + '<br/>' + res.data.instructions);
if (login == false) {
$('.use_o').html('暂无登录');
} else {
$('.use_o').html(res.data.contact);
$('.use_t').html(res.data.customerName);
}
...@@ -479,7 +488,34 @@ ...@@ -479,7 +488,34 @@
} }
<<
<<
<< < HEAD
} ===
===
=
//优惠券的有限时间
let expirationDate = (res.data.expirationDate).split('T')[0].replace(/-/g, '.');
let title = $('.img_bg_p1').text()
let RushbuyTime = {
RushbuyTime: expirationDate,
title: title,
userName: res.data.contact,
shopName: res.data.customerName,
} }
localStorage.RushbuyTime = JSON.stringify(RushbuyTime)
$('.img_bg_p2').html('有效期截止：' + expirationDate)
} else {
$('.dataStatistics').dataStatistics({
max: 0,
min: 0,
len: 4,
add: true
}); //刚进入页面不执行动画
>>>
>>>
> cafb97ea52718b7bc84df076a4eb6ae686a032f5
//优惠券的有限时间 //优惠券的有限时间
let expirationDate = (res.data.expirationDate).split('T')[0].replace(/-/g, '.'); let expirationDate = (res.data.expirationDate).split('T')[0].replace(/-/g, '.');
...@@ -680,23 +716,25 @@ ...@@ -680,23 +716,25 @@
}) })
$('.app_share_pyq').click(function() { //在app里分享微信朋友圈 $('.app_share_pyq').click(function() { //在app里分享微信朋友圈
let data = { let data = {
'action': 'share', 'action': 'share',
'shareData': { 'shareData': {
shareType: '1', shareType: '1',
params: { params: {
type: 'news', type: 'news',
title: '印象之旅11.18同业回馈日', title: '印象之旅11.18同业回馈日',
description: '印象之旅11.18同业回馈日', description: '印象之旅11.18同业回馈日',
webpageUrl: 'https://activity.oytour.com/html/GT_activities.html', webpageUrl: 'https://activity.oytour.com/html/GT_activities.html',
thumbImage: 'http://imgfile.oytour.com/Static/app1118.png', thumbImage: 'http://imgfile.oytour.com/Static/app1118.png',
} }
}
} }
}
window.postMessage(JSON.stringify(data)); window.postMessage(JSON.stringify(data));
}) }) <<
<<
<< < HEAD
setInterval(() => { setInterval(() => {
$('.digit_set').empty() $('.digit_set').empty()
$.ajax({ $.ajax({
...@@ -875,6 +913,193 @@ ...@@ -875,6 +913,193 @@
}); });
}, 300000) //5分钟请求一次接口 }, 300000) //5分钟请求一次接口
===
===
=
setInterval(() => {
$('.digit_set').empty()
$.ajax({
type: "POST",
url: `${getApiUrl().urlJava}api/appActivity/getUserPurchaseTime`,
contentType: "application/json",
data: getJavaData({}),
async: false,
success: function(res) {
if (res.resultCode === 1) {
getTicketList(res.data.couponId);
let num = res.data.repertory; //优惠券总共数量
// let num = 5000; //优惠券总共数量
$('.box_title_2 p').html(res.data.redemptionPrice + '元抢购');
$('.box_title h5').html(res.data.remark);
$('.explain p').html('活动规则' + '<br/>' + res.data.instructions);
if (login == false) {
$('.use_o').html('暂无登录');
} else {
$('.use_o').html(res.data.contact);
$('.use_t').html(res.data.customerName);
}
let activityStartDate = new Date(res.data.activityStartDate.replace('T', ' ').replace(/-/g, '/')).getTime(); //活动开始时间
let activityEndDate = new Date(res.data.activityEndDate.replace('T', ' ').replace(/-/g, '/')).getTime(); //活动结束时间
let nowDate = new Date(res.data.currentTime.replace('T', ' ').replace(/-/g, '/')).getTime(); //服务器时间
$('.dataStatistics').dataStatistics({
max: num,
min: num,
len: 4,
add: true,
price: res.data.redemptionPrice,
couponId: res.data.couponId,
platform: platform,
login: login,
count: res.data.count, //判断是否可以抢购 0为不可以
activityStartDate: activityStartDate,
activityEndDate: activityEndDate,
}); //刚进入页面不执行动画
// let activityStartDate = new Date('2019/11/08 17:43:50').getTime();
// let activityEndDate = new Date('2019/11/14 11:23:00').getTime(); //活动结束时间
let nextActivity = res.data.nextActivity;
if (nextActivity != null) {
let nexttime = nextActivity.activityStartDate;
let year = nexttime.split('T')[0].split('-')[0];
let month = nexttime.split('T')[0].split('-')[1];
let day = nexttime.split('T')[0].split('-')[2];
let hour = nexttime.split('T')[1].split(':')[0];
$('.notice_content').html('下期活动将于' + year + '年' + month + '月' + day + '日' + hour + '点开始。');
$('.notice_content2').html('届时会有' + nextActivity.couponCount + '张价值' + nextActivity.denomination + '的折扣券等待您的抢 购(抢购价' + nextActivity.redemptionPrice + '元），请准时参加。');
// var time2 = setInterval(setTimer3, 1000); //计时器
let beforeDawn = new Date(year + '/' + month + '/' + day + ' 00:00:00').getTime()
let time = ((beforeDawn - nowDate) / 1000).toFixed(0);
runtime(time)
}
//判断当前时间是否到了抢购时间
if (activityStartDate >= nowDate) { //没到抢购时间 显示抢购的具体时间
$('#t1').html('抢购时间：');
$('#t2').html('');
let startDate = res.data.activityStartDate;
let month = startDate.split('T')[0].split('-')[1];
let day = startDate.split('T')[0].split('-')[2];
let hour = startDate.split('T')[1].split(':')[0];
$('#p1').html(month);
$('#p2').html(day);
$('#p3').html(hour);
$('#t3').html('月');
$('#t4').html('日');
$('#t5').html('点整');
$('.img_btn p').html('立即抢购');
$('.img_btn').css("background-image", "url(../images/nobuy_btn.png)");
$('.img_btn p').css("color", "#FFFFFF");
// $(".received_img").attr("src", "");
let time = ((activityStartDate - nowDate) / 1000).toFixed(0);
runtime(time)
} else if (nowDate > activityEndDate || res.data.activityIsEnding == 1) { // 活动时间已过
// $(".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");
$('.img_btn p').css("color", "#FFFFFF");
$('.img_btn p').html('活动结束')
$('.box_content_t').hide()
$('.img_btn').css("background-image", "url(../images/nobuy_btn.png)");
$('.dataStatistics').css('display', "none");
$('.deta_replace').css('display', "flex");
$('#notice').css('display', "block");
$('.notice_img').css('display', "block");
} else { // 到了抢购的时间显示距离结束时间的倒计时
currentTime = res.data.currentTime.replace('T', ' ').replace(/-/g, '/');
end = res.data.activityEndDate.replace('T', ' ').replace(/-/g, '/');
if (num > 0) {
$('#t1').html('结束倒计时：')
if (res.data.count != 0) {
// $(".received_img").attr("src", "");
$('.img_btn p').html('立即抢购');
} else {
$('.img_btn p').html('去使用');
$(".received_img").css('display', "block");
$('.img_btn').css("background-image", "url(../images/buy_btn.png)");
}
} else {
// $(".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");
$('.img_btn p').css("color", "#FFFFFF");
$('.img_btn p').html('活动结束')
$('.box_content_t').hide()
$('.img_btn').css("background-image", "url(../images/nobuy_btn.png)");
$('.dataStatistics').css('display', "none");
$('.deta_replace').css('display', "flex");
$('#notice').css('display', "block");
$('.notice_img').css('display', "block");
}
}
//优惠券的有限时间
let expirationDate = (res.data.expirationDate).split('T')[0].replace(/-/g, '.');
let title = $('.img_bg_p1').text()
let RushbuyTime = {
RushbuyTime: expirationDate,
title: title,
userName: res.data.contact,
shopName: res.data.customerName,
}
localStorage.RushbuyTime = JSON.stringify(RushbuyTime)
$('.img_bg_p2').html('有效期截止：' + expirationDate)
} else {
$('.dataStatistics').dataStatistics({
max: 0,
min: 0,
len: 4,
add: true
}); //刚进入页面不执行动画
}
// clearInterval(xhtime)
},
error: function(res) {
layer.msg(res.message)
$('.dataStatistics').dataStatistics({
max: 0,
min: 0,
len: 4,
add: true
}); //刚进入页面不执行动画
}
});
}, 300000) //5分钟请求一次接口
>>>
>>>
> cafb97ea52718b7bc84df076a4eb6ae686a032f5
</script> </script>
</body> </body>
......
html/Rushbuy.html
View file @ 37f0e92c
...@@ -281,7 +281,9 @@ ...@@ -281,7 +281,9 @@
'goBack':'1', 'goBack':'1',
'cardInfo' : { 'cardInfo' : {
title : RushbuyTime.title, title : RushbuyTime.title,
date : RushbuyTime.RushbuyTime, date : RushbuyTime.RushbuyTime,
userName:RushbuyTime.userName,
shopName:RushbuyTime.shopName,
} }
} }
} }
......
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