anyv / xkeasy · 提交

转到一个项目

作者 anyv
提交 a985a24df9671957c0795299b172e5f6e2d03213 1 个父辈 12aa1285
1 个管道 的构建 通过 耗费 2 秒

5

内嵌 并排对比
正在显示 12 个修改的文件 包含 40 行增加 和 16 行删除
@@ -23,7 +23,7 @@ class AuditController extends AdminBaseController{ @@ -23,7 +23,7 @@ class AuditController extends AdminBaseController{
23 if(!empty($_POST['keyword'])){ 23 if(!empty($_POST['keyword'])){
24 $where['phone'] = $_POST['keyword']; 24 $where['phone'] = $_POST['keyword'];
25 } 25 }
26 - $data = Db::name('sale_audit') -> where($where) -> paginate(12); 26 + $data = Db::name('sale_audit') -> where($where) -> paginate(1000000);
27 $data_arr = $data -> toArray(); 27 $data_arr = $data -> toArray();
28 foreach($data_arr['data'] as $key => $val){ 28 foreach($data_arr['data'] as $key => $val){
29 $data_user = Db::name('user') -> where('id',$val['uid']) -> find(); 29 $data_user = Db::name('user') -> where('id',$val['uid']) -> find();
@@ -36,7 +36,7 @@ class GoodsController extends AdminBaseController{ @@ -36,7 +36,7 @@ class GoodsController extends AdminBaseController{
36 } 36 }
37 $classif_data = Db::name('classification') -> select(); 37 $classif_data = Db::name('classification') -> select();
38 $this -> assign('classif_data',$classif_data); 38 $this -> assign('classif_data',$classif_data);
39 - $data = Db::name('goods') -> where($where) -> paginate(12); 39 + $data = Db::name('goods') -> where($where) -> paginate(1000000);
40 $data1 = $data -> toArray(); 40 $data1 = $data -> toArray();
41 foreach ($data1['data'] as $key => $val){ 41 foreach ($data1['data'] as $key => $val){
42 $class_data = Db::name('classification') -> where('id',$val['classify_id']) -> find(); 42 $class_data = Db::name('classification') -> where('id',$val['classify_id']) -> find();
@@ -26,7 +26,7 @@ class OrderscourierController extends AdminBaseController{ @@ -26,7 +26,7 @@ class OrderscourierController extends AdminBaseController{
26 if(!empty($_POST['state'])){ 26 if(!empty($_POST['state'])){
27 $where['state'] = $_POST['state']; 27 $where['state'] = $_POST['state'];
28 } 28 }
29 - $data = Db::name('indent') -> where($where) -> where("state = 2 or state = 3 or state = 5") -> paginate(12); 29 + $data = Db::name('indent') -> where($where) -> where("state = 2 or state = 3 or state = 5") -> paginate(1000000);
30 }else{ 30 }else{
31 $data = Db::name('indent') -> where('indent_type','1') -> where("state = 2 or state = 3 or state = 5") -> paginate(12); 31 $data = Db::name('indent') -> where('indent_type','1') -> where("state = 2 or state = 3 or state = 5") -> paginate(12);
32 } 32 }
@@ -27,9 +27,21 @@ class PlatformordersController extends AdminBaseController{ @@ -27,9 +27,21 @@ class PlatformordersController extends AdminBaseController{
27 if(!empty($_POST['state'])){ 27 if(!empty($_POST['state'])){
28 $where['state'] = $_POST['state']; 28 $where['state'] = $_POST['state'];
29 } 29 }
30 - $data = Db::name('indent') -> where($where) -> paginate(12); 30 + $data = Db::name('indent') -> where($where) -> paginate(1000000);
  31 + $data1 = $data -> toArray();
  32 + if(count($data1['data'])!=0){
  33 + foreach ($data1['data'] as $key => $val){
  34 + $data1['data'][$key]['dizhi'] = Db::name('address') -> where('id',$val['indent_address']) -> find();
  35 + }
  36 + }
  37 + $this -> assign('data1',$data1['data']);
31 }else{ 38 }else{
32 $data = Db::name('indent') -> where('indent_type','1') -> paginate(12); 39 $data = Db::name('indent') -> where('indent_type','1') -> paginate(12);
  40 + $data1 = $data -> toArray();
  41 + foreach ($data1['data'] as $key => $val){
  42 + $data1['data'][$key]['dizhi'] = Db::name('address') -> where('id',$val['indent_address']) -> find();
  43 + }
  44 + $this -> assign('data1',$data1['data']);
33 } 45 }
34 $this -> assign('data',$data); 46 $this -> assign('data',$data);
35 return $this -> fetch(); 47 return $this -> fetch();
@@ -25,7 +25,7 @@ class SalesmanController extends AdminBaseController{ @@ -25,7 +25,7 @@ class SalesmanController extends AdminBaseController{
25 $keyword = $_POST['keyword']; 25 $keyword = $_POST['keyword'];
26 $where['b.phone'] = $keyword; 26 $where['b.phone'] = $keyword;
27 } 27 }
28 - $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); 28 + $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);
29 }else{ 29 }else{
30 $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); 30 $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);
31 31
@@ -311,7 +311,7 @@ class SalesmanController extends AdminBaseController{ @@ -311,7 +311,7 @@ class SalesmanController extends AdminBaseController{
311 $where['user_nickname'] = ['like',"%$keyword%"]; 311 $where['user_nickname'] = ['like',"%$keyword%"];
312 } 312 }
313 $this -> assign('salesman_id',$_POST['salesman_id']); 313 $this -> assign('salesman_id',$_POST['salesman_id']);
314 - $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','left') -> where($where) -> paginate(12); 314 + $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','left') -> where($where) -> paginate(1000000);
315 $data_arr = $data -> toArray(); 315 $data_arr = $data -> toArray();
316 }else{ 316 }else{
317 $id = $this -> request -> param(); 317 $id = $this -> request -> param();
@@ -359,7 +359,7 @@ class SalesmanController extends AdminBaseController{ @@ -359,7 +359,7 @@ class SalesmanController extends AdminBaseController{
359 $keyword = $_POST['keyword']; 359 $keyword = $_POST['keyword'];
360 $where['b.user_nickname'] = ['like',"%$keyword%"]; 360 $where['b.user_nickname'] = ['like',"%$keyword%"];
361 } 361 }
362 - $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','left') -> where($where) -> paginate(12); 362 + $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','left') -> where($where) -> paginate(1000000);
363 }else{ 363 }else{
364 $id = $this -> request -> param(); 364 $id = $this -> request -> param();
365 $teacher_id = $id['teacher_id']; 365 $teacher_id = $id['teacher_id'];
@@ -25,7 +25,7 @@ class SalesmangoodsController extends AdminBaseController{ @@ -25,7 +25,7 @@ class SalesmangoodsController extends AdminBaseController{
25 $keyword = $_POST['keyword']; 25 $keyword = $_POST['keyword'];
26 $where['book_name'] = ['like',"%$keyword%"]; 26 $where['book_name'] = ['like',"%$keyword%"];
27 } 27 }
28 - $data = Db::name('goods') -> group('book_name') -> where($where) -> paginate(12); 28 + $data = Db::name('goods') -> group('book_name') -> where($where) -> paginate(1000000);
29 $this -> assign('data',$data); 29 $this -> assign('data',$data);
30 return $this -> fetch(); 30 return $this -> fetch();
31 }else{ 31 }else{
@@ -37,7 +37,7 @@ class SalesmanorderController extends AdminBaseController{ @@ -37,7 +37,7 @@ class SalesmanorderController extends AdminBaseController{
37 if(!empty($_POST['grade'])){ 37 if(!empty($_POST['grade'])){
38 $where['grade'] = $_POST['grade']; 38 $where['grade'] = $_POST['grade'];
39 } 39 }
40 - $data = Db::name('indent') -> where($where) -> paginate(50); 40 + $data = Db::name('indent') -> where($where) -> paginate(1000000);
41 $data_arr = $data -> toArray(); 41 $data_arr = $data -> toArray();
42 }else{ 42 }else{
43 $data = Db::name('indent') -> where('indent_type',2) -> paginate(12); 43 $data = Db::name('indent') -> where('indent_type',2) -> paginate(12);
@@ -23,7 +23,7 @@ class SchoolController extends AdminBaseController{ @@ -23,7 +23,7 @@ class SchoolController extends AdminBaseController{
23 $keyword = $_POST['keyword']; 23 $keyword = $_POST['keyword'];
24 $where['school'] = ['like',"%$keyword%"]; 24 $where['school'] = ['like',"%$keyword%"];
25 } 25 }
26 - $data1 = Db::name('school') -> where($where) -> paginate(12) ; 26 + $data1 = Db::name('school') -> where($where) -> paginate(1000000) ;
27 $data = $data1 -> toArray(); 27 $data = $data1 -> toArray();
28 }else{ 28 }else{
29 $data1 = Db::name('school') -> paginate(12) ; 29 $data1 = Db::name('school') -> paginate(12) ;
@@ -27,7 +27,7 @@ class UsersController extends AdminBaseController{ @@ -27,7 +27,7 @@ class UsersController extends AdminBaseController{
27 if($_POST['identity'] != ""){ 27 if($_POST['identity'] != ""){
28 $where['a.status'] = $_POST['identity']; 28 $where['a.status'] = $_POST['identity'];
29 } 29 }
30 - $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','LEFT') -> where($where) -> paginate(12); 30 + $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','LEFT') -> where($where) -> paginate(1000000);
31 }else{ 31 }else{
32 $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','LEFT') -> paginate(12); 32 $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','LEFT') -> paginate(12);
33 33
@@ -72,7 +72,7 @@ class UsersController extends AdminBaseController{ @@ -72,7 +72,7 @@ class UsersController extends AdminBaseController{
72 $where['user_nickname'] = ['like',"%$keyword%"]; 72 $where['user_nickname'] = ['like',"%$keyword%"];
73 } 73 }
74 $this -> assign('salesman_id',$_POST['salesman_id']); 74 $this -> assign('salesman_id',$_POST['salesman_id']);
75 - $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','left') -> where($where) -> paginate(12); 75 + $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','left') -> where($where) -> paginate(1000000);
76 $data_arr = $data -> toArray(); 76 $data_arr = $data -> toArray();
77 }else{ 77 }else{
78 $id = $this -> request -> param(); 78 $id = $this -> request -> param();
@@ -120,7 +120,7 @@ class UsersController extends AdminBaseController{ @@ -120,7 +120,7 @@ class UsersController extends AdminBaseController{
120 $keyword = $_POST['keyword']; 120 $keyword = $_POST['keyword'];
121 $where['b.user_nickname'] = ['like',"%$keyword%"]; 121 $where['b.user_nickname'] = ['like',"%$keyword%"];
122 } 122 }
123 - $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','left') -> where($where) -> paginate(12); 123 + $data = Db::name('my_user') -> alias('a') -> field('a.*,b.user_nickname') -> join('user b','a.uid = b.id','left') -> where($where) -> paginate(1000000);
124 }else{ 124 }else{
125 $id = $this -> request -> param(); 125 $id = $this -> request -> param();
126 $teacher_id = $id['teacher_id']; 126 $teacher_id = $id['teacher_id'];
@@ -24,7 +24,7 @@ class WithdrawalController extends AdminBaseController{ @@ -24,7 +24,7 @@ class WithdrawalController extends AdminBaseController{
24 if(!empty($_POST['keyword'])){ 24 if(!empty($_POST['keyword'])){
25 $where['b.phone'] = $_POST['keyword']; 25 $where['b.phone'] = $_POST['keyword'];
26 } 26 }
27 - $data = Db::name('money_expend') -> alias('a') -> field('a.*,b.phone') -> join('my_user b','a.uid=b.uid','LEFT') -> where($where) -> paginate(12); 27 + $data = Db::name('money_expend') -> alias('a') -> field('a.*,b.phone') -> join('my_user b','a.uid=b.uid','LEFT') -> where($where) -> paginate(1000000);
28 $data_arr = $data -> toArray(); 28 $data_arr = $data -> toArray();
29 }else{ 29 }else{
30 $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); 30 $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{ @@ -57,7 +57,7 @@ class WithdrawalController extends AdminBaseController{
57 if(!empty($_POST['keyword'])){ 57 if(!empty($_POST['keyword'])){
58 $where['b.phone'] = $_POST['keyword']; 58 $where['b.phone'] = $_POST['keyword'];
59 } 59 }
60 - $data = Db::name('money_expend') -> alias('a') -> field('a.*,b.phone') -> join('my_user b','a.uid=b.uid','LEFT') -> where($where) -> paginate(12); 60 + $data = Db::name('money_expend') -> alias('a') -> field('a.*,b.phone') -> join('my_user b','a.uid=b.uid','LEFT') -> where($where) -> paginate(1000000);
61 $data_arr = $data -> toArray(); 61 $data_arr = $data -> toArray();
62 }else{ 62 }else{
63 $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); 63 $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);
@@ -37,6 +37,9 @@ @@ -37,6 +37,9 @@
37 <tr> 37 <tr>
38 <th>序号</th> 38 <th>序号</th>
39 <th>订单号</th> 39 <th>订单号</th>
  40 + <th>姓名</th>
  41 + <th>手机号</th>
  42 + <th>收货地址</th>
40 <th>数量</th> 43 <th>数量</th>
41 <th>价钱</th> 44 <th>价钱</th>
42 <th>订单状态</th> 45 <th>订单状态</th>
@@ -45,10 +48,13 @@ @@ -45,10 +48,13 @@
45 </tr> 48 </tr>
46 </thead> 49 </thead>
47 <tbody> 50 <tbody>
48 - <volist name="data" id="vo"> 51 + <volist name="data1" id="vo">
49 <tr class="tr{$vo.id}"> 52 <tr class="tr{$vo.id}">
50 <td>{$vo.id}</td> 53 <td>{$vo.id}</td>
51 <td>{$vo.order_number}</td> 54 <td>{$vo.order_number}</td>
  55 + <td>{$vo.name}</td>
  56 + <td>{$vo.phone}</td>
  57 + <td>{$vo.dizhi['region']} {$vo.dizhi['detailed']}</td>
52 <td>{$vo.book_num}</td> 58 <td>{$vo.book_num}</td>
53 <td>{$vo.money}</td> 59 <td>{$vo.money}</td>
54 <if condition="$vo.state eq 4"> 60 <if condition="$vo.state eq 4">
@@ -71,6 +71,9 @@ @@ -71,6 +71,9 @@
71 <tr> 71 <tr>
72 <th>序号</th> 72 <th>序号</th>
73 <th>订单号</th> 73 <th>订单号</th>
  74 + <th>姓名</th>
  75 + <th>手机号</th>
  76 + <th>地区</th>
74 <th>数量</th> 77 <th>数量</th>
75 <th>价钱</th> 78 <th>价钱</th>
76 <th>学校-班级</th> 79 <th>学校-班级</th>
@@ -84,6 +87,9 @@ @@ -84,6 +87,9 @@
84 <tr class="tr{$vo.id}"> 87 <tr class="tr{$vo.id}">
85 <td>{$vo.id}</td> 88 <td>{$vo.id}</td>
86 <td>{$vo.order_number}</td> 89 <td>{$vo.order_number}</td>
  90 + <td>{$vo.name}</td>
  91 + <td>{$vo.phone}</td>
  92 + <td>{$vo.region}</td>
87 <td>{$vo.book_num}</td> 93 <td>{$vo.book_num}</td>
88 <td>{$vo.money}</td> 94 <td>{$vo.money}</td>
89 <td>{$vo.grade_class}</td> 95 <td>{$vo.grade_class}</td>