Merge branch 'master' into deploy

2019-04-01 17:39:24 +08:00 · 2019-04-01 17:39:24 +08:00 · 86fa7dd654
parent a319df72e6 26d1bf09fd
commit 86fa7dd654
1 changed files with 4 additions and 1 deletions
--- a/mock/index.js
+++ b/mock/index.js
@ -11,8 +11,11 @@ export function mockXHR() {
  Mock.XHR.prototype.send = function() {
    if (this.custom.xhr) {
      this.custom.xhr.withCredentials = this.withCredentials || false
+
+      if (this.responseType) {
        this.custom.xhr.responseType = this.responseType
      }
+    }
    this.proxy_send(...arguments)
  }