Skip to content

S
SURPRISED
Commit 236ef2b0 authored by Mac's avatar Mac
Browse files
Options

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

parents 937a6b04 3f0bd2c8
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 21 deletions
html/GT_activities.html
View file @ 236ef2b0
......@@ -180,10 +180,10 @@
try {
userInfo = JSON.parse(localStorage.u);
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) {
window.location.href = 'http://activity.oytour.com/html/login.html';
window.location.href = 'https://activity.oytour.com/html/login.html';
}
} else {
// 如果进入页面没有登录的参数 处理跳到h5页面登录
......@@ -191,10 +191,10 @@
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('platform') == -1) {
window.location.href = 'http://activity.oytour.com/html/login.html';
window.location.href = 'https://activity.oytour.com/html/login.html';
}
} else {
window.location.href = 'http://activity.oytour.com/html/login.html';
window.location.href = 'https://activity.oytour.com/html/login.html';
}
......@@ -466,7 +466,7 @@
url_openid = encodeURIComponent(url_openid);
$.ajax({
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,
success: function(res) {
if (res) {
......@@ -508,7 +508,7 @@
}
//跳转到h5优惠券
if (platform == 'H5') {
window.location.href = 'http://activity.oytour.com/html/coupons.html';
window.location.href = 'https://activity.oytour.com/html/coupons.html';
}
})
//点击隐藏提示
......
html/coupons.html
View file @ 236ef2b0
......@@ -519,7 +519,7 @@
layer.msg('登录已过期，请重新登录');
setTimeout(function(){
localStorage.removeItem("u");
window.location.href = 'http://activity.oytour.com/html/login.html';
window.location.href = 'https://activity.oytour.com/html/login.html';
},2000)
}
},
......@@ -534,7 +534,7 @@
}
//跳转至下载
function goDownLoad(){
window.location.href = 'http://activity.oytour.com/html/downloadApp.html';
window.location.href = 'https://activity.oytour.com/html/downloadApp.html';
}
</script>
</html>
html/login.html
View file @ 236ef2b0
......@@ -336,10 +336,10 @@
try{
userInfo=JSON.parse(localStorage.u);
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) {
window.location.href = 'http://activity.oytour.com/html/login.html';
window.location.href = 'https://activity.oytour.com/html/login.html';
}
}
//跳转至激活
......@@ -399,8 +399,7 @@
secretKey: res.data.secretKey,
}
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';
}else{
layer.msg(res.message);
......
html/pay.html
View file @ 236ef2b0
......@@ -230,11 +230,11 @@
return result;
};
function goActive(){
window.location.href = 'http://activity.oytour.com/html/GT_activities.html';
window.location.href = 'https://activity.oytour.com/html/GT_activities.html';
}
function pay() {
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) {
layer.msg('您已经超出支付时间！');
......@@ -253,7 +253,7 @@
}
$.ajax({
type: "POST",
url: `http://reborn.oytour.com/api/WeChatNotify/DoPay?sOrderNo=${payMsg.sOrderNo}&sCurOpenID=${localStorage.openid}`,
url: `https://reborn.oytour.com/api/WeChatNotify/DoPay?sOrderNo=${payMsg.sOrderNo}&sCurOpenID=${localStorage.openid}`,
contentType: "application/json",
async: false,
success: function(res) {
......@@ -294,7 +294,7 @@
if (res.err_msg == "get_brand_wcpay_request: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 @ 236ef2b0
......@@ -64,7 +64,7 @@
<script>
function goDetail(){
//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>
</html>
js/jquery.dataStatistics.js
View file @ 236ef2b0
......@@ -287,7 +287,7 @@ $.fn.dataStatistics = function(options) {
sessionStorage.setItem("payInfo", JSON.stringify(data));
//window.location.href = 'https://127.0.0.1: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';
}
......
js/mian.js
View file @ 236ef2b0
......@@ -2,11 +2,10 @@
let locationName = window.location.hostname;
function getApiUrl() {
let url = {
urlPost: "http://reborn.oytour.com/api/common/post",
urlPost: "https://reborn.oytour.com/api/common/post",
//urlPost: locationName.indexOf('oytour') !== -1 ? "http://reborn.oytour.com/api/common/post" : "http://192.168.2.214:8082/api/common/post",
//urlJava: locationName.indexOf('oytour') !== -1 ? "https://efficient.oytour.com/" : "http://192.168.2.215:9000/"
urlJava: "http://efficient.oytour.com/"
urlJava: "https://efficient.oytour.com/"
}
return url
}
......@@ -30,6 +29,7 @@ function getLocalStorage2() {
return null;
}
}
function clearLocalStorage() {
window.localStorage.removeItem('userInfo')
}
......
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