wnf

c_client/client/components/goodsModal/goodsModal.js

@@ -53,14 +53,21 @@ Component({
      * 收藏商品
      */
     async goToCollectGoods(e) {
-      const { itemId, collected } = e.target.dataset.item
+      let { itemId, collected } = e.target.dataset.item
       const { taskType } = this.props.task
       if(collected) {
         commonToast('您已收藏过该商品了')
         return;
       }
-      let result = await collectGoods(+itemId)
 
+      //判断是否活动外已收藏商品
+      let isCollected = await checkGoodsCollectedStatus(+itemId)
+      if(isCollected) {
+        this.props.onCompleteTask(taskType, itemId)
+        return;
+      }
+
+      let result = await collectGoods(+itemId)
       if(result) {
         this.props.onCompleteTask(taskType, itemId)
       }

c_client/client/pages/collectGoods/collectGoods.js

@@ -56,7 +56,7 @@ Page({
     const { success, data } = await API.getCollectGoodsList({ activityId, itemIds }).catch(res => {
       res && commonToast(res)
     }) || {}
-    if(!success || success) {
+    if(success) {
       this.setData({ goodsList: data || [] })
     }
   },