]+>([^<]+)<\/div>/i.exec(this.text) && RegExp.$1;
+ var status = /核验状态:[\w\W]+?>([^<>]+?)<\/div>/.exec(this.text) && RegExp.$1;
+
+ if (!m || !status)
+ callback({ logined: false });
+ else {
+ callback({ logined: true, realName: m, status: status, isChecked: status === '已通过' });
+ }
+
+ }
+ }, function () {
+
+ });
+ };
Object.defineProperty(this, "current", {
get: function () {
return session;
},
- set:function(v) {
+ set: function (v) {
if (session === v) return;
session = v;
diff --git a/Web12306/js/platform/webRequest.js b/Web12306/js/platform/webRequest.js
index 2a4b669..36318f4 100644
--- a/Web12306/js/platform/webRequest.js
+++ b/Web12306/js/platform/webRequest.js
@@ -1,65 +1,67 @@
-
-define(function (require, exports, module) {
- var EventObject = require("../platform/EventObject.js");
- var config = require("../data.js");
-
- var WebRequest = function() {
- var that = this;
- var requestMap = {};
- var ajaxCount = 0;
-
- this.getFullUri= function (url) {
- ///
获得完整地址
-
- if (url[4] === ":" || url[5] === ":") return url;
- return config.baseUri + url;
- };
- this.send = function (method, url, refer, data, responseType, done, failed) {
- var xhrData = {
- url: that.getFullUri(url),
- data: data,
- timeout: 120000,
- type: "GET",
- dataType: responseType,
- refer: that.getFullUri(refer)
- };
-
- var e = new CustomEvent("ajaxproxy", { detail: { data: xhrData, index: ajaxCount++ }, cancelable: true });
- if (document.dispatchEvent(e)) {
- requestMap[e.detail.index] = {
- done: done,
- fail: failed
- };
- return;
- }
- };
- this.sendGet = function (url, refer, data, responseType, done, failed) {
- ///
以GET模式发送AJAX请求
- ///
要请求的地址
- ///
请求的引用地址
- ///
要发送的数据
- ///
要请求的地址
- ///
完成请求的回调
- ///
请求失败的回调
- that.send("GET", url, refer, data, responseType, done, failed);
- };
- this.sendPost = function (url, refer, data, responseType, done, failed) {
- that.send("GET", url, refer, data, responseType, done, failed);
- };
-
- document.addEventListener("ajaxproxyfinished", function (e) {
- var data = e.detail;
- if (!that.requestMap[data.index]) return;
-
- var param = requestMap[data.index];
- delete requestMap[data.index];
- data.success ? param.done.call(data) : param.fail.call(data);
- });
- };
- .0
-
- WebRequest.prototype = Object.create(EventObject);
- WebRequest.constructor = WebRequest;
-
- return Object.create(WebRequest);
-});
+
+define(function (require, exports, module) {
+ var EventObject = require("../platform/EventObject.js");
+ var config = require("../data.js");
+
+ var WebRequest = function() {
+ var that = this;
+ var requestMap = {};
+ var ajaxCount = 0;
+
+ EventObject.apply(this, arguments);
+ this.getFullUri= function (url) {
+ ///
获得完整地址
+
+ if (url[4] === ":" || url[5] === ":") return url;
+ return config.baseUri + url;
+ };
+ this.send = function (method, url, refer, data, responseType, done, failed) {
+ var xhrData = {
+ url: that.getFullUri(url),
+ data: data,
+ timeout: 120000,
+ type: "GET",
+ dataType: responseType,
+ refer: that.getFullUri(refer)
+ };
+
+ var e = new CustomEvent("ajaxproxy", { detail: { data: xhrData, index: ajaxCount++ }, cancelable: true });
+ if (!document.dispatchEvent(e)) {
+ requestMap[e.detail.index] = {
+ done: done,
+ fail: failed
+ };
+ return;
+ } else {
+ that.fireEvent("requestSupportError");
+ }
+ };
+ this.sendGet = function (url, refer, data, responseType, done, failed) {
+ ///
以GET模式发送AJAX请求
+ ///
要请求的地址
+ ///
请求的引用地址
+ ///
要发送的数据
+ ///
要请求的地址
+ ///
完成请求的回调
+ ///
请求失败的回调
+ that.send("GET", url, refer, data, responseType, done, failed);
+ };
+ this.sendPost = function (url, refer, data, responseType, done, failed) {
+ that.send("GET", url, refer, data, responseType, done, failed);
+ };
+
+ document.addEventListener("ajaxproxyfinished", function (e) {
+ var data = e.detail;
+ if (!requestMap[data.index]) return;
+
+ var param = requestMap[data.index];
+ delete requestMap[data.index];
+ data.success ? param.done.call(data) : param.fail.call(data);
+ });
+ };
+
+ WebRequest.prototype = Object.create(EventObject);
+ WebRequest.constructor = WebRequest;
+
+ module.exports = new WebRequest();
+});
diff --git a/Web12306/js/ui/index.js b/Web12306/js/ui/index.js
index 991da8e..d4cc60e 100644
--- a/Web12306/js/ui/index.js
+++ b/Web12306/js/ui/index.js
@@ -3,6 +3,7 @@
var ajax = require("../platform/webRequest.js");
var storage = require('../platform/storage.js');
var widget = require("./widget.js");
+ var sessMgr = require("../account/sessionMgr.js");
//初始化UI
(function() {
@@ -35,5 +36,8 @@
});
setTimeout(function () {
+ sessMgr.checkLoginState(function(a) {
+ console.log(a)
+ });
}, 1000);
});
diff --git a/Web12306/js/ui/ui-login.js b/Web12306/js/ui/ui-login.js
index 2234049..a5408be 100644
--- a/Web12306/js/ui/ui-login.js
+++ b/Web12306/js/ui/ui-login.js
@@ -1,19 +1,36 @@
-define(function(require, exports, module) {
+define(function (require, exports, module) {
var sessionMgr = require("../account/sessionMgr.js");
var ev = require("../platform/EventObject.js");
- var UiWidgetLogin = function() {
- ev.appy(this, arguments);
+ var UiWidgetLogin = function () {
+ ev.apply(this, arguments);
+
+
+ sessionMgr.on("sessionChanged", function () {
+ if (sessionMgr.current) {
+ $(".non-login").hide();
+ $(".user-logined").show();
+ } else {
+ $(".non-login").show();
+ $(".user-logined").hide();
+ }
+ });
+
+ //界面事件绑定
+ $("#acc_login").click(function () {
+ sessionMgr.showLogin();
+ });
+
+ //初始化显示
+ sessionMgr.fireEvent("sessionChanged");
+
+ return this;
};
UiWidgetLogin.prototype = Object.create(ev);
UiWidgetLogin.constructor = UiWidgetLogin;
- sessionMgr.on("sessionChanged", function() {
-
- });
-
-
+ module.exports = new UiWidgetLogin();
});
diff --git a/Web12306/js/ui/widget_cityselector.js b/Web12306/js/ui/widget_cityselector.js
index 330256e..5e087a8 100644
--- a/Web12306/js/ui/widget_cityselector.js
+++ b/Web12306/js/ui/widget_cityselector.js
@@ -328,7 +328,7 @@
break;
case 13:
//选定
- console.log(selector.getSelectedCity.call(this));
+ selector.selectToTarget();
break;
default:
}