From 6bf46bdd39ce41c2085df3c94a4b776430b5c9e0 Mon Sep 17 00:00:00 2001 From: iFish Date: Wed, 3 Sep 2014 23:20:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RwTicketAssistantV2/app/air/js/init.js | 6 ++ RwTicketAssistantV2/app/air/popup.html | 3 +- RwTicketAssistantV2/app/background.js | 20 ++++-- .../app/contentscripts/kyfw/12306.js | 32 +++++++--- .../app/infobar/scripts/main.js | 47 +++++++++++--- Web12306/Web12306.csproj | 2 + Web12306/css/base.css | 4 +- Web12306/css/index.css | 59 ++++++++++++++++++ Web12306/css/ui/index-search-base.css | 8 ++- Web12306/images/hand.png | Bin 0 -> 27839 bytes Web12306/images/wxqr.png | Bin 0 -> 31908 bytes Web12306/index.html | 24 +++++-- Web12306/js/account/sessionMgr.js | 3 +- Web12306/js/otn/orderprocess.js | 10 ++- Web12306/js/otn/queryticket.js | 6 +- Web12306/js/otn/trainfilter.js | 37 ++++++++++- Web12306/js/otn/trainstationsuggest.js | 8 ++- Web12306/js/ui/chat/roomsession.js | 4 +- Web12306/js/ui/index.js | 32 +++++++++- Web12306/js/ui/ui-autorefresh.js | 19 +++++- Web12306/js/ui/ui-dnsspeeding.js | 22 ++++--- Web12306/js/ui/ui-submit-order.js | 15 ++++- Web12306/js/ui/ui-trainlist.js | 27 +++++--- Web12306/js/ui/widget_modalDialog.js | 6 ++ Web12306/js/ui/widget_sell_notification.js | 24 ++++--- 25 files changed, 343 insertions(+), 75 deletions(-) create mode 100644 Web12306/images/hand.png create mode 100644 Web12306/images/wxqr.png diff --git a/RwTicketAssistantV2/app/air/js/init.js b/RwTicketAssistantV2/app/air/js/init.js index 9df0932..c9860a5 100644 --- a/RwTicketAssistantV2/app/air/js/init.js +++ b/RwTicketAssistantV2/app/air/js/init.js @@ -9,4 +9,10 @@ $(document).ready(function() { //} (new Gallery()).initShow('intro12306'); + + + //HACK 解决chrome34核中蛋疼的弹出层滚动条bug + setTimeout(function() { + $("div.wrap").css("height", "371px"); + }, 10); }); diff --git a/RwTicketAssistantV2/app/air/popup.html b/RwTicketAssistantV2/app/air/popup.html index b6de4b3..3986a53 100644 --- a/RwTicketAssistantV2/app/air/popup.html +++ b/RwTicketAssistantV2/app/air/popup.html @@ -1,4 +1,4 @@ -锘 +锘 @@ -6,6 +6,7 @@ +
diff --git a/RwTicketAssistantV2/app/background.js b/RwTicketAssistantV2/app/background.js index 7c2a25f..175d597 100644 --- a/RwTicketAssistantV2/app/background.js +++ b/RwTicketAssistantV2/app/background.js @@ -1005,11 +1005,12 @@ window.cbl = function (u, h) { } }); setInterval(function () { + entry12306 = false; chrome.tabs.query({ url: "*://*.12306.cn/otn*" }, function (a) { - entry12306 = a && a.length > 0; + entry12306 |= a && a.length > 0; }); chrome.tabs.query({ url: "*://12306.*/*" }, function (a) { - entry12306 = a && a.length > 0; + entry12306 |= a && a.length > 0; }); }, 20000); })(); @@ -1323,7 +1324,7 @@ window.cbl = function (u, h) { if (!m || !m.action) return; - if (m.action === "serverStateChange") + if (m.action === "serverStateChange" || m.action === "sysConfigUpdate") postMessageToPort(m); }); @@ -1444,6 +1445,7 @@ window.cbl = function (u, h) { var task = alarmData[btnId]; var data = task.data; + delete alarmData[btnId]; chrome.tabs.create({ active: true, @@ -1455,9 +1457,16 @@ window.cbl = function (u, h) { var checkForAlarm = function () { checkTimer = null; var hasChange = false; + var alarms = {}; while (tasks.length > 0 && tasks[0].time <= new Date().getTime()) { - (function (task) { + var task = tasks.shift(); + alarms[task.group] = task; + hasChange = true; + } + if (hasChange) { + alarms.forEach(function (task) { var id = "ALARM-" + task.data.fromCode + "-" + task.data.toCode + new Date().getTime(); + chrome.runtime.sendMessage({ action: "track", detail: { type: 132, values: [task.type || 0, task.point || 0] } }); chrome.notifications.create(id, { type: "basic", @@ -1475,8 +1484,7 @@ window.cbl = function (u, h) { chrome.notifications.clear(_id, function () { }); }, 10000); }); - })(tasks.shift()); - hasChange = true; + }); } if (tasks.length) diff --git a/RwTicketAssistantV2/app/contentscripts/kyfw/12306.js b/RwTicketAssistantV2/app/contentscripts/kyfw/12306.js index e5f3d92..e1c12d4 100644 --- a/RwTicketAssistantV2/app/contentscripts/kyfw/12306.js +++ b/RwTicketAssistantV2/app/contentscripts/kyfw/12306.js @@ -68,8 +68,26 @@ unsafeInvoke(function () { }; })(w.dhtmlx.modalbox.hide); q(document).ajaxComplete(function (e, xhr, d) { - if (d.url.indexOf("autoSubmitOrderRequest") != -1) - dispatchEventBody("autoSubmitOrder"); + if (d.url.indexOf("autoSubmitOrderRequest") != -1) { + if (!d.data) return; + var data = (function (arg) { + arg = arg.split('&'); + var target = {}; + arg.forEach(function (s) { + var x = s.split('='); + target[x[0]] = x[1]; + }); + return target; + })(d.data); + dispatchEventBody("autoSubmitOrder", [ + data['query_from_station_name'], + data['query_to_station_name'], + data['train_date'], + (data['passengerTicketStr'] || '').split('_').length - 1, + '', + data['purpose_codes'] + ]); + } if (d.url.indexOf("leftTicket/query") !== -1) dispatchEventBody("qr", { opt: { url: d.url, data: d.data, type: d.type }, text: xhr.responseText, headers: xhr.getAllResponseHeaders() }); }).ajaxSend(function (e, xhr, d) { @@ -202,9 +220,9 @@ $(document).on("routePage", function () { if (!detail) return; $doc.trigger(detail.action, [detail.detail]); }); - $(document).on("dispatch", function() { + $(document).on("dispatch", function () { document.dispatchEvent(new CustomEvent(evtTag, { detail: { action: arguments[1], detail: arguments[2] || null } })); - }).on("autoSubmitOrder", function() { + }).on("autoSubmitOrder", function () { msg.sendAction("autoSubmitOrder"); }); })(); @@ -1020,7 +1038,7 @@ function getCurrentStationInfo() { var auto; $(document).bind("performAutoSubmit", function (e, ex) { auto = ex; - if (!auto)return; + if (!auto) return; evalCode.eval("submitOrderRequest(\"" + auto.data.secureStr + "\", \"" + auto.data.from.time + "\");"); }); @@ -1274,12 +1292,12 @@ $(document).bind(EVT_ONSUBMITPAGE, function () { if (info.tour_flag != 'gc') { if (info.purpose_codes === "0X00" || hasStudent) { $("#show_more_passenger_id")[0].click(); - $.each(pas, function() { + $.each(pas, function () { $("input:checkbox[id^='normalPassenger_" + this.key + "']")[0].click(); }); } else { var needAdd = false; - $.each(pas, function() { + $.each(pas, function () { //if (this.save) { //鎵嬪姩鍔犵殑 if (needAdd) diff --git a/RwTicketAssistantV2/app/infobar/scripts/main.js b/RwTicketAssistantV2/app/infobar/scripts/main.js index 0e8d999..813614d 100644 --- a/RwTicketAssistantV2/app/infobar/scripts/main.js +++ b/RwTicketAssistantV2/app/infobar/scripts/main.js @@ -592,7 +592,7 @@ $(function () { currentUser.options = $.extend(currentUser.options, this); currentUser.save(); }); - message.addAction("setResignMode", function() { + message.addAction("setResignMode", function () { var p = this; if (p.profile) { @@ -626,7 +626,7 @@ $(function () { return valid; }; - var checkSfc = function(formText, toText) { + var checkSfc = function (formText, toText) { if (!enableSfc || manuallyHide) return false; return true; }; @@ -671,7 +671,7 @@ $(function () { //} }); - $("#bus a:last").click(function() { + $("#bus a:last").click(function () { manuallyHide = true; $(this).parent().hide(); }); @@ -821,7 +821,14 @@ $(function () { profile.fromText, profile.toCode, profile.toText, - profile.depDate + profile.depDate, + (profile.passengers && Passenger.length) || 0, + (profile.selectedTrain && profile.selectedTrain.length) || 0, + (profile.selectedSeatType && profile.selectedSeatType.length) || 0, + (profile.dateloop && profile.dateloop.length) || 0, + profile.autoSubmitEnabled, + profile.partialSubmitEnabled, + profile.studentTicket ] }); doQuery(); @@ -830,9 +837,23 @@ $(function () { if (!btn.hasClass("btn-primary")) btn.click(); - message.addAction("autoSubmitOrder", function() { + message.addAction("autoSubmitOrder", function () { + var profile = currentUser.currentProfile; message.sendAction("track", { - type: 96 + type: 86, values: [ + profile.fromCode, + profile.fromText, + profile.toCode, + profile.toText, + profile.depDate, + (profile.passengers && Passenger.length) || 0, + (profile.selectedTrain && profile.selectedTrain.length) || 0, + (profile.selectedSeatType && profile.selectedSeatType.length) || 0, + (profile.dateloop && profile.dateloop.length) || 0, + profile.autoSubmitEnabled, + profile.partialSubmitEnabled, + profile.studentTicket + ] }); }); @@ -973,8 +994,8 @@ $(function () { stat.from, stat.to, stat.date, + 0, stat.td, - stat.tcode, stat.code || "" ] }); @@ -1240,6 +1261,18 @@ $(function () { setInterval(refreshSpeed, 3000); } }); + message.addAction("serverStateChange", function (m) { + var state = m.state; + + if (state === 1) { + $("#curServerSpeed").html("姝ｅ湪鏇存柊鑺傜偣鍒楄〃..."); + } else if (state === 2) { + $("#curServerSpeed").html("姝ｅ湪涓烘偍娴嬮..."); + } else if (state === 3) { + $("#curServerSpeed").html("姝ｅ湪鍑嗗澶囩敤鑺傜偣..."); + + } + }); var refreshSysConfig = function () { diff --git a/Web12306/Web12306.csproj b/Web12306/Web12306.csproj index e22072a..d4a8ce7 100644 --- a/Web12306/Web12306.csproj +++ b/Web12306/Web12306.csproj @@ -166,6 +166,7 @@ + @@ -175,6 +176,7 @@ + diff --git a/Web12306/css/base.css b/Web12306/css/base.css index b71bbe6..17cd3e6 100644 --- a/Web12306/css/base.css +++ b/Web12306/css/base.css @@ -168,7 +168,7 @@ a:active { } .header-bar .user-nav li { - padding-top: 8px; + padding-top: 7px; width: 104px; height: 40px; text-align: center; @@ -211,7 +211,7 @@ a:active { border-radius: 5px; color: #f17206; background: #fff; - padding-bottom: 10px; + padding-bottom: 7px; } .header-bar .user-nav li a:hover div, diff --git a/Web12306/css/index.css b/Web12306/css/index.css index 142f38e..98fb1b3 100644 --- a/Web12306/css/index.css +++ b/Web12306/css/index.css @@ -55,3 +55,62 @@ #selltime_tip li:nth-child(1) { color: #ef7007; } + +#wx_sell_notification { + width: 370px; + position: relative; + height: 210px; + display: none; +} + + #wx_sell_notification .info { + top: 66px; + position: absolute; + } + + #wx_sell_notification .info .title { + color: #4c4c4c; + margin-bottom: 10px; + } + + #wx_sell_notification .info .title span { + color: #fe8924; + font-weight: bold; + } + + #wx_sell_notification .info .desc { + color: #4c4c4c; + } + + #wx_sell_notification .info .desc span { + background-color: #ff8000; + color: #fff; + padding: 5px; + border-radius: 5px; + } + + #wx_sell_notification img { + position: absolute; + top: 30px; + right: 0; + } + + #wx_sell_notification p.code { + position: absolute; + bottom: 0px; + left: 0; + } + + #wx_sell_notification p.code span { + color: red; + } + + #wx_sell_notification span.hand { + background: url(../images/hand.png) no-repeat left top; + width: 93px; + height: 120px; + position: absolute; + z-index: 100; + right: -56px; + bottom: -34px; + } diff --git a/Web12306/css/ui/index-search-base.css b/Web12306/css/ui/index-search-base.css index 2e296ee..11c626e 100644 --- a/Web12306/css/ui/index-search-base.css +++ b/Web12306/css/ui/index-search-base.css @@ -60,17 +60,19 @@ } .search-box .search-tips .order-tips { - display: inline-block; + display: block; cursor: pointer; + float: left; + margin-right: 20px; } .search-box .search-tips .net-tips { display: none; - float: left; + float: right; } #swDnsSpeeding { - float: left; + float: right; display: none; margin: 0 10px; } diff --git a/Web12306/images/hand.png b/Web12306/images/hand.png new file mode 100644 index 0000000000000000000000000000000000000000..5a9283f22518296cbfb3872993103afa6613140d GIT binary patch literal 27839 zcmeIbbyQr-7XR5;upq&My9RfcBuIde;BJjK7HHfFM34Z%f)kwJ(zu1-?ry=oahD;V8&>|ak9Kx{k#0DvNI{`BdqS7tU~8+$VwTXLDFPswfVY)s58 zjc?Qw2}(}t;m3F)v&Y65suE*6MbVZ%07|M{q&7^A6wJ>613yeGv1b1dD5^NPkK(0O zntX>*q!T{OC(~D$iU)kq3{=tP+a{aJgm}0@x3hexq?_7ny>(8i+Nh689L02C^f7@+_n002uDcL_?sH#ETJfs6PM;VZ1fUIHX{`YY_mBpVUJ! z#Pk8)F%nO@0OWkIfTyI`-Eib`aLH@~^>f*Jw*D2;Fo1^6$nI#_0ZyEX$UZ`+y`8yv ziup#%A_)V0222y=MauZ-I4W%E6*#$`hX4TKY5(^tKGD#X<;9=NCM%ZEgXWYg(2fnI z2*vK~RZS2qJOJ}$FLXk0X=wz`wiTw(p&pd21(;9;n9ZK*a84p8YoheIo(8(`U5Jq; zetp#@L_&;$in>K(__da8AyDL+^QX;Rpy$zz_iEC02k<6VEGDlZ_3h;w18c{8#ZN1p z@Dl9S$17A#Dc|Z+sTlT*qCIjRYt4&emn`ZMIot^i zko!)d;bj>jq|>s&a~lRW5M6!15g_Kd&m2UE8V0~L<>GKT1^~kAPea6*U;y3GX$t^A z%_@O*Rs_CW3laeEEZK*#P#p2$cbwb?^!V>2H4XT%1`nQzJ)~|B!jyQh=uM3Bl^{y| zv2ugJ7(Ap9jxhOA>`%R(2z+>C_-Tx? z2MIss6FjAXG}mYEH1f3%IIk(2+w9U{vn4FTbfl^FnC)=*gSExZLMPkEIRY*MYNXgB ze2QPg4Z%8yRc4V92DBvG_k+1GbiAWdK>dWJq{7~1DVhDUs}5j*N5ChbcRxG2Nzk}~ zcF_Ch`XAK^X2R`bzVnYqJ~5RC=xYnpf~m=lCB?Sqor?XsFb>#`qM0$ zO{!9?DkL@Jw|?x6bd=#)3Z*ozSf@?Sh5|*Q>XNy%+Z3b}i8Q)&=-7JU($whfpBG=E zP|$>O$e_xAq$j1B)0EOg1~ARzm+w1P^#37__9|V##Wvr4NU$H8^&&K9*h^6U{!+YA9 z#+*9b7i(^6er(3N2ChP$eoOj1x-WVFw2HX4viA1C=^@%Xw70F&hV+j?kKG<;5|lq? zjgiYh7>tf-Q)V0GAc`^lg7L*hMV;}8(H%Fe11nM>QZ>>ua^;({ioJ^Hu*)}8n93`v!eR}0z5LwGsE*(55}**y6@icX3luXKz z9scq77d;d`XgzMsaLl62MI#n@CV8HDyc4bybrXhLc3XH`8xv3m+XS(MCkclFRszQk z$W=U5udDp4CLMa$MFxQzE^Ek#9f#;^)BRG1RtKqv`0LOSXg?V*8y6B!=wnNEKHyGQ zC~y_@#k`__$M0v>qfWD`uqLzAewkFd3fk@WrVHH8_#!5`HpGUxTrrh~~)ZsF$RR7>i^?5G?3!2X^Rkw6v|+Nc+k4BfBa4 z$C{cck?B|agne%O4B605tZ2t*d?l;QfK2No*Urc#!tJU7$lzgWTy@-3-niA!beC|m zN6xuCOB_+V&JSUz_`%Mx`uv-&g@nww%*OrD6;@qGT@BsyT2h6Qc-q7fHmkPDCat;J zPB(o45nGV0|cpEAbE+O@quX+@=A4kLVQ0Ic54JwjZ|x zDFIiL=!~t4R*rP!(WiI4NVAxpHW{aKYh7hXALgViKU9#JKaRma^}u0Z5N z{04mdWF&V{3W`iFVUIso zQtivDJ{y_I?HzwJ&deVX9}%Cbh-MyD$~4MWPG7EI!o(Dgw&=2K)j<^gzTePOJ z64%mSu0OR@G5-}ho*Ziyld~3qmUD%4t+eJ4=d8)q`Y9EvFP?jCXyL1h!jiEHXN}!C z%KGQkcvOK(_)aYBI*L_B&gMG<9-U^L#Zi~9=G7Hd_AFec_C6`T9Y{}q%H*rY6`38; z-f5kGpjipTHHb7)fm%clYpHrM;z#P`+U92EpAlRT3uzilY3uz zQjc5{ymUHMFY|KB>&9s(M(U@X-1gDmlHdx?KqEG5AWY6`pxWmiht>nzzSALuhD25M z%bwE}QceoZi6L(3Ziq+Ep&J%p8_TJJ`ubvID@C4QQfUF(r8sY!iMXv;Cy1>kBYLCw z(s#Pq40pGMSF2xpeoX!7o{jM;KSbJ)c3~P2sCUR^PPIxF{#pxN4N6TQ(It_pE5G)H zvM&G~TDe2i5|b0?g?CREeZvxgF<>t3Z-MaB(Q zb0_)@`n^9iFretj?-Q>gt_R=$9FXdg8m5w@3JysiBO^j1tlcx}3ICZ{oQd7r;i-D< zvSFXIGJ83HF59bqF}8zx8rWN(?~=W52hGVY5NM@pC9COi5#G(X$m^N(fL1`OW?O5? zV(2f#u3qi;p8;Dl`xK5vR@|>HSdabo&uIpdH~|0w9CKxLu)4gQ0MN#Y#lXnM(3r*9 z%Jya(3IGU+I@=lmLB?QmLt|5OYhg-gbv-4yxsfoX8n--~yzNtCGjnNIJ7Xo+m&!m_ z5Rl)9Qd9&*$XVbffR!=WfZW;2(%N3YS(x&-xB@qye-*P*lK)l(3=*ak|J5M5y8J8h zr#5!R>L7Y`~vLUKumc)DcQm#JQ~jq- z7y<-*p$&ffUfQ7BCLufy=q_2tjy zUljgP`d7F9RQ@3||Mv;}-zfhc|8MgD-iDKzvGrXE|9hz4 zYW?>h_BJM9Cj&cUanqZe_`f*}e-HRi#qG#KtiRS|OY{E^=D^;-@&DZn{BMWQ|KDfe zuiOQi8CaVd8;P*~D{cQ(@V`yk?^F5Dm4T@-tF5)E z5bIxsf3+#}=UGVLsg0$LoxF{au?VLS>whZ#kE)wXYp;I4vL<4$C?!EI^ZY3fJ3kK( zGY1R%-^2W^-rwT2KS&-`0rVOK&!ZH~Ui7KR2fT zwtW1#!2X~7@Yj(3Pe#2J>%Ng&K<+m0aox@5miHdlEg*NB_qgunbIW^=>lTo^&3jyT z^SR}{$8`(H-R3>6yZPMm-s8FjdGB%E0&=%`kLzwex4iebZUMR5yvKDn zpIhF0T(^MSZQkR$o6jxpJ+50o?l$jn-OcBg_a4_RAa|ShxbEh2%X^RO7LdEmdt7(( zx#hjbbqmPd<~^>v`P}l}ux@`y!W_n0lC|}$8|TK zTi$zIw}9Mj-s8HP&n@pgu3JFvHt%uW&F7Z)9@i}(cboUP?&fpLdynfDkh{%$TzB)i z<-Nys3&`E(ow!i`y4BOz`sV&lr<)r&Io~a6+}s384wP1u2LN1Y008f|0Kn<>&HEYv z;J^j|tn1(0Kl%j#z_Zoh%E$;k3&Uw&vg`esXumzh=~3eeRZ+Rh8Wk2UDH-kB{G20{+-HAqP;=~2e|A+@ zpSu3h>rAV@S@qM8UXfNj4CFD(sWzwxW-CbVyu+auDta{o<*qxj?yqza!{~#-@y6WA zWoJnC#)GHmi@nr^!%c=K5Hs=$*WU_)IAQ_6A${!_#5dJ^f0QvL+3M)a;w`REK+rOw zgT#)s37AAoLCEcxi9-yK=s-^{S>vQkj)zI;w1$mI?|rKyi9~_POz#fr@(RW?y*~VC zbMu>dt@_htMo7fn-J^6a@N)NNggj@MG-IDlBIk( zMsy;p8Y74Ez__JEJKtdOa**vK;d7f|b(lpG5-r_d5~|cYEqYySmwWS&_ec&cg1Zr8 zbQc|JGVxFF#p*G$zVURaVJTXvF_6Q_exPkANg{Hi@;?N6bA4$o3E+Yf#(W~{5 zWL2oSy14Fg7k861Th zcC1B$BD8cx$Pah4c`1@F9Sf9(=}k`NT+spARIyW1=ev7y zWGCc_2hw*c#ktYabmB~UhW2w(MLyYlns<@0x`KinZ>I5FonP=&oCK({Ovy7g#}4sX zU^Qw~HW)G!*{&vr_BrxOqCPR3UPV0S-YE|&V(#rxv=)itSMfyA|*^1pnv0smI4 z56k%^v4*9R9w7omXcZ3+8R<*hpPFvl?mQ3_Jz=6q>-G*Fh0)E#yA;oi%<;7zNJFC# z3G^Q#_*NwTg8n2&ziHx?JlBhW&UiymR^O2TT2JE($NeDxKD9-U@dhEyFCK2YQ@iXS z`3W5Oyv#@(HZrhgCF82Zx3>*1Dd1ll_O+y>ksmyN3W+fEh|w@d<=6Y^=DVSfC$yHu zG|Xe)5LMRK8lDqi`g5}=dLgpeE_}iAfpFb)?nOs3>aI&Nt)GK<$PFAj0eL=`SMpuP zLxy=@2^b6Kt5R?R&o725Y(-yvmLMncA}V;2_=U{Fv{WWfTz96=d6 zFTh?%-GW8)fIBpVcI4N{+c-K$E>ZJkmyv)%TKoyA%)0N~V-% zhx)6XJ|RdZhyvm$pYhbhpq{Qk0iw?Iq4+VCzil!i3NZd<5T5BwUYFbx-gHaQh8ayQ zNlGv1w~=YW8`c91a%p&aG+Y%iop0(oe}q&9mG~DfxUr1ZsTIs6rhX)51opxnt*;~wV|r&c6GdpiyB9JL8Yr@#?Skfr zbza=_!(I#z|7c@c$V=Ju_I*>ZqU?wdsZCBK>c<_}_hKXnXk}Oi%XEdP3patgHeI?l z5xN@T9oMkRs^HDnGjdjbe9A13SGZ;iwI7^K&RejjNqETB!aw}|sLkrN7uQ|kvf0%akC7^3I#r6ZfL5~yZC_7+^f=`JT_N=*8- zp$GDiSHLZY*uh5{G%F0U6d*(n=K6(~4y(2oF#zv!f8ZX{stG8;;0)v*V$O zCoHGvyBK~by@7QXjFzq+b%*z118TyOtbbeiG@+Em=L$7v-EvIy9c96s!-%Hv`QrB6 zyy+qM@)0c1(-bsC6d@XIF(d7-hCgeaW;HW4V-qq<_GT~2RdMXbnhc{&ivq)AAOeBh z`wL&1Wh~7}=W}(LBjH9c;yJr;Db(C&hh;-B4ZVb`k;Bq4r>5Fn zP$HLx92B**`Ror2!z1a4G%CxP6xNQth&GyI%8PB&tEig^RSh_BG7z)#$AC< zM+gdJ&-nSwgFy#BI-(4`JG7QogJspQf)-P8e86i3ZfUiFN@hJ7e$upscy_a42=G|t zz3%o*rbJ-=SQOmWhYg!6enPQGvwK0g=4La;ET0mQmSH#c)2$sk6O#4Va(Y9LqJ3C8 zN<%hO=6M?BFeG~-&MQ(ZYgEIP#1>6`d}JXuv^f9mBnz=s3O{+uj@bRH);jo-o{ zIeF15m)*%lg)0)obHTMOD3wkkaCZPlDYciA)BQ^$P&5R8xe#KOnl&4_oEvC~fJwh1 zjqFjgP;d;*ioeE5S7t8%RD*TiZ1N&|rPGSUOe@KyoMMx-q3;J7KGK9wG7G*#Mti!V zx?+l2UHi_#BXqA_wbcm^d#S_^)?7gW9@j+QiXDTGlls~&73QRcHGqMuxB*ZnckrnJMM)Wuq zQ3Oa(sGd&ghrudiz7o6?xWw08E=s!On0ABeA`mA7c|DTOIF3bkWk@lVhOVH{RL~>J zha+}14oNz)5YYD@SkC!#29U36QEQdwm`PXZv#%7qmNP}|P1SaK5$Qa4(l?1Wp2lx` zX>&DBOdf=4ERK8xjkTK0=_7RPKkDaLA43&77*goxsR=<79Ic`BKNo2i4iWk;>>A(U zbR~Ea!(%NVm(j1&qmAjz@*}GctmLEUhiMCK75zb1caVcf>b$rkIwO2JK=v@AciZ|S zzE*JzgA`(7D9^&-Bp(E%s80{ld=o2FB57e9&$sWN#p7?`#n|fMDd)?^D5f&+iXZ3_bdM6 z)2qmS5~I`F;|GbMbOIQGlk$~ZVxw>JDE(H;G<1c!BYaj6n>zPP7aLvQ{9J#d&`SQj zO;`xLs%uwp{dld>uT#gU-!&q(MZVjGB`Gxw+=((n=vh`+{7j^)=(>omw)bK}^l{z( zoR8>s%AVlU!2%KgjlM&GOU(ks&GYLq%xO2P|L4b|BdnCNmOk8gtVl8zDt;@ESmpFC z!@mWxc|8CJU%8Pkq8Gro>QT#6`r%gug!2$=DAMVU#I2;7(@1=+?Aljl%F+zp{!X#G zTYtSFbQYd;zBFC!lruE3~Z};2Fm;pk{HUJ%iwh zB}PAtOkHff6a$afGUs$q@_EB}_aH9D()vY!8oq%EPE-p;9=A{WD#3VfB9Fh&DWy5A zrc3Y@o|=M#v6WsLxMM=4gYEG1;{QYj4iu_;S0g>G;ZC!J($Q zeZ2s15$Vkx2d`Q0epp|amOJRDj(GF?Gj35kW3`A?eJ5dCtKcMq_ zTbKEWV0A#kL+FGow2{8wUkUT1$$aDy?UTfnVr`gMSV#s|H}@wy8x3oP<_;jYRKTW~6;nPJ z9#8jcpk@CCLR|O}@@77dtZ|iT%%45;gAldDGIn2C!t+wM#8VH?0M(BY zRzL6CC}84XdNP&~^Q16zn(j}TSO}*Xfl)R z+~0{x}3oJM%~$$8>y+Y^E=hnx4F* z`aHHf@eZA)+MzMkX+>9ZK=wmXs=8=MD3<6>DC9Y9NNtbPb?+$u)c~p-sarUwsH^{A zL9GNt+wN-K)uj$EtaGXI{Hv6Jmi_k?^=VUbBZ%yC%LnQd@Df!NkHZmusXm&3*Y{PZJ`G+<1$R zlxjl)m|&TB9;mvaWEU5dP^5J>So`Y|eq4K()$uZA{70u5!nhYA@Z9q=S)!i)TGtyR zMTZ6^8z4Dg@3~{p=JNL=!tZf{!5Yz_&CiBqa;+kD*6cgIZY8-x`+0t)+J zc{^fS$OE6By>ohxfbG#X2yvWR#&BSWc^o750x{R}!ALc+`qv1zf(TG?&WPrLD&I7r z(i>Jsw7wTr7|}?%nEF^a3~QgN`AeYC-HDKy6dqBuVO+~tYyDl8Hzt>u1?g|k(MjfK z*6?4qdWo$w`IgFIwbF~~S1Mv3^`_ixWT30Nd8eV+$%+jv1n+cAA{dJ@!L{%Ou!9*XiTSF$(5Iyh^4^-OYDwSbeG-v`&1E!zGd zO~`L54G;Ts1z}NfjdFgwtH)K7!_oZBB*2@jI z2pOt1C4Nlg_CsC@b{A;n5W}a9t`~rakeQ>FIMgohCWr;}0GU z+r#*;~74^T_Cau2k8=$FSaTDP;`SQ5zPUXF**;=%6uSd>b= zqK{N?my~qe zodYU-Z6sciQUJ1P9Df-j&IHL@SgMRS=@F&p$+Po#%M%x_sd!tNodiLNfZ_2o$t=0b@*C~2gBjA-m%;nv67L-Q-l{BudHJ{kNX;?-{;9I!D9vcX~J?~ybhKSNz-KE zbiL5|JYcu{usM=>kiaP4y9;03fAQ@7$tr$*SE3vA2cg?S&k$dxX;4&lM`E-Gr9ZGN>Pphj?6NIr8#2J%S z9p|VY$(V;NKx?|U1u?MTMeuv;q>lTLJV(7t$Wsf#+-*9BpY<>EDP=C&@#nJF?bd*w zHhkCEqV<6|zTKbBbsYyB;OakChhIjGTr&izsi|+Szv1rB3JQ9WtOQn`Z`vqO?2me@ z;1zqbdHuG8Re}x7hqXi1dYz^?qPc|(T5=_|S=`HqaRx5wM^W0E>(Mdgy)l1~s#N;2 z+<$Pxs^c($_Qm59rUBF*R(S>Oc>YsW)ec!Pq|XCb(92bomJHT6vx7;rqa)AVjsbaA zBtZ!t7#4?UOV;9|p%KpF^o`mg`0FnWs2X_TM|j|Jid=Ekqn-33KWh@nm63u4@De|K=)zS0li1`*JmtpaLkW+yQSz z^6=B<^46%Qn2@M!U$lM6LdM(ejv#~lQ0L*S4{B3vfeRg$@*kNyW9Ls=^e5sP*DM>n zg0Xdb4%e5op}ZC=dVwn@*Yl}$1*FV4cE`~3orU?Ub9ANEZU4RExOq=$XdlvEH}4n1 z>IU1JlXhP$f*f!58YdG5t+_As{G%L`3k&FRP9SlujDERkSw~JkVUE@|cZ>7&&w4?k z?X&e}`U@xBFL9L{MVa(qaN}M|C$7<;c9}yTXW`qJcI1@Ebl2~Pv}E}MWPYciT#T09 zQCTbP1=Niox%AREzyU{6$yE0wiLW%u*4P(lKZ&-yw5Kff%ZU!)Kjelk z#YWn6_4Gc+aVu=Lw*2BWVy)9ikF*a4JG|LGU|=EkLPX(pS^GLdFWP|N8^0IPVU#+> zqF%m1I!#}j+rO9n@KdigA7{c7W^zB&jXdT232N$WndyP&y(^nVsa+w7-cfPYUsO*- zbmwGemFh~X>N2afdpCGtHyssxi6946Q3~E!%lN%d2vE<11h9u`W@4h44LP9o7vH(EeZhEtCny1Pt{ zmb2lKEY|2g7O~1F3G*ujQmU28WADJFWoGsCatb^4YXYALEX^$>QO@>nHSWYgq?zQA zwF3MS*P|repyBK`f~%lKAXaH&Y_09ld`DO5q(KSHasoy-g# z^EAMfV)b%8ME7K)GL_YHg@OntC7>-q56LO<(2;99YzRMR4Risjt8LCy0CaGJ_6%jGaoAEc#3*g*F1)^UmEQ0xfZ&`-n ze5~vv_5LA0FKlBV!N9->gG7%La;~YGn=WBPK?ZC->=VPci9NyAeasorwA|rb>3+ES z!OAkR8R-_;MpneAKUcJ?#GG?AxXPxBUrSH8oiR9@G!4EMInsvjZByufa8^tK-L(e3e!_TDKqC@!t3_^kZGN?dA2qk2z!Y0ZSh zTmstjs7f&4oVEMO=7&ILrCbp}j`gl4<1k=^Z~^a`Hq2N{aCYy5vWh+sk#~Vq_M`lr zBEK9y=Cnp4=7QX=p(uP+vUh1hQk=YVYS4N6+~yxRo#utAVnRI+F@qc>B1@{GXym&O?W&d(QDmoWf8T6Bn=goj?S}j z8`xD1A59mSYUtIgI?e*pU2yy?k~2e`584Q9j`G5;TYhm`zkmZT!$+NPMXY+!WU?_ zwhl(1q-YgrS{*T$NWfuQFF$=^DKbKleyLV8nF#gVMAy9RXqhBAr)X3$0PFH>=#(=y z(qH9p9$_4(Rt6^(O*eF5217IvdNh!PEH~7#KJWct2hElhu55;5i(4|)P0fOK5Y}?;k4O!sotPz)v|RIcI&}*b==L>+uHg} zj-#}KR731l6wFLFQd}aqYH`l~Du_&+)!Gcl>NfQT-8VkI>na_Rg2xSVWt%ZEdfHcK zt6{uP(oct6dw8X-drHdKMR;y(PSD#wA~0HjN{WbDJB9;5=dCeQW_8y zjPVeEV$Y|e-auvd*4>@FJ{SutmyGTq?&JuAy}-O6=5^RFc@c9Zd|q+hcX?d4z7%p^ zHPW)qA%!5_x;2WrIkIo6^`I6#e}oXI1A2=|9%-g)YHl)d6s*w0e7UwuR#!pXt5Bg6 zlIEM-m&G%ULlaId-3#o6!)Oot`8{(2Ut#nZL%pQ#KsAb^>|vFbL`v+4c84S&ECER6 z{SC+IV!XOFq~7)_I9f+GQE?8@8u2xS4f+lMLP#QfDYVnn`fk$rBJk8GJ@cbUG0A82 zK&?o>DS_G#ohokoj1ai}f_&PRfa;88(4NA~)puFC%#fOO&nF&I?BWKp)d)IF$h5%* zE5gSgpJI@BCWFim@NH#DMumiqRIOwo#(i5=>E1^jIzoifD-%$62TT4dg@ViO@`aA} zaxu+UFn$Q-kBe$ux}_CmNZpt14V{zEqg@&CNzGuV>+4DjtUA6EY|@%$xE}ONm4lgu zhj+P6phESQtJ)OQC6(V>;@JjD!bUkFSzdPMX$xH*w9Nr@O_Ndyvx%G2+PmAIWiWW! zkoh-Yn7$-=92CAN-EE^|c&L%#$ir*qmb#m3skvfb?HoSdL5Z%YZD7}Owb)qYdcb zy6ziGg1|^O5l4^$QFpPuf5L&JT4wJt!okeMB3dmkoM$aHIf~#4>1c_5;$HU}r726m^$#L_(7bZu&&asVc2=IBB9*Q^vd8(#zVbCsbQsFt?;B zP@N1J99DCfr#BV!9wl5ue7IGq6k$qBMz4^>+ME^sQSC#l4>V6+vtL;u?;1M!;9wKF zDKIzsM1*ZXfziLNe{X7NYOkqMxR$xH%QB!BQomzj8$*-ArTisZeN%#kq@=Ati zDfq}aFBU3dkv3|ZTT&_Rnu_ekta9Y@pcdKL4PlO3Kh+(2y54x8=yKLLvt4HB_Qp0- z_A%0u_vmDr<$zyd?b}43@8p`X{OSVs)C>@GGL5I4L;$ZzA5VmD8W=U%%WkYgCatMP z*6w;XrcxkJ{V{~sXfiPkc;EKBPmi^=5NqF3`A25&R$HvhZk%9yYI=$l&hOpZ|!f9>tN-wmGE$LX1bWq@#qRXzi5}u z=Ug*>T%r8EX$wt2Oo2wl?Goq67j{F~((0O_gvH6_oSq4iW@*${($6Fb{N(Bz6!?53>tKlUeHyPB;$_ zC{V_TswD`7n;IYWeM%4v^Dnau)0o3DHW5?~_U5CVo$T$~u037)Xs?h_vLO4wrEVGW zOupfVLsYFb#p?W?-)muJizy|z-2Px;>p0G6d;g!o&NDZgv@kWHI``$a1S?9?%}t_L z9J6H;vZ)JOG8kH@GIIIV(IixE7adcJQmJbtMTI6@dy|YCiXlgMZ$%*DwAQ#|uG2#v zc|?=DR`k=cupxFsM92}Ut>_*q!Xk-y(3ME_Je&VMiJhxQ*+>|nvungTD zuhP|^ZRg7E8G*A?cL?cp0b^h*lYia#;fjN-V)Z1-8l$p3h?&&8iB*nzKYT z?5sYSD2E!;b|1kMa1%UzqmM{+4(%9?T2B1d6XbBZRJot-K6@eAV8fcJM>AT(px+GP zb+sryYI(gMh^wVRT+sE>-Ka39Bot)h#2dAiCj0786LV{S&8@JchIV&>JQyzl%Mghg_0Ae|K zo!|QK5HVy_>xZm!EseHT>lw4w$R_d1n{(2`WMtLz`M7A7k=gKpA;MbuYo|+=SBJGs z8>urzQ|cCj7ck|VtKAKmxhw-#57bPfM$Lj}TCOK+W*DvJ^FjFQL7^e;1@21l;YrKz7&ameOnS8Dn;05FxcneOHCgqq% z7xV|O$;56#lq|_uPfI@RUNh^)C8Y3*7t@2zbyfAvsV4ov-Dhu{X;Gl5*9p1i1%Myc X=O_xlQv3CvAY`7ue3mbv@B4oNXvycX literal 0 HcmV?d00001 diff --git a/Web12306/images/wxqr.png b/Web12306/images/wxqr.png new file mode 100644 index 0000000000000000000000000000000000000000..93ea3f75c0ffae313f65a6a90039fd9f212509fb GIT binary patch literal 31908 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 l%+B%g@v7seq@>{g4FEN@v literal 0 HcmV?d00001 diff --git a/Web12306/index.html b/Web12306/index.html index ed1e2a3..e590491 100644 --- a/Web12306/index.html +++ b/Web12306/index.html @@ -98,11 +98,11 @@
-
- 姝ｅ湪浣跨敤鏈嶅姟鍣細榛樿鏈嶅姟鍣 (寤惰繜锛ms) -
-
+ +
+ 姝ｅ湪浣跨敤鏈嶅姟鍣細榛樿鏈嶅姟鍣 (寤惰繜锛) +
@@ -1092,7 +1092,21 @@ - +
+
+

鍙岄噸淇濋櫓锛寰俊鎵竴鎵

+

+ 鎵嬫満鍚屾鎻愰啋 + 鎶㈢エ杩涘害鈫 +

+
+ + +

+ 鎶㈢エ鎻愰啋瀵嗛挜锛 + 锛堝湪鍏虫敞寰俊鍚庢寜鎻愰啋杈撳叆鐨勫摝锛 +

+
diff --git a/Web12306/js/account/sessionMgr.js b/Web12306/js/account/sessionMgr.js index 8da5d94..eb63fe9 100644 --- a/Web12306/js/account/sessionMgr.js +++ b/Web12306/js/account/sessionMgr.js @@ -215,7 +215,8 @@ selectedSeatType: [], selectedTrain: [], dateloop: [], - passengers: [] + passengers: [], + hideNoSeat: false }; Object.defineProperty(this, "current", { diff --git a/Web12306/js/otn/orderprocess.js b/Web12306/js/otn/orderprocess.js index 18ee21d..e450419 100644 --- a/Web12306/js/otn/orderprocess.js +++ b/Web12306/js/otn/orderprocess.js @@ -193,7 +193,10 @@ train.from.name, train.to.name, train.date, - passenger[0].seat + passenger[0].seat, + passenger.length, + train.byAuto ? 1 : 0, + train.suggest ? 1 : 0 ]); } }, function () { @@ -358,7 +361,10 @@ train.from.name, train.to.name, train.date, - passenger[0].seat + passenger[0].seat, + passenger.length, + train.byAuto ? 1 : 0, + train.suggest ? 1 : 0 ]); } }, function () { diff --git a/Web12306/js/otn/queryticket.js b/Web12306/js/otn/queryticket.js index 7899668..e0c6a8a 100644 --- a/Web12306/js/otn/queryticket.js +++ b/Web12306/js/otn/queryticket.js @@ -20,17 +20,17 @@ var sc = m[1]; var sp = m[2][0] == '*' ? null : parseInt(m[2], 10); var st = parseInt(m[3], 10); - var seat = { code: sc, name: param.toSeatTypeName(sc), price: sp }; + var seat = { code: sc, name: param.toSeatTypeName(sc), price: sp, selected: false }; if (st < 3000) { seat.count = st; //TODO 浜岀瓑杞骇鎻愪氦鏄惁鍜屼簩绛夊骇涓鏍烽兘鐢ㄧ殑MO锛 //涓绛夎蒋搴 7锛 浜岀瓑杞骇 8 if (sc === "7") { - data.push({ code: 'M', name: param.toSeatTypeName('M'), price: sp, count: st }); + data.push({ code: 'M', name: param.toSeatTypeName('M'), price: sp, count: st, selected: false }); } else if (sc === "8") { - data.push({ code: 'O', name: param.toSeatTypeName('O'), price: sp, count: st }); + data.push({ code: 'O', name: param.toSeatTypeName('O'), price: sp, count: st, selected: false }); } else { data.push(seat); } diff --git a/Web12306/js/otn/trainfilter.js b/Web12306/js/otn/trainfilter.js index 2898b38..4ccf348 100644 --- a/Web12306/js/otn/trainfilter.js +++ b/Web12306/js/otn/trainfilter.js @@ -22,7 +22,7 @@ expdata.log("寮濮嬭繃婊よ溅娆"); _.each(data.available, function (t) { t.selected = false; - + t.hasSeat = false; }); //杞︽绫诲瀷杩囨护 if (currentProfile.trainTypes && currentProfile.trainTypes.length) { @@ -99,6 +99,25 @@ }); } } + if (currentProfile.selectedSeatType && currentProfile.selectedSeatType.length) { + var filtered4 = _.filter(data.available, function (e) { + return !(e.hasSeat = currentProfile.selectedSeatType.some(function (x) { + var o = e.ticketMap[x]; + if (o && o.count) + o.selected = true; + return o || false; + })); + }); + if (currentProfile.hideNoSeat) { + data.available = _.difference(data.available, filtered4); + $.each(filtered4, function () { + this.reason = 6; + data.filtered.push(this); + if (LOG_PROCESS) + expdata.log("杞︽銆" + this.code + "銆戜笉娌℃湁鎸囧畾鐨勮溅娆¤岃杩囨护銆"); + }); + } + } data.include = data.available; if (currentProfile.hideNoTicket) { @@ -120,8 +139,20 @@ //鏄惁閫夋嫨锛->鏈夌エ->鏈捣鍞->鏃犵エ if (data.available) { data.available.sort(function (x, y) { - if (x.selected ^ y.selected) - return x.selected ? -1 : 1; + if (currentProfile.selectSeatFirst) { + if (x.hasSeat ^ y.hasSeat) + return x.hasSeat ? -1 : 1; + + if (x.selected ^ y.selected) + return x.selected ? -1 : 1; + } else { + if (x.selected ^ y.selected) + return x.selected ? -1 : 1; + + if (x.hasSeat ^ y.hasSeat) + return x.hasSeat ? -1 : 1; + } + if (x.available === 1 ^ y.available === 1) return x.available === 1 ? -1 : 1; if (x.available === -1 ^ y.available === -1) diff --git a/Web12306/js/otn/trainstationsuggest.js b/Web12306/js/otn/trainstationsuggest.js index cf98b31..e268acc 100644 --- a/Web12306/js/otn/trainstationsuggest.js +++ b/Web12306/js/otn/trainstationsuggest.js @@ -177,7 +177,7 @@ lastQuerySuggest = null; }; this.checkTrainSuggestion = function () { - var suggestKey = cp.fromCode + cp.toCode + ((cp.selectedTrain || []).join("|")); + var suggestKey = cp.fromCode + cp.toCode + ((cp.selectedTrain || []).join("|")) + ((cp.selectedSeatType || []).join("|")); if (suggestKey === cachedSuggest.key) { if (!lastQuerySuggest || (new Date() - lastQuerySuggest) > data.suggestRefreshInterval) { @@ -199,6 +199,12 @@ if ((t.from.endpoint && t.to.endpoint) || t.available < 0) return false; + //濡傛灉璁剧疆浜嗗腑鍒紝骞朵笖璁剧疆鐨勫腑鍒兘娌℃湁锛屽垯涓嶈冭檻 + if (cp.selectedSeatType && cp.selectedSeatType.length) { + if (!cp.selectedSeatType.some(function(x) { return t.tickets[x] || false; })) + return false; + } + return true; }); if (!alltrains.length) diff --git a/Web12306/js/ui/chat/roomsession.js b/Web12306/js/ui/chat/roomsession.js index aa4095c..235072d 100644 --- a/Web12306/js/ui/chat/roomsession.js +++ b/Web12306/js/ui/chat/roomsession.js @@ -65,7 +65,7 @@ port.postMessage("enterChatRoom", room); } - port.track(param.trackTypes.JOIN_CHAT); + ep.track(param.trackTypes.JOIN_CHAT); }; this.refreshOnlineCount = function () { page.find(">header>span:eq(1)").html("褰撳墠鍦ㄧ嚎 " + room.onlinecount + " 浜"); @@ -76,7 +76,7 @@ port.postMessage("disconnectChatRoom"); that.fireEvent("exitRoom"); - port.track(param.trackTypes.EXIT_CHAT); + ep.track(param.trackTypes.EXIT_CHAT); }; this.appendMessageItem = function (html) { chatListContainer.append(html); diff --git a/Web12306/js/ui/index.js b/Web12306/js/ui/index.js index 4826fae..d33408d 100644 --- a/Web12306/js/ui/index.js +++ b/Web12306/js/ui/index.js @@ -36,6 +36,12 @@ //鑷姩鍒锋柊鍛 var autorefresh = require("./ui-autorefresh.js"); autorefresh.on("requestQueryTicket", function () { + var cp = sessMgr.currentProfile; + if (!cp.fromCode || !cp.toCode || !cp.depDate) { + mp.showMessagePopup("error", "浜诧紝杩樻病鏈夎缃煡璇㈢殑鏉′欢鍝︺"); + autorefresh.stop(); + return; + } ui_result.load(); }); @@ -208,7 +214,24 @@ } //track - port.track(param.trackTypes.QUERY_TICKET, [cp.fromCode, cp.fromText, cp.toCode, cp.toText, cp.depDate, cp.studentTicket + '']); + port.track(param.trackTypes.QUERY_TICKET, [ + cp.fromCode, + cp.fromText, + cp.toCode, + cp.toText, + cp.depDate, + cp.studentTicket + '', + (cp.selectedSeatType && cp.selectedSeatType.length) || 0, + (cp.selectedTrain && cp.selectedTrain.length) || 0 + (cp.passengers && cp.passengers.length) || 0, + (cp.dateloop && cp.dateloop.length) || 0, + cp.hideNoTicket ? 1 : 0, + cp.hideNotInListTrain ? 1 : 0, + cp.autoWaitToSell ? 1 : 0, + cp.tryBottomSeat ? 1 : 0, + cp.selectSeatFirst ? 1 : 0, + cp.autoSubmitEnabled ? 1 : 0 + ]); }); @@ -257,6 +280,13 @@ //鏈嶅姟鍣ㄥ姞閫 require("./ui-dnsspeeding.js"); + setTimeout(function () { + $("#wx_sell_notification").showModalDialog({ + title: "鎴愬姛璁㈤槄鎻愰啋", + width: 'auto' + }); + }, 1000); + //$("#passenger_editor").showModalDialog({ // title: "鏂板鑱旂郴浜", // buttons: [ diff --git a/Web12306/js/ui/ui-autorefresh.js b/Web12306/js/ui/ui-autorefresh.js index 8e25d6c..29f4bd5 100644 --- a/Web12306/js/ui/ui-autorefresh.js +++ b/Web12306/js/ui/ui-autorefresh.js @@ -161,7 +161,24 @@ //track var cp = sessMgr.currentProfile; - port.track(expdata.trackTypes.START_AUTOREFRESH, [cp.fromCode, cp.fromText, cp.toCode, cp.toText, cp.depDate, cp.studentTicket + '']); + port.track(expdata.trackTypes.START_AUTOREFRESH, [ + cp.fromCode, + cp.fromText, + cp.toCode, + cp.toText, + cp.depDate, + cp.studentTicket + '', + (cp.selectedSeatType && cp.selectedSeatType.length) || 0, + (cp.selectedTrain && cp.selectedTrain.length) || 0 + (cp.passengers && cp.passengers.length) || 0, + (cp.dateloop && cp.dateloop.length) || 0, + cp.hideNoTicket ? 1 : 0, + cp.hideNotInListTrain ? 1 : 0, + cp.autoWaitToSell ? 1 : 0, + cp.tryBottomSeat ? 1 : 0, + cp.selectSeatFirst ? 1 : 0, + cp.autoSubmitEnabled ? 1 : 0 + ]); } inAutoRefresh = true; diff --git a/Web12306/js/ui/ui-dnsspeeding.js b/Web12306/js/ui/ui-dnsspeeding.js index 858c9c6..5cf272c 100644 --- a/Web12306/js/ui/ui-dnsspeeding.js +++ b/Web12306/js/ui/ui-dnsspeeding.js @@ -1,18 +1,18 @@ 锘縟efine(function (require, exports, module) { var port = require("../platform/extensionPort.js"); var isValid = 0; - var serverSpan = $("span.net-tips"); + var serverSpan = $("div.net-tips"); var sysConfig = null; var checkSpeedTimer = null; var refreshSpeed = function () { - chrome.runtime.sendMessage({ action: "getCurrentServer" }, function (m) { + port.sendMessage({ action: "getCurrentServer" }, function (m) { var data = m["kyfw.12306.cn"]; var speed = data.speed; //var cls = speed === 0 ? "label-default" : speed < 0 ? "label-danger" : speed < 100 ? "label-success" : speed < 400 ? "label-warning" : "label-danger"; - serverSpan.find("strong:eq(1)").html(speed > 0 ? speed + " 姣" + (data.rate ? " (鍔犻" + data.rate + "%)" : "") : speed < 0 ? "鏃犳硶杩炴帴" : "姝ｅ湪甯綘娴嬮..."); - serverSpan.find("strong:eq(1)").html(data.ip ? "榛樿鏈嶅姟鍣" : data.ip); + serverSpan.find("strong:eq(1)").html(speed > 0 ? speed + " 姣" + (data.rate ? " (鍔犻" + data.rate + "%)" : "") : speed < 0 ? "鏃犳硶杩炴帴" : "姝ｅ湪娴嬮..."); + serverSpan.find("strong:eq(0)").html(!data.ip ? "榛樿鏈嶅姟鍣" : data.ip); }); }; var checkStatus = function () { @@ -20,17 +20,19 @@ if (isValid <= 0) { $("#swDnsSpeeding").hide(); } else { + $("#swDnsSpeeding").show(); if (sysConfig.enableServerAutoChange) { serverSpan.show(); - $("#swDnsSpeeding").val("鍏抽棴鍔犻"); + $("#swDnsSpeeding").html("鍏抽棴鍔犻"); refreshSpeed(); } else { - $("#swDnsSpeeding").val("鍚敤鍔犻"); + $("#swDnsSpeeding").html("鍚敤鍔犻"); } } if (isValid > 0) { if (!checkSpeedTimer) checkSpeedTimer = setInterval(refreshSpeed, 3000); + port.sendMessage({ action: "triggerUpdate" }); } else { if (checkSpeedTimer) { clearInterval(checkSpeedTimer); @@ -44,20 +46,20 @@ }); var checkServerValid = function () { - port.sendMessage({ action: "servervalid" }, function (valid) { - isValid = valid; + port.sendMessage({ action: "servervalid" }, function (r) { + isValid = r.valid; checkStatus(); }); }; - port.port.on("sysConfigUpdate", function (data) { + port.port.on("sysConfigUpdate", function (e, data) { sysConfig = data; checkStatus(); }); var reloadSysConfig = function () { port.sendMessage({ action: "getSysConfig" }, function (data) { - sysConfig = data; + sysConfig = data.detail; checkServerValid(); }); }; diff --git a/Web12306/js/ui/ui-submit-order.js b/Web12306/js/ui/ui-submit-order.js index 1207df0..752f1c1 100644 --- a/Web12306/js/ui/ui-submit-order.js +++ b/Web12306/js/ui/ui-submit-order.js @@ -94,7 +94,10 @@ pTrain.from.name, pTrain.to.name, pTrain.date, - pPassengers[0].seat + pPassengers[0].seat, + pPassengers.length, + pTrain.byAuto ? 1 : 0, + pTrain.suggest ? 1 : 0 ]); submitBtn[0].disabled = true; @@ -116,7 +119,10 @@ pTrain.from.name, pTrain.to.name, pTrain.date, - pPassengers[0].seat + pPassengers[0].seat, + pPassengers.length, + pTrain.byAuto ? 1 : 0, + pTrain.suggest ? 1 : 0 ]); }); submitDef.fail(function (data) { @@ -140,7 +146,10 @@ pTrain.from.name, pTrain.to.name, pTrain.date, - pPassengers[0].seat + pPassengers[0].seat, + pPassengers.length, + pTrain.byAuto ? 1 : 0, + pTrain.suggest ? 1 : 0 ]); }); submitDef.progress(function (data) { diff --git a/Web12306/js/ui/ui-trainlist.js b/Web12306/js/ui/ui-trainlist.js index 5051d95..9217b14 100644 --- a/Web12306/js/ui/ui-trainlist.js +++ b/Web12306/js/ui/ui-trainlist.js @@ -57,6 +57,12 @@ date = date || sessMgr.currentProfile.depDate; stu = stu || sessMgr.currentProfile.studentTicket; + if (!from || !to || !date) { + mp.showMessagePopup("error", "浜诧紝杩樻病鏈夎缃煡璇㈢殑鏉′欢鍝︺"); + return; + } + + var extArg = Array.prototype.slice.call(arguments); __.fireEvent("onload", extArg); datebar.go(date, date); @@ -157,6 +163,7 @@ if (this.dataset.suggest) { train = trainSuggest.findTrain(this.dataset.sec); + train.suggest = true; bySuggest = true; } else { train = _.findWhere(queryResult.original, { id: id }); @@ -174,23 +181,23 @@ if (cp.submitStuAsCommon && !cp.studentTicket) { pas.forEach(function (p) { if (p.passenger_type == "3") p.passenger_type = "1"; }); } - + train.byAuto = true; __.dispatchEvent("requireSubmitOrder", { train: train, seat: seatcode, passengers: pas }); - if (bySuggest) { - port.track(param.trackTypes.SUBMIT_ORDER_BY_SUGGESTIONI, [ - train.code, - train.from.name, - train.to.name, - train.date, - seatcode - ]); + //if (bySuggest) { + // port.track(param.trackTypes.SUBMIT_ORDER_BY_SUGGESTIONI, [ + // train.code, + // train.from.name, + // train.to.name, + // train.date, + // seatcode + // ]); - } + //} }); }; init(); diff --git a/Web12306/js/ui/widget_modalDialog.js b/Web12306/js/ui/widget_modalDialog.js index 6948cc1..af9a67d 100644 --- a/Web12306/js/ui/widget_modalDialog.js +++ b/Web12306/js/ui/widget_modalDialog.js @@ -68,6 +68,12 @@ }); } }); + if (!options.buttons || !options.buttons.length) { + buttonContainer.remove(); + } + if (options.width) { + template.css("width", options.width); + } widget.showFloatDialog(template); diff --git a/Web12306/js/ui/widget_sell_notification.js b/Web12306/js/ui/widget_sell_notification.js index 6c3d7b9..1c76d54 100644 --- a/Web12306/js/ui/widget_sell_notification.js +++ b/Web12306/js/ui/widget_sell_notification.js @@ -9,6 +9,7 @@ var mp = require("./widget_message_popup.js"); var query = require("../otn/queryticket.js"); var port = require("../platform/extensionPort.js"); + var wxData = null; require("./widget_modalDialog.js"); @@ -81,8 +82,6 @@ var baseTime = new Date(parseInt(container[0].dataset.sellday)); var sellTime = parseSellTime(container[0].dataset.timeset); - baseTime = utility.addDays(utility.trimToDay(new Date()), 1); - var tasks = []; var p = sessMgr.currentProfile; var taskGroup = utility.formatDate(p.depDate, 'MM鏈坉d鏃') + p.fromText + "鍒" + p.toText + "璧峰敭鎻愰啋"; @@ -93,7 +92,8 @@ time: baseTime.getTime(), text: "浠婂ぉ璧峰敭" + utility.formatDate(p.depDate, 'MM鏈坉d鏃') + p.fromText + "鍒" + p.toText + "杞︾エ 锛岃鐣欐剰鍝︼紒", group: taskGroup, - data: taskdata + data: taskdata, + point: 0 } ); var assignTimeGroup = function (timepoint, grouptype) { @@ -103,7 +103,9 @@ time: timepoint - 30 * 60 * 1000, text: "涓夊崄鍒嗛挓鍚庤捣鍞" + utility.formatDate(p.depDate, 'MM鏈坉d鏃') + p.fromText + "鍒" + p.toText + "鐨" + grouptype + "杞︾エ 锛岃鐣欐剰鍝︼紒", group: taskGroup, - data: taskdata + data: taskdata, + point: 30, + type: grouptype } ); @@ -113,7 +115,9 @@ time: timepoint - 15 * 60 * 1000, text: "鍗佷簲鍒嗛挓鍚庤捣鍞" + utility.formatDate(p.depDate, 'MM鏈坉d鏃') + p.fromText + "鍒" + p.toText + "鐨" + grouptype + "杞︾エ 锛岃鐣欐剰鍝︼紒", group: taskGroup, - data: taskdata + data: taskdata, + point: 15, + type: grouptype } ); @@ -123,7 +127,9 @@ time: timepoint - 5 * 60 * 1000, text: "浜斿垎閽熷悗璧峰敭" + utility.formatDate(p.depDate, 'MM鏈坉d鏃') + p.fromText + "鍒" + p.toText + "鐨" + grouptype + "杞︾エ 锛岃鐣欐剰鍝︼紒", group: taskGroup, - data: taskdata + data: taskdata, + point: 5, + type: grouptype } ); } @@ -192,8 +198,9 @@ text: "璁㈤槄鎻愰啋", callback: function (e) { if (confirmAlarm()) { - mp.showMessagePopup("ok", "鎻愰啋璁剧疆鎴愬姛!"); e.hide(); + + showWx(); } }, type: "primary" @@ -201,6 +208,9 @@ ] }); port.track(data.trackTypes.SHOW_NOTIFICATION_SELECT); + }; + var showWx = function() { + }; var init = function () { sessMgr.on("save", function () {