Revert "Revert "谢其江""

This reverts commit a4b03e0f91fd2e734faffa5f1e72e6ee5e29bd69.

app/Http/Controllers/Admin/ProjectController.php

@@ -82,9 +82,9 @@ class ProjectController extends BaseController
             $items->where('id','=',request('project_id'));
         }
 
-        if($request->input('type') == 'apply') {
+        /*if($request->input('type') == 'apply') {
             $items = $items->whereNotNull('user_id');
-        }
+        }*/
         $manager_user_id = request('manager_user_id',0);
         if(empty($manager_user_id)){
             $manager_user_id = 0;
@@ -124,12 +124,13 @@ class ProjectController extends BaseController
 
     public function store(Request $request)
     {
-        if(empty($request->input('data')) || !is_array($request->input('data'))) return back()->withErrors(['sg_error_info' => '数据错误']);
+       if(empty($request->input('data')) || !is_array($request->input('data'))) return back()->withErrors(['sg_error_info' => '数据错误']);
         $validator = $this->model->getValidator($request, 'store');
         if($validator->fails()) {
             return back()->withErrors($validator)->withInput();
         }
         $data = $request->input('data');
+        $data = json_decode(json_encode($data,JSON_UNESCAPED_UNICODE),true);//echo "<pre>";var_dump($data);return "";
         $res = $this->model->create($data);
         if(empty($res)) return back()->withErrors(['sg_error_info' => '保存失败']);
         return redirect($this->pre_uri . 'create')->with(['sg_success_info' => '创建成功']);

app/Http/Controllers/Admin/UserController.php

@@ -51,6 +51,12 @@ class UserController extends BaseController
                 $items = $items->where($tmp_item, 'like', '%' . $request->input($tmp_item) . '%');
             }
         }
+        $tmp_items = collect(['phone']);
+        foreach($tmp_items as $tmp_item) {
+            if($request->has($tmp_item) && !empty($request->input($tmp_item))) {
+                $items = $items->where($tmp_item, 'like', '%' . $request->input($tmp_item) . '%');
+            }
+        }
         $ids = [];
         if($request->input('project_id') || $request->input('project_role_id')) {
             $project_users = ProjectUser::where('id', '>', 0);
@@ -97,6 +103,11 @@ class UserController extends BaseController
         {
             return back()->withErrors(['sg_error_info' => '请输入正确的手机号']);
         }
+        //查询输入的手机号码是否已存在于数据库中
+        $phone = $this->model->where('phone','=',$data['phone'])->get();
+        if(count($phone)>=1){
+            return back()->withErrors(['sg_error_info' => '该手机号码已经存在，请重新输入手机号码']);
+        }
 //        $project_id = $data['project_id'];
 //        $project_role_id = $data['project_role_id'];
         unset($data['password_confirmation']);

app/Http/Controllers/Admin/UserResetController.php

@@ -10,6 +10,7 @@ use App\Models\Road;
 use App\Models\User;
 use App\Models\UserReset;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 class UserResetController extends BaseController
 {
@@ -33,13 +34,26 @@ class UserResetController extends BaseController
 
     public function index()
     {
+
+        $admin_id = Auth::guard('admin')->user()->id;//获取超级管理员信息
+
+        $items = $this->model->leftjoin('users','users.id','=','user_resets.user_id')
+            ->where('user_resets.id', '>', 0)->orderBy('user_resets.updated_at', 'desc')
+            ->select('user_resets.*','users.name as real_name')
+            ->get();
+        /*echo "<pre>";var_dump(json_decode(json_encode($items,JSON_UNESCAPED_UNICODE),true));
+        return "";*/
+
         list($model, $model_name, $pre_uri) = array($this->model, $this->model_name, $this->pre_uri);
         return view($this->view_path . 'index', compact('model', 'model_name','pre_uri'));
     }
 
     public function get(Request $request)
     {
-        $items = $this->model->where('id', '>', 0)->orderBy('updated_at', 'desc');
+        //$items = $this->model->where('id', '>', 0)->orderBy('updated_at', 'desc');
+        $items = $this->model->leftjoin('users','users.id','=','user_resets.user_id')
+            ->where('user_resets.id', '>', 0)->orderBy('user_resets.updated_at', 'desc')
+            ->select('user_resets.*','users.name as real_name');
 
         $tmp_items = collect(['name']);
         foreach($tmp_items as $tmp_item) {
@@ -106,6 +120,10 @@ class UserResetController extends BaseController
 
     public function delete(Request $request)
     {
+        $admin_id = Auth::guard('admin')->user()->id;//获取超级管理员信息
+        if($admin_id!=1){
+            return back()->withErrors(['sg_error_info' => '您不是超级管理员没有删除权限！']);
+        }
         if(empty($request->input('id')) || empty($item = $this->model->find($request->input('id')))) return response()->json(['status' => 'fail', 'info' => '找不到要删除的数据']);
         $res = $item->delete();
         if (!$res) return response()->json(['status' => 'fail', 'info' => '删除失败']);
@@ -114,6 +132,12 @@ class UserResetController extends BaseController
 
     public function reset(Request $request)
     {
+        $name = $request->input('name');
+        $real_name = $request->input('real_name');
+        if($name!==$real_name){
+            return response()->json(['status' => 'fail', 'info' => '提交人和真实姓名不一致']);
+        }
+
         if(empty($request->input('id')) || empty($item = $this->model->find($request->input('id')))) return response()->json(['status' => 'fail', 'info' => '找不到数据']);
         $user = User::find($item->user_id);
         if(empty($user)) return response()->json(['status' => 'fail', 'info' => '找不到数据']);

app/Http/Controllers/Api/mini/AuthController.php

@@ -10,6 +10,11 @@ use Illuminate\Support\Facades\Log;
 
 class AuthController extends BaseController
 {
+    protected $model;
+    public function __construct()
+    {
+        $this->model = new User();
+    }
     public function login(Request $request)
     {
         $credentials = $request->only('phone', 'password');
@@ -23,7 +28,54 @@ class AuthController extends BaseController
         return $this->error(['msg' => '账号或密码错误']);
     }
 
+    //通过微信登陆时需要判断手机号是否存在，若存在就不要再往数据库中添加数据了
+    //将这一步的通过微信授权登陆改为直接手机授权登陆
     public function loginByWechat(Request $request)
+    {
+        $app = app('wechat.mini_program');
+        $session_key = $request->input('session_key');
+        if(!$session_key && $request->input('code')) {
+            $res = $app->auth->session($request->input('code'));
+            if(isset($res['session_key'])) $session_key = $res['session_key'];
+        }
+        if($session_key) {
+            $data = $app->encryptor->decryptData($session_key, $request->input('iv'), $request->input('encryptedData'));
+            if(isset($data['phoneNumber'])) {
+                $user = Auth::guard('mini')->user();
+                //在数据库中若存在该手机号码的数据需要update进行修改数据、若不存在需要向数据库中添加数据
+                $phone = User::where("phone","=",$data['phoneNumber'])->first();
+                if(!empty($phone)){
+                    //存在手机号码直接修改
+                    User::where('phone',$data['phoneNumber'] )->update([
+                        [
+                            'open_id' => $data['openId']
+                        ], [
+                            'name' => $data['nickName'],
+                            'nickname' => $data['nickName'],
+                            'avatar' => $data['avatarUrl']
+                        ]
+                    ]);
+                    return $this->error(['msg' => '后台已经存在这个手机号码了，请换一个手机号码绑定']);
+                }
+                //不存在手机号码直接添加数据
+                $user = User::firstOrCreate([
+                    'open_id' => $data['openId']
+                ], [
+                    'phone' => $data['phoneNumber'],
+                    'name' => $data['nickName'],
+                    'nickname' => $data['nickName'],
+                    'avatar' => $data['avatarUrl']
+                ]);
+                $user = $user->getUserInfo($session_key);
+                return $this->success(['data' => $user]);
+            }
+
+            return $this->error(['msg' => '获取失败']);
+        }
+        return $this->error(['msg' => '获取失败']);
+    }
+
+    public function loginByWechat1(Request $request)
     {
         $app = app('wechat.mini_program');
         $session_key = $request->input('session_key');
@@ -81,6 +133,11 @@ class AuthController extends BaseController
                 Log::info('进入parsePhone函数 没有电话号码');
 
                 $user = Auth::guard('mini')->user();
+                //在个人信息中的第三个选项的手机号码绑定这一步不是先修改的操作而是先判断手机号码是否存在于数据库中，若存在于数据库就可以不用修改了直接返回该手机号码已经在后台设置了
+                $phone = User::where("phone","=",$data['phoneNumber'])->first();
+                if(!empty($phone)){
+                    return $this->error(['msg' => '后台已经存在这个手机号码了，请换一个手机号码绑定']);
+                }
                 $user->update(['phone' => $data['phoneNumber']]);
                 $user = $user->getUserInfo($session_key);
                 return $this->success(['data' => $user]);

app/Http/Controllers/Api/mini/DataController.php

@@ -121,10 +121,22 @@ class DataController extends BaseController
         return $order_devices->pluck('order_id')->unique();
     }
 
+    //柱形图展示
     public function getStat(Request $request)
     {
         $info = [];
         $device_arr = $request->input('device_ids');
+        $start_date = $request->input('start_date');
+        $end_date = $request->input('end_date');
+        if(count($device_arr)===1){
+            //单项目
+            $values = [1000,1500];
+            $names = $device_arr;
+            $projects = Project::whereIn('id', $this->project_ids)->where('id','!=',1)->get();
+            $legends = [$start_date,$end_date];
+            return $this->success(['data' => compact('values', 'names', 'legends','info')]);
+        }
+        //多项目
         $device_name_arr = $request->input('device_name_ids');
         $spec_arr = $request->input('spec_ids');
         if (array_sum($device_arr) != 0)
@@ -141,6 +153,7 @@ class DataController extends BaseController
         if($request->input('chart_type') == 'pie') return $this->getPieData($request);
         else if($request->input('chart_type') == 'radar') return $this->getRadarData($request);
         $orders = $this->getOrders($request);
+        if(!$orders) return $this->error(['msg' => '']);
         $names = [];
         $values = [];
         // year|month
@@ -171,6 +184,7 @@ class DataController extends BaseController
         return $this->success(['data' => compact('values', 'names', 'legends','info')]);
     }
 
+    //雷达图
     public function getRadarData(Request $request)
     {
         $orders = $this->getOrders($request);
@@ -234,6 +248,7 @@ class DataController extends BaseController
         return $days;
     }
 
+    //饼状图
     public function getPieData(Request $request)
     {
         $order_ids = $this->getOrderIds($request);
@@ -252,6 +267,7 @@ class DataController extends BaseController
         return $this->success(['data' => compact('data', 'legends')]);
     }
 
+    //明细图
     public function getDetailData(Request $request)
     {
 //        $order_ids = $this->getOrderIds($request);
@@ -422,114 +438,70 @@ class DataController extends BaseController
     {
         $start=2020;
         $now = date('Y',time());
-        $years_arr = [[
-            'text' => '请选择年份',
-            'value' => ''
-        ]];
+        $years_arr = [];
         for ($i = 0;$i<=($now-$start);$i++)
         {
-            $years_arr[$i+1]['text'] = ($start+$i).'年';
-            $years_arr[$i+1]['value'] = $i+1;
+            array_push($years_arr,($start+$i).'年');
         }
         return $this->success(['msg' => '操作成功', 'data' => $years_arr]);
     }
     public function getSingleStat(Request $request)
     {
-        //如果初始进来不传筛选的年份，那就默认选择当前的年份
-        $project_year = $request->input('project_year')? $request->input('project_year'):date('Y',time());
+        //租赁订单
+        $items = Order::where('type', 1);
+        //2021-3-1
+        $date = $request->input('date');
         //如果有项目id，那就用项目id，如果没有就默认选择第一个项目
-        if ($request->input('project_id')!=0)
-        {
-            $all_project = 0;
-            $project_id = $request->input('project_id') ? $request->input('project_id') : Project::where('id','>',1)->first()->id;
-            $project = Project::find($project_id);
-        }else
-        {
-            $all_project = 1;
-        }
+        $project_id = $request->input('project_id') ? $request->input('project_id') : Project::where('id','>',1)->first()->id;
+        //找到这个项目
+        $project = Project::find($project_id);
+        //在订单表里面获取到对应项目的订单集合
+        $items = $items->where('project_id', $project->id);
+        //判断按年还是按月
         $sort_type = $request->input('sort_type') == 'year' ? 'year' : 'month';
+        //如果有传时间，那就用时间，如果没有传时间，那就用本地的时间
+        $date = $date ? $date : Carbon::now()->toDateString();
         $values = [];
         $names = [];
         $name = $sort_type == 'year' ? '每年租赁金额' : '每月租赁金额';
         if($sort_type == 'month') {
-            $start_at = $project_year.'-01-01 00:00:00';
-            $end_at = ($project_year+1).'-01-01 00:00:00';
-            for($i = 1; $i < 13; $i++) {
-                if ($i>9&&$i!=12)
-                {
-                    $start_month_at = $project_year.'-'.$i.'-01 00:00:00';
-                }else
-                {
-                    $start_month_at = $project_year.'-0'.$i.'-01 00:00:00';
-                }
-                if ($i>=9&&$i!=12)
-                {
-                    $end_month_at = $project_year.'-'.($i+1).'-01 00:00:00';
-                }else
-                {
-                    $end_month_at = $project_year.'-0'.($i+1).'-01 00:00:00';
-                }
-                if ($i==12)
-                {
-                    $start_month_at = $project_year.'-'.$i.'-01 00:00:00';
-                    $end_month_at = ($project_year+1).'-01-01 00:00:00';
-                }
-                if ($all_project == 0)
-                {
-                    $value = Order::where('type',1)
-                        ->where('project_id', $project->id)
-                        ->whereBetween('created_at',[$start_at,$end_at])
-                        ->whereBetween('created_at',[$start_month_at,$end_month_at])
-                        ->sum('money');
-                    $value = $value/100;
-                }else
-                {
-                    $value = Order::where('type',1)
-                        ->whereBetween('created_at',[$start_at,$end_at])
-                        ->whereBetween('created_at',[$start_month_at,$end_month_at])
-                        ->sum('money');
-                    $value = $value/100;
-                }
+            //2020-03-01 00:00:00
+            $start_at = Carbon::createFromTimeString($date . ' 00:00:00')->toDateTimeString();
+            //2021-03-01 00:00:00
+            $end_at = Carbon::createFromTimeString($date . ' 00:00:00')->addYear()->toDateTimeString();
+            $items = $items->where([
+                ['created_at', '>=', $start_at],
+                ['created_at', '<', $end_at]
+            ]);
+            $items = $items->get();
+            for($i = 1; $i < 13; ++$i) {
+                $start_at = Carbon::createFromTimeString($date . ' 00:00:00')->addMonths($i - 1)->toDateTimeString();
+                $end_at = Carbon::createFromTimeString($date . ' 00:00:00')->addMonths($i)->toDateTimeString();
+                $value = $items->where('created_at', '>=', $start_at)->where('created_at', '<', $end_at)->sum('money') / 100;
                 array_push($values, $value);
                 array_push($names, $i . '月');
             }
         } else {
-            $start=2020;
-            $now = date('Y',time());
-            $year = [];
-            for ($i = 0;$i<=($now-$start);$i++)
-            {
-                array_push($year,($start+$i));
-                array_push($names,($start+$i).'年');
-            }
-            foreach ($year as $v)
-            {
-                $start_year_at = $v.'-01-01 00:00:00';
-                $end_year_at = ($v+1).'-01-01 00:00:00';
-                if ($all_project == 0)
-                {
-                    $value = Order::where('type',1)
-                        ->where('project_id', $project->id)
-                        ->whereBetween('created_at',[$start_year_at,$end_year_at])
-                        ->sum('money');
-                    $value = $value/100;
-                }else{
-                    $value = Order::where('type',1)
-                        ->whereBetween('created_at',[$start_year_at,$end_year_at])
-                        ->sum('money');
-                    $value = $value/100;
-                }
-
+            $start_at = Carbon::createFromTimeString($date . ' 00:00:00')->toDateTimeString();
+            $end_at = Carbon::now()->addYear(1)->toDateTimeString();
+            $items = $items->where([
+                ['created_at', '>=', $start_at],
+                ['created_at', '<', $end_at]
+            ]);
+            $items = $items->get();
+            $cnt = 1;
+            $next_year = Carbon::now()->toDateTimeString();
+            do {
+                $start_at = Carbon::createFromTimeString($date . ' 00:00:00')->addYears($cnt - 1)->toDateTimeString();
+                $end_at = Carbon::createFromTimeString($date . ' 00:00:00')->addYears($cnt)->toDateTimeString();
+                $value = $items->where('created_at', '>=', $start_at)->where('created_at', '<', $end_at)->sum('money') / 100;
                 array_push($values, $value);
-            }
-        }
-        if ($all_project == 0)
-        {
-            return $this->success(['data' => compact('values', 'names', 'project', 'name')]);
-        }else
-        {
-            return $this->success(['data' => compact('values', 'names', 'name')]);
+                array_push($names, Carbon::createFromTimeString($date . ' 00:00:00')->addYear($cnt - 1)->year . '年');
+                $cnt = $cnt + 1;
+            } while($cnt < 10 && $end_at <= $next_year);
+
         }
+        return $this->success(['data' => compact('values', 'names', 'project', 'name')]);
     }
 
     public function getMaxStat(Request $request)
@@ -621,4 +593,96 @@ class DataController extends BaseController
         $names = $projects->pluck('name');
         return $this->success(['data' => compact('values', 'names')]);
     }
+
+    //单项目柱形图
+    //多项目柱形图
+    //单项目折线图
+    //多项目折线图
+    //单项目雷达图
+    //多项目雷达图
+    //单项目饼状图
+    //单项目明细图
+    //五种图形数据图形(单项目和多项目)接口
+    public function picData(Request $request){
+
+        $arr = [27, 35];echo $arr;return "";
+
+        $project_id = $request->input("project_id");
+
+        //单个项目根据年/月/日来分组
+        $orderone = Order::where(function($query) use ($project_id){
+            $query->where("project_id","=",$project_id);
+        })->groupby("DATE_FORMAT(updated_at,'%Y')")->selectRaw('sum(money) as sum, project_id')->pluck('sum', 'project_id');
+        //多项目根据项目来分组
+        $ordermany = Order::where(function($query) use ($project_id){
+            $query->where("project_id","=",$project_id);
+        })->groupby('project_id')->selectRaw('sum(money) as sum, project_id')->pluck('sum', 'project_id');
+        $param = $request->input("param");
+        switch ($param){
+            //雷达图
+            case 'radar':
+                if($request->input("projects_num")>1){
+                    //多项目雷达图
+                    echo "多项目雷达图";
+                    break;
+                }
+                else {
+                    //单项目雷达图
+                    echo "单项目雷达图";
+                    break;
+                }
+            //折线图
+            case 'line':
+                if($request->input("projects_num")>1){
+                    //多项目
+
+                    break;
+                }
+                else {
+                    //单项目
+                    break;
+                }
+                break;
+            //饼状图
+            case 'pie':
+                //只有单项目
+                break;
+            //明细图
+            case 'detail':
+                //只有单项目
+                break;
+            //柱形图
+            case 'colunm':
+                if($request->input("projects_num")>1){
+                    //多项目
+                    //年
+                    if($request->input("time")=='year'){
+                        $year = $request->input("time");
+                        $year = json_decode($year,true);
+                        $where = "";
+                        $canshu = '$project_id';
+                        return $ordermany;
+                    }
+                    //月
+                    else if($request->input("time")=='month'){
+
+                    }
+                    //日
+                    else {
+
+                    }
+                }
+                else {
+                    //单项目
+                    if($request->input("time_type")=='year'){
+                        $year = $request->input("time");
+                        $year = json_decode($year,true);
+                        $where = "";
+                        return $orderone;
+                    }
+                }
+
+        }
+    }
+
 }

app/Http/Controllers/Api/mini/UserAuthController.php

@@ -19,6 +19,7 @@ class UserAuthController extends BaseController
     {
         $data = $request->only(['name', 'project_id', 'project_role_id', 'remark', 'phone']);
         $user = Auth::guard('mini')->user();
+
         $user_id = $user ? $user->id : '';
         $data['active'] = 2;
         $user = $this->model->firstOrCreate([

app/Models/Project.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Project extends BaseModel
 {
-    use SoftDeletes;
+    //use SoftDeletes;
 
     public function getValidator(Request $request, $type)
     {

app/Models/Project1.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class Project1 extends BaseModel
+{
+
+    protected $table = 'projects';
+    protected $primaryKey='id';
+    public $timestamps = false;
+}

mini/project.config.json

@@ -23,7 +23,7 @@
     "compileHotReLoad": false,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
-    "useApiHostProcess": false,
+    "useApiHostProcess": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],

mini/utils/env.js

@@ -1,5 +1,5 @@
 const isTest = false;
 //172.31.31.35
 //172.31.31.92
-export const baseUrl = isTest ? 'http://172.31.31.92/api/mini/' : 'https://t18.9026.com/api/mini/';
-export const imgHost = isTest ? 'http://172.31.31.92/images/' : 'https://t18.9026.com/images/'
+export const baseUrl = isTest ? 'http://172.31.30.176:8001/api/mini/' : 'https://t18.9026.com/api/mini/';
+export const imgHost = isTest ? 'http://172.31.30.176:8001/images/' : 'https://t18.9026.com/images/'

resources/views/admin/projects/create.blade.php

@@ -13,6 +13,9 @@
 
                 {{ csrf_field() }}
                 @include('share.layui-form-item', ['type' => 'input', 'name' => 'name', 'label' => '名称', 'required' => true, 'value' => (old('data') ? old('data')['name'] : '')])
+                <div style="display: none;">
+                    @include('share.layui-form-item', ['type' => 'input', 'name' => 'active','value' => 1, 'label' => '', 'required' => true])
+                </div>
                 <div class="layui-form-item">
                     <div class="layui-input-block">
                         <button class="layui-btn" lay-submit lay-filter="formDemo">提交</button>
@@ -32,7 +35,7 @@
             layui.use(['form', 'laydate'], function(){
                 var form = layui.form;
                 var laydate = layui.laydate;
-
+                console.log(form);
                 // form.verify({
                 //     integer: function (value) {
                 //         var pattern = /^[1-9]\d*$/;

resources/views/admin/user-resets/index.blade.php

@@ -11,7 +11,7 @@
         <div class="layui-card-header sg-card-header">
             {{ $model_name }}管理
             {{--<div class="sg-card-create">--}}
-                {{--<button id="sg-create-btn" class="layui-btn layui-btn-sm">创建</button>--}}
+            {{--<button id="sg-create-btn" class="layui-btn layui-btn-sm">创建</button>--}}
             {{--</div>--}}
         </div>
         <div class="layui-card-body">
@@ -32,6 +32,7 @@
                 <div class="layui-btn-group">
                     <div class="layui-btn-group">
                         <a class="layui-btn layui-btn-xs" lay-event="reset">重置</a>
+                        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
                     </div>
                 </div>
             </script>
@@ -57,6 +58,7 @@
                         { field: 'id', title: 'ID', align: 'center' },
                         { field: 'name', title: '提交人', align: 'center' },
                         { field: 'phone', title: '手机号', align: 'center' },
+                        { field: 'real_name', title: '真实姓名', align: 'center' },
                         { field: 'created_at', title: '提交日期', align: 'center' },
                         { field: 'status', title: '状态', align: 'center' },
                         { title: '操作', align:'center', toolbar: '#sg-table-bar' }
@@ -82,7 +84,9 @@
                                     'X-CSRF-TOKEN': '{{ csrf_token() }}'
                                 },
                                 data: {
-                                    id: data.id
+                                    id: data.id,
+                                    name:data.name,
+                                    real_name:data.real_name
                                 },
                                 success: function (data) {
                                     if(data.status === 'success') {
@@ -114,6 +118,36 @@
                             }
                         });
                     }
+                    else if(obj.event === 'delete'){
+                        layer.confirm('确定要删除吗？', function(index) {
+                            $.ajax({
+                                method: 'POST',
+                                url: '{{ $pre_uri }}' + 'delete',
+                                headers: {
+                                    'X-CSRF-TOKEN': '{{ csrf_token() }}'
+                                },
+                                data: {
+                                    id: data.id
+                                },
+                                success: function (data) {
+                                    if(data.status === 'success') {
+                                        obj.del();
+                                    } else {
+                                        layer.msg(data.info, {
+                                            icon: 2
+                                        });
+                                    }
+                                    layer.close(index);
+                                },
+                                error: function () {
+                                    layer.close(index);
+                                    layer.msg('删除失败', {
+                                        icon: 2
+                                    });
+                                }
+                            });
+                        });
+                    }
                 });
 
                 if($('#search-begin-date').length > 0) {
@@ -174,46 +208,6 @@
                     });
                 });
 
-                $('#sg-table-top-container').on('click', '.btn-delete-many', function () {
-                    layer.confirm('确定要删除所有选中行吗？', function () {
-                        var data = table.checkStatus('sg-main-table').data;
-                        if(data.length <= 0) {
-                            layer.msg('选择不能为空', {
-                                icon: 2
-                            });
-                            return false;
-                        }
-                        var ids = [];
-                        for(var i = 0; i < data.length; ++i) {
-                            ids.push(data[i]['id']);
-                        }
-                        $.ajax({
-                            method: 'POST',
-                            url: '{{ $pre_uri }}' + 'deleteMany',
-                            headers: {
-                                'X-CSRF-TOKEN': '{{ csrf_token() }}'
-                            },
-                            data: {
-                                ids: JSON.stringify(ids)
-                            },
-                            success: function (data) {
-                                if(data.status === 'success') {
-                                    top_window.location.reload();
-                                } else {
-                                    layer.msg(data.info, {
-                                        icon: 2
-                                    });
-                                }
-
-                            },
-                            error: function () {
-                                layer.msg('删除失败', {
-                                    icon: 2
-                                });
-                            }
-                        });
-                    })
-                });
             });
         })
     </script>

resources/views/admin/users/index.blade.php

@@ -42,6 +42,11 @@
                             <input type="text" name="name" placeholder="请输入用户名" autocomplete="off" class="layui-input" value="{{ request('name') }}">
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input type="number" name="phone" placeholder="请输入手机号码" autocomplete="off" class="layui-input" value="{{ request('phone') }}">
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <div class="layui-btn" id="sg-search-btn">搜索</div>
                     </div>

routes/api.php

@@ -11,11 +11,12 @@
 |
 */
 
+require __DIR__.'/api/dataRoutes.php';
 
 $api = app('Dingo\Api\Routing\Router');
 
 $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\mini', 'prefix' => 'api/mini', 'middleware' => 'mini'], function ($api) {
-    $api->any('test', 'TestController@index');
+    $api->any('test', 'TestController@index');$api->any('admin', 'TestController@test');
     $api->any('login', 'AuthController@login');
     $api->any('reset', 'AuthController@reset');
     $api->any('loginByWechat', 'AuthController@loginByWechat');

routes/api/dataRoutes.php

@@ -0,0 +1,9 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2021/3/11 0011
+ * Time: 15:12
+ */
+use Illuminate\Support\Facades\Route;
+Route::post('data/picData', 'Api\mini\DataController@picData');