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
Show whitespace changes
Inline Side-by-side
Showing with 244 additions and 207 deletions
html/GT_activities.html
View file @ c49fe90e
......@@ -155,7 +155,8 @@
</div>
<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_content"></p>
<p class="notice_content2"></p>
......@@ -169,7 +170,7 @@
<!--<script type="text/javascript" src="js/countdown.js"></script>-->
<script type="text/javascript" src="../js/md5.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="../js/layer/layer.js"></script>
<script type="text/javascript" src="../js/yql.js"></script>
......@@ -335,7 +336,9 @@
$('.click_use p').html('立即登录');
}
var that=this
that.loadData()
function loadData(){
$.ajax({
type: "POST",
url: `${getApiUrl().urlJava}api/appActivity/getUserPurchaseTime`,
......@@ -392,6 +395,8 @@
// 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;
......@@ -399,8 +404,8 @@
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 + '元），请准时参加。');
// $('.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);
......@@ -501,21 +506,16 @@
$('.img_bg_p2').html('有效期截止：' + expirationDate)
} else {
$('.dataStatistics').dataStatistics({
max: 0,
min: 0,
len: 4,
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)
},
......@@ -527,17 +527,14 @@
len: 4,
add: true
}); //刚进入页面不执行动画
if (platform == 'app') {
window.postMessage(JSON.stringify({
'action': 'showToast',
'message': '请求人数过多，请返回再次进入！'
}));
} else {
layer.msg('请求人数过多，请返回再次进入！');
}
layer.msg(res.message);
setTimeout(loadData,3000) //失败后再次3秒后再次调接口
}
});
}
......
html/Rushbuy.html
View file @ c49fe90e
......@@ -245,6 +245,7 @@
let price = param ? param[0].split('=')[1] : 0;
let couponId = param ? param[1].split('=')[1] : 0;
let platform = param ? param[2].split('=')[1] : 0;
let noClick = param ? param[3].split('=')[1] : 0;
$('.anniu').html('支付' + price + '元领取')
let buyIf = {}
// if (localStorage.buyInfo) {
......@@ -260,6 +261,8 @@
let RushbuyTime = localStorage.RushbuyTime ? JSON.parse(localStorage.RushbuyTime) : {
RushbuyTime: ''
}
$('#RushbuyTime').html(`有效期截止:` + RushbuyTime.RushbuyTime)
function move(t) {
......@@ -305,7 +308,17 @@
});
})
var that=this
console.log(noClick)
if(noClick == 1){ //0不执行 1为执行点击事件
that.btnClick()
}
$('.anniu').click(function() {
that.btnClick()
})
function btnClick() {
if (!isChecke) {
layer.msg('请同意活动说明');
return;
......@@ -325,6 +338,7 @@
time: 60000
});
}
$.ajax({
type: "POST",
url: `${getApiUrl().urlJava}api/appActivity/PanicBuyingCoupon`,
......@@ -407,7 +421,9 @@
layer.msg('登录已过期，请重新登录');
setTimeout(function() {
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)
}
......@@ -425,12 +441,13 @@
layer.msg('登录已过期，请重新登录');
setTimeout(function() {
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)
}
}
});
})
}
</script>
</body>
......
html/login.html
View file @ c49fe90e
......@@ -390,6 +390,19 @@
// 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() {
$(".login_denglu").css({
......@@ -463,7 +476,15 @@
secretKey: res.data.secretKey,
}
localStorage.u = JSON.stringify(userInfo)
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';
} else {
layer.msg(res.message);
......@@ -476,7 +497,7 @@
}
//发送验证码
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();
if (!phoneReg.test(phone)) {
......
js/jquery.dataStatistics.js
View file @ c49fe90e
......@@ -289,8 +289,8 @@ $.fn.dataStatistics = function(options) {
// }
// 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 = `./Rushbuy.html?redemptionPrice=${options.price}&couponId=${options.couponId}&platform=${options.platform}`;
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}&noClick=${'0'}&r=efr12123`;
} else {
let data = {
'action': 'jump', // showToast->一个提示信息 showHud->一个黑色的loading
......@@ -386,6 +386,8 @@ $.fn.dataStatistics = function(options) {
// 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;
......@@ -393,8 +395,8 @@ $.fn.dataStatistics = function(options) {
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 + '元），请准时参加。');
// $('.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);
......
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