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
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 244 additions and 207 deletions
html/GT_activities.html
View file @ c49fe90e
This diff is collapsed.
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
......@@ -40,7 +40,7 @@
margin: 0;
padding: 0;
}
.login_page {
position: relative;
height: 100%;
......@@ -48,13 +48,13 @@
background-image: url('https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login_bg.jpg');
background-size: cover;
}
.login_page .page__bd {
position: relative;
z-index: 2;
padding-top: 33rem;
}
.login_page .header {
display: flex;
flex-direction: column;
......@@ -62,44 +62,44 @@
align-items: center;
width: 100%;
}
.login_page .header_span {
font-size: 3rem;
color: #EE4454;
margin-top: 0.5rem;
}
.login_page .header_image {
width: 10rem;
height: 10rem;
}
.login_page .headBg {
position: relative;
width: 54rem;
height: 50rem;
margin: 0 auto;
}
.login_page .headBgImg {
position: absolute;
width: 100%;
height: 100%;
z-index: -1;
}
.login_page .form {
margin: 6rem 0 0 0;
padding: 0 6rem;
}
.login_page .form_item1 {
width: 100%;
height: 6rem;
display: flex;
align-items: center;
}
.login_page .form_item2 {
margin: 3rem 0 0 0;
width: 100%;
......@@ -107,7 +107,7 @@
display: flex;
align-items: center;
}
.login_page .form_item_icoBox {
flex-shrink: 0;
display: flex;
......@@ -118,12 +118,12 @@
border: 1px solid #257BF1;
border-radius: 50%;
}
.login_page .form_item_ico {
width: 2.5rem;
height: 2.5rem
}
.login_page .form_item_inBox {
margin: 0 0 0 10px;
flex-grow: 1;
......@@ -132,7 +132,7 @@
height: 6rem;
border-bottom: 1px solid #666666;
}
.login_page .form_item_input {
flex-grow: 1;
font-size: 14px;
......@@ -145,18 +145,18 @@
font-size: 2rem;
margin-top: 1rem;
}
.login_page .login_Zh {
font-size: 2rem;
margin: 0.5rem 0 0 0.8rem;
color: #111111;
}
input::-webkit-input-placeholder {
/* WebKit browsers */
color: #CCCCCC;
}
.login_page .login_btn {
margin: 0 auto;
font-size: 2rem;
......@@ -175,18 +175,18 @@
background: rgba(238, 68, 84, 1);
box-shadow: 0px 6px 6px 0px rgba(139, 139, 139, 0.25);
}
.login_page .jihuoDiv {
margin-top: 6rem;
text-align: center;
font-size: 2rem;
color: #999;
}
.login_page .jilijihuo {
color: #EE4454;
}
.login_page .login_xieyi {
position: absolute;
bottom: 3rem;
......@@ -196,12 +196,12 @@
text-align: center;
color: #111111;
}
.login_page .login_xieyi span:last-child {
color: #EE4454;
text-decoration: underline;
}
.form_validate_input {
color: #333333;
text-align: left;
......@@ -213,7 +213,7 @@
font-size: 2rem;
margin-top: 1rem;
}
.login_yzm {
font-size: 2rem;
color: #EE4454;
......@@ -221,34 +221,34 @@
padding: 0 2rem;
border-left: 1px solid #666666;
}
.login_jihuo,
.login_Agreement {
display: none;
}
.login_Agreement {
width: 100%;
height: 100%;
}
.boxcenter {
padding: 0 2rem;
}
.login_Agreement .boxcenter h1 {
font-size: 2.3rem;
margin-top: 3rem;
line-height: 4rem;
}
.login_Agreement .boxcenter span {
font-size: 2rem;
display: inline-block;
margin-top: 1rem;
line-height: 4rem;
}
.login_AgreeTitle {
width: 100%;
height: 8rem;
......@@ -258,14 +258,14 @@
border: 0;
box-shadow: 0px 0px 20px #d1d1d1;
}
.login_AgreeTitle img {
position: relative;
left: 3rem;
top: 3rem;
float: left;
}
.layui-layer-content {
font-size: 1.8rem!important;
padding: 2rem 1rem!important;
......@@ -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)
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';
} 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)) {
......@@ -569,4 +590,4 @@
}
</script>
</html>
\ No newline at end of file
</html>
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