Comparing version 1.0.9-beta3 to 1.0.9-beta4
@@ -29,3 +29,3 @@ { | ||
"license": "MIT", | ||
"version": "1.0.9-beta3", | ||
"version": "1.0.9-beta4", | ||
"engines": { | ||
@@ -32,0 +32,0 @@ "node": ">= 0.6" |
@@ -183,10 +183,8 @@ 'use strict'; | ||
let carryBodyData: object = JToolObject.getObjOrFuncResult(this.carryBodyData); | ||
this.clearExtraData(); | ||
let isOk; | ||
const delegate = this.delegate; | ||
let globalOtherParams = this.pickInjectParams(); | ||
let globalOtherHeaders = this.pickInjectHeaders(); | ||
let globalOtherBodyData = this.pickInjectBodyData(); | ||
this.clearExtraData(); | ||
let request: JRequester = JRequester.create( | ||
@@ -193,0 +191,0 @@ method, |
@@ -84,3 +84,2 @@ import {AxiosRequestConfig, AxiosResponse} from "axios"; | ||
let carryBodyData: object = JToolObject.getObjOrFuncResult(this.freezeCarryBodyData); | ||
this.clearExtraData(); | ||
const delegate = this.delegate; | ||
@@ -90,2 +89,3 @@ let globalOtherParams = this.pickInjectParams(); | ||
let globalOtherBodyData = this.pickInjectBodyData(); | ||
this.clearExtraData(); | ||
let request: JRequester = JRequester.create( | ||
@@ -115,3 +115,12 @@ method, | ||
} else { | ||
reject(new JNetworkError(response.statusText, response.status)); | ||
let errorMessage, errorStatus; | ||
if (response.hasOwnProperty('status')){ | ||
errorMessage = response.statusText; | ||
errorStatus = response.status; | ||
} else { | ||
if (response.hasOwnProperty('message')){ | ||
errorMessage = response['message']; | ||
} | ||
} | ||
reject(new JNetworkError(errorMessage, errorStatus)) | ||
} | ||
@@ -118,0 +127,0 @@ }).catch(error => { |
@@ -17,3 +17,3 @@ /** | ||
static isMobile(mobile: string): boolean { | ||
return (/^1[345789]\d{9}$/.test(mobile)); | ||
return (/^1[1234567890]\d{9}$/.test(mobile)); | ||
} | ||
@@ -20,0 +20,0 @@ |
Sorry, the diff of this file is too big to display
238966
4758