Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/introducer into dev

application/api/controller/shopro/Goods.php

@@ -23,11 +23,11 @@ class Goods extends Api
         $page = $this->request->param('page', 1);
         $skeyword = $this->request->param('skeyword', '');
         $map['closed']=0;
-        $map['activity_list']=null;
+        //$map['activity_list']=null;
         if (!empty($skeyword)) {
             $map['title|intro'] = array('LIKE', '%' . $skeyword . '%');
         }
-        $list=GoodsModel::where($map)->order("orderby desc")->limit($this->pageSize)->page($page)->select();
+        $list=GoodsModel::where($map)->where('!FIND_IN_SET(2,activity_list)')->order("orderby desc")->limit($this->pageSize)->page($page)->select();
         return $this->success("",['banner'=>$banner,'list'=>$list]);
     }