From dff5003dfbb6b35cbf928f21edc6ee67170bf30f Mon Sep 17 00:00:00 2001
From: liuxiaohang <283700113@qq.com>
Date: Thu, 26 Nov 2020 15:35:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(h5=E3=80=81app):=201=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8DH5=E3=80=81APP=E7=AB=AF=EF=BC=8C=E4=BD=BF=E7=94=A8down?=
 =?UTF-8?q?load-file=E6=97=B6=EF=BC=8Ctimeout=E9=94=99=E8=AF=AF=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=202=E3=80=81APP=E7=AB=AFrequest=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/platforms/app-plus/service/api/network/download-file.js | 3 ++-
 src/platforms/app-plus/service/api/network/request.js       | 2 +-
 src/platforms/h5/service/api/network/download-file.js       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/platforms/app-plus/service/api/network/download-file.js b/src/platforms/app-plus/service/api/network/download-file.js
index 08fb1c2d3..1e58c8f40 100644
--- a/src/platforms/app-plus/service/api/network/download-file.js
+++ b/src/platforms/app-plus/service/api/network/download-file.js
@@ -20,8 +20,9 @@ const publishStateChange = (res) => {
 const createDownloadTaskById = function (downloadTaskId, {
   url,
   header,
-  timeout = __uniConfig.networkTimeout.downloadFile ? __uniConfig.networkTimeout.downloadFile / 1000 : 120
+  timeout
 } = {}) {
+  timeout = (timeout || (__uniConfig.networkTimeout && __uniConfig.networkTimeout.request) || 60 * 1000) / 1000
   const downloader = plus.downloader.createDownload(url, {
     timeout,
     filename: TEMP_PATH + '/download/',
diff --git a/src/platforms/app-plus/service/api/network/request.js b/src/platforms/app-plus/service/api/network/request.js
index 189cc48da..bc710c974 100644
--- a/src/platforms/app-plus/service/api/network/request.js
+++ b/src/platforms/app-plus/service/api/network/request.js
@@ -46,7 +46,7 @@ export function createRequestTaskById (requestTaskId, {
   responseType,
   sslVerify = true,
   firstIpv4 = false,
-  timeout = __uniConfig.networkTimeout.request
+  timeout = (__uniConfig.networkTimeout && __uniConfig.networkTimeout.request) || 60 * 1000
 } = {}) {
   const stream = requireNativePlugin('stream')
   const headers = {}
diff --git a/src/platforms/h5/service/api/network/download-file.js b/src/platforms/h5/service/api/network/download-file.js
index 0df581a27..cdc2cc0a0 100644
--- a/src/platforms/h5/service/api/network/download-file.js
+++ b/src/platforms/h5/service/api/network/download-file.js
@@ -46,7 +46,7 @@ class DownloadTask {
 export function downloadFile ({
   url,
   header,
-  timeout = (__uniConfig.networkTimeout && __uniConfig.networkTimeout.downloadFile) || 60 * 1000
+  timeout = (__uniConfig.networkTimeout && __uniConfig.networkTimeout.request) || 60 * 1000
 }, callbackId) {
   const {
     invokeCallbackHandler: invoke
-- 
GitLab