Commit fcafa1c7 authored by Mac's avatar Mac

1

parent e2115ad3
......@@ -29,6 +29,7 @@ p{
top:0;
z-index:999;
text-align: center;
display: none;
}
.wx_bg img{
width:2.5rem;
......
......@@ -154,9 +154,9 @@
<script type="text/javascript" src="../js/layer/layer.js"></script>
<script>
// let href = 'http://activity.oytour.com/html/Appmd/draw.html?customerId=1549&accountId=1182&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NzE5NzA5MDUuMCwiZXhwIjoxNTc0NTYyOTA1LjAsInVzZXJJbmZvIjp7InVpZCI6IjExODIiLCJyZXF1ZXN0RnJvbSI6M319.vlAcXCx4C_0KOmfLm4cLRxU28gTHmuMK6jgJtwjsSPM&secretKey=5d5e16254bd741c486fe2b83b42171d2&platform=App';
// let href = 'http://activity.oytour.com/html/Appmd/draw.html?customerId=1549&accountId=1182&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NzE5NzA5MDUuMCwiZXhwIjoxNTc0NTYyOTA1LjAsInVzZXJJbmZvIjp7InVpZCI6IjExODIiLCJyZXF1ZXN0RnJvbSI6M319.vlAcXCx4C_0KOmfLm4cLRxU28gTHmuMK6jgJtwjsSPM&secretKey=5d5e16254bd741c486fe2b83b42171d2&platform=app';
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='http://127.0.0.1:5500/html/GT_activities.html?customerId=1549&accountId=1182&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NzM0NjY2NjMuMCwiZXhwIjoxNTczNTUzMDYzLjAsInVzZXJJbmZvIjp7InVpZCI6IjExODIiLCJyZXF1ZXN0RnJvbSI6NH19.hX2b2MqSWYmWS0k3YsthxW-T6UxarIm5rdbqCVQtxdQ&secretKey=5d5e16254bd741c486fe2b83b42171d2&platform=app';
// 如果进入页面没有登录的参数 处理跳到h5页面登录
if(href.split('?')[1]){
......@@ -181,7 +181,9 @@
secretKey: param[3].split('=')[1],
}
let platform = param[4].split('=')[1] //获取从哪里跳过来的
if(platform == 'H5'){
$('.wx_bg').css('display',"block");
}
var end = '';
var currentTime = '';
localStorage.userInfo = JSON.stringify(userInfo)
......@@ -420,7 +422,7 @@
// 跳转到我的是优惠券
$('.click_use').click(function () {
if(platform == 'App'){
if(platform == 'app'){
let data = {
'action' : 'jump', // showToast->一个提示信息 showHud->一个黑色的loading
......
......@@ -7,7 +7,7 @@ $.fn.dataStatistics = function(options){
len:4, //数字是几位数
price:0, //金额
couponId:0, //订单id
platform:'App',
platform:'app',
count:0,
},options || {});
......@@ -216,7 +216,7 @@ $.fn.dataStatistics = function(options){
if($('.img_btn p').css('color')=='rgb(224, 50, 52)'){ //判断按钮是否可以点击
if( options.count !=0){ //判断是可以抢购
if(options.platform == 'App'){
if(options.platform == 'app'){
window.postMessage(JSON.stringify({'action' : 'showHud', 'message' : '抢购中...'}));
}
$.ajax({
......@@ -226,15 +226,11 @@ $.fn.dataStatistics = function(options){
data: getJavaData({redemptionPrice:options.price,couponId:options.couponId}),
async: false,
success: function (res) {
if(options.platform == 'App'){
if(options.platform == 'app'){
window.postMessage(JSON.stringify({'action' : 'dismissHud'}));
}
if (res.resultCode === 1) {
if(options.platform == 'App'){
window.postMessage(JSON.stringify({'action' : 'showToast', 'message' : res.message}));
}else {
layer.msg(res.message)
}
var timer3 = setInterval(()=>{ //1,需要timer2的定时器走完了 才走timer3的定时器
nownumber = nownumber -1;
......@@ -255,7 +251,7 @@ $.fn.dataStatistics = function(options){
'data':res.data
}
}
if(options.platform == 'App'){
if(options.platform == 'app'){
window.postMessage(JSON.stringify(data));
}
// 跳转到支付
......@@ -280,14 +276,14 @@ $.fn.dataStatistics = function(options){
data.productId=res.data.couponId;
data.dTotalPrice=res.data.preferPrice;
data.customerId=userInfo.customerId;
sessionStorage.setItem("payInfo", JSON.stringify(data));
//window.location.href = 'http://127.0.0.1:5500/html/pay.html';
window.location.href = 'http://http://activity.oytour.com/html/pay.html';
}
}else {
if(options.platform == 'App'){
if(options.platform == 'app'){
window.postMessage(JSON.stringify({'action' : 'showToast', 'message' : res.message}));
}else {
layer.msg(res.message)
......@@ -298,7 +294,7 @@ $.fn.dataStatistics = function(options){
},
error: function (res) {
console.log(options.platform)
if(options.platform == 'App'){
if(options.platform == 'app'){
window.postMessage(JSON.stringify({'action' : 'dismissHud'}));
}else {
......@@ -315,20 +311,20 @@ $.fn.dataStatistics = function(options){
'backType':'pop',
}
}
if(options.platform == 'App'){
if(options.platform == 'app'){
window.postMessage(JSON.stringify(data));
}
}
}else {
if($('.img_btn p').text() == '活动结束'){
if(options.platform == 'App'){
if(options.platform == 'app'){
window.postMessage(JSON.stringify({'action' : 'showToast', 'message' : '活动已结束'}));
}else {
layer.msg('活动已结束')
}
}else {
if(options.platform == 'App'){
if(options.platform == 'app'){
window.postMessage(JSON.stringify({'action' : 'showToast', 'message' : '活动还未开始'}));
}else {
......
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