diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 05123bd..7d09bb3 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.6.29" + const versionNum = "1.6.30" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/subpages/associationNew/pages/addTopic/addTopic.js b/subpages/associationNew/pages/addTopic/addTopic.js index 2919814..fa60f72 100644 --- a/subpages/associationNew/pages/addTopic/addTopic.js +++ b/subpages/associationNew/pages/addTopic/addTopic.js @@ -262,26 +262,28 @@ Page({ return false } const imagesList = [] - if (this.data.imageList.length > 0) { - const isUploadingStatus = this.data.imageList.some(item => item.upload) - if (isUploadingStatus) { + if (this.data.topicType == '0') { + if (this.data.imageList.length > 0) { + const isUploadingStatus = this.data.imageList.some(item => item.upload) + if (isUploadingStatus) { + wx.showToast({ + title: "请等待图片上传完成", + icon: "none", + duration: 2000 + }) + return false + } + this.data.imageList.forEach(item => { + imagesList.push(item.ossUrl) + }) + } else { wx.showToast({ - title: "请等待图片上传完成", - icon: "none", + title: '请上传图片', + icon: 'none', duration: 2000 }) return false - } - this.data.imageList.forEach(item => { - imagesList.push(item.ossUrl) - }) - } else { - wx.showToast({ - title: '请上传图片', - icon: 'none', - duration: 2000 - }) - return false + } } const para = { topicType:this.data.topicType,//话题类型:0:事好儿鼓个掌 1:话对捧个场