diff --git a/app/admin/controller/AuditController.php b/app/admin/controller/AuditController.php
index fb75324..a0a3ba9 100644
--- a/app/admin/controller/AuditController.php
+++ b/app/admin/controller/AuditController.php
@@ -10,33 +10,27 @@ class AuditController extends AdminBaseController{
*业务员审核列表
*/
public function audit_list(){
-
- if($this -> request -> isPost()){
- $where = [
- 'is_audit' => 0,
- ];
- if(!empty($_POST['start_time']) && !empty($_POST['end_time'])){
- $start_time = strtotime($_POST['start_time']);
- $end_time = strtotime($_POST['end_time']);
- $where['create_time'] = [['>=',$start_time],['<=',$end_time]];
- }
- if(!empty($_POST['keyword'])){
- $where['phone'] = $_POST['keyword'];
- }
- $data = Db::name('sale_audit') -> where($where) -> paginate(1000000);
- $data_arr = $data -> toArray();
- foreach($data_arr['data'] as $key => $val){
- $data_user = Db::name('user') -> where('id',$val['uid']) -> find();
- $data_arr['data'][$key]['wname'] = $data_user['user_nickname'];
- }
- }else{
- $data = Db::name('sale_audit') -> where('is_audit',0) -> paginate(12);
- $data_arr = $data -> toArray();
- foreach($data_arr['data'] as $key => $val){
- $data_user = Db::name('user') -> where('id',$val['uid']) -> find();
- $data_arr['data'][$key]['wname'] = $data_user['user_nickname'];
- }
+ $param = $this->request->param();
+ $where = [
+ 'is_audit' => 0,
+ ];
+ if(!empty($param['start_time']) && !empty($param['end_time'])){
+ $start_time = strtotime($param['start_time']);
+ $end_time = strtotime($param['end_time']);
+ $where['create_time'] = [['>=',$start_time],['<=',$end_time]];
+ }
+ if(!empty($param['keyword'])){
+ $where['phone'] = $param['keyword'];
+ }
+ $data = Db::name('sale_audit')->where($where)->order('create_time','DESC')->paginate(12);
+ $data_arr = $data -> toArray();
+ foreach($data_arr['data'] as $key => $val){
+ $data_user = Db::name('user') -> where('id',$val['uid']) -> find();
+ $data_arr['data'][$key]['wname'] = $data_user['user_nickname'];
}
+ $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : '');
+ $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : '');
+ $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : '');
$this -> assign('data',$data);
$this -> assign('data_arr',$data_arr['data']);
return $this -> fetch();
diff --git a/app/admin/controller/GoodsController.php b/app/admin/controller/GoodsController.php
index 1a9a44d..bc12f47 100644
--- a/app/admin/controller/GoodsController.php
+++ b/app/admin/controller/GoodsController.php
@@ -11,53 +11,43 @@ class GoodsController extends AdminBaseController{
* 平台商品列表
*/
public function goods_list(){
+ $param = $this->request->param();
+ $where = [
+ 'type' => ['=', 1],
+ ];
+ if(!empty($param['start_time']) && !empty($param['end_time'])){
+ $start_time = strtotime($param['start_time']);
+ $end_time = strtotime($param['end_time']);
+ $where['create_time'] = [['>=',$start_time],['<=',$end_time]];
+ }
+ if(!empty($param['keyword'])){
+ $keyword = $param['keyword'];
+ $where['book_name'] = ['like',"%$keyword%"];
+ }
+ if(!empty($param['classify_id'])){
+ if($param['classify_id'] == 0){
+ $where['classify_id'] = 0;
+ }elseif ($param['classify_id'] == 100){
- if($this -> request -> isPost()){
- $where = [
- 'type' => ['=', 1],
- ];
- if(!empty($_POST['start_time']) && !empty($_POST['end_time'])){
- $start_time = strtotime($_POST['start_time']);
- $end_time = strtotime($_POST['end_time']);
- $where['create_time'] = [['>=',$start_time],['<=',$end_time]];
- }
- $keyword = $_POST['keyword'];
- if(!empty($_POST['keyword'])){
- $where['book_name'] = ['like',"%$keyword%"];
- }
- if(!empty($_POST['classify_id'])){
- if($_POST['classify_id'] == 0){
- $where['classify_id'] = 0;
- }elseif ($_POST['classify_id'] == 100){
-
- }else{
- $where['classify_id'] = $_POST['classify_id'];
- }
- }
- $classif_data = Db::name('classification') -> select();
- $this -> assign('classif_data',$classif_data);
- $data = Db::name('goods') -> where($where) -> paginate(1000000);
- $data1 = $data -> toArray();
- foreach ($data1['data'] as $key => $val){
- $class_data = Db::name('classification') -> where('id',$val['classify_id']) -> find();
- $data1['data'][$key]['classify_name'] = $class_data['name'];
- }
- $this -> assign('data',$data1['data']);
- $this -> assign('res',$data);
- return $this -> fetch();
- }else{
- $classif_data = Db::name('classification') -> select();
- $this -> assign('classif_data',$classif_data);
- $data = Db::name('goods') -> where('type','1') -> paginate(12);
- $data1 = $data -> toArray();
- foreach ($data1['data'] as $key => $val){
- $class_data = Db::name('classification') -> where('id',$val['classify_id']) -> find();
- $data1['data'][$key]['classify_name'] = $class_data['name'];
+ }else{
+ $where['classify_id'] = $param['classify_id'];
}
- $this -> assign('data',$data1['data']);
- $this -> assign('res',$data);
- return $this -> fetch();
}
+ $classif_data = Db::name('classification') -> select();
+ $this -> assign('classif_data',$classif_data);
+ $data = Db::name('goods') -> where($where)->order('create_time','DESC')->paginate(12);
+ $data1 = $data -> toArray();
+ foreach ($data1['data'] as $key => $val){
+ $class_data = Db::name('classification') -> where('id',$val['classify_id']) -> find();
+ $data1['data'][$key]['classify_name'] = $class_data['name'];
+ }
+ $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : '');
+ $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : '');
+ $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : '');
+ $this->assign('classify_id',!empty($param['classify_id']) ? $param['classify_id'] : '');
+ $this -> assign('data',$data1['data']);
+ $this -> assign('res',$data);
+ return $this -> fetch();
}
diff --git a/app/admin/controller/LabelController.php b/app/admin/controller/LabelController.php
index ce562c6..89401fc 100644
--- a/app/admin/controller/LabelController.php
+++ b/app/admin/controller/LabelController.php
@@ -12,7 +12,7 @@ class LabelController extends AdminBaseController{
*/
public function classify_list(){
- $data = Db::name('classification') -> select();
+ $data = Db::name('classification')->order('create_time','DESC')->select();
$this -> assign('data',$data);
return $this -> fetch();
diff --git a/app/admin/controller/OrderscourierController.php b/app/admin/controller/OrderscourierController.php
index e0cb1c6..3c9c551 100644
--- a/app/admin/controller/OrderscourierController.php
+++ b/app/admin/controller/OrderscourierController.php
@@ -10,26 +10,26 @@ class OrderscourierController extends AdminBaseController{
*平台订单列表
*/
public function order_list(){
-
- if($this -> request -> isPost()){
- $where = [
- "indent_type" => 1
- ];
- if(!empty($_POST['start_time']) && !empty($_POST['end_time'])){
- $start_time = strtotime($_POST['start_time']);
- $end_time = strtotime($_POST['end_time']);
- $where['create_time'] = [['>=',$start_time],['<=',$end_time]];
- }
- if(!empty($_POST['keyword'])){
- $where['order_number'] = $_POST['keyword'];
- }
- if(!empty($_POST['state'])){
- $where['state'] = $_POST['state'];
- }
- $data = Db::name('indent') -> where($where) -> where("state = 2 or state = 3 or state = 5") -> paginate(1000000);
- }else{
- $data = Db::name('indent') -> where('indent_type','1') -> where("state = 2 or state = 3 or state = 5") -> paginate(12);
+ $param = $this->request->param();
+ $where = [
+ "indent_type" => 1
+ ];
+ if(!empty($param['start_time']) && !empty($param['end_time'])){
+ $start_time = strtotime($param['start_time']);
+ $end_time = strtotime($param['end_time']);
+ $where['create_time'] = [['>=',$start_time],['<=',$end_time]];
+ }
+ if(!empty($param['keyword'])){
+ $where['order_number'] = ['like','%'.$param['keyword'].'%'];
+ }
+ if(!empty($param['state'])){
+ $where['state'] = $param['state'];
}
+ $data = Db::name('indent') -> where($where) -> where("state = 2 or state = 3 or state = 5") -> paginate(12);
+ $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : '');
+ $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : '');
+ $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : '');
+ $this->assign('state',!empty($param['state']) ? $param['state'] : '');
$this -> assign('data',$data);
return $this -> fetch();
diff --git a/app/admin/controller/SalesmangoodsController.php b/app/admin/controller/SalesmangoodsController.php
index 20fb6e0..7f4b65a 100644
--- a/app/admin/controller/SalesmangoodsController.php
+++ b/app/admin/controller/SalesmangoodsController.php
@@ -11,28 +11,30 @@ class SalesmangoodsController extends AdminBaseController{
*业务员商品列表
*/
public function salesman_list(){
-
- if($this -> request -> isPost()){
- $where = [
- 'type' => 2,
- ];
- if(!empty($_POST['start_time']) && !empty($_POST['end_time'])){
- $start_time = strtotime($_POST['start_time']);
- $end_time = strtotime($_POST['end_time']);
- $where['a.create_time'] = [['>=',$start_time],['<=',$end_time]];
- }
- if(!empty($_POST['keyword'])){
- $keyword = $_POST['keyword'];
- $where['a.book_name'] = ['like',"%$keyword%"];
- }
- $data = Db::name('goods') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b',"a.uid=b.id",'LEFT') -> where($where) -> paginate(1000000);
- $this -> assign('data',$data);
- return $this -> fetch();
- }else{
- $data = Db::name('goods') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b',"a.uid=b.id",'LEFT') -> where('type',2) -> paginate(12);
- $this -> assign('data',$data);
- return $this -> fetch();
+ $param = $this->request->param();
+ $where = [
+ 'type' => 2,
+ ];
+ if(!empty($param['start_time']) && !empty($param['end_time'])){
+ $start_time = strtotime($param['start_time']);
+ $end_time = strtotime($param['end_time']);
+ $where['a.create_time'] = [['>=',$start_time],['<=',$end_time]];
+ }
+ if(!empty($param['keyword'])){
+ $keyword = $param['keyword'];
+ $where['a.book_name'] = ['like',"%$keyword%"];
}
+ $data = Db::name('goods')->alias('a')
+ ->field('a.*,b.user_nickname')
+ ->join('user b',"a.uid=b.id",'LEFT')
+ ->where($where)
+ ->order('a.create_time','DESC')
+ ->paginate(12);
+ $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : '');
+ $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : '');
+ $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : '');
+ $this -> assign('data',$data);
+ return $this -> fetch();
}
diff --git a/app/admin/controller/SchoolController.php b/app/admin/controller/SchoolController.php
index d1bbe75..eeab799 100644
--- a/app/admin/controller/SchoolController.php
+++ b/app/admin/controller/SchoolController.php
@@ -12,23 +12,19 @@ class SchoolController extends AdminBaseController{
* 学校管理列表
* */
public function school_list(){
-
- if($this -> request -> isPost()){
- if(!empty($_POST['start_time']) && !empty($_POST['end_time'])){
- $start_time = strtotime($_POST['start_time']);
- $end_time = strtotime($_POST['end_time']);
- $where['create_time'] = [['>=',$start_time],['<=',$end_time]];
- }
- if(!empty($_POST['keyword'])){
- $keyword = $_POST['keyword'];
- $where['school'] = ['like',"%$keyword%"];
- }
- $data1 = Db::name('school') -> where($where) -> paginate(1000000) ;
- $data = $data1 -> toArray();
- }else{
- $data1 = Db::name('school') -> paginate(12) ;
- $data = $data1 -> toArray();
+ $param = $this->request->param();
+ $where = [];
+ if(!empty($param['start_time']) && !empty($param['end_time'])){
+ $start_time = strtotime($param['start_time']);
+ $end_time = strtotime($param['end_time']);
+ $where['create_time'] = [['>=',$start_time],['<=',$end_time]];
+ }
+ if(!empty($param['keyword'])){
+ $keyword = $param['keyword'];
+ $where['school'] = ['like',"%$keyword%"];
}
+ $data1 = Db::name('school')->where($where)->order('create_time','DESC') -> paginate(12) ;
+ $data = $data1 -> toArray();
foreach ($data['data'] as $key => $val){
$user_data = Db::name('user') -> where('id',$val['uid']) -> find();
$data['data'][$key]['uname'] = $user_data['user_nickname'];
diff --git a/app/admin/controller/WithdrawalController.php b/app/admin/controller/WithdrawalController.php
index e597fa2..1918b7d 100644
--- a/app/admin/controller/WithdrawalController.php
+++ b/app/admin/controller/WithdrawalController.php
@@ -13,29 +13,27 @@ class WithdrawalController extends AdminBaseController{
* 提现审核
*/
public function withd_audit(){
-
- if($this -> request -> isPost()){
- $where['state'] = 0;
- if(!empty($_POST['start_time']) && !empty($_POST['end_time'])){
- $start_time = strtotime($_POST['start_time']);
- $end_time = strtotime($_POST['end_time']);
- $where['a.create_time'] = [['>=',$start_time],['<=',$end_time]];
- }
- if(!empty($_POST['keyword'])){
- $where['b.phone'] = $_POST['keyword'];
- }
- $data = Db::name('money_expend') -> alias('a') -> field('a.*,b.phone') -> join('my_user b','a.uid=b.uid','LEFT') -> where($where) -> paginate(1000000);
- $data_arr = $data -> toArray();
- }else{
- $data = Db::name('money_expend') -> alias('a') -> field('a.*,b.phone') -> join('my_user b','a.uid=b.uid','LEFT') -> where("state = 0") -> paginate(12);
- $data_arr = $data -> toArray();
+ $param = $this->request->param();
+ $where['state'] = 0;
+ if(!empty($param['start_time']) && !empty($param['end_time'])){
+ $start_time = strtotime($param['start_time']);
+ $end_time = strtotime($param['end_time']);
+ $where['a.create_time'] = [['>=',$start_time],['<=',$end_time]];
+ }
+ if(!empty($param['keyword'])){
+ $where['b.phone'] = ['like','%'.$param['keyword'].'%'];
}
+ $data = Db::name('money_expend') -> alias('a') -> field('a.*,b.phone') -> join('my_user b','a.uid=b.uid','LEFT') -> where($where) -> paginate(12);
+ $data_arr = $data -> toArray();
if(!empty($data_arr)){
foreach($data_arr['data'] as $key => $val){
$name = Db::name('user') -> where('id',$val['uid']) -> find();
$data_arr['data'][$key]['name'] = $name['user_nickname'];
}
}
+ $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : '');
+ $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : '');
+ $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : '');
$this -> assign('data_arr',$data_arr['data']);
$this -> assign('data',$data);
return $this -> fetch();
@@ -46,29 +44,27 @@ class WithdrawalController extends AdminBaseController{
* 提现列表
*/
public function withd_list(){
-
- if($this -> request -> isPost()){
- $where['state'] = [['=',1],['=',2],'or'];
- if(!empty($_POST['start_time']) && !empty($_POST['end_time'])){
- $start_time = strtotime($_POST['start_time']);
- $end_time = strtotime($_POST['end_time']);
- $where['a.create_time'] = [['>=',$start_time],['<=',$end_time]];
- }
- if(!empty($_POST['keyword'])){
- $where['b.phone'] = $_POST['keyword'];
- }
- $data = Db::name('money_expend') -> alias('a') -> field('a.*,b.phone') -> join('my_user b','a.uid=b.uid','LEFT') -> where($where) -> paginate(1000000);
- $data_arr = $data -> toArray();
- }else{
- $data = Db::name('money_expend') -> alias('a') -> field('a.*,b.phone') -> join('my_user b','a.uid=b.uid','LEFT') -> where("state = 1 or state = 2") -> order("a.create_time desc") -> paginate(12);
- $data_arr = $data -> toArray();
+ $param = $this->request->param();
+ $where['state'] = [['=',1],['=',2],'or'];
+ if(!empty($param['start_time']) && !empty($param['end_time'])){
+ $start_time = strtotime($param['start_time']);
+ $end_time = strtotime($param['end_time']);
+ $where['a.create_time'] = [['>=',$start_time],['<=',$end_time]];
+ }
+ if(!empty($param['keyword'])){
+ $where['b.phone'] = ['like','%'.$param['keyword'].'%'];
}
+ $data = Db::name('money_expend') -> alias('a') -> field('a.*,b.phone') -> join('my_user b','a.uid=b.uid','LEFT') -> where($where) -> order("a.create_time desc") -> paginate(12);
+ $data_arr = $data -> toArray();
if(!empty($data_arr)){
foreach($data_arr['data'] as $key => $val){
$name = Db::name('user') -> where('id',$val['uid']) -> find();
$data_arr['data'][$key]['name'] = $name['user_nickname'];
}
}
+ $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : '');
+ $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : '');
+ $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : '');
$this -> assign('data_arr',$data_arr['data']);
$this -> assign('data',$data);
return $this -> fetch();
diff --git a/public/themes/admin_simpleboot3/admin/goods/goods_list.html b/public/themes/admin_simpleboot3/admin/goods/goods_list.html
index 16eff21..bfa2631 100755
--- a/public/themes/admin_simpleboot3/admin/goods/goods_list.html
+++ b/public/themes/admin_simpleboot3/admin/goods/goods_list.html
@@ -28,7 +28,7 @@
<option value="100">全部</option>
<option value="0">为空</option>
<volist name="classif_data" id="vo">
- <option value="{$vo.id}">{$vo.name}</option>
+ <option value="{$vo.id}" <eq name="classify_id" value="$vo['id']">selected</eq> >{$vo.name}</option>
</volist>
</select>
<input type="submit" class="btn btn-primary" value="搜索"/>
diff --git a/public/themes/admin_simpleboot3/admin/orderscourier/order_list.html b/public/themes/admin_simpleboot3/admin/orderscourier/order_list.html
index 95e76a5..5157764 100644
--- a/public/themes/admin_simpleboot3/admin/orderscourier/order_list.html
+++ b/public/themes/admin_simpleboot3/admin/orderscourier/order_list.html
@@ -25,8 +25,8 @@
订单状态:
<select name="state" class="form-control">
<option value="">全部</option>
- <option value="3">已完成</option>
- <option value="2">未完成</option>
+ <option value="3" <eq name="state" value="3">selected</eq> >已完成</option>
+ <option value="2" <eq name="state" value="2">selected</eq> >未完成</option>
</select>
<input type="submit" class="btn btn-primary" value="搜索"/>
<a class="btn btn-danger" href="{:url('Orderscourier/order_list')}">清空</a>