Merge branch 'master' of http://git.meme100.com:10180/yigao/qpapi

app/Http/Controllers/Admin/ActivityController.php

@@ -139,11 +139,11 @@ class ActivityController extends PublicController
         $ids = $request->get('ids');
         $status = $request->get('status') == 0 ? 1 : 0;
         if (empty($ids)){
-            return response()->json(['code'=>1,'msg'=>'请选择删除项']);
+            return response()->json(['code'=>1,'msg'=>'请选择更改状态项']);
         }
         if (ActivityDatabase::whereIn('activity_identity',$ids)->update(['activity_delete'=>$status])){
-            return response()->json(['code'=>0,'msg'=>'删除成功']);
+            return response()->json(['code'=>0,'msg'=>'更改状态成功']);
         }
-        return response()->json(['code'=>1,'msg'=>'删除失败']);
+        return response()->json(['code'=>1,'msg'=>'更改状态失败']);
     }
 }

app/Http/Controllers/Admin/MemberController.php

@@ -4,9 +4,14 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\MemberCreateRequest;
 use App\Http\Requests\MemberUpdateRequest;
+use App\Http\Requests\MemberUpdateMoneyRequest;
 use App\Models\Member;
+use App\Models\MoneyDetails;
+use App\Models\MembersDetailed;
+use App\Models;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\DB;
 
 class MemberController extends Controller
 {
@@ -22,13 +27,19 @@ class MemberController extends Controller
     public function data(Request $request)
     {
         $model = Member::query();
+        $model = $model
+            ->select(['phone', 'name', 'members.created_at', 'identity', 'is_deleted', 'membersDetailed_cash', 'members_id', 'membersDetailed_delete'])
+            ->join('membersDetailed', 'membersDetailed.members_id', 'members.id');
         if ($request->get('name')){
             $model = $model->where('name','like','%'.$request->get('name').'%');
         }
         if ($request->get('phone')){
             $model = $model->where('phone','like','%'.$request->get('phone').'%');
         }
-        $res = $model->orderBy('created_at','desc')->paginate($request->get('limit',30))->toArray();
+        $res = $model
+            ->orderBy('created_at','desc')
+            ->paginate($request->get('limit',30))
+            ->toArray();
         $data = [
             'code' => 0,
             'msg'   => '正在请求中...',
@@ -37,6 +48,100 @@ class MemberController extends Controller
         ];
         return response()->json($data);
     }
+    public function getDetailedInfo()
+    {
+        return view('admin.member.detailedInfo');
+    }
+    public function dataDetailedInfo(Request $request)
+    {
+        $model = MoneyDetails::query();
+        $startTime = $request->get('startTime') ?? '1900-01-01 00:00:00';
+        $endTime = $request->get('endTime') ?? '3000-12-12 00:00:00';
+        $modelBetween = [$startTime, $endTime];
+        $model = $model
+            ->where(['members_id' => $request->get('members_id'), 'moneyDetails_status' => 1])
+            -> whereBetween('moneyDetails_time', $modelBetween);
+        if ($request->get('type')){
+            $model = $model->where(['moneyDetails_type' => $request->get('type')]);
+        }
+        if ($request->get('describe')){
+            $model = $model->where('moneyDetails_describe','like','%'.$request->get('describe').'%');
+        }
+        $res = $model
+            ->orderBy('moneyDetails_time','desc')
+            ->paginate($request->get('limit',30))
+            ->toArray();
+        $data = [
+            'code' => 0,
+            'msg'   => '正在请求中...',
+            'count' => $res['total'],
+            'data'  => $res['data']
+        ];
+        return response()->json($data);
+    }
+    public function resetPassword(Request $request)
+    {
+        $ids = $request->get('ids');
+        $memberModel = new Member;
+        $uuid = $memberModel->select('uuid')->where(['id'=>$ids[0]])->first();
+        $user['password'] = createPasswd(trim('123456'), $uuid->uuid);
+        if (empty($ids)){
+            return response()->json(['code'=>1,'msg'=>'请选择要重置密码的用户']);
+        }
+        if (Member::whereIn('id',$ids)->update($user)){
+            return response()->json(['code'=>0,'msg'=>'密码重置成功']);
+        }
+        return response()->json(['code'=>1,'msg'=>'密码重置失败']);
+    }
+    public function editMoney($id)
+    {
+        $member = Member::findOrFail($id);
+        return view('admin.member.editMoney',compact('member'));
+    }
+    public function updateMoney(MemberUpdateMoneyRequest $request, $id)
+    {
+        $model = MembersDetailed::query();
+        $cash = $model->select('membersDetailed_cash')->where(['members_id'=>$id, 'membersDetailed_delete'=>0])->first();
+        $money = $request->get('money');
+        $type = $request->get('type');
+        $nowMoney = 0;
+        $msg = '';
+        if ($type==1){
+            $msg = '充值';
+            $nowMoney = $cash->membersDetailed_cash + $money;
+        } elseif ($type==2) {
+            $msg = '扣款';
+            $nowMoney = $cash->membersDetailed_cash - $money;
+            if ($nowMoney<0) {
+                return redirect()->to(route('admin.member'))->withErrors('用户余额不足');
+            }
+        }
+        DB::beginTransaction();
+        $updateMoney = $model->where('members_id',$id)->update(['membersDetailed_cash'=>$nowMoney]);
+        // 添加记录
+        $uuid = getUUID();
+        $moneyDetailsModel = new Models\MoneyDetails;
+        $describe = '后台' . $msg;
+        $data = [
+            'moneyDetails_identity' => $uuid,
+            'members_id' => $id,
+            'moneyDetails_money' => $money,
+            'moneyDetails_time' => date('Y-m-d H:i:s'),
+            'moneyDetails_type' => $type,
+            'moneyDetails_cash' => $nowMoney,
+            'moneyDetails_describe' => $describe,
+            'moneyDetails_status' => 1,
+        ];
+        $add = $moneyDetailsModel->insert($data);
+        if ($updateMoney && $add){
+            DB::commit();
+            $msg = $msg . '成功';
+            return redirect()->to(route('admin.member'))->with(['status'=>$msg]);
+        } else {
+            DB::rollBack();
+            return response()->json(['code'=>1,'msg'=>'操作失败']);
+        }
+    }
     /**
      * Show the form for creating a new resource.
      *
@@ -102,12 +207,13 @@ class MemberController extends Controller
     public function destroy(Request $request)
     {
         $ids = $request->get('ids');
+        $status = $request->get('status') == 0 ? 1 : 0;
         if (empty($ids)){
-            return response()->json(['code'=>1,'msg'=>'请选择删除项']);
+            return response()->json(['code'=>1,'msg'=>'请选择更改状态项']);
         }
-        if (Member::destroy($ids)){
-            return response()->json(['code'=>0,'msg'=>'删除成功']);
+        if (Member::whereIn('id',$ids)->update(['is_deleted'=>$status])){
+            return response()->json(['code'=>0,'msg'=>'更改状态成功']);
         }
-        return response()->json(['code'=>1,'msg'=>'删除失败']);
+        return response()->json(['code'=>1,'msg'=>'更改状态失败']);
     }
 }

app/Http/Controllers/Api/AgentController.php

@@ -110,12 +110,22 @@ class AgentController extends Controller
             $sportsAgentModel = new Models\SportsAgent;
             $gmenuId = $req->input('id');
             $money = $req->input('money');
+            $type = $req->input('type');
             // 获取用户信息.
             $getMemberInfo = $agentModel->getMember();
             // 獲取余额.
             $getMembersDetailed = $agentModel->getMembersDetailed();
-            $cash = ($getMembersDetailed->membersDetailed_cash + $money);
-            $backData = $sportsAgentModel->transferSports($gmenuId, $money, $cash, $getMemberInfo, 'IN');
+            if ($type === 'OUT') {
+                $cash = ($getMembersDetailed->membersDetailed_cash + $money);
+            } elseif ($type === 'IN') {
+                $cash = ($getMembersDetailed->membersDetailed_cash - $money);
+                if ($cash < 0) {
+                    $msg = '余额不足';
+                    return toJson($code, $msg, []);
+                }
+            }
+
+            $backData = $sportsAgentModel->transferSports($gmenuId, $money, $cash, $getMemberInfo, $type);
             if ($backData !== 1) {
                 $msg = '链接失败';
                 return toJson($code, $msg, []);
@@ -126,7 +136,7 @@ class AgentController extends Controller
             $msg = '成功';
             $code = 1;
 
-            return toJson($code, $msg, session('sportsToken'));
+            return toJson($code, $msg, []);
         } catch (Exception $e) {
             return toJson($code, $msg, []);
         }

app/Http/Controllers/Sys/UserController.php

@@ -50,6 +50,8 @@ class UserController extends Controller
 
         try {
             $ret = DB::table('members')->insertGetId($userData);
+            $membersDetailed['members_id'] = $ret;
+            $insertMembersDetailed = \App\Models\MembersDetailed::insert($membersDetailed);
             $token = \App\Vendor\Jwt::getToken($ret);
             DB::table('members')
                 ->where('id', $ret)
@@ -71,9 +73,17 @@ class UserController extends Controller
             $user['phone'] = $req->input('phone');
             $user['uuid'] = getUUID();
             $user['password'] = createPasswd(trim($user['password']), $user['uuid']);
-            $re = \App\Models\Member::insert($user);
-
-            return toJson(1);
+            DB::beginTransaction();
+            $insertMembers = \App\Models\Member::insertGetId($user);
+            $membersDetailed['members_id'] = $insertMembers;
+            $insertMembersDetailed = \App\Models\MembersDetailed::insert($membersDetailed);
+            if ($insertMembers && $insertMembersDetailed) {
+                DB::commit();
+                return toJson(1);
+            } else {
+                return toJson(-2);
+                DB::rollBack();
+            }
         } catch (Exception $ex) {
             return toJson(-20001);
         }

app/Http/Models/SportsAgent.php

@@ -172,7 +172,11 @@ class SportsAgent extends Model
         $newUuid = getUUID();
         $agentModel->updateMembersDetailed(['membersDetailed_cash' => $cash]);
         // 添加转账记录.
-        $agentModel->addMoneyDetails($newUuid, $money, 2, $cash, '转账至体育赛事');
+        if ($type === 'IN') {
+            $agentModel->addMoneyDetails($newUuid, $money, 2, $cash, '转账至体育赛事');
+        } elseif ($type === 'OUT') {
+            $agentModel->addMoneyDetails($newUuid, $money, 1, $cash, '体育赛事转回账户');
+        }
         // 获取转账 url及参数.
         $getGameUrlWhere = [
             'gmenu_id' => $gmenuId,

app/Http/Requests/MemberUpdateMoneyRequest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class MemberUpdateMoneyRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $return =  [
+            'money'  => 'required|numeric',
+            'type'   => 'required|numeric',
+        ];
+        return $return;
+    }
+}

resources/lang/zh-CN/validation.php

@@ -145,5 +145,6 @@ return [
         'time' => '时间',
         'available' => '可用的',
         'size' => '大小',
+        'money' => '金额',
     ],
 ];

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

@@ -164,15 +164,17 @@
                 })
                 //搜索
                 $("#memberSearchOn").click(function () {
+                    var activity_title = $("#activity_title").val();
                     dataTable.reload({
-                        where:{activity_delete:0},
+                        where:{activity_delete:0, activity_title:activity_title},
                         page:{curr:1}
                     })
                 })
                 //搜索
                 $("#memberSearchOff").click(function () {
+                    var activity_title = $("#activity_title").val();
                     dataTable.reload({
-                        where:{activity_delete:1},
+                        where:{activity_delete:1, activity_title:activity_title},
                         page:{curr:1}
                     })
                 })

resources/views/admin/member/_js.blade.php

@@ -35,6 +35,16 @@
         z-index:999;
         cursor: pointer;
     }
+    #layui-select{
+        text-align: center;
+        height: 38px;
+        line-height: 1.3;
+        line-height: 38px\9;
+        border-width: 1px;
+        border-style: solid;
+        background-color: #fff;
+        border-radius: 2px;
+    }
 </style>
 <script>
     layui.use(['upload'],function () {
@@ -66,4 +76,4 @@
             }
         });
     });
-</script>
+</script>

resources/views/admin/member/_moneyForm.blade.php

@@ -0,0 +1,31 @@
+{{csrf_field()}}
+<div class="layui-form-item">
+    <label for="" class="layui-form-label">金额</label>
+    <div class="layui-input-inline">
+        <input type="text" name="money" lay-verify="required" placeholder="请输入金额" class="layui-input" >
+    </div>
+</div>
+<div class="layui-form-item">
+    <label for="" class="layui-form-label">充值/扣款</label>
+    <div class="layui-input-inline">
+        <select lay-verify="required" name="type" style="
+                        text-align: center;
+                        height: 38px;
+                        line-height: 1.3;
+                        line-height: 38px\9;
+                        border-width: 1px;
+                        border-style: solid;
+                        background-color: #fff;
+                        border-radius: 2px;" lay-ignore="">
+            <option value="" selected="">——  请选择  ——</option>
+            <option value="1">充值</option>
+            <option value="2">扣款</option>
+        </select>
+    </div>
+</div>
+<div class="layui-form-item">
+    <div class="layui-input-block">
+        <button type="submit" class="layui-btn" lay-submit="" lay-filter="formDemo">确 认</button>
+        <a  class="layui-btn" href="{{route('admin.member')}}" >返 回</a>
+    </div>
+</div>

resources/views/admin/member/detailedInfo.blade.php

@@ -0,0 +1,141 @@
+@extends('admin.base')
+
+@section('content')
+    <div class="layui-card">
+        <div class="layui-card-header layuiadmin-card-header-auto">
+            <div class="layui-btn-group ">
+                <button class="layui-btn layui-btn-sm" id="memberSearch">搜索</button>
+                <button class="layui-btn layui-btn-sm" id="add">增加</button>
+                <button class="layui-btn layui-btn-sm" id="reduce">减少</button>
+                <button class="layui-btn layui-btn-sm" id="return">返回</button>
+            </div>
+            <div class="layui-form">
+                <div class="layui-input-inline">
+                    <input type="text" class="layui-input" placeholder="开始时间" name="start_time" id="start_time">
+                </div>
+                <div class="layui-form-mid layui-word-aux" style="float:none;display: inline;margin-right: 0">-</div>
+                <div class="layui-input-inline">
+                    <input type="text" class="layui-input" placeholder="结束时间" name="end_time" id="end_time">
+                </div>
+                <div class="layui-input-inline">
+                    <input type="text" name="describe" id="describe" placeholder="请输入关键字" class="layui-input">
+                </div>
+            </div>
+        </div>
+        <div class="layui-card-body">
+            <table id="dataTable" lay-filter="dataTable"></table>
+        </div>
+    </div>
+@endsection
+
+@section('script')
+    @can('member.member.getDetailedInfo')
+        <script>
+            layui.use(['layer','table','form'],function () {
+                var layer = layui.layer;
+                var form = layui.form;
+                var table = layui.table;
+                var url = document.location.toString();
+                var arrUrl = url.split("=");
+                var para = arrUrl[1];
+                //用户表格初始化
+                var dataTable = table.render({
+                    elem: '#dataTable'
+                    ,height: 500
+                    ,url: "{{ route('admin.member.dataDetailedInfo') }}" //数据接口
+                    ,where:{members_id: para}
+                    ,page: true //开启分页
+                    ,cols: [[ //表头
+                        {checkbox: true,fixed: true}
+                        ,{field: 'moneyDetails_describe', title: '资金变动描述'}
+                        ,{field: 'moneyDetails_money', title: '金额'}
+                        ,{field: 'moneyDetails_cash', title: '剩余金额'}
+                        ,{field: 'moneyDetails_type', title: '增加/减少', templet:function (d) { if ( d.moneyDetails_type === 1 )  { return '增加';}else if (d.moneyDetails_type === 2) {return '减少'}}}
+                        ,{field: 'moneyDetails_time', title: '记录时间'}
+                    ]]
+                });
+
+                //监听工具条
+                table.on('tool(dataTable)', function(obj){ //注：tool是工具条事件名，dataTable是table原始容器的属性 lay-filter="对应的值"
+                    var data = obj.data //获得当前行数据
+                        ,layEvent = obj.event; //获得 lay-event 对应的值
+                    if(layEvent === 'del'){
+                        layer.confirm('确认删除吗？', function(index){
+                            $.post("{{ route('admin.member.destroy') }}",{_method:'delete',ids:[data.id]},function (result) {
+                                if (result.code==0){
+                                    obj.del(); //删除对应行（tr）的DOM结构
+                                }
+                                layer.close(index);
+                                layer.msg(result.msg)
+                            });
+                        });
+                    } else if(layEvent === 'edit'){
+                        location.href = '/admin/member/'+data.id+'/edit';
+                    }
+                });
+
+                //按钮批量删除
+                $("#listDelete").click(function () {
+                    var ids = []
+                    var hasCheck = table.checkStatus('dataTable')
+                    var hasCheckData = hasCheck.data
+                    if (hasCheckData.length>0){
+                        $.each(hasCheckData,function (index,element) {
+                            ids.push(element.id)
+                        })
+                    }
+                    if (ids.length>0){
+                        layer.confirm('确认删除吗？', function(index){
+                            $.post("{{ route('admin.member.destroy') }}",{_method:'delete',ids:ids},function (result) {
+                                if (result.code==0){
+                                    dataTable.reload()
+                                }
+                                layer.close(index);
+                                layer.msg(result.msg)
+                            });
+                        })
+                    }else {
+                        layer.msg('请选择删除项')
+                    }
+                })
+                //搜索
+                $("#memberSearch").click(function () {
+                    var startTime = $("#start_time").val()
+                    var endTime = $("#end_time").val();
+                    var describe = $("#describe").val();
+                    dataTable.reload({
+                        where:{startTime:startTime,endTime:endTime,describe:describe,members_id: para},
+                        page:{curr:1}
+                    })
+                })
+                //搜索
+                $("#reduce").click(function () {
+                    var startTime = $("#start_time").val()
+                    var endTime = $("#end_time").val();
+                    var describe = $("#describe").val();
+                    dataTable.reload({
+                        where:{startTime:startTime,endTime:endTime,describe:describe,type:2,members_id: para},
+                        page:{curr:1}
+                    })
+                })
+                //搜索
+                $("#add").click(function () {
+                    var startTime = $("#start_time").val()
+                    var endTime = $("#end_time").val();
+                    var describe = $("#describe").val();
+                    dataTable.reload({
+                        where:{startTime:startTime,endTime:endTime,describe:describe,type:1,members_id: para},
+                        page:{curr:1}
+                    })
+                })
+                //返回
+                $("#return").click(function () {
+                    location.href = '/admin/member';
+                })
+            })
+        </script>
+    @endcan
+@endsection
+
+
+

resources/views/admin/member/editMoney.blade.php

@@ -0,0 +1,20 @@
+@extends('admin.base')
+
+@section('content')
+    <div class="layui-card">
+        <div class="layui-card-header layuiadmin-card-header-auto">
+            <h2>充值/扣款</h2>
+        </div>
+        <div class="layui-card-body">
+            <form class="layui-form" action="{{route('admin.member.updateMoney',['member'=>$member])}}" method="post">
+                <input type="hidden" name="id" value="{{$member->id}}">
+                {{method_field('put')}}
+                @include('admin.member._moneyForm')
+            </form>
+        </div>
+    </div>
+@endsection
+
+@section('script')
+    @include('admin.member._js')
+@endsection

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

@@ -4,12 +4,12 @@
     <div class="layui-card">
         <div class="layui-card-header layuiadmin-card-header-auto">
             <div class="layui-btn-group ">
-                @can('member.member.destroy')
+                {{--@can('member.member.destroy')
                     <button class="layui-btn layui-btn-sm layui-btn-danger" id="listDelete">删除</button>
-                @endcan
-                @can('member.member.create')
+                @endcan--}}
+                {{--@can('member.member.create')
                     <a class="layui-btn layui-btn-sm" href="{{ route('admin.member.create') }}">添加</a>
-                @endcan
+                @endcan--}}
                 <button class="layui-btn layui-btn-sm" id="memberSearch">搜索</button>
             </div>
             <div class="layui-form">
@@ -25,14 +25,23 @@
             <table id="dataTable" lay-filter="dataTable"></table>
             <script type="text/html" id="options">
                 <div class="layui-btn-group">
-                    @can('member.member.create')
-                        <a class="layui-btn layui-btn-sm" lay-event="edit">编辑</a>
+                    @can('member.member.getDetailedInfo')
+                        <a class="layui-btn layui-btn-sm" lay-event="info">资金详细</a>
                     @endcan
                     @can('member.member.destroy')
-                        <a class="layui-btn layui-btn-danger layui-btn-sm" lay-event="del">删除</a>
+                        <a class="layui-btn layui-btn-danger layui-btn-sm" lay-event="del">更改状态</a>
+                    @endcan
+                    @can('member.member.resetPassword')
+                        <a class="layui-btn layui-btn-danger layui-btn-sm" lay-event="reset">重置密码</a>
+                    @endcan
+                    @can('member.member.resetPassword')
+                        <a class="layui-btn layui-btn-danger layui-btn-sm" lay-event="moveMoney">充值/扣款</a>
                     @endcan
                 </div>
             </script>
+            <script type="text/html" id="is_deleted">
+                @{{ d.is_deleted === 0 ? '<p style="color: lawngreen">启用</p>' : '<p style="color: red">冻结</p>' }}
+            </script>
             <script type="text/html" id="avatar">
                 <a href="@{{d.avatar}}" target="_blank" title="点击查看"><img src="@{{d.avatar}}" alt="" width="28" height="28"></a>
             </script>
@@ -56,15 +65,14 @@
                     ,page: true //开启分页
                     ,cols: [[ //表头
                         {checkbox: true,fixed: true}
-                        ,{field: 'id', title: 'ID', sort: true,width:80}
                         ,{field: 'name', title: '昵称'}
                         ,{field: 'phone', title: '手机'}
-                        ,{field: 'amount', title: '金额'}
-                        ,{field: 'frozen_amount', title: '冻结金额'}
+                        ,{field: 'identity', title: '身份', templet:function (d) { if ( d.identity === 2 )  { return '游客';}else{return '普通'}}}
+                        ,{field: 'membersDetailed_cash', title: '金额'}
                         ,{field: 'avatar', title: '头像',toolbar:'#avatar',width:100}
+                        ,{field: 'is_deleted', title: '状态', toolbar: '#is_deleted'}
                         ,{field: 'created_at', title: '创建时间'}
-                        ,{field: 'updated_at', title: '更新时间'}
-                        ,{fixed: 'right', width: 120, align:'center', toolbar: '#options'}
+                        ,{fixed: 'right', width: 320, align:'center', toolbar: '#options'}
                     ]]
                 });
 
@@ -73,17 +81,39 @@
                     var data = obj.data //获得当前行数据
                         ,layEvent = obj.event; //获得 lay-event 对应的值
                     if(layEvent === 'del'){
-                        layer.confirm('确认删除吗？', function(index){
-                            $.post("{{ route('admin.member.destroy') }}",{_method:'delete',ids:[data.id]},function (result) {
+                        layer.confirm('确认更改状态吗？', function(index){
+                            $.post("{{ route('admin.member.destroy') }}",{_method:'delete',ids:[data.members_id],status:data.is_deleted},function (result) {
+                                if (result.code==0){
+                                    var name = $("#name").val();
+                                    var phone = $("#phone").val();
+                                    dataTable.reload({
+                                        where:{name:name,phone:phone},
+                                        page:{curr:1}
+                                    })
+                                }
+                                layer.close(index);
+                                layer.msg(result.msg)
+                            });
+                        });
+                    } else if(layEvent === 'info'){
+                        location.href = '/admin/member/getDetailedInfo?members_id=' + data.members_id;
+                    } else if(layEvent === 'reset'){
+                        layer.confirm('确认重置该用户的密码吗？', function(index){
+                            $.post("{{ route('admin.member.resetPassword') }}",{_method:'delete',ids:[data.members_id]},function (result) {
                                 if (result.code==0){
-                                    obj.del(); //删除对应行（tr）的DOM结构
+                                    var name = $("#name").val();
+                                    var phone = $("#phone").val();
+                                    dataTable.reload({
+                                        where:{name:name,phone:phone},
+                                        page:{curr:1}
+                                    })
                                 }
                                 layer.close(index);
                                 layer.msg(result.msg)
                             });
                         });
-                    } else if(layEvent === 'edit'){
-                        location.href = '/admin/member/'+data.id+'/edit';
+                    } else if(layEvent === 'moveMoney'){
+                        location.href = '/admin/member/'+data.members_id+'/editMoney';
                     }
                 });
 
@@ -113,11 +143,10 @@
                 })
                 //搜索
                 $("#memberSearch").click(function () {
-                    var userSign = $("#user_sign").val()
                     var name = $("#name").val();
                     var phone = $("#phone").val();
                     dataTable.reload({
-                        where:{user_sign:userSign,name:name,phone:phone},
+                        where:{name:name,phone:phone},
                         page:{curr:1}
                     })
                 })

routes/admin.php

@@ -223,13 +223,21 @@ Route::group(['namespace' => 'Admin', 'prefix' => 'admin', 'middleware' => ['aut
         Route::get('member/data', 'MemberController@data')->name('admin.member.data');
         Route::get('member', 'MemberController@index')->name('admin.member');
         //添加
-        Route::get('member/create', 'MemberController@create')->name('admin.member.create')->middleware('permission:member.member.create');
-        Route::post('member/store', 'MemberController@store')->name('admin.member.store')->middleware('permission:member.member.create');
+        /*Route::get('member/create', 'MemberController@create')->name('admin.member.create')->middleware('permission:member.member.create');
+        Route::post('member/store', 'MemberController@store')->name('admin.member.store')->middleware('permission:member.member.create');*/
         //编辑
-        Route::get('member/{id}/edit', 'MemberController@edit')->name('admin.member.edit')->middleware('permission:member.member.edit');
-        Route::put('member/{id}/update', 'MemberController@update')->name('admin.member.update')->middleware('permission:member.member.edit');
+        /*Route::get('member/{id}/edit', 'MemberController@edit')->name('admin.member.edit')->middleware('permission:member.member.edit');
+        Route::put('member/{id}/update', 'MemberController@update')->name('admin.member.update')->middleware('permission:member.member.edit');*/
         //删除
         Route::delete('member/destroy', 'MemberController@destroy')->name('admin.member.destroy')->middleware('permission:member.member.destroy');
+        //资金详细
+        Route::get('member/getDetailedInfo', 'MemberController@getDetailedInfo')->name('admin.member.getDetailedInfo')->middleware('permission:member.member.getDetailedInfo');
+        Route::get('member/dataDetailedInfo', 'MemberController@dataDetailedInfo')->name('admin.member.dataDetailedInfo');
+        //重置密码
+        Route::delete('member/resetPassword', 'MemberController@resetPassword')->name('admin.member.resetPassword')->middleware('permission:member.member.resetPassword');
+        //充值/扣款
+        Route::get('member/{id}/editMoney', 'MemberController@editMoney')->name('admin.member.editMoney')->middleware('permission:member.member.editMoney');
+        Route::put('member/{id}/updateMoney', 'MemberController@updateMoney')->name('admin.member.updateMoney')->middleware('permission:member.member.editMoney');
     });
 });
 //消息管理