daima

@@ -7,24 +7,13 @@
                 <div class="widget-body no-padding">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('lovecar/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <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>
                         <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>
                         <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>
                         <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>
-                        <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>
-
-                        <div class="dropdown btn-group {:$auth->check('lovecar/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
-                            <ul class="dropdown-menu text-left" role="menu">
-                                <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>
-                                <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>
-                            </ul>
-                        </div>
 
 
                         
                         
                     </div>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('lovecar/edit')}" 
                            data-operate-edit="{:$auth->check('lovecar/edit')}" 
-                           data-operate-del="{:$auth->check('lovecar/del')}" 
                            width="100%">
                            width="100%">
                     </table>
                     </table>
                 </div>
                 </div>

@@ -441,13 +441,14 @@ class User extends Api
         if ($param['type'] == 3) {
         if ($param['type'] == 3) {
             $map['status'] = ['eq', 0];
             $map['status'] = ['eq', 0];
         }
         }
-        $rult = Db::name('order')->where($map)->where('user_id', $user_id)->order('id desc')->page($param['pages'], $param['rows'])
+        $map2['status'] = ['neq', 2];
+        $rult = Db::name('order')->where($map)->where($map2)->where('user_id', $user_id)->order('id desc')->page($param['pages'], $param['rows'])
             ->alias('a')
             ->alias('a')
             ->join('user u', 'u.id=a.user_id')
             ->join('user u', 'u.id=a.user_id')
             ->join('vip v', 'v.id=a.vip_id')
             ->join('vip v', 'v.id=a.vip_id')
             ->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')
             ->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')
             ->select();
             ->select();
-        $count = Db::name('order')->where($map)->where('user_id', $user_id)->order('id desc')
+        $count = Db::name('order')->where($map)->where($map2)->where('user_id', $user_id)->order('id desc')
             ->alias('a')
             ->alias('a')
             ->join('user u', 'u.id=a.user_id')
             ->join('user u', 'u.id=a.user_id')
             ->join('vip v', 'v.id=a.vip_id')
             ->join('vip v', 'v.id=a.vip_id')
@@ -788,7 +789,7 @@ class User extends Api
             'xi_type' => $param['type'],
             'xi_type' => $param['type'],
             'xi_images' => $param['images'],
             'xi_images' => $param['images'],
             'updatetime' => time(),
             'updatetime' => time(),
-            'type' => $param['type  ']
+            'type' => $param['type']
         ];
         ];
         $res = Db::name('renwu')->where('id', $param['order_id'])->where('xi_id', $user_id)->update($data);
         $res = Db::name('renwu')->where('id', $param['order_id'])->where('xi_id', $user_id)->update($data);
         $this->res($res);
         $this->res($res);