Skip to content

S
SURPRISED
Commit 3c089c3f authored by Mac's avatar Mac
Browse files
Options

登录的逻辑修改

parent 236ef2b0
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 62 deletions
html/GT_activities.html
View file @ 3c089c3f
...@@ -173,46 +173,62 @@ ...@@ -173,46 +173,62 @@
<script> <script>
let href = window.location.href; let href = window.location.href;
// 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 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 login = true; //判断是否登录
let userInfo = {}; let userInfo = {};
let platform = "H5"; let platform = "H5";
if (localStorage.u) { if (localStorage.u) {
try { try {
userInfo = JSON.parse(localStorage.u); userInfo = JSON.parse(localStorage.u);
if (!userInfo.customerId) { if (!userInfo.customerId) {
window.location.href = 'https://activity.oytour.com/html/login.html'; login=false
// window.location.href = 'https://activity.oytour.com/html/login.html';
} }
} catch (e) { } catch (e) {
window.location.href = 'https://activity.oytour.com/html/login.html'; // window.location.href = 'https://activity.oytour.com/html/login.html';
login=false
} }
} else { } else {
// 如果进入页面没有登录的参数 处理跳到h5页面登录 // 如果进入页面没有登录的参数 处理跳到h5页面登录
if (href.split('?')[1]) { if (href.split('?')[1]) {
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 = 'https://activity.oytour.com/html/login.html'; // window.location.href = 'https://activity.oytour.com/html/login.html';
userInfo = {
token:'token',
accountId:'-1'
}
login=false
}else {
let param = href.split('?')[1].split("&") ? href.split('?')[1].split("&") : null;
userInfo = {
customerId: param[0].split('=')[1],
accountId: param[1].split('=')[1] ,
token: param[2].split('=')[1],
secretKey: param[3].split('=')[1]
}
platform = param[4].split('=')[1] //获取从哪里跳过来的
} }
} else { } else {
window.location.href = 'https://activity.oytour.com/html/login.html'; // window.location.href = 'https://activity.oytour.com/html/login.html';
userInfo = {
token:'token',
accountId:'-1'
}
login=false
} }
let param = href.split('?')[1].split("&") ? href.split('?')[1].split("&") : null;
// console.log(href.split('?')[1].split("&").indexOf('customerId'))
userInfo = {
customerId: param[0].split('=')[1],
accountId: param[1].split('=')[1],
token: param[2].split('=')[1],
secretKey: param[3].split('=')[1]
}
platform = param[4].split('=')[1] //获取从哪里跳过来的
} }
var ua = navigator.userAgent.toLowerCase(); var ua = navigator.userAgent.toLowerCase();
if (platform == 'H5' && ua.match(/MicroMessenger/i) != "micromessenger") { if (platform == 'H5' && ua.match(/MicroMessenger/i) != "micromessenger") {
$('.wx_bg').css('display', "block"); // $('.wx_bg').css('display', "block");
} else if (platform == 'H5') { } else if (platform == 'H5') {
this.initOpenid() this.initOpenid()
} }
...@@ -225,6 +241,12 @@ ...@@ -225,6 +241,12 @@
$('.app_share').css('display', "block"); $('.app_share').css('display', "block");
} }
if(login == false){
$('.click_use p').html('立即登录');
}
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: `${getApiUrl().urlJava}api/appActivity/getUserPurchaseTime`, url: `${getApiUrl().urlJava}api/appActivity/getUserPurchaseTime`,
...@@ -241,7 +263,12 @@ ...@@ -241,7 +263,12 @@
$('.box_title h5').html(res.data.remark); $('.box_title h5').html(res.data.remark);
$('.explain p').html('使用说明' + '<br/>' + res.data.instructions); $('.explain p').html('使用说明' + '<br/>' + res.data.instructions);
$('.use_o').html(res.data.contact); if(login == false){
$('.use_o').html('暂无登录');
}else {
$('.use_o').html(res.data.contact);
}
$('.use_t').html(res.data.customerName); $('.use_t').html(res.data.customerName);
$('.dataStatistics').dataStatistics({ $('.dataStatistics').dataStatistics({
...@@ -252,6 +279,7 @@ ...@@ -252,6 +279,7 @@
price: res.data.redemptionPrice, price: res.data.redemptionPrice,
couponId: res.data.couponId, couponId: res.data.couponId,
platform: platform, platform: platform,
login:login,
count: res.data.count, //判断是否可以抢购 0为不可以 count: res.data.count, //判断是否可以抢购 0为不可以
}); //刚进入页面不执行动画 }); //刚进入页面不执行动画
...@@ -262,10 +290,27 @@ ...@@ -262,10 +290,27 @@
// let activityStartDate = new Date('2019/11/08 17:43:50').getTime(); // let activityStartDate = new Date('2019/11/08 17:43:50').getTime();
// let activityEndDate = new Date('2019/11/14 11:23:00').getTime(); //活动结束时间 // let activityEndDate = new Date('2019/11/14 11:23:00').getTime(); //活动结束时间
let nextActivity = res.data.nextActivity;
if (nextActivity != null) {
let nexttime = nextActivity.activityStartDate;
let year = nexttime.split('T')[0].split('-')[0];
let month = nexttime.split('T')[0].split('-')[1];
let day = nexttime.split('T')[0].split('-')[2];
let hour = nexttime.split('T')[1].split(':')[0];
$('.notice_name').html('亲爱的' + nextActivity.userName);
$('.notice_content').html('下期活动将于' + year + '年' + month + '月' + day + '日' + hour + '点开始。');
$('.notice_content2').html('届时会有' + nextActivity.couponCount + '张价值' + nextActivity.denomination + '的折扣券等待您的抢 购(抢购价' + nextActivity.redemptionPrice + '元），请准时参加。');
// var time2 = setInterval(setTimer3, 1000); //计时器
let beforeDawn = new Date(year + '/' + month + '/' + day + ' 00:00:00').getTime()
let time = ((beforeDawn - nowDate) / 1000).toFixed(0);
runtime(time)
}
//判断当前时间是否到了抢购时间 //判断当前时间是否到了抢购时间
if (activityStartDate >= nowDate) { //没到抢购时间 显示抢购的具体时间 if (activityStartDate >= nowDate) { //没到抢购时间 显示抢购的具体时间
$('#t1').html('抢购时间：'); $('#t1').html('抢购时间：');
$('#t2').html(''); $('#t2').html('');
let startDate = res.data.activityStartDate; let startDate = res.data.activityStartDate;
...@@ -279,7 +324,8 @@ ...@@ -279,7 +324,8 @@
$('#t4').html('日'); $('#t4').html('日');
$('#t5').html('点整'); $('#t5').html('点整');
$('.img_btn p').html('立即抢购'); $('.img_btn p').html('立即抢购');
$('.img_btn').css("background-color", "#CCCCCC"); $('.img_btn').css("background-image", "url(../images/nobuy_btn.png)");
$('.img_btn p').css("color", "#FFFFFF"); $('.img_btn p').css("color", "#FFFFFF");
// $(".received_img").attr("src", ""); // $(".received_img").attr("src", "");
let time = ((activityStartDate - nowDate) / 1000).toFixed(0); let time = ((activityStartDate - nowDate) / 1000).toFixed(0);
...@@ -295,26 +341,13 @@ ...@@ -295,26 +341,13 @@
$('.img_btn p').html('活动结束') $('.img_btn p').html('活动结束')
$('.box_content_t').hide() $('.box_content_t').hide()
$('.img_btn').css("background-image", "url(../images/nobuy_btn.png)"); $('.img_btn').css("background-image", "url(../images/nobuy_btn.png)");
let nextActivity = res.data.nextActivity;
if (nextActivity != null) {
$('.dataStatistics').css('display', "none");
$('.deta_replace').css('display', "flex");
$('#notice').css('display', "block");
$('.notice_img').css('display', "block");
let nexttime = nextActivity.activityStartDate;
let year = nexttime.split('T')[0].split('-')[0];
let month = nexttime.split('T')[0].split('-')[1];
let day = nexttime.split('T')[0].split('-')[2];
let hour = nexttime.split('T')[1].split(':')[0];
$('.notice_name').html('亲爱的' + nextActivity.userName);
$('.notice_content').html('下期活动将于' + year + '年' + month + '月' + day + '日' + hour + '点开始。');
$('.notice_content2').html('届时会有' + nextActivity.couponCount + '张价值' + nextActivity.denomination + '的折扣券等待您的抢 购(抢购价' + nextActivity.redemptionPrice + '元），请准时参加。');
// var time2 = setInterval(setTimer3, 1000); //计时器
let beforeDawn = new Date(year + '/' + month + '/' + day + ' 00:00:00').getTime()
let time = ((beforeDawn - nowDate) / 1000).toFixed(0);
runtime(time)
} $('.dataStatistics').css('display', "none");
$('.deta_replace').css('display', "flex");
$('#notice').css('display', "block");
$('.notice_img').css('display', "block");
} else { // 到了抢购的时间显示距离结束时间的倒计时 } else { // 到了抢购的时间显示距离结束时间的倒计时
...@@ -342,7 +375,10 @@ ...@@ -342,7 +375,10 @@
$('.img_btn p').html('活动结束') $('.img_btn p').html('活动结束')
$('.box_content_t').hide() $('.box_content_t').hide()
$('.img_btn').css("background-image", "url(../images/nobuy_btn.png)"); $('.img_btn').css("background-image", "url(../images/nobuy_btn.png)");
$('.dataStatistics').css('display', "none");
$('.deta_replace').css('display', "flex");
$('#notice').css('display', "block");
$('.notice_img').css('display', "block");
} }
...@@ -358,7 +394,7 @@ ...@@ -358,7 +394,7 @@
$('.dataStatistics').dataStatistics({ $('.dataStatistics').dataStatistics({
max: 0, max: 0,
min: 0, min: 0,
len: 3, len: 4,
add: true add: true
}); //刚进入页面不执行动画 }); //刚进入页面不执行动画
...@@ -369,7 +405,7 @@ ...@@ -369,7 +405,7 @@
$('.dataStatistics').dataStatistics({ $('.dataStatistics').dataStatistics({
max: 0, max: 0,
min: 0, min: 0,
len: 3, len: 4,
add: true add: true
}); //刚进入页面不执行动画 }); //刚进入页面不执行动画
...@@ -487,6 +523,7 @@ ...@@ -487,6 +523,7 @@
// 跳转到我的是优惠券 // 跳转到我的是优惠券
$('.click_use').click(function() { $('.click_use').click(function() {
if(login == true){
if (platform == 'app') { if (platform == 'app') {
let data = { let data = {
...@@ -510,6 +547,11 @@ ...@@ -510,6 +547,11 @@
if (platform == 'H5') { if (platform == 'H5') {
window.location.href = 'https://activity.oytour.com/html/coupons.html'; window.location.href = 'https://activity.oytour.com/html/coupons.html';
} }
}else {// 没登录去登录页面登录
window.location.href = 'https://activity.oytour.com/html/login.html'
// window.location.href = './login.html'
}
}) })
//点击隐藏提示 //点击隐藏提示
// function hideTips(){ // function hideTips(){
......
js/jquery.dataStatistics.js
View file @ 3c089c3f
...@@ -8,6 +8,7 @@ $.fn.dataStatistics = function(options) { ...@@ -8,6 +8,7 @@ $.fn.dataStatistics = function(options) {
couponId: 0, //订单id couponId: 0, //订单id
platform: 'app', platform: 'app',
count: 0, count: 0,
login:true,
}, options || {}); }, options || {});
var ths = this; //解决this指向问题 var ths = this; //解决this指向问题
...@@ -79,6 +80,10 @@ $.fn.dataStatistics = function(options) { ...@@ -79,6 +80,10 @@ $.fn.dataStatistics = function(options) {
$('.img_btn p').html('活动结束') $('.img_btn p').html('活动结束')
$('.box_content_t').hide() $('.box_content_t').hide()
$('.img_btn').css("background-image", "url(../images/nobuy_btn.png)"); $('.img_btn').css("background-image", "url(../images/nobuy_btn.png)");
$('.dataStatistics').css('display', "none");
$('.deta_replace').css('display', "flex");
$('#notice').css('display', "block");
$('.notice_img').css('display', "block");
// layer.msg('优惠券被抢光了！') // layer.msg('优惠券被抢光了！')
} }
...@@ -143,11 +148,29 @@ $.fn.dataStatistics = function(options) { ...@@ -143,11 +148,29 @@ $.fn.dataStatistics = function(options) {
if (nownumber > 0) { if (nownumber > 0) {
let num = nownumber - res.data.repertory; // 算出动画执行的次数 let num = nownumber - res.data.repertory; // 算出动画执行的次数
nownumber = res.data.repertory; // 算出现在的数字 nownumber = res.data.repertory; // 算出现在的数字
// let num = 475 ; // 算出动画执行的次数 // let num = 10 ; // 算出动画执行的次数
// nownumber = 0; // 算出现在的数字 // // nownumber = 900; // 算出现在的数字
if (num > 0) { if (num > 0) {
run(num) if(num> 5){
$('.digit_set').empty()
clearInterval(timer2);
$('.dataStatistics').dataStatistics({
max: nownumber,
min: nownumber,
len: 4,
add: true,
price: res.data.redemptionPrice,
couponId: res.data.couponId,
platform: options.platform,
login:options.login,
count: res.data.count, //判断是否可以抢购 0为不可以
}); //刚进入页面不执行动画
}else {
run(num)
}
} }
if (nownumber == 0) { if (nownumber == 0) {
Activityendtime = res.data.expirationDate.replace('T', ' ').replace(/-/g, '/'); Activityendtime = res.data.expirationDate.replace('T', ' ').replace(/-/g, '/');
...@@ -171,6 +194,10 @@ $.fn.dataStatistics = function(options) { ...@@ -171,6 +194,10 @@ $.fn.dataStatistics = function(options) {
$('.img_btn').css("background-image", "url(../images/nobuy_btn.png)"); $('.img_btn').css("background-image", "url(../images/nobuy_btn.png)");
$('.img_btn p').html('活动结束') $('.img_btn p').html('活动结束')
$('.box_content_t').hide() $('.box_content_t').hide()
$('.dataStatistics').css('display', "none");
$('.deta_replace').css('display', "flex");
$('#notice').css('display', "block");
$('.notice_img').css('display', "block");
clearInterval(timer2); //活动结束 清楚定时器 clearInterval(timer2); //活动结束 清楚定时器
} else { } else {
if (nownumber > 0) { if (nownumber > 0) {
...@@ -193,6 +220,10 @@ $.fn.dataStatistics = function(options) { ...@@ -193,6 +220,10 @@ $.fn.dataStatistics = function(options) {
$('.img_btn p').html('活动结束') $('.img_btn p').html('活动结束')
$('.box_content_t').hide() $('.box_content_t').hide()
$('.img_btn').css("background-image", "url(../images/nobuy_btn.png)"); $('.img_btn').css("background-image", "url(../images/nobuy_btn.png)");
$('.dataStatistics').css('display', "none");
$('.deta_replace').css('display', "flex");
$('#notice').css('display', "block");
$('.notice_img').css('display', "block");
} }
...@@ -216,26 +247,33 @@ $.fn.dataStatistics = function(options) { ...@@ -216,26 +247,33 @@ $.fn.dataStatistics = function(options) {
$('.img_btn').click(function() { $('.img_btn').click(function() {
if ($('.img_btn p').css('color') == 'rgb(224, 50, 52)') { //判断按钮是否可以点击 if ($('.img_btn p').css('color') == 'rgb(224, 50, 52)') { //判断按钮是否可以点击
if(options.login == true){
if (options.count != 0) { //判断是可以抢购 if (options.count != 0) { //判断是可以抢购
var loadingFlag; var loadingFlag;
if (options.platform == 'app') { if (options.platform == 'app') {
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",
url: `${getApiUrl().urlJava}api/appActivity/PanicBuyingCoupon`, url: `${getApiUrl().urlJava}api/appActivity/PanicBuyingCoupon`,
contentType: "application/json", contentType: "application/json",
data: getJavaData({ redemptionPrice: options.price, couponId: options.couponId, productName: '印象之旅-200元线路产品优惠券' }), data: getJavaData({
async: false, redemptionPrice: options.price,
success: function(res) { couponId: options.couponId,
productName: '印象之旅-200元线路产品优惠券'
}),
async: false,
success: function (res) {
if (options.platform == 'app') { if (options.platform == 'app') {
window.postMessage(JSON.stringify({ 'action': 'dismissHud' })); window.postMessage(JSON.stringify({'action': 'dismissHud'}));
} }
if (options.platform == 'H5') { if (options.platform == 'H5') {
layer.close(loadingFlag); layer.close(loadingFlag);
} }
if (res.resultCode === 1) { if (res.resultCode === 1) {
...@@ -270,11 +308,11 @@ $.fn.dataStatistics = function(options) { ...@@ -270,11 +308,11 @@ $.fn.dataStatistics = function(options) {
data.sProductName = title; data.sProductName = title;
data.productId = res.data.couponId; data.productId = res.data.couponId;
data.dTotalPrice = res.data.preferPrice; data.dTotalPrice = res.data.preferPrice;
wx.miniProgram.getEnv(function(res) { wx.miniProgram.getEnv(function (res) {
window.wx.miniProgram.navigateTo({ window.wx.miniProgram.navigateTo({
url: `/pages/Home/pay/pay?data=` + JSON.stringify(data), url: `/pages/Home/pay/pay?data=` + JSON.stringify(data),
}); });
}); });
} else if (options.platform == 'H5') { } else if (options.platform == 'H5') {
let userInfo = getLocalStorage() let userInfo = getLocalStorage()
let data = {}; let data = {};
...@@ -293,7 +331,7 @@ $.fn.dataStatistics = function(options) { ...@@ -293,7 +331,7 @@ $.fn.dataStatistics = function(options) {
} else { } else {
if (options.platform == 'app') { if (options.platform == 'app') {
window.postMessage(JSON.stringify({ 'action': 'showToast', 'message': res.message })); window.postMessage(JSON.stringify({'action': 'showToast', 'message': res.message}));
} else { } else {
layer.msg(res.message) layer.msg(res.message)
} }
...@@ -303,15 +341,16 @@ $.fn.dataStatistics = function(options) { ...@@ -303,15 +341,16 @@ $.fn.dataStatistics = function(options) {
} }
}, },
error: function(res) { error: function (res) {
console.log(options.platform) console.log(options.platform)
if (options.platform == 'app') { if (options.platform == 'app') {
window.postMessage(JSON.stringify({ 'action': 'dismissHud' })); window.postMessage(JSON.stringify({'action': 'dismissHud'}));
} else if(options.platform == 'H5'){ } else if (options.platform == 'H5') {
layer.close(loadingFlag); layer.close(loadingFlag);
} }
} }
}); });
} else { } else {
let data = { let data = {
'action': 'jump', // showToast->一个提示信息 showHud->一个黑色的loading 'action': 'jump', // showToast->一个提示信息 showHud->一个黑色的loading
...@@ -325,6 +364,9 @@ $.fn.dataStatistics = function(options) { ...@@ -325,6 +364,9 @@ $.fn.dataStatistics = function(options) {
} }
} }
}else {
window.location.href = 'https://activity.oytour.com/html/login.html'
}
} else { } else {
if ($('.img_btn p').text() == '活动结束') { if ($('.img_btn p').text() == '活动结束') {
if (options.platform == 'app') { if (options.platform == 'app') {
......
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