Skip to content

S
SURPRISED
Commit c49fe90e authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 023b2285 d074502c
Hide whitespace changes
Inline Side-by-side
Showing with 244 additions and 207 deletions
html/GT_activities.html
View file @ c49fe90e
...@@ -155,7 +155,8 @@ ...@@ -155,7 +155,8 @@
</div> </div>
<div class="notice_img"> <div class="notice_img">
<img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/notice_2.png" alt=""> <!-- <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/notice_2.png" alt="">-->
<img src="" alt="">
<p class="notice_name">尊敬的客户</p> <p class="notice_name">尊敬的客户</p>
<p class="notice_content"></p> <p class="notice_content"></p>
<p class="notice_content2"></p> <p class="notice_content2"></p>
...@@ -169,7 +170,7 @@ ...@@ -169,7 +170,7 @@
<!--<script type="text/javascript" src="js/countdown.js"></script>--> <!--<script type="text/javascript" src="js/countdown.js"></script>-->
<script type="text/javascript" src="../js/md5.js"></script> <script type="text/javascript" src="../js/md5.js"></script>
<script type="text/javascript" src="../js/mian.js"></script> <script type="text/javascript" src="../js/mian.js"></script>
<script src="../js/jquery.dataStatistics.js?r=efa5420042"></script> <script src="../js/jquery.dataStatistics.js?r=efh0054202"></script>
<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script> <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
<script type="text/javascript" src="../js/layer/layer.js"></script> <script type="text/javascript" src="../js/layer/layer.js"></script>
<script type="text/javascript" src="../js/yql.js"></script> <script type="text/javascript" src="../js/yql.js"></script>
...@@ -335,141 +336,107 @@ ...@@ -335,141 +336,107 @@
$('.click_use p').html('立即登录'); $('.click_use p').html('立即登录');
} }
var that=this
that.loadData()
function loadData(){
$.ajax({
type: "POST",
url: `${getApiUrl().urlJava}api/appActivity/getUserPurchaseTime`,
contentType: "application/json",
data: getJavaData({}),
async: false,
$.ajax({ success: function(res) {
type: "POST", if (res.resultCode === 1) {
url: `${getApiUrl().urlJava}api/appActivity/getUserPurchaseTime`, couponId=res.data.couponId;
contentType: "application/json", //getTicketList(res.data.couponId);
data: getJavaData({}),
async: false,
success: function(res) {
if (res.resultCode === 1) {
couponId=res.data.couponId;
//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(); //服务器时间
let nextActivity = res.data.nextActivity;
let nextAc = false;
if (nextActivity != null) {
nextAc = true
}
$('.dataStatistics').dataStatistics({ let num = res.data.repertory; //优惠券总共数量
max: num, // let num = 5000; //优惠券总共数量
min: num, $('.box_title_2 p').html(res.data.redemptionPrice + '元抢购');
len: 4, $('.box_title h5').html(res.data.remark);
add: true,
price: res.data.redemptionPrice,
couponId: res.data.couponId,
platform: platform,
login: login,
count: res.data.count, //判断是否可以抢购 0为不可以
activityStartDate: activityStartDate,
activityEndDate: activityEndDate,
nextAc: nextAc
}); //刚进入页面不执行动画
$('.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('2019/11/08 17:43:50').getTime(); let activityStartDate = new Date(res.data.activityStartDate.replace('T', ' ').replace(/-/g, '/')).getTime(); //活动开始时间
// let activityEndDate = new Date('2019/11/14 11:23:00').getTime(); //活动结束时间 let activityEndDate = new Date(res.data.activityEndDate.replace('T', ' ').replace(/-/g, '/')).getTime(); //活动结束时间
if (nextActivity != null) { let nowDate = new Date(res.data.currentTime.replace('T', ' ').replace(/-/g, '/')).getTime(); //服务器时间
let nextActivity = res.data.nextActivity;
let nextAc = false;
if (nextActivity != null) {
nextAc = true
}
let nexttime = nextActivity.activityStartDate; $('.dataStatistics').dataStatistics({
let year = nexttime.split('T')[0].split('-')[0]; max: num,
let month = nexttime.split('T')[0].split('-')[1]; min: num,
let day = nexttime.split('T')[0].split('-')[2]; len: 4,
let hour = nexttime.split('T')[1].split(':')[0]; add: true,
$('.notice_content').html('下期活动将于' + year + '年' + month + '月' + day + '日' + hour + '点开始。'); price: res.data.redemptionPrice,
$('.notice_content2').html('届时会有' + nextActivity.couponCount + '张价值' + nextActivity.denomination + '的折扣券等待您的抢 购(抢购价' + nextActivity.redemptionPrice + '元），请准时参加。'); couponId: res.data.couponId,
// var time2 = setInterval(setTimer3, 1000); //计时器 platform: platform,
let beforeDawn = new Date(year + '/' + month + '/' + day + ' 00:00:00').getTime() login: login,
let time = ((beforeDawn - nowDate) / 1000).toFixed(0); count: res.data.count, //判断是否可以抢购 0为不可以
runtime(time) activityStartDate: activityStartDate,
activityEndDate: activityEndDate,
nextAc: nextAc
}); //刚进入页面不执行动画
// let activityStartDate = new Date('2019/11/08 17:43:50').getTime();
// let activityEndDate = new Date('2019/11/14 11:23:00').getTime(); //活动结束时间
$('.notice_content').html('本次1118活动已圆满结束，感谢各位同业会员的支持与厚爱，我们将秉持印象之旅的初心，陆续推出更多的让利活动，请您持续关注，印象之旅全体员工祝各位老板生意兴隆');
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) { //没到抢购时间 显示抢购的具体时间 if (activityStartDate >= nowDate) { //没到抢购时间 显示抢购的具体时间
$('#t1').html('抢购时间：'); $('#t1').html('抢购时间：');
$('#t2').html(''); $('#t2').html('');
let startDate = res.data.activityStartDate; let startDate = res.data.activityStartDate;
let month = startDate.split('T')[0].split('-')[1]; let month = startDate.split('T')[0].split('-')[1];
let day = startDate.split('T')[0].split('-')[2]; let day = startDate.split('T')[0].split('-')[2];
let hour = startDate.split('T')[1].split(':')[0]; let hour = startDate.split('T')[1].split(':')[0];
$('#p1').html(month); $('#p1').html(month);
$('#p2').html(day); $('#p2').html(day);
$('#p3').html(hour); $('#p3').html(hour);
$('#t3').html('月'); $('#t3').html('月');
$('#t4').html('日'); $('#t4').html('日');
$('#t5').html('点整'); $('#t5').html('点整');
$('.img_btn p').html('立即抢购'); $('.img_btn p').html('立即抢购');
$('.img_btn').css("background-image", "url(https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/nobuy_btn.png)"); $('.img_btn').css("background-image", "url(https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/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(https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/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(https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/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('立即抢购'); $('.img_btn p').css("color", "#FFFFFF");
// $(".received_img").attr("src", "");
let time = ((activityStartDate - nowDate) / 1000).toFixed(0);
runtime(time)
} else { } else if (nowDate > activityEndDate || res.data.activityIsEnding == 1) { // 活动时间已过
$('.img_btn p').html('去使用');
$(".received_img").css('display', "block");
$('.img_btn').css("background-image", "url(https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/buy_btn.png)");
//去使用状态显示弹幕
if(couponId!=null&&couponId!=undefined){
getTicketList(couponId);
}
}
} else {
// $(".received_img").attr("src", ""); // $(".received_img").attr("src", "");
$('.img_bg_M').css("background-image", "url(https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/MJ_200@3x.png)"); $('.img_bg_M').css("background-image", "url(https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/MJ_200@3x.png)");
...@@ -479,64 +446,94 @@ ...@@ -479,64 +446,94 @@
$('.img_btn p').html('活动结束') $('.img_btn p').html('活动结束')
$('.box_content_t').hide() $('.box_content_t').hide()
$('.img_btn').css("background-image", "url(https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/nobuy_btn.png)"); $('.img_btn').css("background-image", "url(https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/nobuy_btn.png)");
$('.dataStatistics').css('display', "none"); $('.dataStatistics').css('display', "none");
$('.deta_replace').css('display', "flex"); $('.deta_replace').css('display', "flex");
$('#notice').css('display', "block"); $('#notice').css('display', "block");
$('.notice_img').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(https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/buy_btn.png)");
//去使用状态显示弹幕
if(couponId!=null&&couponId!=undefined){
getTicketList(couponId);
}
}
} else {
// $(".received_img").attr("src", "");
$('.img_bg_M').css("background-image", "url(https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/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(https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/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
}); //刚进入页面不执行动画
layer.msg(res.message);
setTimeout(loadData,3000) //失败后再次3秒后再次调接口
//优惠券的有限时间
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) // clearInterval(xhtime)
$('.img_bg_p2').html('有效期截止：' + expirationDate) },
error: function(res) {
} else {
$('.dataStatistics').dataStatistics({ $('.dataStatistics').dataStatistics({
max: 0, max: 0,
min: 0, min: 0,
len: 4, len: 4,
add: true add: true
}); //刚进入页面不执行动画 }); //刚进入页面不执行动画
layer.msg(res.message);
setTimeout(loadData,3000) //失败后再次3秒后再次调接口
if (platform == 'app') {
window.postMessage(JSON.stringify({
'action': 'showToast',
'message': '请求人数过多，请返回再次进入！'
}));
} else {
layer.msg('请求人数过多，请返回再次进入！');
}
}
// clearInterval(xhtime)
},
error: function(res) {
$('.dataStatistics').dataStatistics({
max: 0,
min: 0,
len: 4,
add: true
}); //刚进入页面不执行动画
if (platform == 'app') {
window.postMessage(JSON.stringify({
'action': 'showToast',
'message': '请求人数过多，请返回再次进入！'
}));
} else {
layer.msg('请求人数过多，请返回再次进入！');
} }
} });
});
}
......
html/Rushbuy.html
View file @ c49fe90e
...@@ -245,6 +245,7 @@ ...@@ -245,6 +245,7 @@
let price = param ? param[0].split('=')[1] : 0; let price = param ? param[0].split('=')[1] : 0;
let couponId = param ? param[1].split('=')[1] : 0; let couponId = param ? param[1].split('=')[1] : 0;
let platform = param ? param[2].split('=')[1] : 0; let platform = param ? param[2].split('=')[1] : 0;
let noClick = param ? param[3].split('=')[1] : 0;
$('.anniu').html('支付' + price + '元领取') $('.anniu').html('支付' + price + '元领取')
let buyIf = {} let buyIf = {}
// if (localStorage.buyInfo) { // if (localStorage.buyInfo) {
...@@ -260,6 +261,8 @@ ...@@ -260,6 +261,8 @@
let RushbuyTime = localStorage.RushbuyTime ? JSON.parse(localStorage.RushbuyTime) : { let RushbuyTime = localStorage.RushbuyTime ? JSON.parse(localStorage.RushbuyTime) : {
RushbuyTime: '' RushbuyTime: ''
} }
$('#RushbuyTime').html(`有效期截止:` + RushbuyTime.RushbuyTime) $('#RushbuyTime').html(`有效期截止:` + RushbuyTime.RushbuyTime)
function move(t) { function move(t) {
...@@ -305,7 +308,17 @@ ...@@ -305,7 +308,17 @@
}); });
}) })
var that=this
console.log(noClick)
if(noClick == 1){ //0不执行 1为执行点击事件
that.btnClick()
}
$('.anniu').click(function() { $('.anniu').click(function() {
that.btnClick()
})
function btnClick() {
if (!isChecke) { if (!isChecke) {
layer.msg('请同意活动说明'); layer.msg('请同意活动说明');
return; return;
...@@ -325,6 +338,7 @@ ...@@ -325,6 +338,7 @@
time: 60000 time: 60000
}); });
} }
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: `${getApiUrl().urlJava}api/appActivity/PanicBuyingCoupon`, url: `${getApiUrl().urlJava}api/appActivity/PanicBuyingCoupon`,
...@@ -407,7 +421,9 @@ ...@@ -407,7 +421,9 @@
layer.msg('登录已过期，请重新登录'); layer.msg('登录已过期，请重新登录');
setTimeout(function() { setTimeout(function() {
localStorage.removeItem("u"); localStorage.removeItem("u");
window.location.href = 'https://activity.oytour.com/html/login.html'; window.location.href = `https://activity.oytour.com/html/login.html?redemptionPrice=${price}&couponId=${couponId}&platform=${platform}&jumpPay=${'1'}&r=opfr12123`;
// window.location.href = `./login.html?redemptionPrice=${price}&couponId=${couponId}&platform=${platform}&jumpPay=${'1'}&r=efr12123`;
}, 2000) }, 2000)
} }
...@@ -425,12 +441,13 @@ ...@@ -425,12 +441,13 @@
layer.msg('登录已过期，请重新登录'); layer.msg('登录已过期，请重新登录');
setTimeout(function() { setTimeout(function() {
localStorage.removeItem("u"); localStorage.removeItem("u");
window.location.href = 'https://activity.oytour.com/html/login.html?r=uj23123'; window.location.href = `https://activity.oytour.com/html/login.html?redemptionPrice=${price}&couponId=${couponId}&platform=${platform}&jumpPay=${'1'}&r=eiu12123`;
// window.location.href = `./login.html?redemptionPrice=${price}&couponId=${couponId}&platform=${platform}&jumpPay=${'1'}&r=efr12123`;
}, 2000) }, 2000)
} }
} }
}); });
}) }
</script> </script>
</body> </body>
......
html/login.html
View file @ c49fe90e
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.login_page { .login_page {
position: relative; position: relative;
height: 100%; height: 100%;
...@@ -48,13 +48,13 @@ ...@@ -48,13 +48,13 @@
background-image: url('https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login_bg.jpg'); background-image: url('https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login_bg.jpg');
background-size: cover; background-size: cover;
} }
.login_page .page__bd { .login_page .page__bd {
position: relative; position: relative;
z-index: 2; z-index: 2;
padding-top: 33rem; padding-top: 33rem;
} }
.login_page .header { .login_page .header {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -62,44 +62,44 @@ ...@@ -62,44 +62,44 @@
align-items: center; align-items: center;
width: 100%; width: 100%;
} }
.login_page .header_span { .login_page .header_span {
font-size: 3rem; font-size: 3rem;
color: #EE4454; color: #EE4454;
margin-top: 0.5rem; margin-top: 0.5rem;
} }
.login_page .header_image { .login_page .header_image {
width: 10rem; width: 10rem;
height: 10rem; height: 10rem;
} }
.login_page .headBg { .login_page .headBg {
position: relative; position: relative;
width: 54rem; width: 54rem;
height: 50rem; height: 50rem;
margin: 0 auto; margin: 0 auto;
} }
.login_page .headBgImg { .login_page .headBgImg {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%; height: 100%;
z-index: -1; z-index: -1;
} }
.login_page .form { .login_page .form {
margin: 6rem 0 0 0; margin: 6rem 0 0 0;
padding: 0 6rem; padding: 0 6rem;
} }
.login_page .form_item1 { .login_page .form_item1 {
width: 100%; width: 100%;
height: 6rem; height: 6rem;
display: flex; display: flex;
align-items: center; align-items: center;
} }
.login_page .form_item2 { .login_page .form_item2 {
margin: 3rem 0 0 0; margin: 3rem 0 0 0;
width: 100%; width: 100%;
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
} }
.login_page .form_item_icoBox { .login_page .form_item_icoBox {
flex-shrink: 0; flex-shrink: 0;
display: flex; display: flex;
...@@ -118,12 +118,12 @@ ...@@ -118,12 +118,12 @@
border: 1px solid #257BF1; border: 1px solid #257BF1;
border-radius: 50%; border-radius: 50%;
} }
.login_page .form_item_ico { .login_page .form_item_ico {
width: 2.5rem; width: 2.5rem;
height: 2.5rem height: 2.5rem
} }
.login_page .form_item_inBox { .login_page .form_item_inBox {
margin: 0 0 0 10px; margin: 0 0 0 10px;
flex-grow: 1; flex-grow: 1;
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
height: 6rem; height: 6rem;
border-bottom: 1px solid #666666; border-bottom: 1px solid #666666;
} }
.login_page .form_item_input { .login_page .form_item_input {
flex-grow: 1; flex-grow: 1;
font-size: 14px; font-size: 14px;
...@@ -145,18 +145,18 @@ ...@@ -145,18 +145,18 @@
font-size: 2rem; font-size: 2rem;
margin-top: 1rem; margin-top: 1rem;
} }
.login_page .login_Zh { .login_page .login_Zh {
font-size: 2rem; font-size: 2rem;
margin: 0.5rem 0 0 0.8rem; margin: 0.5rem 0 0 0.8rem;
color: #111111; color: #111111;
} }
input::-webkit-input-placeholder { input::-webkit-input-placeholder {
/* WebKit browsers */ /* WebKit browsers */
color: #CCCCCC; color: #CCCCCC;
} }
.login_page .login_btn { .login_page .login_btn {
margin: 0 auto; margin: 0 auto;
font-size: 2rem; font-size: 2rem;
...@@ -175,18 +175,18 @@ ...@@ -175,18 +175,18 @@
background: rgba(238, 68, 84, 1); background: rgba(238, 68, 84, 1);
box-shadow: 0px 6px 6px 0px rgba(139, 139, 139, 0.25); box-shadow: 0px 6px 6px 0px rgba(139, 139, 139, 0.25);
} }
.login_page .jihuoDiv { .login_page .jihuoDiv {
margin-top: 6rem; margin-top: 6rem;
text-align: center; text-align: center;
font-size: 2rem; font-size: 2rem;
color: #999; color: #999;
} }
.login_page .jilijihuo { .login_page .jilijihuo {
color: #EE4454; color: #EE4454;
} }
.login_page .login_xieyi { .login_page .login_xieyi {
position: absolute; position: absolute;
bottom: 3rem; bottom: 3rem;
...@@ -196,12 +196,12 @@ ...@@ -196,12 +196,12 @@
text-align: center; text-align: center;
color: #111111; color: #111111;
} }
.login_page .login_xieyi span:last-child { .login_page .login_xieyi span:last-child {
color: #EE4454; color: #EE4454;
text-decoration: underline; text-decoration: underline;
} }
.form_validate_input { .form_validate_input {
color: #333333; color: #333333;
text-align: left; text-align: left;
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
font-size: 2rem; font-size: 2rem;
margin-top: 1rem; margin-top: 1rem;
} }
.login_yzm { .login_yzm {
font-size: 2rem; font-size: 2rem;
color: #EE4454; color: #EE4454;
...@@ -221,34 +221,34 @@ ...@@ -221,34 +221,34 @@
padding: 0 2rem; padding: 0 2rem;
border-left: 1px solid #666666; border-left: 1px solid #666666;
} }
.login_jihuo, .login_jihuo,
.login_Agreement { .login_Agreement {
display: none; display: none;
} }
.login_Agreement { .login_Agreement {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.boxcenter { .boxcenter {
padding: 0 2rem; padding: 0 2rem;
} }
.login_Agreement .boxcenter h1 { .login_Agreement .boxcenter h1 {
font-size: 2.3rem; font-size: 2.3rem;
margin-top: 3rem; margin-top: 3rem;
line-height: 4rem; line-height: 4rem;
} }
.login_Agreement .boxcenter span { .login_Agreement .boxcenter span {
font-size: 2rem; font-size: 2rem;
display: inline-block; display: inline-block;
margin-top: 1rem; margin-top: 1rem;
line-height: 4rem; line-height: 4rem;
} }
.login_AgreeTitle { .login_AgreeTitle {
width: 100%; width: 100%;
height: 8rem; height: 8rem;
...@@ -258,14 +258,14 @@ ...@@ -258,14 +258,14 @@
border: 0; border: 0;
box-shadow: 0px 0px 20px #d1d1d1; box-shadow: 0px 0px 20px #d1d1d1;
} }
.login_AgreeTitle img { .login_AgreeTitle img {
position: relative; position: relative;
left: 3rem; left: 3rem;
top: 3rem; top: 3rem;
float: left; float: left;
} }
.layui-layer-content { .layui-layer-content {
font-size: 1.8rem!important; font-size: 1.8rem!important;
padding: 2rem 1rem!important; padding: 2rem 1rem!important;
...@@ -390,6 +390,19 @@ ...@@ -390,6 +390,19 @@
// window.location.href = 'https://activity.oytour.com/html/login.html'; // window.location.href = 'https://activity.oytour.com/html/login.html';
// } // }
// } // }
let jumpPay = 0; //0 为跳转到活动页面 1位支付页面
let price = 0;
let couponId = 0;
let platform = 0;
let href = window.location.href;
if(href.split('?')[1] && href.split('?')[1].indexOf('redemptionPrice') != -1){
let param = href.split('?')[1].split("&") ? href.split('?')[1].split("&") : null;
price = param ? param[0].split('=')[1] : 0;
couponId = param ? param[1].split('=')[1] : 0;
platform = param ? param[2].split('=')[1] : 0;
jumpPay = param ? param[3].split('=')[1] : 1;
}
//跳转至激活 //跳转至激活
function goJihuo() { function goJihuo() {
$(".login_denglu").css({ $(".login_denglu").css({
...@@ -463,7 +476,15 @@ ...@@ -463,7 +476,15 @@
secretKey: res.data.secretKey, secretKey: res.data.secretKey,
} }
localStorage.u = JSON.stringify(userInfo) localStorage.u = JSON.stringify(userInfo)
window.location.href = 'https://activity.oytour.com/html/GT_activities.html'; if(jumpPay == 0 || couponId == 0){
window.location.href = 'https://activity.oytour.com/html/GT_activities.html';
// window.location.href = './GT_activities.html';
}else {
window.location.href = `https://activity.oytour.com/html/Rushbuy.html?redemptionPrice=${price}&couponId=${couponId}&platform=${platform}&noClick=${'1'}&r=ejhr12123`;
// window.location.href = `./Rushbuy.html?redemptionPrice=${price}&couponId=${couponId}&platform=${platform}&noClick=${'1'}&r=efr12123`;
}
//window.location.href='http://127.0.0.1:5500/html/GT_activities.html'; //window.location.href='http://127.0.0.1:5500/html/GT_activities.html';
} else { } else {
layer.msg(res.message); layer.msg(res.message);
...@@ -476,7 +497,7 @@ ...@@ -476,7 +497,7 @@
} }
//发送验证码 //发送验证码
function getCode() { function getCode() {
var phoneReg = /(^1[3|4|5|7|8]\d{9}$)|(^09\d{8}$)/; var phoneReg = /(^1[3|4|5|6|7|8|9]\d{9}$)|(^09\d{8}$)/;
//电话 //电话
let phone = $('#Activation_Account').val(); let phone = $('#Activation_Account').val();
if (!phoneReg.test(phone)) { if (!phoneReg.test(phone)) {
...@@ -569,4 +590,4 @@ ...@@ -569,4 +590,4 @@
} }
</script> </script>
</html> </html>
\ No newline at end of file
js/jquery.dataStatistics.js
View file @ c49fe90e
...@@ -289,8 +289,8 @@ $.fn.dataStatistics = function(options) { ...@@ -289,8 +289,8 @@ $.fn.dataStatistics = function(options) {
// } // }
// localStorage.buyInfo = JSON.stringify(buyInfo) // localStorage.buyInfo = JSON.stringify(buyInfo)
window.location.href = `https://activity.oytour.com/html/Rushbuy.html?redemptionPrice=${options.price}&couponId=${options.couponId}&platform=${options.platform}&r=efr12123`; window.location.href = `https://activity.oytour.com/html/Rushbuy.html?redemptionPrice=${options.price}&couponId=${options.couponId}&platform=${options.platform}&noClick=${'0'}&r=efrq12123`;
//window.location.href = `./Rushbuy.html?redemptionPrice=${options.price}&couponId=${options.couponId}&platform=${options.platform}`; // window.location.href = `./Rushbuy.html?redemptionPrice=${options.price}&couponId=${options.couponId}&platform=${options.platform}&noClick=${'0'}&r=efr12123`;
} else { } else {
let data = { let data = {
'action': 'jump', // showToast->一个提示信息 showHud->一个黑色的loading 'action': 'jump', // showToast->一个提示信息 showHud->一个黑色的loading
...@@ -386,6 +386,8 @@ $.fn.dataStatistics = function(options) { ...@@ -386,6 +386,8 @@ $.fn.dataStatistics = function(options) {
// let activityStartDate = new Date('2019/11/08 17:43:50').getTime(); // let activityStartDate = new Date('2019/11/08 17:43:50').getTime();
// let activityEndDate = new Date('2019/11/14 11:23:00').getTime(); //活动结束时间 // let activityEndDate = new Date('2019/11/14 11:23:00').getTime(); //活动结束时间
$('.notice_content').html('本次1118活动已圆满结束，感谢各位同业会员的支持与厚爱，我们将秉持印象之旅的初心，陆续推出更多的让利活动，请您持续关注，印象之旅全体员工祝各位老板生意兴隆');
if (nextActivity != null) { if (nextActivity != null) {
let nexttime = nextActivity.activityStartDate; let nexttime = nextActivity.activityStartDate;
...@@ -393,8 +395,8 @@ $.fn.dataStatistics = function(options) { ...@@ -393,8 +395,8 @@ $.fn.dataStatistics = function(options) {
let month = nexttime.split('T')[0].split('-')[1]; let month = nexttime.split('T')[0].split('-')[1];
let day = nexttime.split('T')[0].split('-')[2]; let day = nexttime.split('T')[0].split('-')[2];
let hour = nexttime.split('T')[1].split(':')[0]; let hour = nexttime.split('T')[1].split(':')[0];
$('.notice_content').html('下期活动将于' + year + '年' + month + '月' + day + '日' + hour + '点开始。'); // $('.notice_content').html('下期活动将于' + year + '年' + month + '月' + day + '日' + hour + '点开始。');
$('.notice_content2').html('届时会有' + nextActivity.couponCount + '张价值' + nextActivity.denomination + '的折扣券等待您的抢 购(抢购价' + nextActivity.redemptionPrice + '元），请准时参加。'); // $('.notice_content2').html('届时会有' + nextActivity.couponCount + '张价值' + nextActivity.denomination + '的折扣券等待您的抢 购(抢购价' + nextActivity.redemptionPrice + '元），请准时参加。');
// var time2 = setInterval(setTimer3, 1000); //计时器 // var time2 = setInterval(setTimer3, 1000); //计时器
let beforeDawn = new Date(year + '/' + month + '/' + day + ' 00:00:00').getTime() let beforeDawn = new Date(year + '/' + month + '/' + day + ' 00:00:00').getTime()
let time = ((beforeDawn - nowDate) / 1000).toFixed(0); let time = ((beforeDawn - nowDate) / 1000).toFixed(0);
......
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