diff --git a/Mobile12306New/js/js.min.js b/Mobile12306New/js/js.min.js
index 252f427..539812a 100644
--- a/Mobile12306New/js/js.min.js
+++ b/Mobile12306New/js/js.min.js
@@ -153,8 +153,8 @@ a.username);localStorage.setItem("useraccount",JSON.stringify(a));Public.toast("
 "hisQuery",localStorage.getItem("hisQuery"));location.href="run_query.html?t="+a.t;break;case "order_list":location.href="order_list.html";break;case "no_commplete":location.href="no_complete_order.html";break;case "run_query":location.href="run_query.html"}else location.href="query.html"}};var Query={calendar:null,init:function(){if(0!=$("#query_page").length){Public.checkLogin(Query.hasLogin,Query.noLogin,Query.noLogin);var a=(new Date).addDays(19);Public.setDate(a);$("#menu_btn").on("click",function(){$("#user_menu").toggle()});$("#user_menu").on("click",function(a){"user_menu"==$(a.target).attr("id")&&$("#user_menu").hide()});$("#open_filter").on("click",function(){Public.showInnerPage("filter")});$("#filter_cancel").on("click",function(){Public.hideInnerPage("filter");var a=$("#query_form [name=filters]").val().split("&");
 Query.setFilter(a)});$("#filter_ok").on("click",function(){Public.hideInnerPage("filter");$("#query_form [name=filters]").val($("#filter_form").serialize())});$("#query_form [name=filters]").val($("#filter_form").serialize());$("#query_form").on("submit",function(){var a=$("#startStationCode").val(),c=$("#endStationCode").val();if(""==a)return Public.alert("\u8bf7\u9009\u62e9\u51fa\u53d1\u7ad9"),!1;if(""==c)return Public.alert("\u8bf7\u9009\u62e9\u5230\u8fbe\u7ad9"),!1;if(a==c)return Public.alert("\u51fa\u53d1\u5730\u548c\u76ee\u7684\u5730\u4e0d\u80fd\u76f8\u540c"),
 !1;var d=$("#query_form").serialize();Public.setHisQuery(a+"-"+c,d);window.location.href="run_query.html";return!1});$("#login").on("click",function(){"loginout"==$(this).attr("data-fn")&&cn12306.loginOut(function(){Public.toast("\u9000\u51fa\u6210\u529f\uff0c\u6b63\u5728\u8df3\u8f6c");setTimeout(function(){window.location.href="login.html"},1E3)},function(){Public.toast("\u9000\u51fa\u5931\u8d25\uff0c\u8bf7\u91cd\u8bd5\u3002")})});CheckStaion.init();Query.stationInt();Query.setHisQuery();Query.filterBind();
-$("#remind_btn").on("click",function(a){a="remind.html";var c=$("#startStationCode").val(),d=$("#endStationCode").val(),e=$("#start_date_val").val();a+="?date="+e;c&&(a+="&from="+c);d&&(a+="&to="+d);location.href=a})}},setHisQuery:function(){var a=Public.his.querys,b,c;if(0==Public.his.querys.length)return!1;b='<div class="his_title">\u6700\u8fd1\u67e5\u627e</div><ul class="list his_list">';for(var d=0,e=a.length;d<e;d++)c=Public.his.queryObjs[a[d][0]],b+='<li><a href="javascript:;" data-key="'+a[d][0]+
-'"><span>'+c.startname+"</span><span>"+c.endname+"</span></a></li>";$("#hisQuery").html(b+"</ul>");$("#hisQuery [data-key]").on("click",function(){var a=$(this).attr("data-key");a&&Public.his.queryObjs[a]&&(Query.newQuery(Public.his.queryObjs[a]),Public.toast("\u5207\u6362\u6210\u529f"))});Query.newQuery(Public.his.queryObjs[$("#hisQuery [data-key]:eq(0)").attr("data-key")])},newQuery:function(a){var b;$("#query_form [type=checkbox],#query_form [type=radio]").prop("checked",!1);for(var c in a)b=$("#query_form [name="+
+$("#remind_btn").on("click",function(a){a="remind.html?";var c=$("#startStationCode").val(),d=$("#endStationCode").val();$("#start_date_val").val();c&&(a+="&from="+c);d&&(a+="&to="+d);location.href=a})}},setHisQuery:function(){var a=Public.his.querys,b,c;if(0==Public.his.querys.length)return!1;b='<div class="his_title">\u6700\u8fd1\u67e5\u627e</div><ul class="list his_list">';for(var d=0,e=a.length;d<e;d++)c=Public.his.queryObjs[a[d][0]],b+='<li><a href="javascript:;" data-key="'+a[d][0]+'"><span>'+
+c.startname+"</span><span>"+c.endname+"</span></a></li>";$("#hisQuery").html(b+"</ul>");$("#hisQuery [data-key]").on("click",function(){var a=$(this).attr("data-key");a&&Public.his.queryObjs[a]&&(Query.newQuery(Public.his.queryObjs[a]),Public.toast("\u5207\u6362\u6210\u529f"))});Query.newQuery(Public.his.queryObjs[$("#hisQuery [data-key]:eq(0)").attr("data-key")])},newQuery:function(a){var b;$("#query_form [type=checkbox],#query_form [type=radio]").prop("checked",!1);for(var c in a)b=$("#query_form [name="+
 c+"]"),1<b.length?$('#query_form [name="'+c+'"][value="'+a[c]+'"]').prop("checked",!0):(b.val(a[c]),"startname"==c?$("#startStation").html(a[c]):"endname"==c?$("#endStation").html(a[c]):"start_date"==c&&(b=new Date(a[c].replace(/\-/g,"/")),$("#start_date").html(b.format("yyyy\u5e74M\u6708d\u65e5")+" "+b.day(3)),Public.calendar.setCurDate(b)));a=$("#query_form [name=filters]").val().split("&");Query.setFilter(a)},setFilter:function(a){var b=[],c;$("#filter_form [type=checkbox],#filter_form [type=radio]").prop("checked",
 !1);$("#filter_form #train_labels,#filter_form #passenger_list").html("");for(var d=0;d<a.length;d++)b=a[d].split("="),b[1]=decodeURIComponent(b[1]),c=$('#filter_form [name="'+b[0]+'"][value="'+b[1]+'"]'),"train_type"==b[0]||"train_seat"==b[0]?c.prop("checked",!0):"timeslot"==b[0]?(c.prop("checked",!0),c.closest(".query_box").find("label").removeClass("query_bigcheck_checked"),c.closest("label").addClass("query_bigcheck_checked")):"train"==b[0]?$("#filter_form #train_labels").append('<span class="train_label">'+
 b[1]+'<input type="hidden" name="train" value="'+b[1]+'"></span>'):"passenger"==b[0]&&($('#passenger_form [name="psg"][value="'+b[1]+'"]').prop("checked",!0),$("#filter_form #passenger_list").append('<span class="train_label">'+b[1].split("$")[0]+'<input type="hidden" name="passenger" value="'+b[1]+'"></span></span>'));sessionStorage.getItem(Public.user+"_passenger")?(Query.passengerList=JSON.parse(sessionStorage.getItem(Public.user+"_passenger")),Query.passengerObj=JSON.parse(sessionStorage.getItem(Public.user+
@@ -208,8 +208,8 @@ b[d].filterTicket.push(a[g].lines[n].trainCode);for(d in b)e.push(b[d]);RunQuery
 " "+b.day(3)+"</span></div>"),a=a+('<div class="stations_info"><div class="station_info"><strong>'+OrderSubmit.curData.from.name+"</strong>"+OrderSubmit.curData.from.time+"</div>"),a=a+('<div class="station_info"><strong>'+OrderSubmit.curData.to.name+"</strong>"+OrderSubmit.curData.to.time+"</div></div>");$("#trainInfo").html(a+"</div>")},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&&
 Array.isArray(a.data.normal_passengers)&&0<a.data.normal_passengers.length?(OrderSubmit.formatPassenger(a.data.normal_passengers),OrderSubmit.setPassengerList()):Public.alert("23:00-07:00 \u7cfb\u7edf\u7ef4\u62a4\u65f6\u95f4")}).fail(function(a,b){console.log(a,b)})},setPassengerList:function(){for(var a="",b=0,c=OrderSubmit.passengerList.length;b<c;b++)a+='<label class="query_checkbox"><input name="train_type" type="checkbox" value="'+OrderSubmit.passengerList[b].key+'">'+OrderSubmit.passengerList[b].passenger_name+
-"</label>";if(OrderSubmit.curInfo)for(var c=OrderSubmit.curInfo.filters.split("&"),d=[],b=0;b<c.length;b++)d=c[b].split("="),d[1]=decodeURIComponent(d[1]),"passenger"==d[0]&&OrderSubmit.passengerObj[d[1]]&&OrderSubmit.passengerAdd(OrderSubmit.passengerObj[d[1]]);$("#passengers").html(a);$("#add_passenger").on("click",function(){Public.showInnerPage("passenger")});$("#passenger_ok").on("click",function(){Public.hideInnerPage("passenger")});$('#passengers [type="checkbox"]').on("change",function(){if(5<
-$('#passengers [type="checkbox"]:checked').length||5<=$("#passenger_list li").length)return Public.alert("\u8054\u7cfb\u4eba\u6700\u591a\u53ea\u80fd\u9009\u62e9\u4e94\u4e2a"),$(this).prop("checked",!1),!1;var a=$(this),b=a.val();a.prop("checked")?OrderSubmit.passengerAdd(OrderSubmit.passengerObj[b]):$('#passenger_list [data-key="'+b+'"]').remove()});0<$("#passenger_list li").length&&$("#ordersubmit").click()},passenger:{},passengerAdd:function(a){var b="",b=Util.getAvailableTicketType(a),c=OrderSubmit.curData.ticketMap[OrderSubmit.curBuySeat],
+"</label>";if(OrderSubmit.curInfo)for(var c=OrderSubmit.curInfo.filters.split("&"),d=[],b=0;b<c.length;b++)d=c[b].split("="),d[1]=decodeURIComponent(d[1]),"passenger"==d[0]&&OrderSubmit.passengerObj[d[1]]&&OrderSubmit.passengerAdd(OrderSubmit.passengerObj[d[1]]);$("#passengers").html(a);$("#add_passenger").on("click",function(){Public.showInnerPage("passenger")});$("#passenger_ok").on("click",function(){Public.hideInnerPage("passenger")});$('#passengers [type="checkbox"]').on("change",function(){if($(this).prop("checked")&&
+(5<$('#passengers [type="checkbox"]:checked').length||5<=$("#passenger_list li").length))return Public.alert("\u8054\u7cfb\u4eba\u6700\u591a\u53ea\u80fd\u9009\u62e9\u4e94\u4e2a"),$(this).prop("checked",!1),!1;var a=$(this),b=a.val();a.prop("checked")?OrderSubmit.passengerAdd(OrderSubmit.passengerObj[b]):$('#passenger_list [data-key="'+b+'"]').remove()});0<$("#passenger_list li").length&&$("#ordersubmit").click()},passenger:{},passengerAdd:function(a){var b="",b=Util.getAvailableTicketType(a),c=OrderSubmit.curData.ticketMap[OrderSubmit.curBuySeat],
 b='<li class="clearfix" data-key="'+a.key+'" data-type="'+b[0].id+'" data-seat="'+c.code+'"><span class="pull_left"><strong>'+a.passenger_name+'</strong><span class="ticket">'+b[0].name+"</span><br>"+a.passenger_id_no+'</span><a href="javascript:;" data-fn="edit" class="pull_right"><span class="seat">'+c.name+"&nbsp;"+c.price/10+'\u5143</span>&nbsp;<i class="icon_edit"></i></a></li>';$("#passenger_list").append(b)},addChildren:function(a,b){var c=OrderSubmit.passengerObj[a],d=OrderSubmit.curData.ticketMap[b.attr("data-seat")];
 html='<li class="clearfix" data-children="true" data-key="'+c.passenger_name+"$"+c.passenger_id_type_code+"$"+c.passenger_id_no+'" data-type="2" data-seat="'+b.attr("data-seat")+'">\t\t\t\t<span class="pull_left"><strong>'+c.passenger_name+'</strong><span class="ticket">\u513f\u7ae5\u7968</span><br>'+c.passenger_id_no+'</span>\t\t\t\t<a href="javascript:;" data-fn="edit" class="pull_right">\t\t\t\t<span class="seat">'+d.name+"&nbsp;"+d.price/10+'\u5143</span>&nbsp;<i class="icon_edit"></i></a></li>';
 b.after(html)},formatPassenger:function(a){for(var b=[],c={},d="",e=0;e<a.length;e++)Util.canPassageAddToOrder(a[e])&&(d=a[e].passenger_name+"$"+a[e].passenger_id_type_code+"$"+a[e].passenger_id_no,a[e].key=d,c[d]=a[e],b.push(a[e]));OrderSubmit.passengerList=b;OrderSubmit.passengerObj=c;sessionStorage.setItem("_passenger",JSON.stringify(b));sessionStorage.setItem("_passengerobj",JSON.stringify(c))},editKey:"",editEl:null,showLayer:function(){$("#layer").show()},hideLayer:function(){$("#layer").hide()},
