diff --git a/miniprogram/app.json b/miniprogram/app.json index ef2f24b..11d2d45 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -74,11 +74,5 @@ "selectedIconPath": "/asset/img/my.png" } ] - }, - "plugins": { - "echarts": { - "version": "2.1.1", - "provider": "wx1db9e5ab1149ea03" - } } } \ No newline at end of file diff --git a/miniprogram/pages/workReport/workReport.js b/miniprogram/pages/workReport/workReport.js index 4b70069..ad57c1b 100644 --- a/miniprogram/pages/workReport/workReport.js +++ b/miniprogram/pages/workReport/workReport.js @@ -124,7 +124,14 @@ Page({ //上传之前 handleBeforeUpload(e){ const { file, callback } = e.detail; - if(file.url.indexOf('.jpg') > -1 || file.url.indexOf('.png') > -1 || file.url.indexOf('.pdf') > -1 || + if(file.size > 52428800){ + wx.showToast({ + title:'文件大小不能大于50MB!', + duration:2000, + icon:'none' + }) + callback(false); + }else if(file.url.indexOf('.jpg') > -1 || file.url.indexOf('.png') > -1 || file.url.indexOf('.pdf') > -1 || file.url.indexOf('.jpg') > -1 || file.url.indexOf(".doc")>-1 || file.url.indexOf(".docx")>-1 || file.url.indexOf(".xlsx")>-1 || file.url.indexOf(".xls")>-1){ callback(true); @@ -162,13 +169,13 @@ Page({ success(res){ let _isUpload = false; res.tempFiles.forEach(item => { - if(item.size > 10485760){ + if(item.size > 52428800){ _isUpload = true; } }); if(_isUpload){ wx.showToast({ - title:'图片或视频不能大于10MB!', + title:'图片或视频不能大于50MB!', icon:'none', duration:1500 })