diff --git a/app/admin/controller/AuditController.php b/app/admin/controller/AuditController.php
index 53b39e8..373282a 100644
--- a/app/admin/controller/AuditController.php
+++ b/app/admin/controller/AuditController.php
@@ -23,7 +23,7 @@ class AuditController extends AdminBaseController{
if(!empty($_POST['keyword'])){
$where['phone'] = $_POST['keyword'];
}
- $data = Db::name('sale_audit') -> where($where) -> paginate(12);
+ $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();
diff --git a/app/admin/controller/GoodsController.php b/app/admin/controller/GoodsController.php
index f10a892..1a9a44d 100644
--- a/app/admin/controller/GoodsController.php
+++ b/app/admin/controller/GoodsController.php
@@ -36,7 +36,7 @@ class GoodsController extends AdminBaseController{
}
$classif_data = Db::name('classification') -> select();
$this -> assign('classif_data',$classif_data);
- $data = Db::name('goods') -> where($where) -> paginate(12);
+ $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();
diff --git a/app/admin/controller/OrderscourierController.php b/app/admin/controller/OrderscourierController.php
index df77d6f..e0cb1c6 100644
--- a/app/admin/controller/OrderscourierController.php
+++ b/app/admin/controller/OrderscourierController.php
@@ -26,7 +26,7 @@ class OrderscourierController extends AdminBaseController{
if(!empty($_POST['state'])){
$where['state'] = $_POST['state'];
}
- $data = Db::name('indent') -> where($where) -> where("state = 2 or state = 3 or state = 5") -> paginate(12);
+ $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);
}
diff --git a/app/admin/controller/PlatformordersController.php b/app/admin/controller/PlatformordersController.php
index 1b70883..b25306d 100644
--- a/app/admin/controller/PlatformordersController.php
+++ b/app/admin/controller/PlatformordersController.php
@@ -27,9 +27,21 @@ class PlatformordersController extends AdminBaseController{
if(!empty($_POST['state'])){
$where['state'] = $_POST['state'];
}
- $data = Db::name('indent') -> where($where) -> paginate(12);
+ $data = Db::name('indent') -> where($where) -> paginate(1000000);
+ $data1 = $data -> toArray();
+ if(count($data1['data'])!=0){
+ foreach ($data1['data'] as $key => $val){
+ $data1['data'][$key]['dizhi'] = Db::name('address') -> where('id',$val['indent_address']) -> find();
+ }
+ }
+ $this -> assign('data1',$data1['data']);
}else{
$data = Db::name('indent') -> where('indent_type','1') -> paginate(12);
+ $data1 = $data -> toArray();
+ foreach ($data1['data'] as $key => $val){
+ $data1['data'][$key]['dizhi'] = Db::name('address') -> where('id',$val['indent_address']) -> find();
+ }
+ $this -> assign('data1',$data1['data']);
}
$this -> assign('data',$data);
return $this -> fetch();
diff --git a/app/admin/controller/SalesmanController.php b/app/admin/controller/SalesmanController.php
index a46da2d..11629db 100644
--- a/app/admin/controller/SalesmanController.php
+++ b/app/admin/controller/SalesmanController.php
@@ -25,7 +25,7 @@ class SalesmanController extends AdminBaseController{
$keyword = $_POST['keyword'];
$where['b.phone'] = $keyword;
}
- $data = Db::name('my_user') -> alias('a') -> field("a.uid,a.id,a.balance,a.audit_time,a.is_pro,b.phone") -> join('sale_audit b','a.uid = b.uid','LEFT') -> where($where) -> group('a.id') -> paginate(12);
+ $data = Db::name('my_user') -> alias('a') -> field("a.uid,a.id,a.balance,a.audit_time,a.is_pro,b.phone") -> join('sale_audit b','a.uid = b.uid','LEFT') -> where($where) -> group('a.id') -> paginate(1000000);
}else{
$data = Db::name('my_user') -> alias('a') -> field("a.uid,a.id,a.balance,a.audit_time,a.is_pro,b.phone") -> join('sale_audit b','a.uid = b.uid','LEFT') -> where('a.status',2) -> group('a.id') -> paginate(12);
@@ -311,7 +311,7 @@ class SalesmanController extends AdminBaseController{
$where['user_nickname'] = ['like',"%$keyword%"];
}
$this -> assign('salesman_id',$_POST['salesman_id']);
- $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','left') -> where($where) -> paginate(12);
+ $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','left') -> where($where) -> paginate(1000000);
$data_arr = $data -> toArray();
}else{
$id = $this -> request -> param();
@@ -359,7 +359,7 @@ class SalesmanController extends AdminBaseController{
$keyword = $_POST['keyword'];
$where['b.user_nickname'] = ['like',"%$keyword%"];
}
- $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','left') -> where($where) -> paginate(12);
+ $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','left') -> where($where) -> paginate(1000000);
}else{
$id = $this -> request -> param();
$teacher_id = $id['teacher_id'];
diff --git a/app/admin/controller/SalesmangoodsController.php b/app/admin/controller/SalesmangoodsController.php
index 5adffe1..d0d163c 100644
--- a/app/admin/controller/SalesmangoodsController.php
+++ b/app/admin/controller/SalesmangoodsController.php
@@ -25,7 +25,7 @@ class SalesmangoodsController extends AdminBaseController{
$keyword = $_POST['keyword'];
$where['book_name'] = ['like',"%$keyword%"];
}
- $data = Db::name('goods') -> group('book_name') -> where($where) -> paginate(12);
+ $data = Db::name('goods') -> group('book_name') -> where($where) -> paginate(1000000);
$this -> assign('data',$data);
return $this -> fetch();
}else{
diff --git a/app/admin/controller/SalesmanorderController.php b/app/admin/controller/SalesmanorderController.php
index 548cf79..432a70f 100644
--- a/app/admin/controller/SalesmanorderController.php
+++ b/app/admin/controller/SalesmanorderController.php
@@ -37,7 +37,7 @@ class SalesmanorderController extends AdminBaseController{
if(!empty($_POST['grade'])){
$where['grade'] = $_POST['grade'];
}
- $data = Db::name('indent') -> where($where) -> paginate(50);
+ $data = Db::name('indent') -> where($where) -> paginate(1000000);
$data_arr = $data -> toArray();
}else{
$data = Db::name('indent') -> where('indent_type',2) -> paginate(12);
diff --git a/app/admin/controller/SchoolController.php b/app/admin/controller/SchoolController.php
index f521eb8..02030ce 100644
--- a/app/admin/controller/SchoolController.php
+++ b/app/admin/controller/SchoolController.php
@@ -23,7 +23,7 @@ class SchoolController extends AdminBaseController{
$keyword = $_POST['keyword'];
$where['school'] = ['like',"%$keyword%"];
}
- $data1 = Db::name('school') -> where($where) -> paginate(12) ;
+ $data1 = Db::name('school') -> where($where) -> paginate(1000000) ;
$data = $data1 -> toArray();
}else{
$data1 = Db::name('school') -> paginate(12) ;
diff --git a/app/admin/controller/UsersController.php b/app/admin/controller/UsersController.php
index 44e3946..72ca4cf 100644
--- a/app/admin/controller/UsersController.php
+++ b/app/admin/controller/UsersController.php
@@ -27,7 +27,7 @@ class UsersController extends AdminBaseController{
if($_POST['identity'] != ""){
$where['a.status'] = $_POST['identity'];
}
- $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','LEFT') -> where($where) -> paginate(12);
+ $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','LEFT') -> where($where) -> paginate(1000000);
}else{
$data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','LEFT') -> paginate(12);
@@ -72,7 +72,7 @@ class UsersController extends AdminBaseController{
$where['user_nickname'] = ['like',"%$keyword%"];
}
$this -> assign('salesman_id',$_POST['salesman_id']);
- $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','left') -> where($where) -> paginate(12);
+ $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','left') -> where($where) -> paginate(1000000);
$data_arr = $data -> toArray();
}else{
$id = $this -> request -> param();
@@ -120,7 +120,7 @@ class UsersController extends AdminBaseController{
$keyword = $_POST['keyword'];
$where['b.user_nickname'] = ['like',"%$keyword%"];
}
- $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','left') -> where($where) -> paginate(12);
+ $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','left') -> where($where) -> paginate(1000000);
}else{
$id = $this -> request -> param();
$teacher_id = $id['teacher_id'];
diff --git a/app/admin/controller/WithdrawalController.php b/app/admin/controller/WithdrawalController.php
index 714d44d..fd8d64b 100644
--- a/app/admin/controller/WithdrawalController.php
+++ b/app/admin/controller/WithdrawalController.php
@@ -24,7 +24,7 @@ class WithdrawalController extends AdminBaseController{
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(12);
+ $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);
@@ -57,7 +57,7 @@ class WithdrawalController extends AdminBaseController{
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(12);
+ $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") -> paginate(12);
diff --git a/public/themes/admin_simpleboot3/admin/platformorders/plat_list.html b/public/themes/admin_simpleboot3/admin/platformorders/plat_list.html
index d3c6dfc..45bce5e 100755
--- a/public/themes/admin_simpleboot3/admin/platformorders/plat_list.html
+++ b/public/themes/admin_simpleboot3/admin/platformorders/plat_list.html
@@ -37,6 +37,9 @@
<tr>
<th>序号</th>
<th>订单号</th>
+ <th>姓名</th>
+ <th>手机号</th>
+ <th>收货地址</th>
<th>数量</th>
<th>价钱</th>
<th>订单状态</th>
@@ -45,10 +48,13 @@
</tr>
</thead>
<tbody>
- <volist name="data" id="vo">
+ <volist name="data1" id="vo">
<tr class="tr{$vo.id}">
<td>{$vo.id}</td>
<td>{$vo.order_number}</td>
+ <td>{$vo.name}</td>
+ <td>{$vo.phone}</td>
+ <td>{$vo.dizhi['region']} {$vo.dizhi['detailed']}</td>
<td>{$vo.book_num}</td>
<td>{$vo.money}</td>
<if condition="$vo.state eq 4">
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 bde6d20..735444d 100755
--- a/public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_list.html
+++ b/public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_list.html
@@ -71,6 +71,9 @@
<tr>
<th>序号</th>
<th>订单号</th>
+ <th>姓名</th>
+ <th>手机号</th>
+ <th>地区</th>
<th>数量</th>
<th>价钱</th>
<th>学校-班级</th>
@@ -84,6 +87,9 @@
<tr class="tr{$vo.id}">
<td>{$vo.id}</td>
<td>{$vo.order_number}</td>
+ <td>{$vo.name}</td>
+ <td>{$vo.phone}</td>
+ <td>{$vo.region}</td>
<td>{$vo.book_num}</td>
<td>{$vo.money}</td>
<td>{$vo.grade_class}</td>