diff --git a/Mobile12306New/css/css.css b/Mobile12306New/css/css.css
index a3502fd..b3ea732 100644
--- a/Mobile12306New/css/css.css
+++ b/Mobile12306New/css/css.css
@@ -120,10 +120,8 @@ input[type=radio]:checked:after{content:''; display:block; width:12px; height:12
 .form_label{display:inline-block; width:86px; float:left;}
 .ipt_wrap{position:relative; overflow:hidden;}
 .ipt_wrap .ipt{position:relative; width:100%; padding:10px 0; height:20px; border:0; margin:0;}
-.form_cardimg{float:right; width:90px; height:40px; overflow:hidden; margin:0 0 0 10px; text-align:center; vertical-align:middle;}
-.form_cardimg img{max-width:100%; height:100%;}
-#query_form .btn_success{width:60%;}
-#query_form .btn_gray{width:35%;}
+.form_cardimg{float:right; width:90px; overflow:hidden; margin:7px 0 0 10px; text-align:center; vertical-align:middle;}
+.form_cardimg img{max-width:100%;}
 
 .btn{ height:40px; padding:0 1em;-webkit-box-sizing: border-box; line-height:40px; background:#ffbb51; border:0; margin:0; display:inline-block; border-radius:3px; font-size:1.1875rem; color:#FFF; text-align:center; position:relative; overflow:hidden;}
 .btn_block{display:block; width:100%; }
diff --git a/Mobile12306New/index.html b/Mobile12306New/index.html
index 32a38d2..a5a15e2 100644
--- a/Mobile12306New/index.html
+++ b/Mobile12306New/index.html
@@ -41,14 +41,9 @@
           <label><input type="radio" value="1" checked="checked" name="type">普通票</label>
           <label><input type="radio" value="2" name="type">学生票</label>
         </div>
-<<<<<<< HEAD
         <div class="form_line"><a href="javascript:;" class="block text_center" id="open_filter"><span class="pull_right"><i class="icon_right"></i></span>选择条件：类型/席别/时段/车次</a></div>
-=======
-        <div class="form_line"><a href="javascript:;" class="block text_center" id="open_filter"><span class="pull_right"><i class="icon_right"></i></span>类别/坐席/车次/联系人</a></div>
->>>>>>> 02f84c66d2fc321e999eace2b8bb58e803438ddd
         <div class="form_btns">
           <input type="hidden" name="filters" value="">
-		  <button type="button" class="btn btn_gray btn_block btn_lg pull_right">查学生票</button>
           <button type="submit" id="btnLogin" class="btn btn_success btn_block btn_lg">查询</button>
         </div>
       </form>
diff --git a/Mobile12306New/js/js.min.js b/Mobile12306New/js/js.min.js
index 6f81247..fe1d7b8 100644
--- a/Mobile12306New/js/js.min.js
+++ b/Mobile12306New/js/js.min.js
@@ -151,27 +151,27 @@ randCode:Login.formData.randcode},"login/init").done(function(a){a&&a.data&&"Y"=
 Public.alert("\u767b\u5f55\u65f6\u7f51\u7edc\u9519\u8bef")})},userPostLogin:function(){bootStrap.post("login/userLogin","text",null,"login/init").done(function(){Login.checkJsonAttr()}).fail(function(){Login.checkJsonAttr()})},checkJsonAttr:function(){var a=Login.formData;cn12306.isUserLogined(function(){sessionStorage.setItem("user",a.username);localStorage.setItem("useraccount",JSON.stringify(a));Public.toast("\u767b\u5f55\u6210\u529f!");Login.loginRoute()},function(){Public.toast("\u672a\u80fd\u6210\u529f\u767b\u5f55\uff0c\u8bf7\u91cd\u8bd5\u3002")},
 function(){Public.toast("\u767b\u5f55\u65f6\u7f51\u7edc\u9519\u8bef")})},loginRoute:function(){var a=Public.getQueryData(window.location.search);if(a.t)switch(a.t){case "submitorder":location.href="perfect.html?t="+a.t;break;case "autorefer":localStorage.getItem("hisQuery")&&localStorage.setItem(sessionStorage.getItem("user")+"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="index.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").height(document.documentElement.clientHeight-45)});$("#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);a=Public.getQueryData(window.location.search);a.c&&"query"!=a.c&&Public.isLogin?Public.alert("\u8fd8\u672a\u767b\u5f55\uff0c\u8bf7\u767b\u9646\u540e\u67e5\u8be2",function(){location.href="login.html?t=submitorder"}):window.location.href="run_query.html";return!1});$("#login").on("click",
-function(){"loginout"==$(this).attr("data-fn")&&Public.confirm("\u786e\u5b9a\u9000\u51fa\u767b\u5f55\uff1f",function(){cn12306.loginOut(function(){setTimeout(function(){window.location.href="login.html"},1E3)})})});CheckStaion.init();Query.stationInt();Query.setHisQuery();Query.filterBind();$("#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=6<a.length?6: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)if(b=$("#query_form [name="+c+"]"),1<b.length)$('#query_form [name="'+c+'"][value="'+a[c]+'"]').prop("checked",!0);else if(b.val(a[c]),"startname"==c)$("#startStation").html(a[c]);else if("endname"==c)$("#endStation").html(a[c]);else if("start_date"==
-c){b=new Date(a[c].replace(/\-/g,"/"));var d=(new Date).date;b.getTime()>=d.getTime()&&b.getTime()<=d.addDays(19).getTime()&&($("#start_date").html(b.format("yyyy\u5e74M\u6708d\u65e5")+" "+b.day(3)),$("#start_date_val").html(b.format("yyyy-MM-dd")),Public.calendar.setCurDate(b),Public.setDate(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('<a href="javascript:;" class="train_label">'+b[1]+'<input type="hidden" name="train" value="'+
-b[1]+'"></a>'):"passenger"==b[0]&&($('#passenger_form [name="psg"][value="'+b[1]+'"]').prop("checked",!0),$("#filter_form #passenger_list").append('<a href="javascript:;" class="train_label">'+b[1].split("$")[0]+'<input type="hidden" name="passenger" value="'+b[1]+'"></span></a>'));sessionStorage.getItem(Public.user+"_passenger")?(Query.passengerList=JSON.parse(sessionStorage.getItem(Public.user+"_passenger")),Query.passengerObj=JSON.parse(sessionStorage.getItem(Public.user+"_passengerobj"))):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)&&Query.formatPassenger(a.data.normal_passengers)}).fail(function(a,b){})},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]));Query.passengerList=b;Query.passengerObj=c;sessionStorage.setItem(Public.user+
-"_passenger",JSON.stringify(b));sessionStorage.setItem(Public.user+"_passengerobj",JSON.stringify(c))},hasLogin:function(){$("#login").attr("href","javascript:;").attr("data-fn","loginout").html("\u9000\u51fa");$("#menu_btn .icon_user").addClass("icon_user2");Query.setHisQuery();Query.getPassenger()},noLogin:function(){var a=Public.getQueryData(window.location.search);a.cond&&"login"==a.cond&&(history.replaceState(null,null,WIN.location.href.split("?")[0]),Public.confirm("\u4f60\u8fd8\u672a\u767b\u5f55\uff0c\u662f\u5426\u767b\u9646\uff1f",
-function(){location.href="login.html"}));$("#login").attr("href","/12306/login.html").attr("data-fn","login").html("\u767b\u5f55");$("#menu_btn .icon_user").removeClass("icon_user2");Query.setHisQuery()},stationInt:function(){$("#startStation").on("click",function(){CheckStaion.callback=Query.startCallback;CheckStaion.cancelCallback=Query.cancelCallback;CheckStaion.show();$("#wrap").hide()});$("#endStation").on("click",function(){CheckStaion.callback=Query.endCallback;CheckStaion.cancelCallback=Query.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")})},startCallback:function(a,b){$("#startStation").html(a);
-$("#startStationName").val(a);$("#startStationCode").val(b);CheckStaion.hide();$("#wrap").show()},endCallback:function(a,b){$("#endStation").html(a);$("#endStationName").val(a);$("#endStationCode").val(b);CheckStaion.hide();$("#wrap").show()},cancelCallback:function(){$("#wrap").show()},trainsHis:{},getTrains:function(){if(""==$("#startStationCode").val()||""==$("#endStationCode").val())Public.alert("\u8bf7\u9009\u62e9\u53d1\u5230\u8fbe\u7ad9");else{var a="ADULT";"2"==$("#query_form [name=type]").val()&&
-(a="0X00");var b=Public.showLoading("\u6b63\u5728\u83b7\u53d6\u8f66\u6b21"),c=$("#start_date_val").val(),d=$("#startStationCode").val(),e=$("#endStationCode").val(),f=d+e+c+a,a={"leftTicketDTO.train_date":c,"leftTicketDTO.from_station":d,"leftTicketDTO.to_station":e,purpose_codes:a};Query.trainsHis[f]&&(Query.setTrains(Query.trainsHis[f]),Public.showInnerPage("trains_box"));cn12306.queryTicket(a,function(a){!0==a.status&&200==a.httpstatus&&0<a.data.length&&(Query.trainsHis[f]=a.data,Query.setTrains(a.data),
-Public.showInnerPage("trains_box"));Public.hideLoading(b)},function(a,c){Public.hideLoading(b)})}},setTrains:function(a){for(var b,c="",d=[],e=0,f=a.length;e<f;e++)b=a[e].queryLeftNewDTO,d=b.lishi.split(":"),c=0<$('#train_labels [value="'+b.station_train_code+'"]').length?c+'<li><a href="javascript:;" class="clearfix cur"':c+'<li><a href="javascript:;" class="clearfix"',c+=' data-traincode="'+b.station_train_code+'"><span class="pull_right">'+(d[0]&&"00"!=d[0]?parseInt(d[0])+"\u5c0f\u65f6":"")+(d[1]?
-parseInt(d[1])+"\u5206":"0\u5206")+'</span><span class="pull_left "><strong class="text_lg form_label text_left">'+b.station_train_code+"</strong>"+b.start_time+" - "+b.arrive_time+"</span></a></li>";$("#trainList").html(c)},getPassenger:function(){sessionStorage.getItem(Public.user+"_passenger")?Query.setPassengerList(JSON.parse(sessionStorage.getItem(Public.user+"_passenger"))):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)&&Query.setPassengerList(a.data.normal_passengers)}).fail(function(a,b){})},setPassengerList:function(a){for(var b="",c=0,d=a.length;c<d;c++)b+='<label class="query_checkbox"><input name="psg" type="checkbox" data-name="'+a[c].passenger_name+'" value="'+a[c].passenger_name+"$"+a[c].passenger_id_type_code+"$"+a[c].passenger_id_no+'">'+a[c].passenger_name+"</label>";$("#passengers").html(b);a=$("#query_form [name=filters]").val().split("&");Query.setFilter(a)},filterBind:function(){$("#train_filter").live("click",
-function(){Query.getTrains()});$("#trains_ok").live("click",function(){Public.showInnerPage("filter")});$("#trainList a").live("click",function(){var a=$(this).attr("data-traincode");$(this).hasClass("cur")?($('#train_labels [value="'+a+'"]').closest(".train_label").remove(),$(this).removeClass("cur")):($(this).addClass("cur"),$("#train_labels").append('<a href="javascript:;" class="train_label">'+a+'<input type="hidden" name="train" value="'+a+'"></a>'))});$("#train_labels .train_label").live("click",
-function(){$(this).remove()});$("#check_passenger").live("click",function(){Public.isLogin?Public.showInnerPage("passenger"):Public.confirm("\u767b\u9646\u540e\u53ef\u9009\u4e58\u8f66\u4eba",function(){window.location.href="login.html"},"\u767b\u9646")});$('#passengers [name="psg"]').live("change",function(){if(5<$('#passengers [name="psg"]:checked').length)Public.alert("\u8054\u7cfb\u4eba\u6700\u591a\u53ea\u80fd\u9009\u62e9\u4e94\u4e2a"),$(this).prop("checked",!1);else{var a=$(this).val(),b=$(this).attr("data-name");
-$(this).prop("checked")?$("#passenger_list").append('<a href="javascript:;" class="train_label">'+b+'<input type="hidden" name="passenger" value="'+a+'"></a>'):$('#passenger_list [name="passenger"][value="'+a+'"]').closest(".train_label").remove()}});$("#passenger_ok").live("click",function(){var a=$('#passenger_list [name="passenger"]');$('#passenger_form [name="psg"]').prop("checked",!1);a.each(function(a,c){$('#passenger_form [name="psg"][value="'+$(c).val()+'"]').prop("checked",!0)});Public.showInnerPage("filter")});
-$("#passenger_list .train_label").live("click",function(){var a=$("input",this).val();$(this).remove();$('#passengers [name="psg"][value="'+a+'"]').prop("checked",!1)})}};var RunQuery={goRefer:!1,init:function(){if(0==$("#runquery_page").length)return!1;var a=(new Date).addDays(19);Public.formatString="M\u6708d\u65e5";Public.setDate(a);Public.calendar.checkCallback=RunQuery.dateChangeCallback;Public.checkLogin(RunQuery.run,RunQuery.run,RunQuery.run);$("#filter_ok").on("click",function(){Public.hideInnerPage("filter");$("#query_form [name=filters]").val($("#filter_form").serialize());RunQuery.setFilterCond();RunQuery.hisUpdata();RunQuery.goRefer&&(RunQuery.goRefer=
+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=Public.getQueryData(window.location.search);"query"!=a.c&&Public.checkLogin(null,function(){Public.alert("\u8fd8\u672a\u767b\u5f55\uff0c\u8bf7\u767b\u9646\u540e\u67e5\u8be2",
+function(){location.href="login.html?t=submitorder"});return!1},null);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);a=Public.getQueryData(window.location.search);a.c&&"query"!=
+a.c&&Public.isLogin?Public.alert("\u8fd8\u672a\u767b\u5f55\uff0c\u8bf7\u767b\u9646\u540e\u67e5\u8be2",function(){location.href="login.html?t=submitorder"}):window.location.href="run_query.html";return!1});$("#login").on("click",function(){"loginout"==$(this).attr("data-fn")&&Public.confirm("\u786e\u5b9a\u9000\u51fa\u767b\u5f55\uff1f",function(){cn12306.loginOut(function(){setTimeout(function(){window.location.href="login.html"},1E3)})})});CheckStaion.init();Query.stationInt();Query.setHisQuery();
+Query.filterBind();$("#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=6<a.length?6: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)if(b=
+$("#query_form [name="+c+"]"),1<b.length)$('#query_form [name="'+c+'"][value="'+a[c]+'"]').prop("checked",!0);else if(b.val(a[c]),"startname"==c)$("#startStation").html(a[c]);else if("endname"==c)$("#endStation").html(a[c]);else if("start_date"==c){b=new Date(a[c].replace(/\-/g,"/"));var d=(new Date).date;b.getTime()>=d.getTime()&&b.getTime()<=d.addDays(19).getTime()&&($("#start_date").html(b.format("yyyy\u5e74M\u6708d\u65e5")+" "+b.day(3)),$("#start_date_val").html(b.format("yyyy-MM-dd")),Public.calendar.setCurDate(b),
+Public.setDate(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('<a href="javascript:;" class="train_label">'+b[1]+'<input type="hidden" name="train" value="'+b[1]+'"></a>'):"passenger"==b[0]&&($('#passenger_form [name="psg"][value="'+b[1]+'"]').prop("checked",!0),$("#filter_form #passenger_list").append('<a href="javascript:;" class="train_label">'+b[1].split("$")[0]+'<input type="hidden" name="passenger" value="'+
+b[1]+'"></span></a>'));sessionStorage.getItem(Public.user+"_passenger")?(Query.passengerList=JSON.parse(sessionStorage.getItem(Public.user+"_passenger")),Query.passengerObj=JSON.parse(sessionStorage.getItem(Public.user+"_passengerobj"))):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)&&Query.formatPassenger(a.data.normal_passengers)}).fail(function(a,b){})},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]));Query.passengerList=b;Query.passengerObj=c;sessionStorage.setItem(Public.user+"_passenger",JSON.stringify(b));sessionStorage.setItem(Public.user+"_passengerobj",JSON.stringify(c))},hasLogin:function(){$("#login").attr("href","javascript:;").attr("data-fn","loginout").html("\u9000\u51fa");$("#menu_btn .icon_user").addClass("icon_user2");
+Query.setHisQuery();Query.getPassenger()},noLogin:function(){var a=Public.getQueryData(window.location.search);a.cond&&"login"==a.cond&&(history.replaceState(null,null,WIN.location.href.split("?")[0]),Public.confirm("\u4f60\u8fd8\u672a\u767b\u5f55\uff0c\u662f\u5426\u767b\u9646\uff1f",function(){location.href="login.html"}));$("#login").attr("href","/12306/login.html").attr("data-fn","login").html("\u767b\u5f55");$("#menu_btn .icon_user").removeClass("icon_user2");Query.setHisQuery()},stationInt:function(){$("#startStation").on("click",
+function(){CheckStaion.callback=Query.startCallback;CheckStaion.cancelCallback=Query.cancelCallback;CheckStaion.show();$("#wrap").hide()});$("#endStation").on("click",function(){CheckStaion.callback=Query.endCallback;CheckStaion.cancelCallback=Query.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")})},startCallback:function(a,b){$("#startStation").html(a);$("#startStationName").val(a);$("#startStationCode").val(b);CheckStaion.hide();$("#wrap").show()},endCallback:function(a,b){$("#endStation").html(a);$("#endStationName").val(a);$("#endStationCode").val(b);CheckStaion.hide();$("#wrap").show()},
+cancelCallback:function(){$("#wrap").show()},trainsHis:{},getTrains:function(){if(""==$("#startStationCode").val()||""==$("#endStationCode").val())Public.alert("\u8bf7\u9009\u62e9\u53d1\u5230\u8fbe\u7ad9");else{var a="ADULT";"2"==$("#query_form [name=type]").val()&&(a="0X00");var b=Public.showLoading("\u6b63\u5728\u83b7\u53d6\u8f66\u6b21"),c=$("#start_date_val").val(),d=$("#startStationCode").val(),e=$("#endStationCode").val(),f=d+e+c+a,a={"leftTicketDTO.train_date":c,"leftTicketDTO.from_station":d,
+"leftTicketDTO.to_station":e,purpose_codes:a};Query.trainsHis[f]&&(Query.setTrains(Query.trainsHis[f]),Public.showInnerPage("trains_box"));cn12306.queryTicket(a,function(a){!0==a.status&&200==a.httpstatus&&0<a.data.length&&(Query.trainsHis[f]=a.data,Query.setTrains(a.data),Public.showInnerPage("trains_box"));Public.hideLoading(b)},function(a,c){Public.hideLoading(b)})}},setTrains:function(a){for(var b,c="",d=[],e=0,f=a.length;e<f;e++)b=a[e].queryLeftNewDTO,d=b.lishi.split(":"),c=0<$('#train_labels [value="'+
+b.station_train_code+'"]').length?c+'<li><a href="javascript:;" class="clearfix cur"':c+'<li><a href="javascript:;" class="clearfix"',c+=' data-traincode="'+b.station_train_code+'"><span class="pull_right">'+(d[0]&&"00"!=d[0]?parseInt(d[0])+"\u5c0f\u65f6":"")+(d[1]?parseInt(d[1])+"\u5206":"0\u5206")+'</span><span class="pull_left "><strong class="text_lg form_label text_left">'+b.station_train_code+"</strong>"+b.start_time+" - "+b.arrive_time+"</span></a></li>";$("#trainList").html(c)},getPassenger:function(){sessionStorage.getItem(Public.user+
+"_passenger")?Query.setPassengerList(JSON.parse(sessionStorage.getItem(Public.user+"_passenger"))):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)&&Query.setPassengerList(a.data.normal_passengers)}).fail(function(a,b){})},setPassengerList:function(a){for(var b="",c=0,d=a.length;c<d;c++)b+='<label class="query_checkbox"><input name="psg" type="checkbox" data-name="'+
+a[c].passenger_name+'" value="'+a[c].passenger_name+"$"+a[c].passenger_id_type_code+"$"+a[c].passenger_id_no+'">'+a[c].passenger_name+"</label>";$("#passengers").html(b);a=$("#query_form [name=filters]").val().split("&");Query.setFilter(a)},filterBind:function(){$("#train_filter").live("click",function(){Query.getTrains()});$("#trains_ok").live("click",function(){Public.showInnerPage("filter")});$("#trainList a").live("click",function(){var a=$(this).attr("data-traincode");$(this).hasClass("cur")?
+($('#train_labels [value="'+a+'"]').closest(".train_label").remove(),$(this).removeClass("cur")):($(this).addClass("cur"),$("#train_labels").append('<a href="javascript:;" class="train_label">'+a+'<input type="hidden" name="train" value="'+a+'"></a>'))});$("#train_labels .train_label").live("click",function(){$(this).remove()});$("#check_passenger").live("click",function(){Public.isLogin?Public.showInnerPage("passenger"):Public.confirm("\u767b\u9646\u540e\u53ef\u9009\u4e58\u8f66\u4eba",function(){window.location.href=
+"login.html"},"\u767b\u9646")});$('#passengers [name="psg"]').live("change",function(){if(5<$('#passengers [name="psg"]:checked').length)Public.alert("\u8054\u7cfb\u4eba\u6700\u591a\u53ea\u80fd\u9009\u62e9\u4e94\u4e2a"),$(this).prop("checked",!1);else{var a=$(this).val(),b=$(this).attr("data-name");$(this).prop("checked")?$("#passenger_list").append('<a href="javascript:;" class="train_label">'+b+'<input type="hidden" name="passenger" value="'+a+'"></a>'):$('#passenger_list [name="passenger"][value="'+
+a+'"]').closest(".train_label").remove()}});$("#passenger_ok").live("click",function(){var a=$('#passenger_list [name="passenger"]');$('#passenger_form [name="psg"]').prop("checked",!1);a.each(function(a,c){$('#passenger_form [name="psg"][value="'+$(c).val()+'"]').prop("checked",!0)});Public.showInnerPage("filter")});$("#passenger_list .train_label").live("click",function(){var a=$("input",this).val();$(this).remove();$('#passengers [name="psg"][value="'+a+'"]').prop("checked",!1)})}};var RunQuery={goRefer:!1,init:function(){if(0==$("#runquery_page").length)return!1;var a=(new Date).addDays(19);Public.formatString="M\u6708d\u65e5";Public.setDate(a);Public.calendar.checkCallback=RunQuery.dateChangeCallback;Public.checkLogin(RunQuery.run,RunQuery.run,RunQuery.run);$("#filter_ok").on("click",function(){Public.hideInnerPage("filter");$("#query_form [name=filters]").val($("#filter_form").serialize());RunQuery.setFilterCond();RunQuery.hisUpdata();RunQuery.goRefer&&(RunQuery.goRefer=
 !1,RunQuery.startRef())});$("#check_left,#check_right").on("click",function(){RunQuery.hisUpdata()});$("#filter_cancel").on("click",function(){Public.hideInnerPage("filter");var a=$("#query_form [name=filters]").val().split("&");Query.setFilter(a);RunQuery.goRefer&&(RunQuery.goRefer=!1,RunQuery.startRef())});$("#filter_btn").on("click",function(){Public.showInnerPage("filter")});$("#filter_cancel").on("click",function(){Public.hideInnerPage()});$('[data-fn="buy"]').live("click",function(){var a=$(this).attr("data-traincode"),
 c=$(this).attr("data-seatcode");"0"==c&&0<$('[data-traincode="'+a+'"][data-seatcode="'+c+'"]').length&&(c="1");sessionStorage.setItem(Public.user+"curBuy",JSON.stringify(RunQuery.trainData.trainMap[a]));sessionStorage.setItem(Public.user+"curBuySeat",c);Public.isLogin?location.href="perfect.html":Public.alert("\u8fd8\u672a\u767b\u5f55\uff0c\u8bf7\u767b\u9646\u540e\u8d2d\u7968",function(){location.href="login.html?t=submitorder"})});$("#autoTipBtn").live("click",function(){Public.isLogin?(RunQuery.goRefer=
 !0,Public.showInnerPage("filter")):window.location.href="login.html?t=autorefer"});$("#refresh_end").live("click",function(){RunQuery.refStop()})},run:function(){Query.getPassenger();RunQuery.getQueryData();if(!RunQuery.curData)return window.location.href="index.html",!1;RunQuery.setFilter();console.log(93);RunQuery.queryTicket();Query.filterBind()},curData:null,getQueryData:function(){if(Public.his.queryObjs[Public.his.querys[0][0]]){RunQuery.curData=Public.his.queryObjs[Public.his.querys[0][0]];
diff --git a/Mobile12306New/js/query.js b/Mobile12306New/js/query.js
index ddb43b7..ceb43d8 100644
--- a/Mobile12306New/js/query.js
+++ b/Mobile12306New/js/query.js
@@ -41,12 +41,22 @@ var Query = {
 		$('#query_form [name=filters]').val($('#filter_form').serialize());
 
 		$('#query_form').on('submit', function() {
-
+		
+		
+			var fixedUrl = Public.getQueryData(window.location.search);
+		
+			if(fixedUrl.c != 'query'){
+				Public.checkLogin(null, function(){
+					Public.alert('还未登录，请登陆后查询', function() {
+						location.href = 'login.html?t=submitorder';
+					});
+					return false;
+				}, null);
+			}
 
 			var start = $('#startStationCode').val(),
 				end = $('#endStationCode').val();
 
-
 			if (start == '') {
 				Public.alert('请选择出发站');
 				return false;