Commit c854b7e4 authored by 华国豪's avatar 华国豪 🙄

1

parent 28890dbf
...@@ -134,8 +134,8 @@ ...@@ -134,8 +134,8 @@
} }
.page3 .page3_shiz{ .page3 .page3_shiz{
width: 80%; width: 80%;
padding-left: 5%;
padding-top: .3rem; padding-top: .3rem;
margin: 0 auto;
} }
.page3 .page3_shiz img{ .page3 .page3_shiz img{
width: 100%; width: 100%;
...@@ -185,6 +185,7 @@ ...@@ -185,6 +185,7 @@
.page5 .page5_img{ .page5 .page5_img{
width: 80%; width: 80%;
margin: 0 auto; margin: 0 auto;
text-align: center;
} }
.page5 .page5_img img{ .page5 .page5_img img{
width: 90%; width: 90%;
...@@ -209,6 +210,7 @@ ...@@ -209,6 +210,7 @@
} }
.page7 .page7_img, .page8 .page8_img{ .page7 .page7_img, .page8 .page8_img{
width: 100%; width: 100%;
text-align: center;
} }
.page7 .page7_img img,.page8 .page8_img img{ .page7 .page7_img img,.page8 .page8_img img{
width: 95%; width: 95%;
......
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
userInfo.token = billPage.token userInfo.token = billPage.token
userInfo.secretKey = billPage.secretKey userInfo.secretKey = billPage.secretKey
} else { // 否则就去登录 } else { // 否则就去登录
window.location.href = '../login.html?page=billPage'; window.location.href = 'login.html?page=billPage';
} }
var str = location.href, var str = location.href,
param = str.substr(str.indexOf("?")+1), param = str.substr(str.indexOf("?")+1),
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
} else { } else {
layer.msg(res.message) layer.msg(res.message)
setTimeout(function(){ setTimeout(function(){
window.location.href = '../login.html?page=billPage'; window.location.href = 'login.html?page=billPage';
},500) },500)
} }
} }
......
...@@ -395,6 +395,10 @@ ...@@ -395,6 +395,10 @@
let couponId = 0; let couponId = 0;
let platform = 0; let platform = 0;
let href = window.location.href; let href = window.location.href;
let isbillPage = false
if (window.location.href.split('?')[1] && window.location.href.split('?')[1] == "page=billPage") {
isbillPage = true
}
if(href.split('?')[1] && href.split('?')[1].indexOf('redemptionPrice') != -1){ if(href.split('?')[1] && href.split('?')[1].indexOf('redemptionPrice') != -1){
let param = href.split('?')[1].split("&") ? href.split('?')[1].split("&") : null; let param = href.split('?')[1].split("&") ? href.split('?')[1].split("&") : null;
...@@ -476,15 +480,21 @@ ...@@ -476,15 +480,21 @@
secretKey: res.data.secretKey, secretKey: res.data.secretKey,
} }
localStorage.u = JSON.stringify(userInfo) localStorage.u = JSON.stringify(userInfo)
if(jumpPay == 0 || couponId == 0){ if(isbillPage){
window.location.href = 'https://activity.oytour.com/html/GT_activities.html'; localStorage.billPage = JSON.stringify(userInfo);
// window.location.href = './GT_activities.html'; setTimeout(function(){
window.location.href='billPage.html';
}else { },500)
window.location.href = `https://activity.oytour.com/html/Rushbuy.html?redemptionPrice=${price}&couponId=${couponId}&platform=${platform}&noClick=${'1'}&r=ejhr12123`; } else {
// window.location.href = `./Rushbuy.html?redemptionPrice=${price}&couponId=${couponId}&platform=${platform}&noClick=${'1'}&r=efr12123`; 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);
......
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
}else { }else {
localStorage.removeItem("userInfo") localStorage.removeItem("userInfo")
localStorage.removeItem("dataObj") localStorage.removeItem("dataObj")
window.location.href = '../login.html?page=billPage'; window.location.href = 'login.html?page=billPage';
} }
$('.money').html(dataObj.yearTotalPrice); $('.money').html(dataObj.yearTotalPrice);
......
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