'+OrderSubmit.curData.from.name+""+OrderSubmit.curData.from.time+"
"),a=a+('
'+OrderSubmit.curData.to.name+""+OrderSubmit.curData.to.time+"
");$("#trainInfo").html(a+"")},passengerList:null,loadPassCode:function(){if($("#randcodeimg").hasClass("loading_code"))return!1;$("#randcodeimg").addClass("loading_code");cn12306.loadRandCode("sjrand",
function(a){$("#randcodeimg").attr("src",a);$("#randcodeimg").removeClass("loading_code")},"passcodeNew/getPassCodeNew?module=login&rand=sjrand")},getPassenger:function(){sessionStorage.getItem(Public.user+"_passenger")?(OrderSubmit.passengerList=JSON.parse(sessionStorage.getItem(Public.user+"_passenger")),OrderSubmit.passengerObj=JSON.parse(sessionStorage.getItem(Public.user+"_passengerobj")),OrderSubmit.setPassengerList()):bootStrap.post("confirmPassenger/getPassengerDTOs",null,null,"leftTicket/init").done(function(a){a.status&&
diff --git a/Mobile12306New/js/login.js b/Mobile12306New/js/login.js
index 3039167..a82942a 100644
--- a/Mobile12306New/js/login.js
+++ b/Mobile12306New/js/login.js
@@ -51,11 +51,11 @@ var Login = {
cn12306.isUserLogined(function() {
sessionStorage.setItem("user", Login.formData['username']);
- Public.toast("登录成功,正在进入订票页面,请稍等 ❤");
+ Public.toast("登录成功!");
setTimeout(function() {
// 登录成功 跳转
- location.href = 'query.html';
+ Login.loginRoute();
}, 1000);
});
@@ -134,32 +134,40 @@ var Login = {
checkJsonAttr: function() {
var data = Login.formData;
cn12306.isUserLogined(function() {
- var urlData = Public.getQueryData(window.location.search);
sessionStorage.setItem("user", data.username);
localStorage.setItem('useraccount', JSON.stringify(data));
- Public.toast("登录成功,正在进入订票页面,请稍等 ❤");
+ Public.toast("登录成功!");
- setTimeout(function() {
- // 登录成功 跳转
- if (!urlData['t']) {
- location.href = 'query.html';
- } else {
- switch (urlData['t']) {
- case 'submitorder':
- location.href = 'perfect.html';
- break;
- }
- }
-
- }, 1000);
+ Login.loginRoute();
}, function() {
Public.toast("未能成功登录,请重试。");
}, function() {
Public.toast("登录时网络错误");
});
+ },
+ loginRoute:function(){
+
+ var urlData = Public.getQueryData(window.location.search);
+
+ // 登录成功 跳转
+ if (!urlData['t']) {
+ location.href = 'query.html';
+ } else {
+ switch (urlData['t']) {
+ case 'submitorder':
+ location.href = 'perfect.html?t='+urlData['t'];
+ break;
+ case 'autorefer' :
+ if(localStorage.getItem('hisQuery')){
+ localStorage.setItem(sessionStorage.getItem("user")+'hisQuery',localStorage.getItem('hisQuery'));
+ }
+ location.href = 'run_query.html?t='+urlData['t'];
+ break;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/Mobile12306New/js/public.js b/Mobile12306New/js/public.js
index 68f99f1..1df0bf6 100644
--- a/Mobile12306New/js/public.js
+++ b/Mobile12306New/js/public.js
@@ -14,6 +14,7 @@ DOC.addEventListener("mobileSupportInitialized", function() {
var Public = {
init: function() {
+ console.log('asdf');
Public.setHis();
cn12306.getLocalTrainNos();
// 刷新验证码
@@ -32,13 +33,13 @@ var Public = {
window.history.back();
});
- $('.query_box [type=checkbox]').live('change', function(e) {
+ $('.query_box [type=checkbox]').on('change', function(e) {
if ($(this).closest('.query_box').find('[type=checkbox][value="all"]').length == 0) {
return;
}
var $checkbox = $(this).closest('.query_box').find('[type=checkbox]'),
$allBtn = $(this).closest('.query_box').find('[type=checkbox][value="all"]');
-
+ // alert('change');
if ($(this).val() == 'all') {
if ($(this).prop('checked')) {
$checkbox.prop('checked', true);
diff --git a/Mobile12306New/js/run_query.js b/Mobile12306New/js/run_query.js
index c0be4ad..e936a39 100644
--- a/Mobile12306New/js/run_query.js
+++ b/Mobile12306New/js/run_query.js
@@ -1,4 +1,5 @@
var RunQuery = {
+ goRefer: false,
init: function() {
if ($('#runquery_page').length == 0) {
return false;
@@ -17,6 +18,10 @@ var RunQuery = {
$('#query_form [name=filters]').val($('#filter_form').serialize());
RunQuery.setFilterCond();
RunQuery.hisUpdata();
+ if(RunQuery.goRefer){
+ RunQuery.goRefer = false;
+ RunQuery.startRef();
+ }
});
$('#check_left,#check_right').on('click', function() {
RunQuery.hisUpdata();
@@ -28,6 +33,10 @@ var RunQuery = {
querys = bak.split('&');
Query.setFilter(querys);
+ if(RunQuery.goRefer){
+ RunQuery.goRefer = false;
+ RunQuery.startRef();
+ }
});
@@ -62,9 +71,11 @@ var RunQuery = {
$('#autoTipBtn').live('click', function() {
if (Public.isLogin) {
- RunQuery.startRef();
+ RunQuery.goRefer = true;
+ Public.showInnerPage('filter');
+ // RunQuery.startRef();
} else {
- window.location.href = 'login.html';
+ window.location.href = 'login.html?t=autorefer';
}
});
$('#refresh_end').live('click', function() {
@@ -142,9 +153,9 @@ var RunQuery = {
Public.hideLoading(loading);
});
},
- getHtml:function(lists){
+ getHtml: function(lists) {
var html = '';
- if(!lists || lists.length == 0){
+ if (!lists || lists.length == 0) {
return html;
}
for (var k in lists) {
@@ -529,6 +540,12 @@ var RunQuery = {
$('#autoTip p').html('暂时无票!