1

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

@@ -46,8 +46,7 @@ class OrderShift extends Base
             $limit = $this->request->param('limit',10);
             $off_set = $this->request->param('offset',0);
             $search_time = $this->request->param('createtime',0);
-
-
+            var_dump($limit);
 
             if($search_time) {
                 $search_time = explode(' - ',$search_time);

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

@@ -198,20 +198,19 @@
                     </div>
                 </div>
             </div>
-            <div class="screen-container-right display-flex">
-                <div class="custom-filter-content">
-                    <el-input placeholder="请输入内容" v-model="searchForm.form_1_value" class="input-with-select" size="small">
+        </div>
+        <el-collapse-transition>
+            <div class="screen-con" v-if="screenType">
+                <div class="display-flex header-select-item">
+                    <el-input placeholder="请输入内容" v-model="searchForm.form_1_value" class="input-with-select"
+                              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="会员ID" value="user_id"></el-option>
+                            <el-option label="会员昵称" value="nickname"></el-option>
+                            <el-option label="手机号" value="user_phone"></el-option>
                         </el-select>
                     </el-input>
                 </div>
-            </div>
-        </div>
-        <el-collapse-transition>
-            <div class="screen-con" v-if="screenType">
                 <div class="header-button-item display-flex">
                     <el-button size="small" @click="screenEmpty">重置</el-button>
                     <el-button type="primary" size="small" @click="getData(0,10)">筛选</el-button>