1

.idea/workspace.xml

@@ -121,7 +121,7 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../fssy" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../xiang_admin" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -202,7 +202,7 @@
       <workItem from="1670547445908" duration="12147000" />
       <workItem from="1670633686675" duration="15717000" />
       <workItem from="1670719843429" duration="8446000" />
-      <workItem from="1670807412269" duration="1990000" />
+      <workItem from="1670807412269" duration="2407000" />
     </task>
     <servers />
   </component>
@@ -280,10 +280,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="283" y="145" width="1942" height="1088" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1670291222413" />
-    <state x="1418" y="514" key="FileChooserDialogImpl" timestamp="1670578042981">
+    <state x="1418" y="514" key="FileChooserDialogImpl" timestamp="1670810057067">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1418" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1670578042981" />
+    <state x="1418" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1670810057067" />
     <state x="981" y="616" key="VCS.ChangelistChooser" timestamp="1667975342482">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

application/user/controller/Member.php

@@ -60,12 +60,25 @@ class Member extends Controller
         if($level_id = input('get.level_id')) $where[] = ['m.level_id','=',$level_id];
         if($account_type = input('get.account_type')) $where[] = ['m.account_type','=',$account_type];
         $field="m.id,m.openid,m.name,m.headimg,m.level_exp,m.phone,m.status,m.create_at,m.account_type,w.growth,w.integral,w.money,m.tag_id,label";
+        $create_at = input('create_at');
+        if(isset($create_at) && $create_at) {
+            $time = explode(' - ',$_GET['create_at']);
+            $start_date_time = $time[0];
+            $end_date_time =  $time[1];
+        }
         $query = $this->_query($this->table)
             ->field($field)
             ->alias('m')
             ->leftJoin('UserWallet w','m.id =w.user_id')
             ->where($where)
-            ->dateBetween('m.create_at')->order('id desc')->page();
+            ->when($create_at,function ($q)use ($create_at){
+                if($create_at){
+                    $time = explode(' - ',$_GET['create_at']);
+                    $start_date_time = $time[0];
+                    $end_date_time =  $time[1];
+                    $q->whereBetweenTime('m.create_at',$start_date_time,$end_date_time);
+                }
+            })->order('id desc')->page();
     }
 
     /**