iFish/Light12306
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://10.33.41.6:8080/scm/git/12306

Browse Source
This commit is contained in:
SilenceLeo 2014-09-03 16:24:24 +08:00
commit 20417bc282
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mobile12306New/css/css.css
View File

@ -98,7 +98,7 @@ input[type=radio]:checked:after{content:''; display:block; width:12px; height:12
.h_t{font-size:1.0625rem;}
.h_l a{padding-right:1.2rem;text-align: left;}
.h_r a{padding-left:1.2rem;text-align: right;}
.h_l a.logo{ display:block;width:121px; height:25px; overflow:hidden; background:url(../images/logo.png) no-repeat; background-size:cover; margin:10px 0 0;padding:0;}
.h_l a.logo{ display:block;width:122px; height:26px; overflow:hidden; background:url(../images/logo.png) no-repeat; background-size:122px 26px; margin:10px 0 0;padding:0;}
.h_r_text{ padding:5px 0; text-align:right; line-height:16px;}
.header .icon_back{margin-left:-15px;}
.header a{color:#FFF; font-size:0.875rem;display: block;}

BIN
Mobile12306New/images/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

14
Mobile12306New/js/js.min.js vendored
View File

@ -258,13 +258,13 @@ a[c].ispush&&(b=a[c].fromCode+a[c].toCode+a[c].date,MyRemind.remindObj[b]||(MyRe
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"),
c=$(this).closest("li");Public.confirm("\u786e\u5b9a\u53d6\u6d88\u6b64\u8ba2\u5355\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?OrderList.setHtml():Public.alert("\u4e00\u4e2a\u6708\u5185\u6682\u65e0\u8ba2\u5355");else Public.confirm("\u83b7\u53d6\u8ba2\u5355\u5217\u8868\u5931\u8d25,\u662f\u5426\u91cd\u65b0\u83b7\u53d6\uff1f",
function(){OrderList.getNoComOrder()})}).fail(function(a,c){Public.hideLoading();Public.confirm("\u83b7\u53d6\u8ba2\u5355\u5217\u8868\u5931\u8d25,\u662f\u5426\u91cd\u65b0\u83b7\u53d6\uff1f",function(){OrderList.getNoComOrder()})})},setHtml:function(){if(0!=OrderList.hisList.length){for(var a="",b=OrderList.hisList,c=[],c=[],d=0;d<b.length;d++){for(var c=b[d].start_train_date_page.split(" "),a=a+"<li>",a=a+'<div class="order_info">',a=a+('<div class="text_gray clearfix"><span class="pull_right">'+
b[d].order_date.split(" ")[0]+"</span>\u8ba2\u5355\u53f7\uff1a"+b[d].sequence_no+"</div>"),a=a+('<div class="clearfix"><span class="pull_right">'+b[d].train_code_page+"</span>"+c[0]+" "+(new Date(b[d].order_date.replace(/\-/gi,"/"))).day(3)+" "+c[1]+"\u5f00</div>"),a=a+('<div class="order_ticket">'+b[d].from_station_name_page[0]+" \u2192 "+b[d].to_station_name_page[0]+"</div>"),c=b[d].tickets,e=0;e<c.length;e++)a+="<div>","a"!=c[e].ticket_status_code&&(a="c"!=c[e].ticket_status_code?a+('<span class="pull_right">'+
c[e].ticket_status_name+"</span>"):a+'<span class="pull_right">\u5df2\u9000\u7968</span>'),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+="</div>";a+="</div>";a+='<div class="order_fn clearfix"><span class="pull_right">';"Y"==b[d].cancel_flag&&(a+='<a href="#" class="btn btn_gray btn_m" data-cancelno="'+b[d].sequence_no+'">\u53d6\u6d88\u8ba2\u5355</a>');"Y"==b[d].pay_flag&&(a+='<a href="javascript:;" class="btn btn_success btn_m" data-no="'+
b[d].sequence_no+'">\u7acb\u5373\u652f\u4ed8</a>');"Y"!=b[d].pay_flag&&"Y"!=b[d].cancel_flag&&(a+='<span class="delivered"></span>');a+="</span>"+b[d].ticket_total_price_page+"\u5143</div>";a+="</li>"}$(".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<e;)f=b[g]<<16|b[g+1]<<8|b[g+2],d.push(a[f>>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<e;)f=b[a[g]]<<
c=$(this).closest("li");Public.confirm("\u53d6\u6d883\u6b21\u8ba2\u5355\u540e\uff0c\u5f53\u524d\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?
OrderList.setHtml():Public.alert("\u4e00\u4e2a\u6708\u5185\u6682\u65e0\u8ba2\u5355");else Public.confirm("\u83b7\u53d6\u8ba2\u5355\u5217\u8868\u5931\u8d25,\u662f\u5426\u91cd\u65b0\u83b7\u53d6\uff1f",function(){OrderList.getNoComOrder()})}).fail(function(a,c){Public.hideLoading();Public.confirm("\u83b7\u53d6\u8ba2\u5355\u5217\u8868\u5931\u8d25,\u662f\u5426\u91cd\u65b0\u83b7\u53d6\uff1f",function(){OrderList.getNoComOrder()})})},setHtml:function(){if(0!=OrderList.hisList.length){for(var a="",b=OrderList.hisList,
c=[],c=[],d=0;d<b.length;d++){for(var c=b[d].start_train_date_page.split(" "),a=a+"<li>",a=a+'<div class="order_info">',a=a+('<div class="text_gray clearfix"><span class="pull_right">'+b[d].order_date.split(" ")[0]+"</span>\u8ba2\u5355\u53f7\uff1a"+b[d].sequence_no+"</div>"),a=a+('<div class="clearfix"><span class="pull_right">'+b[d].train_code_page+"</span>"+c[0]+" "+(new Date(b[d].order_date.replace(/\-/gi,"/"))).day(3)+" "+c[1]+"\u5f00</div>"),a=a+('<div class="order_ticket">'+b[d].from_station_name_page[0]+
" \u2192 "+b[d].to_station_name_page[0]+"</div>"),c=b[d].tickets,e=0;e<c.length;e++)a+="<div>","a"!=c[e].ticket_status_code&&(a="c"!=c[e].ticket_status_code?a+('<span class="pull_right">'+c[e].ticket_status_name+"</span>"):a+'<span class="pull_right">\u5df2\u9000\u7968</span>'),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+="</div>";a+="</div>";a+='<div class="order_fn clearfix"><span class="pull_right">';"Y"==b[d].cancel_flag&&
(a+='<a href="#" class="btn btn_gray btn_m" data-cancelno="'+b[d].sequence_no+'">\u53d6\u6d88\u8ba2\u5355</a>');"Y"==b[d].pay_flag&&(a+='<a href="javascript:;" class="btn btn_success btn_m" data-no="'+b[d].sequence_no+'">\u7acb\u5373\u652f\u4ed8</a>');"Y"!=b[d].pay_flag&&"Y"!=b[d].cancel_flag&&(a+='<span class="delivered"></span>');a+="</span>"+b[d].ticket_total_price_page+"\u5143</div>";a+="</li>"}$(".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<e;)f=b[g]<<16|b[g+1]<<8|b[g+2],d.push(a[f>>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<e;)f=b[a[g]]<<
18|b[a[g+1]]<<12|b[a[g+2]]<<6|b[a[g+3]],d.push(f>>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<b;f++)e.push(a.getUint8(f));return base64.encode(e)},toObjectUrl:function(a,b){return"data:"+b+";base64,"+a}}}(),bootStrap=function(){var a=$.Deferred(),b="undefined"!==typeof __TicketJavaScriptObject__,c="undefined"!=typeof window.__ksticket||"undefined"!=typeof window.__gChrome,d="undefined"!=typeof window.__ksticket||
"undefined"!==typeof window.liebaoExtentions,e=window.__TicketJavaScriptObject__||window.__ksticket,f=document.body.dataset.mobileSupportInitialized||!1;Object.defineProperties(a,{isAndroid:{get:function(){return isAndLiebao}},isIos:{get:function(){return c}},isIosOld:{get:function(){return!d}},device_info:{get:function(){return e?e.get_device_info():null}}});a.open_url=function(a){e?e.open_url(a):window.open(a)};a.refresh_start=function(){[].slice.call(arguments);e&&e.refresh_start()};a.refresh_end=
function(){[].slice.call(arguments);e&&e.refresh_end()};a.refresh_success=function(){[].slice.call(arguments);e?e.refresh_success():window.liebaoExtentions&&window.liebaoExtentions.vibrate?window.liebaoExtentions.vibrate(5E3):window.__gChrome&&window.__gChrome.hasTicket&&window.__gChrome.hasTicket("\u5237\u7968\u6210\u529f\uff0c\u8bf7\u5c3d\u5feb\u8ba2\u7968","")};var g={},n=0,m=function(){return{getUrl:function(a){return":"===a[4]||":"===a[5]?a:"https://kyfw.12306.cn/otn/"+a},getHeaders:function(a,

2
Mobile12306New/js/order_list.js
View File

@ -23,7 +23,7 @@ var OrderList = {
$('[data-cancelno]').live('click', function(events) {
var no = $(this).attr('data-cancelno'),
$_box = $(this).closest('li');
Public.confirm('确定取消此订单？', function() {
Public.confirm('取消3次订单后，当前不可再订票，确定要取消订单吗？', function() {
NoComplete.cancelOrder(no, function() {
$_box.remove();
});