作者 王智

daima

@@ -7,24 +7,13 @@ @@ -7,24 +7,13 @@
7 <div class="widget-body no-padding"> 7 <div class="widget-body no-padding">
8 <div id="toolbar" class="toolbar"> 8 <div id="toolbar" class="toolbar">
9 <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a> 9 <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
10 - <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('lovecar/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>  
11 <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('lovecar/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a> 10 <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('lovecar/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
12 <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('lovecar/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a> 11 <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('lovecar/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
13 - <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('lovecar/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>  
14 -  
15 - <div class="dropdown btn-group {:$auth->check('lovecar/multi')?'':'hide'}">  
16 - <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>  
17 - <ul class="dropdown-menu text-left" role="menu">  
18 - <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>  
19 - <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>  
20 - </ul>  
21 - </div>  
22 12
23 13
24 </div> 14 </div>
25 <table id="table" class="table table-striped table-bordered table-hover table-nowrap" 15 <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
26 data-operate-edit="{:$auth->check('lovecar/edit')}" 16 data-operate-edit="{:$auth->check('lovecar/edit')}"
27 - data-operate-del="{:$auth->check('lovecar/del')}"  
28 width="100%"> 17 width="100%">
29 </table> 18 </table>
30 </div> 19 </div>
@@ -441,13 +441,14 @@ class User extends Api @@ -441,13 +441,14 @@ class User extends Api
441 if ($param['type'] == 3) { 441 if ($param['type'] == 3) {
442 $map['status'] = ['eq', 0]; 442 $map['status'] = ['eq', 0];
443 } 443 }
444 - $rult = Db::name('order')->where($map)->where('user_id', $user_id)->order('id desc')->page($param['pages'], $param['rows']) 444 + $map2['status'] = ['neq', 2];
  445 + $rult = Db::name('order')->where($map)->where($map2)->where('user_id', $user_id)->order('id desc')->page($param['pages'], $param['rows'])
445 ->alias('a') 446 ->alias('a')
446 ->join('user u', 'u.id=a.user_id') 447 ->join('user u', 'u.id=a.user_id')
447 ->join('vip v', 'v.id=a.vip_id') 448 ->join('vip v', 'v.id=a.vip_id')
448 ->field('a.id,a.order_sn,v.title,v.price,a.status,a.createtime,u.address,u.address_con,u.car_num,u.color,u.car_type') 449 ->field('a.id,a.order_sn,v.title,v.price,a.status,a.createtime,u.address,u.address_con,u.car_num,u.color,u.car_type')
449 ->select(); 450 ->select();
450 - $count = Db::name('order')->where($map)->where('user_id', $user_id)->order('id desc') 451 + $count = Db::name('order')->where($map)->where($map2)->where('user_id', $user_id)->order('id desc')
451 ->alias('a') 452 ->alias('a')
452 ->join('user u', 'u.id=a.user_id') 453 ->join('user u', 'u.id=a.user_id')
453 ->join('vip v', 'v.id=a.vip_id') 454 ->join('vip v', 'v.id=a.vip_id')
@@ -788,7 +789,7 @@ class User extends Api @@ -788,7 +789,7 @@ class User extends Api
788 'xi_type' => $param['type'], 789 'xi_type' => $param['type'],
789 'xi_images' => $param['images'], 790 'xi_images' => $param['images'],
790 'updatetime' => time(), 791 'updatetime' => time(),
791 - 'type' => $param['type '] 792 + 'type' => $param['type']
792 ]; 793 ];
793 $res = Db::name('renwu')->where('id', $param['order_id'])->where('xi_id', $user_id)->update($data); 794 $res = Db::name('renwu')->where('id', $param['order_id'])->where('xi_id', $user_id)->update($data);
794 $this->res($res); 795 $this->res($res);