Skip to content

S
SURPRISED
Commit 5fd5df55 authored by Mac's avatar Mac
Browse files
Options

修改活动

parent 68195447
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 21 deletions
html/GT_activities.html
View file @ 5fd5df55
......@@ -159,9 +159,9 @@
// 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 userInfo={};
let platform = "H5";
if(localStorage.userInfo){
if(localStorage.u){
try{
userInfo=JSON.parse(localStorage.userInfo);
userInfo=JSON.parse(localStorage.u);
if(!userInfo.customerId){
window.location.href = 'http://activity.oytour.com/html/login.html';
}
......@@ -461,9 +461,9 @@
}
})
//点击隐藏提示
function hideTips(){
$('.wx_bg').css({'display':'none'})
}
// function hideTips(){
// $('.wx_bg').css({'display':'none'})
// }
</script>
</body>
......
html/coupons.html
View file @ 5fd5df55
......@@ -17,7 +17,7 @@
}
.coupons_page{
width:100%;
background-color:#F8F5F5;
background-color:#F8F5F5;
}
.coupons_title{
width:100%;
......@@ -276,7 +276,7 @@
top:2.5rem;
left:8rem;
color:#fff;
}
}
.goToDownLoad span img{
margin-left:1rem;
}
......@@ -310,7 +310,7 @@
<body>
<div class="coupons_page">
<div class="coupons_Top">
<img src="../images/login/login_arrowleft.png"/>我的优惠券
<img src="../images/login/login_arrowleft.png"/>
</div>
<div class="coupons_title">
<div class="coupons_Navone" onclick="showList()">
......@@ -355,8 +355,8 @@
<div class="Coupon_Time">
2019.06.14 - 2019.06.16
</div>
</div>
<button class="goToUse gtyUse">去使用</button>
</div>
<button class="goToUse gtyUse">去使用</button>
</div>
<div class="coupons_List">
<div class="Coupon_leftImg">
......@@ -375,8 +375,8 @@
<div class="Coupon_Time">
2019.06.14 - 2019.06.16
</div>
</div>
<button class="goToUse zyxUse">去使用</button>
</div>
<button class="goToUse zyxUse">去使用</button>
</div> -->
</div>
<div class="goToDownLoad">
......@@ -435,7 +435,7 @@
couponsUseScope: couponsUseScope
}
// coupon 优惠券使用范围 1:全场通用,2:团队,3:签证,4:机票,5:门票,6:车辆,7:自由行,8:当地游，9：定制游，10：酒店，11：餐厅
$.ajax({
$.ajax({
type: "POST",
url: `${getApiUrl().urlJava}api/b2b/user/getUserCouponAllotList`,
contentType: "application/json",
......@@ -511,7 +511,7 @@
str+=`<div class="zanwu">
<img src="../images/login/zanwu.png" alt=""/>
<div class="zanwurenhe">暂无任何优惠券</div>
</div>`
</div>`
}
$('.coupons_Content').html(str);
}else{
......
html/login.html
View file @ 5fd5df55
......@@ -50,7 +50,7 @@
width: 54rem;
height: 50rem;
margin: 0 auto;
}
.login_page .headBgImg{
position: absolute;
......@@ -292,7 +292,7 @@
<input class='form_validate_input' id="Activation_valicode" placeholder="请输入验证码"></input>
<span class="login_yzm" onclick="getCode()">发送验证码</span>
</div>
</div>
</div>
</div>
<button class="login_btn" onclick="Activation()">激活并登录</button>
</div>
......@@ -331,6 +331,17 @@
<script type="text/javascript" src="../js/mian.js"></script>
<script src="../js/md5.js"></script>
<script>
if(localStorage.u){
let userInfo = {}
try{
userInfo=JSON.parse(localStorage.u);
if(userInfo.customerId){
window.location.href = 'http://activity.oytour.com/html/GT_activities.html';
}
}catch (e) {
// window.location.href = 'http://activity.oytour.com/html/login.html';
}
}
//跳转至激活
function goJihuo(){
$(".login_denglu").css({'display':'none'});
......@@ -371,7 +382,7 @@
}
//登录
function Login(msg){
$.ajax({
$.ajax({
type: "POST",
url: `${getApiUrl().urlPost}`,
contentType: "application/json",
......@@ -387,7 +398,7 @@
token: res.data.token,
secretKey: res.data.secretKey,
}
localStorage.userInfo = JSON.stringify(userInfo)
localStorage.u = JSON.stringify(userInfo)
window.location.href = 'http://activity.oytour.com/html/GT_activities.html';
//window.location.href = 'http://127.0.0.1:5500/html/GT_activities.html';
......@@ -433,7 +444,7 @@
mobileCodeType:1
};
if(isSend){
$.ajax({
$.ajax({
type: "POST",
url: `${getApiUrl().urlPost}`,
contentType: "application/json",
......@@ -454,7 +465,7 @@
function Activation(){
if ($('#Activation_Account').val() == ""){
layer.msg('请输入账号！');
return
return
}
if ($('#Activation_password').val() == ""){
layer.msg('请输入密码！');
......@@ -470,7 +481,7 @@
password: $('#Activation_password').val(),
code: $('#Activation_valicode').val()
};
$.ajax({
$.ajax({
type: "POST",
url: `${getApiUrl().urlPost}`,
contentType: "application/json",
......
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