|
@@ -90,7 +90,7 @@ var BasicFunction = new (function () {
|
|
|
// .then(BasicFunction.onCheckFail);
|
|
|
};
|
|
|
|
|
|
- this.onReachServer = function (checkResponse) {
|
|
|
+ this.onReachServer = function () {
|
|
|
BasicFunction.Queue.IS_LOADED = true;
|
|
|
BasicFunction.logwarn("Using SERVER : ");
|
|
|
BasicFunction.logwarn(BasicFunction.Queue.SVR_URL);
|
|
@@ -102,7 +102,7 @@ var BasicFunction = new (function () {
|
|
|
BasicFunction.logwarn("Backup Failed : " + BasicFunction.Queue.backup[BasicFunction.Queue.nowuse]);
|
|
|
BasicFunction.logwarn(this);
|
|
|
var out = "";
|
|
|
- BasicFunction.Queue.backup.forEach(function (val, index, arr) {
|
|
|
+ BasicFunction.Queue.backup.forEach(function (val, index) {
|
|
|
out += index + ":[" +val +"] \n";
|
|
|
});
|
|
|
BasicFunction.logerror("抱歉, 服务器连接失败! \n 请确认 "+ out +" 其中之一可用");
|
|
@@ -116,13 +116,12 @@ var BasicFunction = new (function () {
|
|
|
.then(function (response) {return response.json();} )
|
|
|
.then(BasicFunction.onReachServer)
|
|
|
.catch(BasicFunction.onCheckFail);
|
|
|
- //.fail(BasicFunction.onCheckFail).done(BasicFunction.onReachServer);
|
|
|
}
|
|
|
};
|
|
|
|
|
|
- this.get_data = function (url, callback, data, scope) {
|
|
|
+ this.get_data = function (url, callback, data, onescope) {
|
|
|
console.log('calling get_data()');
|
|
|
- BasicFunction.Queue.list.push({url: url, callback: callback, gid: -1, data:data, scope: scope});
|
|
|
+ BasicFunction.Queue.list.push({url: url, callback: callback, gid: -1, data:data, scope: onescope});
|
|
|
};
|
|
|
|
|
|
this.new_data_group = function (groupName, callback) {
|
|
@@ -198,6 +197,7 @@ var BasicFunction = new (function () {
|
|
|
url: BasicFunction.Queue.SVR_URL + url,
|
|
|
apiName: url,
|
|
|
data: data,
|
|
|
+ scope: scope,
|
|
|
sendTime: new Date()
|
|
|
}).then(BasicFunction.checkStatus)
|
|
|
.then(BasicFunction.parseJson)
|