|
@@ -23,7 +23,7 @@ class Order extends Base
|
|
if($username!=""){
|
|
if($username!=""){
|
|
$where['username'] = ["like","%{$username}%"];
|
|
$where['username'] = ["like","%{$username}%"];
|
|
}
|
|
}
|
|
- $nickname = isset($this->post['nickname'])&&$this->post['nickname']!=="" ? trim($this->post['username']) :"";
|
|
|
|
|
|
+ $nickname = isset($this->post['nickname'])&&$this->post['nickname']!=="" ? trim($this->post['nickname']) :"";
|
|
if($nickname!=""){
|
|
if($nickname!=""){
|
|
$where['nickname'] = ["like","%{$nickname}%"];
|
|
$where['nickname'] = ["like","%{$nickname}%"];
|
|
}
|
|
}
|
|
@@ -32,14 +32,18 @@ class Order extends Base
|
|
$where['mobile'] = ["like","%{$mobile}%"];
|
|
$where['mobile'] = ["like","%{$mobile}%"];
|
|
}
|
|
}
|
|
$order_low = isset($this->post['order_low'])&&$this->post['order_low']!=="" ? $this->post['order_low'] :"";
|
|
$order_low = isset($this->post['order_low'])&&$this->post['order_low']!=="" ? $this->post['order_low'] :"";
|
|
- if($order_low!=""){
|
|
|
|
-
|
|
|
|
- $where['order_time'] = [">=",$order_low." 00:00:00"];
|
|
|
|
|
|
+ if($order_low!="") {
|
|
|
|
+ $order_low = date("Y-m-d H:i:s", strtotime($order_low . " 00:00:00"));
|
|
|
|
+ }else{
|
|
|
|
+ $order_low = "1970-01-01 00:00:00";
|
|
}
|
|
}
|
|
$order_up = isset($this->post['order_up'])&&$this->post['order_up']!=="" ? $this->post['order_up'] :"";
|
|
$order_up = isset($this->post['order_up'])&&$this->post['order_up']!=="" ? $this->post['order_up'] :"";
|
|
if($order_up!=""){
|
|
if($order_up!=""){
|
|
- $where['order_time'] = ["<=",$order_up." 23:59:59"];
|
|
|
|
|
|
+ $order_up = date("Y-m-d H:i:s",strtotime($order_up." 23:59:59"));
|
|
|
|
+ }else{
|
|
|
|
+ $order_up = date("Y-m-d H:i:s");
|
|
}
|
|
}
|
|
|
|
+ $where['order_time'] = ["between",[$order_low,$order_up]];
|
|
$count= Db::name("order_info")->where($where)->count();
|
|
$count= Db::name("order_info")->where($where)->count();
|
|
$total = ceil($count/$size);
|
|
$total = ceil($count/$size);
|
|
$page = $page>=$total? $total:$page;
|
|
$page = $page>=$total? $total:$page;
|