fix(h5): unify the default content-type (#7796)

* fix(h5): unify the default content-type * fix(style): remove trailing spaces * fix(h5): improve the solution * fix(h5): update test case Co-authored-by: Yue, Zongkun <zyue@microstrategy.com>
NervJS · Oct 9, 2020 · 89e0ef0 · 89e0ef0
1 parent 60bb8fc
commit 89e0ef0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/packages/taro-h5/__test__/request-test.js b/packages/taro-h5/__test__/request-test.js
@@ -73,11 +73,10 @@ describe('request', () => {
         expect(fetch.mock.calls[0][0]).toBe('https://github.com')
         expect(fetch.mock.calls[0][1]).toEqual({
           method: 'POST',
-          body: {
-            arg: 123
-          },
+          body: JSON.stringify({ arg: 123 }),
           headers: {
-            'A': 'CCC'
+            'A': 'CCC',
+            'Content-Type': 'application/json'
           },
           mode: 'cors',
           cache: 'no-cache',

diff --git a/packages/taro-h5/src/api/request/index.js b/packages/taro-h5/src/api/request/index.js
@@ -52,10 +52,13 @@ function _request (options) {
   if (methodUpper === 'GET' || methodUpper === 'HEAD') {
     url = generateRequestUrlWithParams(url, options.data)
   } else if (typeof options.data === 'object') {
-    const contentType = options.header && (options.header['Content-Type'] || options.header['content-type'])
-    if (contentType && contentType.indexOf('application/json') >= 0) {
+    options.header = options.header || {}
+    options.header['Content-Type'] = options.header['Content-Type'] || options.header['content-type'] || 'application/json'
+    const contentType = options.header['Content-Type']
+
+    if (contentType.indexOf('application/json') >= 0) {
       params.body = JSON.stringify(options.data)
-    } else if (contentType && contentType.indexOf('application/x-www-form-urlencoded') >= 0) {
+    } else if (contentType.indexOf('application/x-www-form-urlencoded') >= 0) {
       params.body = serializeParams(options.data)
     } else {
       params.body = options.data