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)