mkm/nk-lihaink-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

入驻申请页面js筛选功能完成

Browse Source
This commit is contained in:
liuxiaoquan 2023-03-14 09:42:24 +08:00
parent 343c12a035
commit 2eb9e64ef3
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/admin/controller/merchant/system/merchant/MerchantIntention.php
View File

@ -62,8 +62,8 @@ class MerchantIntention extends BaseController
$params = get_params(); $params = get_params();
$page = empty($params['page'])? 1 : (int)$params['page']; $page = empty($params['page'])? 1 : (int)$params['page'];
$limit = empty($params['limit'])? (int)get_config('app . page_size') : (int)$params['limit']; $limit = empty($params['limit'])? (int)get_config('app . page_size') : (int)$params['limit'];
$where = get_params(['mer_name', 'status', 'date', 'keywords', 'mer_intention_id', 'category_id', 'type_id', 'start_date','end_date']);
$where = get_params(['mer_name', 'status', 'date', 'keyword', 'mer_intention_id', 'category_id', 'type_id']);
$data = $this->intention->GetList($where, $page, $limit); $data = $this->intention->GetList($where, $page, $limit);
@ -100,6 +100,9 @@ class MerchantIntention extends BaseController
return to_assign(0,'修改成功'); return to_assign(0,'修改成功');
} }
/**
* 备注表单页
*/
public function MarkForm() public function MarkForm()
{ {
$id = get_params('id'); $id = get_params('id');

3
app/admin/view/merchant/system/merchant/intention/lst.html
View File

@ -334,8 +334,9 @@
let name = data.elem.name; let name = data.elem.name;
if (name =='today') { if (name =='today') {
start_date=end_date; start_date=end_date;
end_date = getDaysAgo(-1);
}else if(name == 'yeserday'){ }else if(name == 'yeserday'){
start_date = end_date = getDaysAgo(1); start_date = getDaysAgo(1);
}else if(name == 'week'){ }else if(name == 'week'){
start_date = getDaysAgo(7); start_date = getDaysAgo(7);
}else if(name == '30day'){ }else if(name == '30day'){

14
app/common/model/merchant/system/merchant/MerchantIntention.php
View File

@ -79,15 +79,20 @@ class MerchantIntention extends Model
function ($query) use ($where) { function ($query) use ($where) {
$query->where('mer_type_id', $where['type_id']); $query->where('mer_type_id', $where['type_id']);
}) })
->when(isset($where['keyword']) && $where['keyword'] !== '', ->when(isset($where['keywords']) && $where['keywords'] !== '',
function ($query) use ($where) { function ($query) use ($where) {
$query->where('mer_name|phone|mark', 'like', '%' . $where['keyword'] . '%'); $query->where('mer_name|phone|mark', 'like', '%' . $where['keywords'] . '%');
}) })
->when(isset($where['date']) && $where['date'] !== '', ->when(isset($where['date']) && $where['date'] !== '',
function ($query) use ($where) { function ($query) use ($where) {
getModelTime($query, $where['date']); getModelTime($query, $where['date']);
} }
) )
->when(isset($where['start_date'])&&isset($where['end_date'])&&$where['start_date']!==''&&$where['end_date']!=='',
function($query)use($where){
$query->where('create_time','between',[$where['start_date'], $where['end_date']]);
}
)
->where('is_del', 0); ->where('is_del', 0);
return $query; return $query;
@ -101,9 +106,12 @@ class MerchantIntention extends Model
return $rows; return $rows;
} }
/**
* 备注表单页
*/
public function form($id, $data) public function form($id, $data)
{ {
$this->getModel()::getDB()->where($this->getPk(), $id)->update(['status' => $data['status'], 'mark' => $data['mark']]); self::where($this->getPk(), $id)->update(['status' => $data['status'], 'mark' => $data['mark']]);
} }
/** /**