Merge remote-tracking branch 'origin/master' into akun

@@ -62,7 +62,11 @@ class RenewProjectController extends BaseController
         }
         //按类型搜索
         $map['delete_status'] = 0;
-        $map['type'] = ['in',[2,3,4]];
+        if(empty($param['type'])){
+            $map['type'] = ['in',[2,3,4]];
+        }else{
+            $map['type'] = $param['type'];
+        }
         $map['remain_day'] = ['<=',15];
         return $map;
     }

@@ -692,7 +692,7 @@ class ProductLogic extends  BaseLogic
             'attrs'=>Arr::a2s($info['attrs']),
             'attr_id'=>Arr::arrToSet($info['attr_id']),
             'category_id'=>!empty($info['category_id']) ? ','.Arr::arrToSet($info['category_id']).',' : '',
-            'keyword_id'=>'',
+            'keyword_id'=> '',
             'intro'=>$info['intro'],
             'content'=>$info['content'],
             'describe'=>Arr::a2s($info['describe']),