1

application/admin/controller/shopro/order/OrderShift.php

@@ -48,33 +48,19 @@ class OrderShift extends Base
             $filter = $filter ? $filter : [];
             $limit = $this->request->param('limit',10);
             $off_set = $this->request->param('offset',0);
-            $sel_where = [];
-            if(isset($filter['createtime'])) {
-                $search_time = explode(' - ',$filter['createtime']);
-                var_dump($search_time);
-                $sel_where[]=  ['create_at','between time',$search_time];
-               // $sel_where[] = ['create_at','<time',$search_time[1]];
-            }
-            if(isset($filter['sh_status']))$sel_where[] = ['sh_status','=',$filter['sh_status']];
-            if(isset($filter['user_id']))$sel_where[] = ['user_id','=',$filter['user_id']];
-            $name = $this->model->getQuery()->getTable();
-            $tableName = $name . '.';
-            $userTableName = (new \app\admin\model\User())->getQuery()->getTable();
-            $total =  $this->model->where($sel_where)
-                ->where(function ($query)use ($filter,$tableName,$userTableName){
-                    $query = $query->table($userTableName)->where($userTableName . '.id=' . $tableName . 'user_id');
-                    if (isset($filter['nickname']))$query->where('nickname', 'like', "%{$filter['nickname']}%");
-                    if (isset($filter['user_phone']))$query->where('mobile', 'like', "%{$filter['user_phone']}%");
-                })->buildSql();
-            var_dump($total);
+            $total =  $this->model->where(function ($query)use ($filter){
+                    if (isset($filter['createtime']))$query->where('create_at', 'between time', explode(' - ',$filter['createtime']));
+                    if (isset($filter['sh_status']))$query->where('sh_status', '=', $filter['sh_status']);
+                    if (isset($filter['user_id']))$query->where('user_id', '=', $filter['user_id']);
+                    if (isset($filter['order_no']))$query->where('order_no', 'like', '%'.$filter['order_no'].'%');
+                })->count();
             $list= $this->model->with('user')
-                ->where($sel_where)
-                ->where(function ($query)use ($filter,$tableName,$userTableName){
-                    $query = $query->table($userTableName)->where($userTableName . '.id=' . $tableName . 'user_id');
-                    if (isset($filter['nickname']))$query->where('nickname', 'like', "%{$filter['nickname']}%");
-                    if (isset($filter['user_phone']))$query->where('mobile', 'like', "%{$filter['user_phone']}%");
-                })
-                ->order('id desc')
+                ->where(function ($query)use ($filter){
+                    if (isset($filter['createtime']))$query->where('create_at', 'between time', explode(' - ',$filter['createtime']));
+                    if (isset($filter['sh_status']))$query->where('sh_status', '=', $filter['sh_status']);
+                    if (isset($filter['user_id']))$query->where('user_id', '=', $filter['user_id']);
+                    if (isset($filter['order_no']))$query->where('order_no', 'like', '%'.$filter['order_no'].'%');
+                })->order('id desc')
                 ->limit($off_set,$limit)
                 ->select();
             $result = array("total" => $total, "rows" => $list);

application/admin/view/shopro/order/order_shift/index.html

@@ -206,8 +206,7 @@
                               size="small">
                         <el-select v-model="searchForm.form_1_key" slot="prepend" placeholder="请选择">
                             <el-option label="会员ID" value="user_id"></el-option>
-                            <el-option label="会员昵称" value="nickname"></el-option>
-                            <el-option label="手机号" value="user_phone"></el-option>
+                            <el-option label="订单号" value="order_no"></el-option>
                         </el-select>
                     </el-input>
                 </div>
@@ -236,6 +235,9 @@
                             <el-image class="table-image" :src="scope.row.user.avatar"></el-image>
                             <div>
                                 <div class="ellipsis-item">
+                                    {{scope.row.user.id}}
+                                </div>
+                                <div class="ellipsis-item">
                                     {{scope.row.user.nickname}}
                                 </div>
                                 <div>

public/assets/js/backend/shopro/order/order_shift.js

@@ -41,8 +41,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             sh_status: "=",
                             create_at: "range",
                             user_id: "=",
-                            nickname: "like",
-                            user_phone: "like",
+                            order_no: "like",
                         },
                         focusi: false,
                         //审核