From 3c75f9456d114e51ee475a939c7ebde90217b0aa Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 23 Mar 2021 09:09:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=9D=E5=AF=B9=E6=8D=A7?=
 =?UTF-8?q?=E4=B8=AA=E5=9C=BA=E5=BF=85=E9=A1=BB=E4=B8=8A=E4=BC=A0=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E7=9A=84BUG=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/toRegister/toRegister.js                |  2 +-
 .../associationNew/pages/addTopic/addTopic.js | 34 ++++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

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:话对捧个场