Merge branch 'activity-m' into transfer_dev

app/adminapi/lists/goods/GoodsLists.php

@@ -65,8 +65,7 @@ class GoodsLists extends BaseAdminDataLists implements ListsSearchInterface
         }
         if (isset($this->params['property_activity_id']) && !empty($this->params['property_activity_id'])) {
             // 筛选已选过的
-
-            $where[] = ['property_activity_id','>' ,0];//100000
+            $where[] = ['is_activity','=' ,1];//100000
         }
         return $where;
     }

app/adminapi/logic/goods/GoodsLogic.php

@@ -73,6 +73,7 @@ class GoodsLogic extends BaseLogic
                 'is_hot' => $params['is_hot'] ?:0,
                 'hot_weight' => $params['hot_weight'] ?:0,
                 'is_agent' => $params['is_agent'] ?:0,
+                'is_activity' => $params['is_activity'] ??0,
                 'property_activity_id' => $params['property_activity_id'] ??0
             ]);
 
@@ -132,6 +133,7 @@ class GoodsLogic extends BaseLogic
                 'is_hot' => $params['is_hot'] ?:0,
                 'hot_weight' => $params['hot_weight'] ?:0,
                 'is_agent' => $params['is_agent'] ?:0,
+                'is_activity' => $params['is_activity'] ??0,
                 'property_activity_id' => $params['property_activity_id'] ??0
             ]);