From 12cc4ce8a90c75cc0127d43f16d2dc4c600edf4b Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Tue, 1 Aug 2023 11:20:02 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix-bug74259=E3=80=91=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E5=8E=9F=E6=9D=A5=E4=BC=9A=E8=AE=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=AF=E4=B8=8B=E8=BD=BD=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/js/http/http.js                        | 32 -------------------
 assets/js/http/userApi.js                     |  2 +-
 .../meetingDetailSigned.js                    |  2 +-
 3 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/assets/js/http/http.js b/assets/js/http/http.js
index ebff092..0da13fd 100644
--- a/assets/js/http/http.js
+++ b/assets/js/http/http.js
@@ -36,42 +36,10 @@ const http = (method, url, data, header= headerDefault) => {
   })
 }
 
-const httpDownload = (method, url, data, header= headerDefault) => {
-  let Authorization = wx.getStorageSync(TokenKey) ? wx.getStorageSync(TokenKey) : '';
-  header[TokenKey] = Authorization == '' ? '' : Authorization
-  return new Promise((resolve, reject) => {
-    wx.request({
-      method: method,
-      url: baseUrl + url,
-      header: header,
-      data: data,
-      responseType: 'arraybuffer',
-      // responseType: 'arraybuffer',
-      success: res => {
-        wx.hideLoading();
-        if (res.statusCode === 200) {
-          // 200: 服务端业务处理正常结束
-          resolve(res.data)
-        } else {
-          reject(res.data);
-          wx.hideLoading();
-        }
-      },
-      fail: err => {
-        console.log(err, "---------err-----")
-        reject(err);
-        wx.hideLoading();
-      },
-
-    })
-  })
-}
-
 module.exports = {
   get: (url, data, header) => http('GET', url, data, header),
   post: (url, data, header) => http('POST', url, data, header),
   post1: (url, data, header) => http('POST', url, data, headerDefault1),
   put: (url, data, header) => http('PUT', url, data, header),
-  download: (url, data, header) => httpDownload('GET', url, data, header),
   delete: (url, data, header) => http('DELETE', url, data, header)
 }
diff --git a/assets/js/http/userApi.js b/assets/js/http/userApi.js
index f9d2fe9..93fd6b9 100644
--- a/assets/js/http/userApi.js
+++ b/assets/js/http/userApi.js
@@ -82,7 +82,7 @@ const UserApi = {
   // 手机号唯一校验
   checkPhoneOnly: (params) =>  http.get(`${URL_CONFIG}/sys/duplicate/check`, params),
   // 企业端的会议文件的下载
-  downFileDownWeb: (fileId,meetingId, params) => http.download(`${URL_CONFIG}meeting/payMeeting/userDownload/${fileId}/${meetingId}`,params),
+  downFileDownWeb: (fileId,meetingId, params) => http.get(`${URL_CONFIG}meeting/payMeeting/userDownloadByApplet/${fileId}/${meetingId}`,params),
   // 企业人员查询参与项目的邮寄信息
   getVoiceMailList: (fileId,meetingId, params) => http.get(`${URL_CONFIG}mail/payMailBill/contactsSearch`,params)
 }
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index 00d2239..0160a3e 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/pages/meetingDetailSigned/meetingDetailSigned.js
@@ -264,7 +264,7 @@ Page({
     }
     let res = await this.downMeetingFile(param)
     // r如果可以下载 那么res 是一个文件流 否则就不可以下载
-    let flag = Object.prototype.toString.call(res) === '[object ArrayBuffer]'
+    let flag = res.success
     const that = this
     // 只有审核通过的才可以去下载
     // 原判断条件 !flag && this.data.singInPersonInfo.checkResult !== 1)