merge
This commit is contained in:
SilenceLeo
commit
3793ae176e
1
Mobile12306New/.gitignore
vendored
1
Mobile12306New/.gitignore
vendored
@ -16,3 +16,4 @@ node_modules/
|
||||
build/
|
||||
#忽略服务器hook
|
||||
update.php
|
||||
assets/js/debug.js
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -18,7 +18,6 @@ body { background:#f4f4f4; color:#787878; position:relative;}
|
||||
body.nologin{padding-bottom:60px;}
|
||||
a{color:#fa8c13;}
|
||||
|
||||
|
||||
input[type=checkbox],
|
||||
.icon_change,
|
||||
.icon_edit,
|
||||
@ -107,9 +106,13 @@ input[type=radio]:checked:after{content:''; display:block; width:12px; height:12
|
||||
|
||||
.box_insert{background:#FFF; border-bottom:#ddd solid 1px;padding:0 15px;}
|
||||
|
||||
<<<<<<< HEAD
|
||||
#loginForm .text_warning{display: inline-block;height: 20px;padding: 5px 10px;margin-right: -10px}
|
||||
=======
|
||||
|
||||
|
||||
#loginForm .text_warning{display: inline-block;padding: 5px 10px;margin-right: -10px}
|
||||
>>>>>>> da5ee090397d854e36bf8b10f22395763f653d3a
|
||||
#loginForm .form_btns{margin: 10px 0}
|
||||
.form_btns{ margin:15px 0;}
|
||||
.form_line{padding:5px 0;min-height:40px; line-height:40px;border-bottom:#ddd solid 1px;}
|
||||
@ -233,7 +236,7 @@ input[type=radio]:checked:after{content:''; display:block; width:12px; height:12
|
||||
.query_bigcheck_checked span{background:#fa8c13; color:#FFF;}
|
||||
|
||||
/**/
|
||||
.bottom_tip{position:fixed; width:100%; left:0; bottom:0; display:none;}
|
||||
.bottom_tip{position:fixed; width:100%; height:57px; left:0; bottom:0; display:none; overflow:hidden;}
|
||||
.bottom_tip a{display:block; background:rgba(0,0,0,.8); padding:1.3em 1em; font-size:0.9375rem; color:#FFF; position:relative;}
|
||||
#login_tip a:after{content:"登录"; position: absolute; right:1em; background:#fa8c13; padding:0 1.5em; height:2em; line-height:2em; top:50%; -webkit-transform:translate3d(0,-50%,0); border-radius:3px;}
|
||||
|
||||
@ -266,8 +269,8 @@ input[type=radio]:checked:after{content:''; display:block; width:12px; height:12
|
||||
.search_box:before{ content:'';display:block; width:100%; height:0; overflow:hidden; clear:both;}
|
||||
.search_cancel{float:right; width:4em; text-align:center;}
|
||||
.search_ipt{overflow:hidden; height:29px; border-radius:5px; background-color:#fcaf5a; padding-left:30px; background-position:8px -443px; margin-top:8px;}
|
||||
.search_input{width:100%; border:0; font-size:0.9375rem; height:29px; padding:5px 0; -webkit-appearance: none;-webkit-appearance:none; vertical-align:top; background:none; color:#FFF;}
|
||||
.search_input::-webkit-input-placeholder{color:#fa8c13;}
|
||||
.search_input{width:100%; border:0; font-size:0.9375rem; height:29px; padding:5px 0;-webkit-appearance: none;-webkit-appearance:none; vertical-align:top; background:none; color:#FFF;}
|
||||
.search_input::-webkit-input-placeholder {color:#fa8c13;}
|
||||
|
||||
.station_list{ overflow:hidden;}
|
||||
.station_list:after{ content: ''; display: block; overflow: hidden; visibility: hidden; clear: both}
|
||||
|
||||
27
Mobile12306New/js/js.min.js
vendored
27
Mobile12306New/js/js.min.js
vendored
@ -243,9 +243,35 @@ a[d].ticket_total_price_page+"\u5143</span></div>";b+="</div>"}$("#orders").html
|
||||
setTimeout(NoComplete.countdown,1E3)},gm:function(a){var b=parseInt(a/6E4);a=parseInt(a%6E4/1E3);10>b&&(b="0"+b);10>a&&(a="0"+a);return b+":"+a},selectBank:function(){Public.showInnerPage("banks")},pay:function(a,b){var c={sequence_no:NoComplete.curNo,pay_flag:"pay",_json_att:"",REPEAT_SUBMIT_TOKEN:NoComplete.token};$("span",NoComplete.payLoading).html("\u6b63\u5728\u83b7\u53d6\u652f\u4ed8\u4fe1\u606f");bootStrap.post("queryOrder/continuePayNoCompleteMyOrder","json",c,"queryOrder/initNoComplete").done(function(a){a.status&&
|
||||
("Y"==a.data.existError?Public.alert(a.data.errorMsg):bootStrap.post("payOrder/paycheck","json",{_json_att:""},"payOrder/init").done(function(a){NoComplete.submitPay(a.data.payForm)}).fail(function(){Public.alert("12306\u4e0d\u7ed9\u529b\u554a\uff0c\u5509\u3002\u51fa\u73b0\u7f51\u7edc\u9519\u8bef\u4e86\uff0c\u8bf7\u91cd\u8bd5..")}))}).fail(function(){Public.alert("12306\u4e0d\u7ed9\u529b\u554a\uff0c\u5509\u3002\u51fa\u73b0\u7f51\u7edc\u9519\u8bef\u4e86\uff0c\u8bf7\u91cd\u8bd5..")})},analyzeFormData:function(a){for(var b=
|
||||
{},c=/<input[\s\w\W]*?(name|value)="([\s\w\W]*?)"[\s\w\W]*?(name|value)=['"]([\s\w\W]*?)['"][\s\w\W]*?\/?>/g,d=null;null!=(d=c.exec(a));)"name"==d[1]?b[d[2]]=d[4]:b[d[4]]=d[2];return b},submitPay:function(a){a={_json_att:"",interfaceName:a.interfaceName,interfaceVersion:a.interfaceVersion,tranData:a.tranData,merSignMsg:a.merSignMsg,appId:a.appId,transType:a.transType};$("span",NoComplete.payLoading).html("\u6b63\u5728\u63d0\u4ea4\u652f\u4ed8\u8bf7\u6c42");bootStrap.post("https://epay.12306.cn/pay/payGateway",
|
||||
<<<<<<< HEAD
|
||||
"html",a,"payOrder/init").done(function(a){a=NoComplete.analyzeFormData(a);a.bankId=NoComplete.bankId;bootStrap.post("https://epay.12306.cn/pay/webBusiness","html",a,"https://epay.12306.cn/pay/payGateway").done(function(a){NoComplete.analyzeFormData(a);a=a.replace(/[\n\t\r]/gi,"").replace(/>\s+</gi,"><").match(/<form.*\/form>/gi);0<a.length&&($("span",NoComplete.payLoading).html("\u6b63\u5728\u5411\u94f6\u884c\u63d0\u4ea4\u652f\u4ed8\u8bf7\u6c42"),$("#hideHtml").html(a[0]),setTimeout(function(){Public.hideLoading(NoComplete.payLoading);
|
||||
$('form[name="myform"]').submit()},1E3))}).fail(function(){})}).fail(function(){Public.alert("12306\u4e0d\u7ed9\u529b\u554a\uff0c\u5509\u3002\u51fa\u73b0\u7f51\u7edc\u9519\u8bef\u4e86\uff0c\u8bf7\u91cd\u8bd5..")})},cancelOrder:function(a,b,c){var d=Public.showLoading("\u6b63\u5728\u53d6\u6d88\u8ba2\u5355...");bootStrap.post("queryOrder/cancelNoCompleteMyOrder","json",{sequence_no:a,cancel_flag:"cancel_order",_json_att:""},"queryOrder/initNoComplete").done(function(a){Public.hideLoading(d);if(a.status&&
|
||||
"N"==a.data.existError)Public.alert("\u53d6\u6d88\u8ba2\u5355\u6210\u529f\uff01",function(){"function"==typeof b&&b()});else{var f="";0<a.messages.length&&(f=a.messages[0]);f||(f="\u53d6\u6d88\u8ba2\u5355\u5931\u8d25\uff0c\u8bf7\u91cd\u8bd5\uff01");Public.alert(f,function(){"function"==typeof c&&c()})}}).fail(function(){Public.hideLoading(d);Public.alert("\u7f51\u7edc\u8fde\u63a5\u5931\u8d25\uff0c\u8bf7\u91cd\u8bd5\uff01",function(){"function"==typeof c&&c()})})}};var Remind={sellTime:null,loading:null,init:function(){if(0==$("#remind_page").length)return!1;Remind.deviceInfo=JSON.parse(bootStrap.device_info);if(Remind.deviceInfo){Public.checkLogin(Remind.checkLoginCallback,Remind.checkLoginCallback,Remind.checkLoginCallback);Remind.sellTime=WIN.sellTime;Remind.dataInit();Remind.staionInt();$('.query_box [type="checkbox"]').on("change",function(){setTimeout(function(){Remind.checkSubmit()},50)});$("#remind_form").on("submit",function(){Remind.remindSubmit();
|
||||
=======
|
||||
"html",a,"payOrder/init").done(function(a){a=NoComplete.analyzeFormData(a);a.bankId=NoComplete.bankId;bootStrap.post("https://epay.12306.cn/pay/webBusiness","html",a,"https://epay.12306.cn/pay/payGateway").done(function(a){NoComplete.analyzeFormData(a);a=a.replace(/[\n\t\r]/gi,"").replace(/>\s+</gi,"><").match(/<form.*\/form>/gi);0<a.length&&($("span",NoComplete.payLoading).html("\u6b63\u5728\u5411\u94f6\u884c\u63d0\u4ea4\u652f\u4ed8\u8bf7\u6c42"),$("#hideHtml").html(a[0]),setTimeout(function(){$('form[name="myform"]').submit()},
|
||||
1E3))}).fail(function(){})}).fail(function(){Public.alert("12306\u4e0d\u7ed9\u529b\u554a\uff0c\u5509\u3002\u51fa\u73b0\u7f51\u7edc\u9519\u8bef\u4e86\uff0c\u8bf7\u91cd\u8bd5..")})},cancelOrder:function(a,b,c){var d=Public.showLoading("\u6b63\u5728\u53d6\u6d88\u8ba2\u5355...");bootStrap.post("queryOrder/cancelNoCompleteMyOrder","json",{sequence_no:a,cancel_flag:"cancel_order",_json_att:""},"queryOrder/initNoComplete").done(function(a){Public.hideLoading(d);if(a.status&&"N"==a.data.existError)Public.alert("\u53d6\u6d88\u8ba2\u5355\u6210\u529f\uff01",
|
||||
<<<<<<< HEAD
|
||||
function(){"function"==typeof b&&b()});else{var f="";0<a.messages.length&&(f=a.messages[0]);f||(f="\u53d6\u6d88\u8ba2\u5355\u5931\u8d25\uff0c\u8bf7\u91cd\u8bd5\uff01");Public.alert(f,function(){"function"==typeof c&&c()})}}).fail(function(){Public.hideLoading(d);Public.alert("\u7f51\u7edc\u8fde\u63a5\u5931\u8d25\uff0c\u8bf7\u91cd\u8bd5\uff01",function(){"function"==typeof c&&c()})})}};var Remind={sellTime:null,loading:null,init:function(){if(0==$("#remind_page").length)return!1;Remind.deviceInfo=JSON.parse(bootStrap.device_info);Remind.deviceInfo?(Public.checkLogin(Remind.checkLoginCallback,Remind.checkLoginCallback,Remind.checkLoginCallback),Remind.sellTime=WIN.sellTime,Remind.dataInit(),Remind.staionInt(),$('.query_box [type="checkbox"]').on("change",function(){setTimeout(function(){Remind.checkSubmit()},50)}),$("#remind_form").on("submit",function(){Remind.remindSubmit();return!1})):
|
||||
Public.alert("\u8ba2\u9605\u529f\u80fd\u4ec5\u8bf7\u4f7f\u7528\u624b\u673a\u730e\u8c79\u6d4f\u89c8\u5668",function(){window.history.back()})},checkLoginCallback:function(){},dataInit:function(){var a=(new Date).addDays(49);Public.setDate(a);Public.calendar.setSection((new Date).addDays(20),29);Public.calendar.checkCallback=Remind.dateChangeCallback;Public.calendar.setBasic()},dateChangeCallback:function(a){a=a.date.getTime();a>=Public.calendar.minDate.date.getTime()&&a<=Public.calendar.maxDate.date.getTime()&&
|
||||
($("#date_tip").hide(),Public.hideInnerPage("date_box"),$("#start_date").html(Public.calendar.curDate.format(Public.formatString)+" "+Public.calendar.curDate.day(3)),$("#start_date_val").val(Public.calendar.curDate.format("yyyy-MM-dd")))},staionInt:function(){CheckStaion.init();$("#startStation").on("click",function(){CheckStaion.callback=Remind.startCallback;CheckStaion.cancelCallback=Remind.cancelCallback;CheckStaion.show();$("#wrap").hide()});$("#endStation").on("click",function(){CheckStaion.callback=
|
||||
Remind.endCallback;CheckStaion.cancelCallback=Remind.cancelCallback;CheckStaion.show();$("#wrap").hide()});$("#exchange").on("click",function(){var a=$("#startStationName").val(),b=$("#startStationCode").val(),c=$("#endStationName").val(),d=$("#endStationCode").val();$("#startStationName").val(c);$("#startStationCode").val(d);$("#endStationName").val(a);$("#endStationCode").val(b);a?$("#endStation").html(a):$("#endStation").html("\u5230\u8fbe\u7ad9");c?$("#startStation").html(c):$("#startStation").html("\u51fa\u53d1\u7ad9");
|
||||
Remind.changeCity()})},startCallback:function(a,b){$("#startStation").html(a);$("#startStationName").val(a);$("#startStationCode").val(b);CheckStaion.hide();$("#wrap").show();Remind.changeCity()},endCallback:function(a,b){$("#endStation").html(a);$("#endStationName").val(a);$("#endStationCode").val(b);CheckStaion.hide();$("#wrap").show();Remind.changeCity()},changeCity:function(){Remind.checkSubmit();if(0<$('.station [value=""]').length)return!1;Remind.getTrains()},cancelCallback:function(){$("#wrap").show()},
|
||||
trainsHis:{},getTrains:function(){var a=(new Date($("#start_date_val").val())).addDays(-30).format("yyyy-MM-dd"),b=$("#startStationCode").val(),c=$("#endStationCode").val(),d=b+c+a+"ADULT",a={"leftTicketDTO.train_date":a,"leftTicketDTO.from_station":b,"leftTicketDTO.to_station":c,purpose_codes:"ADULT"};b!=c&&(Remind.trainsHis[d]?Remind.checkType(Remind.trainsHis[d]):cn12306.queryTicket(a,function(a){!0==a.status&&200==a.httpstatus&&0<a.data.length&&(Remind.trainsHis[d]=a.data,Remind.checkType(a.data))}))},
|
||||
checkType:function(a){$('.query_box [type="checkbox"]').attr("disabled","disabled").prop("checked",!1);for(var b=0,c=a.length;b<c;b++){if(2<$('.query_box [type="checkbox"]:checked').length){$('.query_box [value="all"]').removeAttr("disabled").prop("checked",!0);break}switch(a[b].queryLeftNewDTO.station_train_code[0]){case "G":$('.query_box [value="1"]').removeAttr("disabled").prop("checked",!0);break;case "D":case "C":$('.query_box [value="2"]').removeAttr("disabled").prop("checked",!0);break;default:$('.query_box [value="3"]').removeAttr("disabled").prop("checked",
|
||||
!0)}}Remind.checkSubmit()},checkSubmit:function(){0==$('.station [value=""]').length&&0<$('[name="train_type"]:checked').length&&$("#startStationCode").val()!=$("#endStationCode").val()?$("#remind_btn").removeAttr("disabled").removeClass("btn_gray"):$("#remind_btn").attr("disabled","disabled").addClass("btn_gray")},remindSubmit:function(){Remind.loading=Public.showLoading("\u6b63\u5728\u9884\u5b9a");var a=$('.query_box [type="checkbox"]:checked'),b="",c={device_id:Remind.deviceInfo.did,device_type:Remind.deviceInfo.device_type,
|
||||
fromCode:$("#startStationCode").val(),fromName:$("#startStationName").val(),toCode:$("#endStationCode").val(),toName:$("#endStationName").val(),date:$("#start_date_val").val(),tasks:[]},d=c.date.replace(/\-/g,"/"),e=new Date(d),f=[];a.each(function(a,b){var e=$(b).val(),p=Remind.sellTime[c.fromCode];if("all"!=e)switch(p||(p=Remind.sellTime[c.fromName]),p=p.split("/"),e){case "1":f.push("14:00");c.tasks.push({time:(new Date(d+" 14:00")).getTime(),left:15,type:1});c.tasks.push({time:(new Date(d+" 14:00")).getTime(),
|
||||
left:60,type:1});break;case "2":f.push("11:00");c.tasks.push({time:(new Date(d+" 11:00")).getTime(),left:15,type:2});c.tasks.push({time:(new Date(d+" 11:00")).getTime(),left:60,type:2});break;case "3":for(e=0;e<p.length;e++)f.push(p[e]),c.tasks.push({time:(new Date(d+" "+p[e])).getTime(),left:15,type:3}),c.tasks.push({time:(new Date(d+" "+p[e])).getTime(),left:60,type:3})}});f.sort(function(a,b){return parseInt(a.split(":")[0])>parseInt(b.split(":")[0])?1:-1});f=f.join(",");b="\u60a8\u9884\u7ea6\u7684"+
|
||||
e.format("YYYY\u5e74M\u6708d\u65e5")+"\uff0c"+c.fromName+"\u81f3"+c.toName+"\u7684\u706b\u8f66\u7968\uff0c\u5c06\u4e8e"+e.addDays(-19).format("YYYY\u5e74M\u6708d\u65e5")+f+"\u5f00\u552e\u3002\u552e\u7968\u5f00\u59cb\u524d\u6211\u4eec\u4f1a\u63d0\u9192\u60a8\u3002\u795d\u60a8\u62a2\u7968\u6210\u529f\uff01";$.ajax({type:"POST",url:"http://12306.liebao.cn/index.php?r=Api/SentRss",data:{data:JSON.stringify(c)},dataType:"json",success:function(a){Public.hideLoading(Remind.loading);0==a.resCode?Public.alert(b):
|
||||
Public.alert(a.message)},error:function(){Public.hideLoading(Remind.loading);Public.alert("\u9884\u5b9a\u5931\u8d25")}})}};var MyRemind={init:function(){if(0==$("#myremind_page").length)return!1;MyRemind.deviceInfo=JSON.parse(bootStrap.device_info);MyRemind.deviceInfo?(MyRemind.getMyRemind(),$("[data-ids]").live("click",function(){var a=$(this),b=$(this).attr("data-ids");Public.confirm("\u5220\u9664\u63d0\u9192\u540e\uff0c\u4f60\u5c06\u4e0d\u4f1a\u6536\u5230\u653e\u7968\u63d0\u9192\uff0c\u786e\u5b9a\u5220\u9664\u5417\uff1f",function(){MyRemind.deleteRemind(b,a.closest("li"))})})):Public.alert("\u8ba2\u9605\u529f\u80fd\u4ec5\u8bf7\u4f7f\u7528\u624b\u673a\u730e\u8c79\u6d4f\u89c8\u5668",
|
||||
function(){window.history.back()})},deleteRemind:function(a,b){var c=Public.showLoading("\u6b63\u5728\u5220\u9664\u63d0\u9192");$.ajax({type:"POST",url:"http://12306.liebao.cn/index.php?r=Api/UpdateRss",data:{device_id:MyRemind.deviceInfo.did,id_list:a},success:function(){$(".loading",c).html("\u5220\u9664\u63d0\u9192\u6210\u529f");b.remove();setTimeout(function(){Public.hideLoading(c)},1E3)},error:function(){Public.hideLoading(c);Public.alert("\u5220\u9664\u63d0\u9192\u5931\u8d25")}})},getMyRemind:function(){$.ajax({type:"POST",
|
||||
url:"http://12306.liebao.cn/index.php?r=Api/GetRss",data:{device_id:MyRemind.deviceInfo.did},dataType:"json",success:function(a){0==a.resCode&&0<a.data.length?(MyRemind.formatJson(a.data),MyRemind.setHtmlList(),$(".list_tip").hide(),$("#myremind_list").show()):Public.alert(a.message)},error:function(){$(".list_tip").html("\u83b7\u53d6\u4fe1\u606f\u5931\u8d25");Public.alert("\u83b7\u53d6\u4fe1\u606f\u5931\u8d25")}})},remindObj:{},remindList:[],formatJson:function(a){for(var b="",c=0;c<a.length;c++)1!=
|
||||
a[c].ispush&&(b=a[c].fromCode+a[c].toCode+a[c].date,MyRemind.remindObj[b]||(MyRemind.remindObj[b]=a[c],MyRemind.remindObj[b].id_list=[],MyRemind.remindObj[b].time_list=[],MyRemind.remindObj[b].format_time_list=[]),-1==MyRemind.remindObj[b].id_list.indexOf(a[c].id)&&MyRemind.remindObj[b].id_list.push(a[c].id),-1==MyRemind.remindObj[b].time_list.indexOf(1E3*a[c].tasks_time)&&MyRemind.remindObj[b].time_list.push(1E3*a[c].tasks_time));for(b in MyRemind.remindObj){MyRemind.remindObj[b].time_list.sort(function(a,
|
||||
b){return a>b?1:-1});for(c=0;c<MyRemind.remindObj[b].time_list.length;c++)MyRemind.remindObj[b].format_time_list.push((new Date(MyRemind.remindObj[b].time_list[c])).toString().match(/\d{2}:\d{2}/)[0]);MyRemind.remindList.push(MyRemind.remindObj[b])}MyRemind.remindList.sort(function(a,b){return(new Date(a.date.replace(/\-/gi,"/"))).getTime()>(new Date(b.date.replace(/\-/gi,"/"))).getTime()?1:-1})},formatHoursDate:function(a){a=new Date(a);var b=a.getHours();a.getMinutes();return b+":"},setHtmlList:function(){for(var a=
|
||||
"",b={},c=0,d=MyRemind.remindList.length;c<d;c++)b=MyRemind.remindList[c],a+="<li>",a+='<div class="mr_title"><a class="pull_right" data-ids="'+b.id_list.join(",")+'"><i class="icon_remove"></i></a><i class="icon_clock"></i>'+(new Date(b.date.replace(/\-/gi,"/"))).format("M\u6708d\u65e5")+"</div>",a+='<div class="stations_info"><div class="station_info"><strong>'+b.fromName+'</strong></div><div class="station_info"><strong>'+b.toName+"</strong></div></div>",a+='<div class="mr_text">\u8d77\u552e\u65f6\u95f4\uff1a'+
|
||||
b.format_time_list.join("\u3001")+"</div>",a+="</li>";$("#myremind_list").html(a)}};var OrderList={token:"",bankId:"",payLoading:null,curNo:"",init:function(){if(0==$("#order_list_page").length)return!1;OrderList.loading=Public.showLoading("\u6b63\u5728\u83b7\u53d6\u8ba2\u5355\u5217\u8868");Public.checkLogin(OrderList.hasLogin,OrderList.noLogin,OrderList.noLogin)},hasLogin:function(){OrderList.getNoComOrder();$("[data-no]").live("click",function(){NoComplete.curNo=$(this).attr("data-no");NoComplete.selectBank()});$("[data-cancelno]").live("click",function(a){var b=$(this).attr("data-cancelno"),
|
||||
=======
|
||||
function(){"function"==typeof b&&b()});else{var f="";0<a.messages.length&&(f=a.messages[0]);f||(f="\u53d6\u6d88\u8ba2\u5355\u5931\u8d25\uff0c\u8bf7\u91cd\u8bd5\uff01");Public.alert(f,function(){"function"==typeof c&&c()})}}).fail(function(){Public.hideLoading(d);Public.alert("\u7f51\u7edc\u8fde\u63a5\u5931\u8d25\uff0c\u8bf7\u91cd\u8bd5\uff01",function(){"function"==typeof c&&c()})})}};var Remind={sellTime:null,loading:null,init:function(){if(0==$("#remind_page").length)return!1;Remind.deviceInfo=JSON.parse(bootStrap.device_info);if(Remind.deviceInfo){Public.checkLogin(Remind.checkLoginCallback,Remind.checkLoginCallback,Remind.checkLoginCallback);Remind.sellTime=WIN.sellTime;Remind.dataInit();Remind.staionInt();$('.query_box [type="checkbox"]').on("change",function(){setTimeout(function(){Remind.checkSubmit()},50)});$("#remind_form").on("submit",function(){Remind.remindSubmit();
|
||||
>>>>>>> 7096071de57dbdda83dfbbb422d9e6e5864cc345
|
||||
return!1});var a=Public.getQueryData(window.location.search);a.date&&!isNaN((new Date(a.date.replace(/\-/gi,"/"))).getTime())&&Remind.dateChangeCallback(new Date(a.date.replace(/\-/gi,"/")));a.from&&CheckStaion.CodeObj[a.from]&&Remind.startCallback(CheckStaion.CodeObj[a.from][1],CheckStaion.CodeObj[a.from][2]);a.to&&CheckStaion.CodeObj[a.to]&&Remind.endCallback(CheckStaion.CodeObj[a.to][1],CheckStaion.CodeObj[a.to][2])}else Public.alert("\u8ba2\u9605\u529f\u80fd\u4ec5\u8bf7\u4f7f\u7528\u624b\u673a\u730e\u8c79\u6d4f\u89c8\u5668",
|
||||
function(){window.history.back()})},checkLoginCallback:function(){},dataInit:function(){var a=Public.getQueryData(window.location.search),b=(new Date).addDays(49);a.date&&!isNaN((new Date(a.date.replace(/\-/gi,"/"))).getTime())&&(b=new Date(a.date.replace(/\-/gi,"/")));Public.setDate(b);Public.calendar.setSection((new Date).addDays(20),29);Public.calendar.checkCallback=Remind.dateChangeCallback;Public.calendar.setBasic()},dateChangeCallback:function(a){a=a.date.getTime();a>=Public.calendar.minDate.date.getTime()&&
|
||||
a<=Public.calendar.maxDate.date.getTime()&&($("#date_tip").hide(),Public.hideInnerPage("date_box"),$("#start_date").html(Public.calendar.curDate.format(Public.formatString)+" "+Public.calendar.curDate.day(3)),$("#start_date_val").val(Public.calendar.curDate.format("yyyy-MM-dd")))},staionInt:function(){CheckStaion.init();$("#startStation").on("click",function(){CheckStaion.callback=Remind.startCallback;CheckStaion.cancelCallback=Remind.cancelCallback;CheckStaion.show();$("#wrap").hide()});$("#endStation").on("click",
|
||||
@ -264,6 +290,7 @@ $(".list_tip").hide(),$("#myremind_list").show()):$(".list_tip").html('\u6682\u6
|
||||
b){return a>b?1:-1});for(c=0;c<MyRemind.remindObj[b].time_list.length;c++)MyRemind.remindObj[b].format_time_list.push((new Date(MyRemind.remindObj[b].time_list[c])).toString().match(/\d{2}:\d{2}/)[0]);MyRemind.remindList.push(MyRemind.remindObj[b])}MyRemind.remindList.sort(function(a,b){return(new Date(a.date.replace(/\-/gi,"/"))).getTime()>(new Date(b.date.replace(/\-/gi,"/"))).getTime()?1:-1})},formatHoursDate:function(a){a=new Date(a);var b=a.getHours();a.getMinutes();return b+":"},setHtmlList:function(){for(var a=
|
||||
"",b={},c=0,d=MyRemind.remindList.length;c<d;c++)b=MyRemind.remindList[c],a+="<li>",a+='<div class="mr_title"><a class="pull_right" data-ids="'+b.id_list.join(",")+'"><i class="icon_remove"></i></a><i class="icon_clock"></i>'+(new Date(b.date.replace(/\-/gi,"/"))).format("M\u6708d\u65e5")+"</div>",a+='<div class="stations_info"><div class="station_info"><strong>'+b.fromName+'</strong></div><div class="station_info"><strong>'+b.toName+"</strong></div></div>",a+='<div class="mr_text">\u8d77\u552e\u65f6\u95f4\uff1a'+
|
||||
b.format_time_list.join("\u3001")+"</div>",a+="</li>";$("#myremind_list").html(a);$("[data-ids]").on("click",function(){var a=$(this),b=$(this).attr("data-ids");Public.confirm("\u5220\u9664\u63d0\u9192\u540e\uff0c\u4f60\u5c06\u4e0d\u4f1a\u6536\u5230\u653e\u7968\u63d0\u9192\uff0c\u786e\u5b9a\u5220\u9664\u5417\uff1f",function(){MyRemind.deleteRemind(b,a.closest("li"))})})}};var OrderList={token:"",bankId:"",payLoading:null,curNo:"",init:function(){if(0==$("#order_list_page").length)return!1;OrderList.loading=Public.showLoading("\u6b63\u5728\u83b7\u53d6\u8ba2\u5355\u5217\u8868");Public.checkLogin(OrderList.hasLogin,OrderList.noLogin,OrderList.noLogin)},hasLogin:function(){OrderList.getNoComOrder();$("[data-no]").live("click",function(){NoComplete.curNo=$(this).attr("data-no");NoComplete.selectBank()});$("[data-cancelno]").live("click",function(a){var b=$(this).attr("data-cancelno"),
|
||||
>>>>>>> da5ee090397d854e36bf8b10f22395763f653d3a
|
||||
c=$(this).closest("li");Public.confirm("\u53d6\u6d883\u6b21\u8ba2\u5355\u540e\uff0c\u5f53\u5929\u4e0d\u53ef\u518d\u8ba2\u7968\uff0c\u786e\u5b9a\u8981\u53d6\u6d88\u8ba2\u5355\u5417\uff1f",function(){NoComplete.cancelOrder(b,function(){c.remove()})})});$('[data-fn="close_bank"]').live("click",function(){Public.hideInnerPage()});$("#banks [data-bank]").live("click",function(){NoComplete.bankId=$(this).attr("data-bank");NoComplete.payLoading=Public.showLoading("\u6b63\u5728\u52a0\u8f7d");NoComplete.pay()})},
|
||||
noLogin:function(){Public.hideLoading();Public.alert("\u8bf7\u5148\u767b\u5f55",function(){location.href="login.html?order_list"})},loading:null,hisList:[],getNoComOrder:function(){bootStrap.get("queryOrder/queryMyOrderNoComplete","json",null,"queryOrder/initNoComplete").done(function(a){a.status&&(a.data&&a.data.orderDBList&&0<a.data.orderDBList.length)&&(OrderList.hisList=a.data.orderDBList);OrderList.getOrder()}).fail(function(a,b){OrderList.getOrder()})},getOrder:function(){var a={queryType:1,
|
||||
queryStartDate:(new Date).addDays(-90).format("yyyy-MM-dd"),queryEndDate:(new Date).format("yyyy-MM-dd"),come_from_flag:"my_order",pageSize:100,pageIndex:0,sequeue_train_name:""};bootStrap.get("queryOrder/queryMyOrder","json",a,"queryOrder/init").done(function(a){Public.hideLoading();if(a.status&&a.data)if(a.data.OrderDTODataList&&0<a.data.OrderDTODataList.length){for(var c=0;c<a.data.OrderDTODataList.length;c++)OrderList.hisList.push(a.data.OrderDTODataList[c]);OrderList.setHtml()}else 0<OrderList.hisList.length?
|
||||
|
||||
@ -100,7 +100,7 @@ var OrderSubmit = {
|
||||
Public.hideInnerPage('passenger');
|
||||
});
|
||||
$('#passengers [type="checkbox"]').on('change', function() {
|
||||
if ($('#passengers [type="checkbox"]:checked').length > 5 || $('#passenger_list li').length >= 5) {
|
||||
if ($(this).prop("checked") && ($('#passengers [type="checkbox"]:checked').length > 5 || $('#passenger_list li').length >= 5)) {
|
||||
Public.alert('联系人最多只能选择五个');
|
||||
$(this).prop("checked", false);
|
||||
return false;
|
||||
@ -489,7 +489,7 @@ var OrderSubmit = {
|
||||
}
|
||||
// else if (json['data']['op_2'] === "true") {
|
||||
// Public.alert("排队人数过多，不允许提交订单。排队人数=" + json['data']['countT']);
|
||||
// }
|
||||
// }
|
||||
else if (!!json['data'] && !json['data']['submitStatus']) {
|
||||
Public.alert(json['data']['errMsg'] || "未知错误");
|
||||
} else {
|
||||
|
||||
@ -115,7 +115,6 @@ var Public = {
|
||||
if (typeof loginCB == 'function') {
|
||||
loginCB();
|
||||
}
|
||||
|
||||
}, function() {
|
||||
sessionStorage.clear();
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
</div>
|
||||
<div class="form_btns"><button type="submit" id="btnLogin" class="btn btn_success btn_block btn_lg">登录</button></div>
|
||||
<div class="form_btns clearfix">
|
||||
<span class="pull_right"><a href="http://12306.cn" class="text_warning">注册12306</a></span>
|
||||
<span class="pull_right"><a href="https://kyfw.12306.cn/otn/regist/init" class="text_warning">注册12306</a></span>
|
||||
<!--<label><input type="checkbox" value="1" id="autosubmit" checked="checked" name="autosubmit">输入验证码后自动登录</label>-->
|
||||
</div>
|
||||
</form>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user