周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 e9689b07fa69b3dc106c7d3739b624db2099b0d0 2 个父辈 0440fc0a f2916957

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

内嵌 并排对比
正在显示 2 个修改的文件 包含 6 行增加 和 2 行删除
@@ -62,7 +62,11 @@ class RenewProjectController extends BaseController @@ -62,7 +62,11 @@ class RenewProjectController extends BaseController
62 } 62 }
63 //按类型搜索 63 //按类型搜索
64 $map['delete_status'] = 0; 64 $map['delete_status'] = 0;
65 - $map['type'] = ['in',[2,3,4]]; 65 + if(empty($param['type'])){
  66 + $map['type'] = ['in',[2,3,4]];
  67 + }else{
  68 + $map['type'] = $param['type'];
  69 + }
66 $map['remain_day'] = ['<=',15]; 70 $map['remain_day'] = ['<=',15];
67 return $map; 71 return $map;
68 } 72 }
@@ -692,7 +692,7 @@ class ProductLogic extends BaseLogic @@ -692,7 +692,7 @@ class ProductLogic extends BaseLogic
692 'attrs'=>Arr::a2s($info['attrs']), 692 'attrs'=>Arr::a2s($info['attrs']),
693 'attr_id'=>Arr::arrToSet($info['attr_id']), 693 'attr_id'=>Arr::arrToSet($info['attr_id']),
694 'category_id'=>!empty($info['category_id']) ? ','.Arr::arrToSet($info['category_id']).',' : '', 694 'category_id'=>!empty($info['category_id']) ? ','.Arr::arrToSet($info['category_id']).',' : '',
695 - 'keyword_id'=>'', 695 + 'keyword_id'=> '',
696 'intro'=>$info['intro'], 696 'intro'=>$info['intro'],
697 'content'=>$info['content'], 697 'content'=>$info['content'],
698 'describe'=>Arr::a2s($info['describe']), 698 'describe'=>Arr::a2s($info['describe']),