提交 6efa1600 编写于 作者: KK's avatar KK

http 组件调整

上级 d04cdb6e
import axios, { AxiosResponse } from 'axios';
import qs from 'qs';
import { HttpResponse } from './http-response';
/**
* Http net 对象
* 调用 getInstance() 获取实例
......@@ -86,10 +87,10 @@ export class Http {
// }
// return _data;
// }],
}).then((response: any) => {
this.doResponseRresult(response, resolve, isloading, serialnumber);
}).catch((response: any) => {
this.doResponseRresult(response, reject, isloading, serialnumber);
}).then((response: AxiosResponse) => {
resolve(this.doResponseRresult(response, resolve, isloading, serialnumber));
}).catch((response: AxiosResponse) => {
reject(this.doResponseRresult(response, reject, isloading, serialnumber));
});
});
}
......@@ -131,10 +132,11 @@ export class Http {
this.beginLoading();
}
return new Promise((resolve: any, reject: any) => {
axios.get(url).then((response: any) => {
this.doResponseRresult(response, resolve, isloading, serialnumber);
}).catch((response: any) => {
this.doResponseRresult(response, reject, isloading, serialnumber);
axios.get(url).then((response: AxiosResponse) => {
resolve(this.doResponseRresult(response, resolve, isloading, serialnumber));
}).catch((response: AxiosResponse) => {
reject(this.doResponseRresult(response, reject, isloading, serialnumber));
});
});
}
......@@ -155,15 +157,15 @@ export class Http {
return new Promise((resolve: any, reject: any) => {
if(!data){
axios.delete(url).then((response: any) => {
this.doResponseRresult(response, resolve, isloading, serialnumber);
resolve(this.doResponseRresult(response, resolve, isloading, serialnumber);
}).catch((response: any) => {
this.doResponseRresult(response, reject, isloading, serialnumber);
reject(this.doResponseRresult(response, reject, isloading, serialnumber));
});
}else{
axios.delete(url,{data:data}).then((response: any) => {
this.doResponseRresult(response, resolve, isloading, serialnumber);
resolve(this.doResponseRresult(response, resolve, isloading, serialnumber));
}).catch((response: any) => {
this.doResponseRresult(response, reject, isloading, serialnumber);
reject(this.doResponseRresult(response, reject, isloading, serialnumber));
});
}
});
......@@ -186,9 +188,9 @@ export class Http {
data = this.handleRequestData(data);
return new Promise((resolve: any, reject: any) => {
axios.put(url, data).then((response: any) => {
this.doResponseRresult(response, resolve, isloading, serialnumber);
resolve(this.doResponseRresult(response, resolve, isloading, serialnumber));
}).catch((response: any) => {
this.doResponseRresult(response, reject, isloading, serialnumber);
reject(this.doResponseRresult(response, reject, isloading, serialnumber));
});
});
}
......@@ -203,14 +205,20 @@ export class Http {
* @param {number} [serialnumber]
* @memberof Http
*/
private doResponseRresult(response: any, funt: Function, isloading?: boolean, serialnumber?: number): void {
private doResponseRresult(response: any, funt: Function, isloading?: boolean, serialnumber?: number): HttpResponse {
if (isloading) {
this.endLoading();
}
if (serialnumber) {
Object.assign(response, { serialnumber: serialnumber });
}
funt(response);
if (response) {
if (response.status === 200) {
return new HttpResponse(200, response.data, undefined, response.headers);
}
return new HttpResponse(response.status, response.data, { code: 101, message: HttpResponse.getStatusMessage(response.status) }, response.headers)
}
return new HttpResponse(500, null, { code: 100, message: '请求发生异常,无返回结果!' }, response.headers);
}
/**
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册