diff --git a/Mobile12306New/css/css.css b/Mobile12306New/css/css.css index 8650d73..b71c4e9 100644 --- a/Mobile12306New/css/css.css +++ b/Mobile12306New/css/css.css @@ -120,11 +120,11 @@ input[type=radio]:checked:after{content:''; display:block; width:12px; height:12 .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:active{background: #fa7a13;box-shadow: 0 1px 0px #fa6f13} .btn_block{display:block; width:100%; } .btn_lg{height:45px; line-height:45px;} .btn_m{height:30px; line-height:30px; font-size:0.75rem;} .btn_success{background:#fa8c13;} +.btn_success:active{background: #fa7a13;box-shadow: 0 1px 0px #fa6f13} .btn_gray{background:#b5b5b5;} .box{padding:10px 15px;} diff --git a/Mobile12306New/js/js.min.js b/Mobile12306New/js/js.min.js index 51c95e3..d7d6d86 100644 --- a/Mobile12306New/js/js.min.js +++ b/Mobile12306New/js/js.min.js @@ -215,17 +215,17 @@ $(this).prop("checked",!1),!1;var a=$(this),b=a.val();a.prop("checked")?OrderSub 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'+c.passenger_name+'\u513f\u7ae5\u7968
'+c.passenger_id_no+'
\t\t\t\t\t\t\t\t'+d.name;0'+b.count+' \u5f20'+b.name+'',0";$("#edit_seat ul").html(a);$("#edit_seat").show();OrderSubmit.showLayer()},setTicket:function(){for(var a=Util.getAvailableTicketType(OrderSubmit.passengerObj[OrderSubmit.editKey]),b="",c=0,d=a.length;c'+ -a[c].name+"";$("#edit_ticket ul").html(b);$("#edit_ticket").show();OrderSubmit.showLayer()},submitData:null,submit:function(a,b,c){var d=[],e=[];c=c?"0X00":"ADULT";a.forEach(function(a){d.push(a.seat+",1,"+a.passenger_type+","+a.passenger_name+","+a.passenger_id_type_code+","+a.passenger_id_no+","+a.mobile_no+","+(b.resign?"Y":"N"));"2"===a.passenger_type?e.push(" "):e.push(a.passenger_name+","+a.passenger_id_type_code+","+a.passenger_id_no+","+a.passenger_type)});d=d.join("_");e=e.join("_")+ -"_";OrderSubmit.submitData={secretStr:b.secureStr,train_date:b.date,train_date_full:(new Date(b.date)).toString(),train_no:b.id,tour_flag:b.resign?"gc":"dc",purpose_codes:c,query_from_station_name:b.from.name,fromStationTelecode:b.from.code,query_to_station_name:b.to.name,toStationTelecode:b.to.code,stationTrainCode:b.code,seatType:a[0].seat,cancel_flag:2,bed_level_order_num:"000000000000000000000000000000",_json_att:"",passengerTicketStr:d,oldPassengerStr:e};OrderSubmit.loading=Public.showLoading("\u6b63\u5728\u63d0\u4ea4\u8ba2\u5355"); -cn12306.queryTicket({"leftTicketDTO.train_date":OrderSubmit.curData.form_train_date,"leftTicketDTO.from_station":OrderSubmit.curData.from.code,"leftTicketDTO.to_station":OrderSubmit.curData.to.code,purpose_codes:OrderSubmit.submitData.purpose_codes},function(a){if(!0==a.status&&200==a.httpstatus&&0'+b.count+' \u5f20'+b.name+'',0";$("#edit_seat ul").html(a);$("#edit_seat").show();OrderSubmit.showLayer()},setTicket:function(){for(var a=Util.getAvailableTicketType(OrderSubmit.passengerObj[OrderSubmit.editKey]), +b="",c=0,d=a.length;c'+a[c].name+"";$("#edit_ticket ul").html(b);$("#edit_ticket").show();OrderSubmit.showLayer()},submitData:null,submit:function(a,b,c){var d=[],e=[];c=c?"0X00":"ADULT";a.forEach(function(a){d.push(a.seat+",1,"+a.passenger_type+","+a.passenger_name+","+a.passenger_id_type_code+","+a.passenger_id_no+","+a.mobile_no+","+(b.resign?"Y":"N"));"2"===a.passenger_type?e.push(" "):e.push(a.passenger_name+","+a.passenger_id_type_code+ +","+a.passenger_id_no+","+a.passenger_type)});d=d.join("_");e=e.join("_")+"_";OrderSubmit.submitData={secretStr:b.secureStr,train_date:b.date,train_date_full:(new Date(b.date)).toString(),train_no:b.id,tour_flag:b.resign?"gc":"dc",purpose_codes:c,query_from_station_name:b.from.name,fromStationTelecode:b.from.code,query_to_station_name:b.to.name,toStationTelecode:b.to.code,stationTrainCode:b.code,seatType:a[0].seat,cancel_flag:2,bed_level_order_num:"000000000000000000000000000000",_json_att:"",passengerTicketStr:d, +oldPassengerStr:e};OrderSubmit.loading=Public.showLoading("\u6b63\u5728\u63d0\u4ea4\u8ba2\u5355");cn12306.queryTicket({"leftTicketDTO.train_date":OrderSubmit.curData.form_train_date,"leftTicketDTO.from_station":OrderSubmit.curData.from.code,"leftTicketDTO.to_station":OrderSubmit.curData.to.code,purpose_codes:OrderSubmit.submitData.purpose_codes},function(a){if(!0==a.status&&200==a.httpstatus&&0b?1:-1});for(c=0;c",a+='
\u8d77\u552e\u65f6\u95f4\uff1a'+c+" "+b.format_time_list.join("\u3001")+"
",a+="";$("#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;$("#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()});$("#remind_btn").on("click",function(a){a="remind.html?";var b=$("#startStationCode").val(),c=$("#endStationCode").val();$("#start_date_val").val();b&&(a+= "&from="+b);c&&(a+="&to="+c);location.href=a});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"),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?t=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=a+'
',a=a+('
'+b[d].order_date.split(" ")[0]+"\u8ba2\u5355\u53f7\uff1a"+b[d].sequence_no+ -"
"),a=a+('
'+b[d].train_code_page+""+c[0]+" "+(new Date(b[d].start_train_date_page.replace(/\-/gi,"/"))).day(3)+" "+c[1]+"\u5f00
"),a=a+('
'+b[d].from_station_name_page[0]+" \u2192 "+b[d].to_station_name_page[0]+"
"),c=b[d].tickets,e=0;e","a"!=c[e].ticket_status_code&&(a="c"!=c[e].ticket_status_code?a+(''+c[e].ticket_status_name+""):a+'\u5df2\u9000\u7968'), -a+=c[e].passengerDTO.passenger_name+" "+c[e].ticket_type_name+" "+c[e].seat_type_name+" "+c[e].coach_name+"\u8f66"+c[e].seat_name,a+="
";a+="";a+='
';"Y"==b[d].cancel_flag&&(a+='\u53d6\u6d88\u8ba2\u5355');"Y"==b[d].pay_flag&&(a+='\u7acb\u5373\u652f\u4ed8');"Y"!=b[d].pay_flag&& -"Y"!=b[d].cancel_flag&&(a+='');a+=""+b[d].ticket_total_price_page+"\u5143
";a+=""}$(".order_list").html(a);NoComplete.getToken()}}};var base64=base64||function(){var a="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split(""),b=!function(){var b={};$.each(a,function(a,e){b[e]=a});return b}();return{encode:function(b){for(var d=[],e=b.length,f,g=0;g>18],a[f>>12&63],a[f>>6&63],a[f&63]),g+=3;1==e%3?(d.pop(),d.pop(),d.push("=","=")):(d.pop(),d.push("="));return d.join("")},decode:function(a){var d=[];a=a.split("");var e=a.length,f,g=0;if(e%4)return null;for(;g",a=a+'
',a=a+('
'+ +b[d].order_date.split(" ")[0]+"\u8ba2\u5355\u53f7\uff1a"+b[d].sequence_no+"
"),a=a+('
'+b[d].train_code_page+""+c[0]+" "+(new Date(b[d].start_train_date_page.replace(/\-/gi,"/"))).day(3)+" "+c[1]+"\u5f00
"),a=a+('
'+b[d].from_station_name_page[0]+" \u2192 "+b[d].to_station_name_page[0]+"
"),c=b[d].tickets,e=0;e","a"!=c[e].ticket_status_code&&(a="c"!=c[e].ticket_status_code?a+ +(''+c[e].ticket_status_name+""):a+'\u5df2\u9000\u7968'),a+=c[e].passengerDTO.passenger_name+" "+c[e].ticket_type_name+" "+c[e].seat_type_name+" "+c[e].coach_name+"\u8f66"+c[e].seat_name,a+="
";a+="";a+='
';"Y"==b[d].cancel_flag&&(a+='\u53d6\u6d88\u8ba2\u5355');"Y"==b[d].pay_flag&&(a+='\u7acb\u5373\u652f\u4ed8');"Y"!=b[d].pay_flag&&"Y"!=b[d].cancel_flag&&(a+='');a+=""+b[d].ticket_total_price_page+"\u5143
";a+=""}$(".order_list").html(a);NoComplete.getToken()}}};var base64=base64||function(){var a="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split(""),b=!function(){var b={};$.each(a,function(a,e){b[e]=a});return b}();return{encode:function(b){for(var d=[],e=b.length,f,g=0;g>18],a[f>>12&63],a[f>>6&63],a[f&63]),g+=3;1==e%3?(d.pop(),d.pop(),d.push("=","=")):(d.pop(),d.push("="));return d.join("")},decode:function(a){var d=[];a=a.split("");var e=a.length,f,g=0;if(e%4)return null;for(;g>16,f>>8&255,f&255),g+=4;for(;"="==a[--e];)d.pop();return d},encodeArrayBuffer:function(a){a=new DataView(a);for(var b=a.byteLength,e=[],f=0;f 0) { if(NoComplete.loadNum < 2){ Public.showLoading('正在获取订单信息'); diff --git a/Mobile12306New/js/order_list.js b/Mobile12306New/js/order_list.js index d93cc6c..cc62a6a 100644 --- a/Mobile12306New/js/order_list.js +++ b/Mobile12306New/js/order_list.js @@ -76,15 +76,18 @@ var OrderList = { hisList: [], getNoComOrder: function() { bootStrap.get("queryOrder/queryMyOrderNoComplete", "json", null, "queryOrder/initNoComplete").done(function(json) { + Public.hideLoading(); if (!!json['status'] && !!json['data'] && !!json['data']['orderDBList'] && json['data']['orderDBList'].length > 0) { OrderList.hisList = json['data']['orderDBList']; } OrderList.getOrder(); }).fail(function(xhr, type) { + Public.hideLoading(); OrderList.getOrder(); }); }, getOrder: function() { + Public.showLoading('正在获取订单列表'); var data = { 'queryType': 1, 'queryStartDate': (new Date()).addDays(-90).format('yyyy-MM-dd'), diff --git a/Mobile12306New/js/prdersubmit.js b/Mobile12306New/js/prdersubmit.js index 2d7404b..4adaff3 100644 --- a/Mobile12306New/js/prdersubmit.js +++ b/Mobile12306New/js/prdersubmit.js @@ -243,6 +243,9 @@ var OrderSubmit = { var type = OrderSubmit.editEl.attr('data-type'); if (type == '2') { OrderSubmit.editEl.remove(); + if($('#passenger_list [data-key="' + OrderSubmit['editKey'] + '"]').length == 0){ + $('#passengers [value="' + OrderSubmit['editKey'] + '"]').prop('checked', false); + } } else { $('#passenger_list [data-key="' + OrderSubmit['editKey'] + '"]').remove(); $('#passengers [value="' + OrderSubmit['editKey'] + '"]').prop('checked', false);