diff --git a/components/gx-upload.vue b/components/gx-upload.vue index e31f2c7..57bb6d7 100644 --- a/components/gx-upload.vue +++ b/components/gx-upload.vue @@ -55,12 +55,12 @@ export default { // 2. 验证文件格式 const tempFilePath = res.tempFilePaths[0]; - const isValid = await this.checkPngFormat(tempFilePath); + // const isValid = await this.checkPngFormat(tempFilePath); - if (!isValid) { - uni.showToast({ title: '请上传PNG格式图片', icon: 'none' }); - return; - } + // if (!isValid) { + // uni.showToast({ title: '请上传PNG格式图片', icon: 'none' }); + // return; + // } // 3. 添加到预览列表 this.fileList = [{ @@ -106,11 +106,11 @@ export default { async uploadFile(file) { // 上传前再次验证 - const isValid = await this.checkPngFormat(file.url); - if (!isValid) { - uni.showToast({ title: '文件格式不符合要求', icon: 'none' }); - return Promise.reject('Invalid file format'); - } + // const isValid = await this.checkPngFormat(file.url); + // if (!isValid) { + // uni.showToast({ title: '文件格式不符合要求', icon: 'none' }); + // return Promise.reject('Invalid file format'); + // } try { const res = await new Promise((resolve, reject) => { diff --git a/pages/docList/index.vue b/pages/docList/index.vue index ef47335..fabd4d3 100644 --- a/pages/docList/index.vue +++ b/pages/docList/index.vue @@ -10,7 +10,9 @@ 返回 - + + 预约完成,请致电社区,并关注预约记录留意审核状态,谢谢! + @@ -21,6 +23,8 @@ data(){ return{ docList:[], + content:'预约完成,请致电社区,并关注预约记录留意审核状态,谢谢!', + show:false, nameList:{ 'applyPdf':'申请表申请表申请表申请表申请表申请表申请表申请表申请表申请表', 'covenantPdf':'协议书' @@ -28,6 +32,7 @@ } }, onLoad(option) { + this.show=true const obj=JSON.parse(option.files) this.docList=[ {name:obj.applyPdfName,url:BASE_URL+obj.covenantPdf}, diff --git a/pages/meetingDetail/index.vue b/pages/meetingDetail/index.vue index 70978a4..40f8129 100644 --- a/pages/meetingDetail/index.vue +++ b/pages/meetingDetail/index.vue @@ -683,10 +683,7 @@ if (!res || !res.success) { throw new Error('会议室预定失败'); } - uni.showToast({ - title: '预约完成,请致电社区,并关注预约记录留意审核状态,谢谢!', - icon: 'success' - }); + if (res.success == true) { uni.redirectTo({ url: `/pages/docList/index?files=${JSON.stringify(res.data)}&&isSelfStudy=${this.isSelfStudy}`