Skip to content

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

no message

parent 72e8b35f
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 66 deletions
html/GT_activities.html
View file @ b61856c3
......@@ -335,9 +335,10 @@
$('.click_use p').html('立即登录');
}
var that=this
var that = this
that.loadData()
function loadData(){
function loadData() {
$.ajax({
type: "POST",
url: `${getApiUrl().urlJava}api/appActivity/getUserPurchaseTime`,
......@@ -347,7 +348,7 @@
success: function(res) {
if (res.resultCode === 1) {
couponId=res.data.couponId;
couponId = res.data.couponId;
//getTicketList(res.data.couponId);
let num = res.data.repertory; //优惠券总共数量
......@@ -467,7 +468,7 @@
$(".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){
if (couponId != null && couponId != undefined) {
getTicketList(couponId);
}
}
......@@ -511,7 +512,7 @@
add: true
}); //刚进入页面不执行动画
layer.msg(res.message);
setTimeout(loadData,3000) //失败后再次3秒后再次调接口
setTimeout(loadData, 3000) //失败后再次3秒后再次调接口
}
// clearInterval(xhtime)
......@@ -524,8 +525,8 @@
len: 4,
add: true
}); //刚进入页面不执行动画
layer.msg(res.message);
setTimeout(loadData,3000) //失败后再次3秒后再次调接口
layer.msg(res.message);
setTimeout(loadData, 3000) //失败后再次3秒后再次调接口
}
});
......@@ -718,4 +719,4 @@
</script>
</body>
</html>
</html>
\ No newline at end of file
html/coupons.html
View file @ b61856c3
......@@ -424,7 +424,7 @@
<div class="coupons_Content">
<!-- <div class="coupons_List">
<div class="Coupon_leftImg">
<img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/gty.png" alt=""/>
<img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/gty.png" alt=""/>
<div class="dikouPrice">
<span>¥</span>20
</div>
......@@ -444,7 +444,7 @@
</div>
<div class="coupons_List">
<div class="Coupon_leftImg">
<img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/zyx.png" alt=""/>
<img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/zyx.png" alt=""/>
<div class="dikouPrice">
<span>¥</span>20
</div>
......@@ -544,34 +544,34 @@
str += `<div class="coupons_List">
<div class="Coupon_leftImg">`
if (dataArr[i].couponsUseScope == 1) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/gty.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/gty.png" alt=""/>`
}
if (dataArr[i].couponsUseScope == 2) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/gty.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/gty.png" alt=""/>`
}
if (dataArr[i].couponsUseScope == 7) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/zyx.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/zyx.png" alt=""/>`
}
if (dataArr[i].couponsUseScope == 8) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/ddy.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/ddy.png" alt=""/>`
}
if (dataArr[i].couponsUseScope == 5) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/mp.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/mp.png" alt=""/>`
}
if (dataArr[i].couponsUseScope == 11) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/dzy.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/dzy.png" alt=""/>`
}
if (dataArr[i].couponsUseScope == 10) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/meishi.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/meishi.png" alt=""/>`
}
if (dataArr[i].couponsUseScope == 3) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/qz.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/qz.png" alt=""/>`
}
if (dataArr[i].couponsUseScope == 4) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/jp.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/jp.png" alt=""/>`
}
if (dataArr[i].couponEffectStatus == 3) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/guoqi.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/guoqi.png" alt=""/>`
}
str += `<div class="dikouPrice">
......@@ -592,22 +592,22 @@
</div>`
str += `</div>`
if (dataArr[i].fromPlatform == 0) {
str += `<img class="goToUse" src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/all.png"/>`
str += `<img class="goToUse" src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/all.png"/>`
}
if (dataArr[i].fromPlatform == 1) {
str += `<img class="goToUse" src='https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/app.png'/>`
str += `<img class="goToUse" src='https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/app.png'/>`
}
if (dataArr[i].fromPlatform == 2) {
str += `<img class="goToUse" src='https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/xcx.png'/>`
str += `<img class="goToUse" src='https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/xcx.png'/>`
}
if (dataArr[i].fromPlatform == 3) {
str += `<img class="goToUse" src='https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/pc.png'/>`
str += `<img class="goToUse" src='https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/pc.png'/>`
}
str += `</div>`
}
} else {
str += `<div class="zanwu">
<img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/zanwu.png" alt=""/>
<img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/zanwu.png" alt=""/>
<div class="zanwurenhe">暂无任何优惠券</div>
</div>`
}
......
html/login.html
View file @ b61856c3
......@@ -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;
......@@ -395,14 +395,18 @@
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;
if (href.split('?')[1] && href.split('?')[1].indexOf('redemptionPrice') != -1) {
try {
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;
} catch (error) {
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({
......@@ -476,11 +480,11 @@
secretKey: res.data.secretKey,
}
localStorage.u = JSON.stringify(userInfo)
if(jumpPay == 0 || couponId == 0){
if (jumpPay == 0 || couponId == 0) {
window.location.href = 'https://activity.oytour.com/html/GT_activities.html';
// window.location.href = './GT_activities.html';
}else {
} 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`;
......@@ -590,4 +594,4 @@
}
</script>
</html>
</html>
\ 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