上传

application/admin/controller/User.php

@@ -63,9 +63,14 @@ class User extends AuthBase
         if($nickname){
         if($nickname){
             $condition['nickname'] = ['like','%'.$nickname.'%'];
             $condition['nickname'] = ['like','%'.$nickname.'%'];
         }
         }
-        if($is_vip){
-            $condition['is_vip'] = $is_vip;
-        }
+        // if($is_vip){
+        //     $condition['vip_endtime'] = ['>=',date('Y-m-d H:i:s')];
+        // }else{
+        //     $condition['vip_endtime'] = ['<',date('Y-m-d H:i:s')];
+        // }
+        // if($is_vip){
+        //     $condition['vip_endtime'] = 1;
+        // }
         if($start_time&&$end_time){
         if($start_time&&$end_time){
             $condition['created_at'] = ['between',[$start_time.' 00:00:00',$end_time.' 00:00:00']];
             $condition['created_at'] = ['between',[$start_time.' 00:00:00',$end_time.' 00:00:00']];
         }else{
         }else{
@@ -79,6 +84,7 @@ class User extends AuthBase
         $mulit_arr = [];
         $mulit_arr = [];
         $mulit_arr['data'] = [];
         $mulit_arr['data'] = [];
         $cont = [['真实姓名','微信号','昵称','性别','电话','是否是会员','注册时间','更新时间','会员到期时间']];
         $cont = [['真实姓名','微信号','昵称','性别','电话','是否是会员','注册时间','更新时间','会员到期时间']];
+<<<<<<< HEAD
 //            [
 //            [
 //                'data'=>
 //                'data'=>
 //                    [
 //                    [
@@ -94,6 +100,9 @@ class User extends AuthBase
             //        ['title'=>'工作空间2名称']，
             //        ['title'=>'工作空间2名称']，
             //   ]
             //   ]
 //            ];
 //            ];
+=======
+
+>>>>>>> 5d590c1903c67ef1e2f127fec2999b966fdcfe3d
         foreach ($user_list as $vo){
         foreach ($user_list as $vo){
             $arr = [];
             $arr = [];
             $arr[] = $vo['name'];
             $arr[] = $vo['name'];

application/admin/view/user/index.html

@@ -153,6 +153,7 @@
             var is_vip = $("#is_vip").val();
             var is_vip = $("#is_vip").val();
             var start_time = $("#start_time").val();
             var start_time = $("#start_time").val();
             var end_time = $("#end_time").val();
             var end_time = $("#end_time").val();
+            console.log("{:url('admin/user/userOutput')}"+'?nickname='+nickname+'&is_vip='+is_vip+'&start_time='+start_time+'&end_time='+end_time);
             window.location.href="{:url('admin/user/userOutput')}"+'?nickname='+nickname+'&is_vip='+is_vip+'&start_time='+start_time+'&end_time='+end_time;
             window.location.href="{:url('admin/user/userOutput')}"+'?nickname='+nickname+'&is_vip='+is_vip+'&start_time='+start_time+'&end_time='+end_time;
             $(this).removeAttr('disabled');
             $(this).removeAttr('disabled');
         });
         });