diff --git a/app/admin/controller/SalesmanController.php b/app/admin/controller/SalesmanController.php index 2bb06fa..fd8e915 100644 --- a/app/admin/controller/SalesmanController.php +++ b/app/admin/controller/SalesmanController.php @@ -388,8 +388,7 @@ class SalesmanController extends AdminBaseController{ public function salesman_money(){ $uid = $this -> request -> param(); - $data = Db::name('money_income') -> where('uid',$uid['uid']) -> select() -> toArray(); - $money_ratio = Db::name('money_ratio')->where('id',1)->find(); + $data = Db::name('money_income') -> where('uid',$uid['uid'])->order('create_time','DESC') -> select() -> toArray(); if(!empty($data)){ foreach ($data as $key => $val){ if($val['type'] == 2){ @@ -404,7 +403,6 @@ class SalesmanController extends AdminBaseController{ $data[$key]['indent'] = Db::name('indent') -> where('id',$val['indent_id']) -> find(); $data[$key]['indent_good'] = $val['book_name']; } - $data[$key]['money'] = $val['money'] * $money_ratio['salesman_ratio']; } } $this -> assign('data',$data); diff --git a/app/admin/controller/UsersController.php b/app/admin/controller/UsersController.php index 74b8915..2d2a3f5 100644 --- a/app/admin/controller/UsersController.php +++ b/app/admin/controller/UsersController.php @@ -176,9 +176,7 @@ class UsersController extends AdminBaseController{ public function users_money(){ $uid = $this -> request -> param(); - $data = Db::name('money_income') -> where('uid',$uid['uid']) -> select() -> toArray(); - $my_user = Db::name('my_user')->where('uid',$uid['uid'])->find(); - $money_ratio = Db::name('money_ratio')->where('id',1)->find(); + $data = Db::name('money_income') -> where('uid',$uid['uid'])->order('create_time','DESC') -> select() -> toArray(); if(!empty($data)){ foreach ($data as $key => $val){ if($val['type'] == 2){ @@ -193,12 +191,6 @@ class UsersController extends AdminBaseController{ $data[$key]['indent'] = Db::name('indent') -> where('id',$val['indent_id']) -> find(); $data[$key]['indent_good'] = $val['book_name']; } - if($my_user['status'] == 2) { - $data[$key]['money'] = $val['money'] * $money_ratio['salesman_ratio']; - } - if($my_user['status'] == 3) { - $data[$key]['money'] = $val['money'] * $money_ratio['teacher_ratio']; - } } } $this -> assign('data',$data); diff --git a/public/themes/admin_simpleboot3/admin/platformorders/plat_list.html b/public/themes/admin_simpleboot3/admin/platformorders/plat_list.html index 64a4fee..fd555e9 100755 --- a/public/themes/admin_simpleboot3/admin/platformorders/plat_list.html +++ b/public/themes/admin_simpleboot3/admin/platformorders/plat_list.html @@ -33,7 +33,7 @@ <a class="btn btn-danger" href="{:url('Platformorders/plat_list')}">清空</a> <input type="button" class="btn btn-primary" id="excel" value="导出"/> </form> - <table class="table table-bordered"> + <table class="table table-hover table-bordered table-list"> <thead> <tr> <th>序号</th> diff --git a/public/themes/admin_simpleboot3/admin/salesman/salesman_list.html b/public/themes/admin_simpleboot3/admin/salesman/salesman_list.html index 98ddc1d..fe2f455 100755 --- a/public/themes/admin_simpleboot3/admin/salesman/salesman_list.html +++ b/public/themes/admin_simpleboot3/admin/salesman/salesman_list.html @@ -28,7 +28,7 @@ <input type="submit" class="btn btn-primary" value="搜索"/> <a class="btn btn-danger" href="{:url('Salesman/salesman_list')}">清空</a> </form> - <table class="table table-bordered"> + <table class="table table-hover table-bordered table-list"> <thead> <tr> <th>序号</th> diff --git a/public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_list.html b/public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_list.html index 9dccfe5..9e95675 100755 --- a/public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_list.html +++ b/public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_list.html @@ -50,7 +50,7 @@ <div style="margin-left: 1200px;"> <span>总盈利:¥{$money}</span> </div> - <table class="table table-bordered" style="margin-top: 20px;"> + <table class="table table-hover table-bordered table-list" style="margin-top: 20px;"> <thead> <tr> <th>序号</th> diff --git a/public/themes/admin_simpleboot3/admin/users/user_list.html b/public/themes/admin_simpleboot3/admin/users/user_list.html index 4c4ebbb..21b858b 100755 --- a/public/themes/admin_simpleboot3/admin/users/user_list.html +++ b/public/themes/admin_simpleboot3/admin/users/user_list.html @@ -36,7 +36,7 @@ <input type="submit" class="btn btn-primary" value="搜索"/> <a class="btn btn-danger" href="{:url('Users/user_list')}">清空</a> </form> - <table class="table table-bordered"> + <table class="table table-hover table-bordered table-list"> <caption>边框表格布局</caption> <thead> <tr> diff --git a/public/themes/admin_simpleboot3/admin/users/users_money.html b/public/themes/admin_simpleboot3/admin/users/users_money.html index c6f3678..03872fd 100755 --- a/public/themes/admin_simpleboot3/admin/users/users_money.html +++ b/public/themes/admin_simpleboot3/admin/users/users_money.html @@ -6,7 +6,7 @@ <li><a href="{:url('Users/user_list')}">用户列表</a></li> <li class="active"><a href="#">余额明细列表</a></li> </ul> - <table class="table table-bordered"> + <table class="table table-hover table-bordered table-list"> <thead> <tr> <th>收入时间</th>