@@ -243,35 +243,9 @@ 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",
@@ -290,7 +264,6 @@ $(".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?
diff --git a/Mobile12306New/js/query.js b/Mobile12306New/js/query.js
index 10ec484..55ee70f 100644
--- a/Mobile12306New/js/query.js
+++ b/Mobile12306New/js/query.js
@@ -82,11 +82,11 @@ var Query = {
 		Query.filterBind();
 
 		$('#remind_btn').on('click',function(e){
-			var url = 'remind.html',
+			var url = 'remind.html?',
 				from = $('#startStationCode').val(),
 				to = $('#endStationCode').val(),
 				date = $('#start_date_val').val();
-			url += '?date='+date;
+			// url += 'date='+date;
 			if(!!from){
 				url += '&from='+from;
 			}
diff --git a/Mobile12306New/remind.html b/Mobile12306New/remind.html
index 55bdcb6..c29ac63 100644
--- a/Mobile12306New/remind.html
+++ b/Mobile12306New/remind.html
@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="viewport" content="width=device-width,initial-scale=1, minimum-scale=1.0, maximum-scale=1.0,user-scalable=no, minimal-ui">
 <meta name="format-detection" content="telephone=no">
-<title>车次查询</title>
+<title>预售提醒</title>
 
 <script src="js/station_name.js" type="text/javascript"></script>
 <script src="js/favorite_name.js" type="text/javascript"></script>