Skip to content

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

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

# Conflicts:
#	html/GT_activities.html
parents c8f557b1 5fbccdad
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
html/GT_activities.html
View file @ 292418b4
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
<script> <script>
// let href = window.location.href; // let href = window.location.href;
let href = 'http://127.0.0.1:5500/html/GT_activities.html?customerId=1549&accountId=1182&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NzM0NjY2NjMuMCwiZXhwIjoxNTczNTUzMDYzLjAsInVzZXJJbmZvIjp7InVpZCI6IjExODIiLCJyZXF1ZXN0RnJvbSI6NH19.hX2b2MqSWYmWS0k3YsthxW-T6UxarIm5rdbqCVQtxdQ&secretKey=5d5e16254bd741c486fe2b83b42171d2&platform=app'; let href='https://127.0.0.1:5500/html/GT_activities.html?customerId=1549&accountId=1182&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NzM0NjY2NjMuMCwiZXhwIjoxNTczNTUzMDYzLjAsInVzZXJJbmZvIjp7InVpZCI6IjExODIiLCJyZXF1ZXN0RnJvbSI6NH19.hX2b2MqSWYmWS0k3YsthxW-T6UxarIm5rdbqCVQtxdQ&secretKey=5d5e16254bd741c486fe2b83b42171d2&platform=app';
let userInfo = {}; let userInfo = {};
let platform = "H5"; let platform = "H5";
...@@ -169,10 +169,10 @@ ...@@ -169,10 +169,10 @@
try { try {
userInfo = JSON.parse(localStorage.u); userInfo = JSON.parse(localStorage.u);
if (!userInfo.customerId) { if (!userInfo.customerId) {
window.location.href = 'http://activity.oytour.com/html/login.html'; window.location.href = 'https://activity.oytour.com/html/login.html';
} }
} catch (e) { } catch (e) {
window.location.href = 'http://activity.oytour.com/html/login.html'; window.location.href = 'https://activity.oytour.com/html/login.html';
} }
} else { } else {
// 如果进入页面没有登录的参数 处理跳到h5页面登录 // 如果进入页面没有登录的参数 处理跳到h5页面登录
...@@ -180,10 +180,10 @@ ...@@ -180,10 +180,10 @@
if (href.split('?')[1].indexOf('customerId') == -1 || href.split('?')[1].indexOf('accountId') == -1 || if (href.split('?')[1].indexOf('customerId') == -1 || href.split('?')[1].indexOf('accountId') == -1 ||
href.split('?')[1].indexOf('token') == -1 || href.split('?')[1].indexOf('secretKey') == -1 || href.split('?')[1].indexOf('token') == -1 || href.split('?')[1].indexOf('secretKey') == -1 ||
href.split('?')[1].indexOf('platform') == -1) { href.split('?')[1].indexOf('platform') == -1) {
window.location.href = 'http://activity.oytour.com/html/login.html'; window.location.href = 'https://activity.oytour.com/html/login.html';
} }
} else { } else {
window.location.href = 'http://activity.oytour.com/html/login.html'; window.location.href = 'https://activity.oytour.com/html/login.html';
} }
...@@ -450,7 +450,7 @@ ...@@ -450,7 +450,7 @@
url_openid = encodeURIComponent(url_openid); url_openid = encodeURIComponent(url_openid);
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: 'http://reborn.oytour.com/api/test/GetHtmlByUrl?urlStr=' + url_openid, url: 'https://reborn.oytour.com/api/test/GetHtmlByUrl?urlStr=' + url_openid,
async: false, async: false,
success: function(res) { success: function(res) {
if (res) { if (res) {
...@@ -492,7 +492,7 @@ ...@@ -492,7 +492,7 @@
} }
//跳转到h5优惠券 //跳转到h5优惠券
if (platform == 'H5') { if (platform == 'H5') {
window.location.href = 'http://activity.oytour.com/html/coupons.html'; window.location.href = 'https://activity.oytour.com/html/coupons.html';
} }
}) })
//点击隐藏提示 //点击隐藏提示
...@@ -502,4 +502,4 @@ ...@@ -502,4 +502,4 @@
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
html/coupons.html
View file @ 292418b4
...@@ -530,7 +530,7 @@ ...@@ -530,7 +530,7 @@
} }
//跳转至下载 //跳转至下载
function goDownLoad(){ function goDownLoad(){
window.location.href = 'http://activity.oytour.com/html/downloadApp.html'; window.location.href = 'https://activity.oytour.com/html/downloadApp.html';
} }
</script> </script>
</html> </html>
html/login.html
View file @ 292418b4
...@@ -336,10 +336,10 @@ ...@@ -336,10 +336,10 @@
try{ try{
userInfo=JSON.parse(localStorage.u); userInfo=JSON.parse(localStorage.u);
if(userInfo.customerId){ if(userInfo.customerId){
window.location.href = 'http://activity.oytour.com/html/GT_activities.html'; window.location.href = 'https://activity.oytour.com/html/GT_activities.html';
} }
}catch (e) { }catch (e) {
window.location.href = 'http://activity.oytour.com/html/login.html'; window.location.href = 'https://activity.oytour.com/html/login.html';
} }
} }
//跳转至激活 //跳转至激活
...@@ -400,7 +400,7 @@ ...@@ -400,7 +400,7 @@
} }
localStorage.u = JSON.stringify(userInfo) localStorage.u = JSON.stringify(userInfo)
window.location.href = 'http://activity.oytour.com/html/GT_activities.html'; window.location.href = 'https://activity.oytour.com/html/GT_activities.html';
//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);
......
html/pay.html
View file @ 292418b4
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
function pay() { function pay() {
if (!localStorage.openid) { if (!localStorage.openid) {
window.location.href = 'http://activity.oytour.com/html/GT_activities.html'; window.location.href = 'https://activity.oytour.com/html/GT_activities.html';
} }
if (!payBtn) { if (!payBtn) {
layer.msg('您已经超出支付时间！'); layer.msg('您已经超出支付时间！');
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
if (res.err_msg == "get_brand_wcpay_request:ok") { if (res.err_msg == "get_brand_wcpay_request:ok") {
// 使用以上方式判断前端返回,微信团队郑重提示： // 使用以上方式判断前端返回,微信团队郑重提示：
//res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。 //res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
window.location.href = 'http://activity.oytour.com/html/paySuccess.html'; window.location.href = 'https://activity.oytour.com/html/paySuccess.html';
} }
}); });
} }
......
html/paySuccess.html
View file @ 292418b4
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<script> <script>
function goDetail(){ function goDetail(){
//window.location.href = 'http://192.168.0.117:5500/html/coupons.html'; //window.location.href = 'http://192.168.0.117:5500/html/coupons.html';
window.location.href = 'http://activity.oytour.com/html/coupons.html'; window.location.href = 'https://activity.oytour.com/html/coupons.html';
} }
</script> </script>
</html> </html>
js/jquery.dataStatistics.js
View file @ 292418b4
...@@ -222,7 +222,7 @@ $.fn.dataStatistics = function(options) { ...@@ -222,7 +222,7 @@ $.fn.dataStatistics = function(options) {
window.postMessage(JSON.stringify({ 'action': 'showHud', 'message': '抢购中...' })); window.postMessage(JSON.stringify({ 'action': 'showHud', 'message': '抢购中...' }));
} }
if (options.platform == 'H5') { if (options.platform == 'H5') {
loadingFlag= layer.msg('加载中...', { icon: 16, shade: 0.01,shadeClose:false,time:60000 }); loadingFlag= layer.msg('抢购中...', { icon: 16, shade: 0.01,shadeClose:false,time:60000 });
} }
$.ajax({ $.ajax({
type: "POST", type: "POST",
...@@ -287,7 +287,7 @@ $.fn.dataStatistics = function(options) { ...@@ -287,7 +287,7 @@ $.fn.dataStatistics = function(options) {
sessionStorage.setItem("payInfo", JSON.stringify(data)); sessionStorage.setItem("payInfo", JSON.stringify(data));
//window.location.href = 'http://127.0.0.1:5500/html/pay.html'; //window.location.href = 'http://127.0.0.1:5500/html/pay.html';
//window.location.href = 'http://192.168.0.117:5500/html/pay.html'; //window.location.href = 'http://192.168.0.117:5500/html/pay.html';
window.location.href = 'http://activity.oytour.com/html/pay.html'; window.location.href = 'https://activity.oytour.com/html/pay.html';
} }
......
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