彭俊 6 år sedan
förälder
incheckning
c96a521164

+ 60 - 38
app/Http/Controllers/Admin/IndexController.php

@@ -9,9 +9,11 @@ use Illuminate\Support\Facades\DB;
 /**
  *
  */
-class IndexController extends Controller {
+class IndexController extends Controller
+{
 
-    function welcome() {
+    function welcome()
+    {
         $total = array(
             'total_user' => $this->countTodayUser(),
             'total_bet' => $this->countBet(),
@@ -31,12 +33,14 @@ class IndexController extends Controller {
     }
 
     //返回用户数量
-    function countUser() {
+    function countUser()
+    {
         return \App\Models\Account_detailed::count();
     }
 
     //今日注册用户数量
-    function countTodayUser() {
+    function countTodayUser()
+    {
         $time1 = date('Y-m-d 00:00:00'); //今日0时
         $time2 = date('Y-m-d 23:59:59'); //
         $timearea = [$time1, $time2];
@@ -59,20 +63,21 @@ class IndexController extends Controller {
     }
 
     //注单总数量
-    function countBet() {
+    function countBet()
+    {
         $time1 = date('Y-m-d 00:00:00'); //今日0时
         $time2 = date('Y-m-d 23:59:59'); //
         $timearea = [$time1, $time2];
         if (\App\Models\Role::hasRoot('/enable/show/bet_count') < 0) {
             $bet_count['count'] = "*****";
         } else {
-            $bet_count['count'] = \App\Models\MoneyBuy::where('money_buy.status', '<>', 4)->join('account', 'money_buy.account_identity', '=', 'account.identity')->where('account.status', '<>', '4')->where('account.user_type','1')->whereBetween('money_time', $timearea)->count();
+            $bet_count['count'] = \App\Models\MoneyBuy::where('money_buy.status', '<>', 4)->join('account', 'money_buy.account_identity', '=', 'account.identity')->where('account.status', '<>', '4')->where('account.user_type', '1')->whereBetween('money_time', $timearea)->count();
         }
         if (\App\Models\Role::hasRoot('/enable/show/bet_money') < 0) {
-            $bet_money = \App\Models\MoneyBuy::where('money_buy.status', '<>', 4)->join('account', 'money_buy.account_identity', '=', 'account.identity')->where('account.status', '<>', '4')->where('account.user_type','1')->whereBetween('money_time', $timearea)->sum('money');
+            $bet_money = \App\Models\MoneyBuy::where('money_buy.status', '<>', 4)->join('account', 'money_buy.account_identity', '=', 'account.identity')->where('account.status', '<>', '4')->where('account.user_type', '1')->whereBetween('money_time', $timearea)->sum('money');
             $bet_count['money_count'] = "*****";
         } else {
-            $bet_money = \App\Models\MoneyBuy::where('money_buy.status', '<>', 4)->join('account', 'money_buy.account_identity', '=', 'account.identity')->where('account.status', '<>', '4')->where('account.user_type','1')->whereBetween('money_time', $timearea)->sum('money');
+            $bet_money = \App\Models\MoneyBuy::where('money_buy.status', '<>', 4)->join('account', 'money_buy.account_identity', '=', 'account.identity')->where('account.status', '<>', '4')->where('account.user_type', '1')->whereBetween('money_time', $timearea)->sum('money');
             $bet_count['money_count'] = round($bet_money, 2);
         }
         // DB::connection()->enableQueryLog();
@@ -89,7 +94,8 @@ class IndexController extends Controller {
     }
 
     //今日提现
-    function countTodayTake() {
+    function countTodayTake()
+    {
         $time1 = date('Y-m-d 00:00:00'); //今日0时
         $time2 = date('Y-m-d 23:59:59'); //
         $timearea = [$time1, $time2];
@@ -119,7 +125,8 @@ class IndexController extends Controller {
     }
 
     //今日充值笔数
-    function countTodayRecharge() {
+    function countTodayRecharge()
+    {
         $time1 = date('Y-m-d 00:00:00'); //今日0时
         $time2 = date('Y-m-d 23:59:59'); //
         $timearea = [$time1, $time2];
@@ -154,7 +161,8 @@ class IndexController extends Controller {
     }
 
     //	今日回水笔数
-    function countTodayReturn() {
+    function countTodayReturn()
+    {
         $time1 = date('Y-m-d 00:00:00'); //今日0时
         $time2 = date('Y-m-d 23:59:59'); //
         $timearea = [$time1, $time2];
@@ -180,7 +188,8 @@ class IndexController extends Controller {
     }
 
     //	今日反水笔数
-    function countTodayBack() {
+    function countTodayBack()
+    {
         $time1 = date('Y-m-d 00:00:00'); //今日0时
         $time2 = date('Y-m-d 23:59:59'); //
         $timearea = [$time1, $time2];
@@ -203,7 +212,8 @@ class IndexController extends Controller {
     }
 
     //今日汇款
-    function countTodayRimt() {
+    function countTodayRimt()
+    {
         $time1 = date('Y-m-d 00:00:00'); //今日0时
         $time2 = date('Y-m-d 23:59:59'); //
         $timearea = [$time1, $time2];
@@ -228,7 +238,8 @@ class IndexController extends Controller {
     }
 
     //公告信息
-    function getNotice() {
+    function getNotice()
+    {
         $db = new \App\Models\Article();
         $data = $db->getMsg(2, 2);
 
@@ -236,7 +247,8 @@ class IndexController extends Controller {
     }
 
     //当前在线用户饼状图
-    function onlineUser() {
+    function onlineUser()
+    {
 //		$db = new \App\Model\Logfile;
 //		$db=new \App\Model\Account_Token;
         $db = new \App\Models\Account_detailed;
@@ -264,7 +276,8 @@ class IndexController extends Controller {
     }
 
     //今日投注统计饼状图
-    function getBetUrl() {
+    function getBetUrl()
+    {
         $db = new \App\Models\OrderUrl;
         $data = $db->getUrlBet();
         $array['data'] = $data;
@@ -285,7 +298,8 @@ class IndexController extends Controller {
     }
 
     //时间区
-    function getTime() {
+    function getTime()
+    {
         $time = array(
             'addrss' => date_default_timezone_get(),
             'time' => date("Y-m-d H:i:s", time() + 3600 * 8),
@@ -295,7 +309,8 @@ class IndexController extends Controller {
     }
 
     //最近7天会员注册情况
-    function regUser() {
+    function regUser()
+    {
         /*
         $time2 = date('Y-m-d H:i:s', time() - 60 * 60 * 24 * 30);
         $time1 = date('Y-m-d H:i:s', time());
@@ -307,17 +322,18 @@ class IndexController extends Controller {
         $data = $rimit->toArray();
         */
 
+
         //统计七天内注册用户数量按天进行分组
         $start_time = date('Y-m-d', strtotime('-7 days'));
-        $end_time = date('Y-m-d',time());
-        $user = DB::table('account_detailed')->whereBetween('register_time',[$start_time,$end_time])
-        ->selectRaw('date(register_time) as name,count(identity) as value')
-        ->groupBy('register_time')->get();
-        if(!empty($user)){
+        $end_time = date('Y-m-d', time());
+
+        $user = DB::select('select  rtime as name ,count(rtime) as value   from  (SELECT  to_char( "register_time",\'YYYY-MM-DD\') as rtime FROM "account_detailed" where "register_time">=CURRENT_DATE-7) as tmp  group by rtime order by name asc');
+        
+        if (!empty($user)) {
             $userData = [];
-            foreach($user as $k=>$v){
-                $userData[$k]['name'] = $v->name; 
-                $userData[$k]['value'] = $v->value; 
+            foreach ($user as $k => $v) {
+                $userData[$k]['name'] = $v->name;
+                $userData[$k]['value'] = $v->value;
             }
         }
         //计算日期内天数
@@ -327,17 +343,17 @@ class IndexController extends Controller {
         $days = ($etimestamp - $stimestamp) / 86400;
         //保存每天日期
         $date = array();
-        for($i = 0;$i < $days;$i++){
+        for ($i = 0; $i < $days; $i++) {
             $date[] = date('Y-m-d', $stimestamp + (86400 * $i));
         }
         //循环补全日期
-        foreach ($date as $key => $val){
+        foreach ($date as $key => $val) {
             $data[$key] = [
-            'name' => $val,
-            'value' => 0
+                'name' => $val,
+                'value' => 0
             ];
-            foreach ($userData as $item => $value){
-                if($val == $value['name']){
+            foreach ($userData as $item => $value) {
+                if ($val == $value['name']) {
                     $data[$key] = $value;
                 }
             }
@@ -354,7 +370,8 @@ class IndexController extends Controller {
     }
 
     //最近7天财务情况
-    function money() {
+    function money()
+    {
         $res_array = array();
 
         for ($i = 6; $i >= 0; $i--) {
@@ -448,7 +465,8 @@ class IndexController extends Controller {
         return responseToJson($array);*/
     }
 
-    private function getTradetype() {
+    private function getTradetype()
+    {
         $tradetype = array(
             '5' => 'money_with',
             '6' => 'money_recharge',
@@ -460,7 +478,8 @@ class IndexController extends Controller {
     }
 
     //每天每个游戏注单数
-    function TodayGameNote() {
+    function TodayGameNote()
+    {
         $time1 = date('Y-m-d 00:00:00');//今日零时
         $time2 = date('Y-m-d 23:59:59');//今日末时
 //        $time1='2017-09-14 00:00:00';
@@ -482,7 +501,8 @@ class IndexController extends Controller {
     }
 
     //拉时间
-    function pullTime() {
+    function pullTime()
+    {
         //获取前台域名
         $setInfo = new \App\Models\Setinfo();
         $info = $setInfo->getInfo(18);
@@ -508,7 +528,8 @@ class IndexController extends Controller {
     }
 
     //通知消息
-    function Message() {
+    function Message()
+    {
 
         $admin_id = session('adminInfo.admin_id');
         $db = new \App\Models\MessageRead;
@@ -532,7 +553,8 @@ class IndexController extends Controller {
     }
 
     //刷新缓存
-    public function refresh() {
+    public function refresh()
+    {
         return view('admin.refresh');
     }
 }

+ 56 - 32
public/js/common.js

@@ -50,10 +50,11 @@ function openHtml(obj, title, width, height) {
         content: $(obj).html()
     });
 }
+
 /**
  * 添加到标答
- * @param {*}  
- * @param {*}  
+ * @param {*}
+ * @param {*}
  */
 function joinTab($title, $url) {
     parent.addTab(null, $title, $url);
@@ -67,7 +68,8 @@ function closeWin() {
 function reloadDataTable() {
     try {
         g.currentDataTableReload['reload'].call();
-    } catch (ex) {}
+    } catch (ex) {
+    }
 }
 
 /**
@@ -84,8 +86,8 @@ function delWin(url, ids) {
     }
     layer.confirm('是否确认删除?', {
         btn: ['确认', '取消'] //按钮
-    }, function() {
-        $.getJSON(url + ids, function(data, textStatus) {
+    }, function () {
+        $.getJSON(url + ids, function (data, textStatus) {
             if (data.status == '1') {
                 reloadDataTable();
                 layer.msg('删除成功');
@@ -93,7 +95,7 @@ function delWin(url, ids) {
                 layer.msg(data.msg);
             }
         });
-    }, function() {
+    }, function () {
 
     });
 
@@ -113,17 +115,17 @@ function allbalance(url, ids) {
     }
     layer.confirm('是否确认结算?', {
         btn: ['确认', '取消'] //按钮
-    }, function() {
-        $.getJSON(url + ids, function(data, textStatus) {
+    }, function () {
+        $.getJSON(url + ids, function (data, textStatus) {
             if (data.status == '1') {
                 reloadDataTable();
-                g.currentDataTableIdArray=undefined;
+                g.currentDataTableIdArray = undefined;
                 layer.msg('结算成功');
             } else {
                 layer.msg(data.msg);
             }
         });
-    }, function() {
+    }, function () {
 
     });
 
@@ -143,31 +145,31 @@ function allrevoke(url, ids) {
     }
     layer.confirm('是否确认作废?', {
         btn: ['确认', '取消'] //按钮
-    }, function() {
-        $.getJSON(url + ids, function(data, textStatus) {
+    }, function () {
+        $.getJSON(url + ids, function (data, textStatus) {
             if (data.status == '1') {
                 reloadDataTable();
-                g.currentDataTableIdArray=undefined;
+                g.currentDataTableIdArray = undefined;
                 layer.msg('作废成功');
             } else {
                 layer.msg(data.msg);
             }
         });
-    }, function() {
+    }, function () {
 
     });
 
 }
 
-$(document).ready(function() {
-    $('*[eventType=eventForm]').submit(function() {
+$(document).ready(function () {
+    $('*[eventType=eventForm]').submit(function () {
 
         $(this).attr('method', 'get');
         return true;
 
     });
 
-    $('*[eventType=eventAjaxForm]').submit(function() {
+    $('*[eventType=eventAjaxForm]').submit(function () {
         var uid = $(this).serialize() + $(this).attr('action');
         if (g.parentUid == uid) {
             return false;
@@ -178,7 +180,7 @@ $(document).ready(function() {
             shade: 0.71
         });
 
-        $.post($(this).attr('action'), $(this).serialize(), function(data, status) {
+        $.post($(this).attr('action'), $(this).serialize(), function (data, status) {
             parent.layer.close(msgIndex);
             if (data.status == '1') {
                 try {
@@ -199,7 +201,7 @@ $(document).ready(function() {
         });
         return false;
     });
-    $(document).on('click', '[eventType=event-view]', function() {
+    $(document).on('click', '[eventType=event-view]', function () {
         var url = $(this).attr('uri');
         var pid = $(this).attr('pid');
         var width = $(this).attr('win-width');
@@ -207,7 +209,7 @@ $(document).ready(function() {
         var id = $(this).parent().find('span').attr('data-' + pid);
         openWin(url + id, '查看详细信息', width, height);
     });
-    $(document).on('click', '[eventType=event-edit]', function() {
+    $(document).on('click', '[eventType=event-edit]', function () {
         var url = $(this).attr('uri');
         var pid = $(this).attr('pid');
         var width = $(this).attr('win-width');
@@ -215,14 +217,16 @@ $(document).ready(function() {
         var id = $(this).parent().find('span').attr('data-' + pid);
         openWin(url + id, '修改信息', width, height);
     });
-    $('form').keyup(function(event) {
+    $('form').keyup(function (event) {
         if (event.keyCode == 13) {
             try {
                 $(".lay-btn-diy").trigger("click");
-            } catch (ex) {}
+            } catch (ex) {
+            }
             try {
                 $('*[eventType=event-query-submit]').click();
-            } catch (ex) {}
+            } catch (ex) {
+            }
         }
     });
 
@@ -230,10 +234,11 @@ $(document).ready(function() {
 });
 
 try {
-    $('*[eventType=event-query-submit]').click(function() {
+    $('*[eventType=event-query-submit]').click(function () {
         $('*[eventType=eventForm]').submit();
     });
-} catch (ex) {}
+} catch (ex) {
+}
 
 // try {
 //   $(".lay-btn-diy").click(function () {
@@ -248,10 +253,9 @@ function selfTab(name, value) {
 }
 
 
-
-layui.use(['table', 'form', 'tree', 'laydate'], function() {
+layui.use(['table', 'form', 'tree', 'laydate'], function () {
     laydate = layui.laydate //日期;
-    lay('*[eventType=event-datetime]').each(function() {
+    lay('*[eventType=event-datetime]').each(function () {
         laydate.render({
             elem: this,
             type: 'datetime',
@@ -259,7 +263,7 @@ layui.use(['table', 'form', 'tree', 'laydate'], function() {
         });
     });
 
-    $('select[eventType=event_query]', function(data) {
+    $('select[eventType=event_query]', function (data) {
         // try {
         //   $(".lay-btn-diy").trigger("click");
         // } catch (ex) { }
@@ -280,8 +284,8 @@ layui.use(['table', 'form', 'tree', 'laydate'], function() {
 function editLine(url, title) {
     layer.confirm('是否确认修改?', {
         btn: ['确认', '取消'] //按钮
-    }, function() {
-        $.getJSON(url, function(data, textStatus) {
+    }, function () {
+        $.getJSON(url, function (data, textStatus) {
             if (data.status == '1') {
                 layer.msg('修改成功');
                 reloadDataTable();
@@ -289,5 +293,25 @@ function editLine(url, title) {
                 layer.msg(data.msg);
             }
         });
-    }, function() {});
+    }, function () {
+    });
+}
+
+
+//js 正则判断
+function jsReg(type, content) {
+    switch (type) {
+        case 'number':
+            return /^\d+$/.exec(content);
+            break;
+        case 'char':
+            return /^[a-zA-Z]+$/.exec(content);
+            break;
+        case 'numberchar':
+            return /^\w+$/.exec(content);
+            break;
+        default:
+            return false;
+    }
+    return false;
 }

+ 76 - 37
resources/views/admin/Usergrade/add.blade.php

@@ -1,55 +1,78 @@
 @extends('vip.layouts')
 @section('content')
 
-    <form class="layui-form" action="{{ url()->full() }}" id="submitForm" name="submitForm" method="post" eventType="eventAjaxForm">
+    <form class="layui-form" action="{{ url()->full() }}" id="submitForm" name="submitForm" method="post"
+          eventType="eventAjaxForm">
         {!! csrf_field() !!}
 
         <div class="layui-form-item">
             <label class="layui-form-label">{{ trans('grade.name') }}:</label>
             <div class="layui-input-block">
-                <input type="text" name="name"  id="name"  required  lay-verify="required" placeholder="" autocomplete="off" value="@isset($admin) {{ $admin['name'] }} @endisset" class="layui-input">
+                <input type="text" name="name" id="name" required lay-verify="required" placeholder=""
+                       autocomplete="off" value="@isset($admin) {{ $admin['name'] }} @endisset" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">{{ trans('grade.grade') }}:</label>
             <div class="layui-input-block">
-                <input type="text" name="grade" id="grade"  required  lay-verify="required" placeholder="" autocomplete="off" value="@isset($admin) {{ $admin['grade'] }} @endisset" class="layui-input">
+                <input type="text" name="grade" id="grade" required lay-verify="required" placeholder=""
+                       autocomplete="off" value="@isset($admin) {{ $admin['grade'] }} @endisset" class="layui-input">
             </div>
         </div>
-        <!-- <div class="layui-form-item">
+    <!-- <div class="layui-form-item">
             <label class="layui-form-label">{{ trans('grade.rule') }}:</label>
             <div class="layui-input-block">
                 <input type="text" name="rule"   id="rule"  required  lay-verify="required" placeholder="请输入英文规则(不可重复)" autocomplete="off" value="@isset($admin) {{ $admin['rule'] }} @endisset" class="layui-input">
             </div>
         </div> -->
-        @isset($admin['grade']) 
-        @if($admin['grade']=='0')
-        <div class="layui-form-item">
-            <label class="layui-form-label">{{ trans('grade.time_type') }}</label>
-            <div class="layui-input-inline" style="width: 200px;">
-                <select name="time_type"  id="time_type"  lay-filter="time_type" lay-verify="required" autocomplete="off" class="layui-input" eventType=event-query>
-                    <option value="">{{ trans('grade.time_type1') }}</option>
-                    {{--<option value="year" @isset($admin['rule_details'][0]) @if($admin['rule_details'][0]=='year') selected @endif @endisset>年份</option>--}}
-                    <option value="month" @isset($admin['rule_details'][0]) @if($admin['rule_details'][0]=='month') selected @endif @endisset>月份</option>
-                    <option value="week" @isset($admin['rule_details'][0]) @if($admin['rule_details'][0]=='week') selected @endif @endisset>周份</option>
-                    <option value="day" @isset($admin['rule_details'][0]) @if($admin['rule_details'][0]=='day') selected @endif @endisset>日份</option>
-                    <option value="all" @isset($admin['rule_details'][0]) @if($admin['rule_details'][0]=='all') selected @endif @endisset>全部</option>
-                    <option value="ymd" @isset($admin['rule_details'][0]) @if($admin['rule_details'][0]=='ymd') selected @endif @endisset>年月日</option>
-                    {{--<option value="day" @isset($admin['rule_details'][0]) @if($admin['rule_details'][0]=='quarter') selected @endif @endisset>季度</option>--}}
-                </select>
-            </div>
-            <div class="layui-input-inline" style="width: 200px; @isset($admin['rule_details'][0]) @if($admin['rule_details'][0]=='day' || $admin['rule_details'][0]=='ymd') display: block; @else display: none; @endif @else display: none; @endisset " id="day">
-                <input type="text" name="day"   lay-verify="" placeholder="请输入天数或年月日" autocomplete="off" value="@isset($admin['rule_details'][3]) {{ $admin['rule_details'][3] }} @endisset" class="layui-input">如:天数:2---年月日:2018-09-18
-            </div>
-        </div>
-        @endif @endisset
-        <!-- <div class="layui-form-item">
+        @isset($admin['grade'])
+            @if($admin['grade']=='0')
+                <div class="layui-form-item">
+                    <label class="layui-form-label">{{ trans('grade.time_type') }}</label>
+                    <div class="layui-input-inline" style="width: 200px;">
+                        <select name="time_type" id="time_type" lay-filter="time_type" lay-verify="required"
+                                autocomplete="off" class="layui-input" eventType=event-query>
+                            <option value="">{{ trans('grade.time_type1') }}</option>
+                            {{--<option value="year" @isset($admin['rule_details'][0]) @if($admin['rule_details'][0]=='year') selected @endif @endisset>年份</option>--}}
+                            <option value="month"
+                                    @isset($admin['rule_details'][0]) @if($admin['rule_details'][0]=='month') selected @endif @endisset>
+                                月份
+                            </option>
+                            <option value="week"
+                                    @isset($admin['rule_details'][0]) @if($admin['rule_details'][0]=='week') selected @endif @endisset>
+                                周份
+                            </option>
+                            <option value="day"
+                                    @isset($admin['rule_details'][0]) @if($admin['rule_details'][0]=='day') selected @endif @endisset>
+                                日份
+                            </option>
+                            <option value="all"
+                                    @isset($admin['rule_details'][0]) @if($admin['rule_details'][0]=='all') selected @endif @endisset>
+                                全部
+                            </option>
+                            <option value="ymd"
+                                    @isset($admin['rule_details'][0]) @if($admin['rule_details'][0]=='ymd') selected @endif @endisset>
+                                年月日
+                            </option>
+                            {{--<option value="day" @isset($admin['rule_details'][0]) @if($admin['rule_details'][0]=='quarter') selected @endif @endisset>季度</option>--}}
+                        </select>
+                    </div>
+                    <div class="layui-input-inline"
+                         style="width: 200px; @isset($admin['rule_details'][0]) @if($admin['rule_details'][0]=='day' || $admin['rule_details'][0]=='ymd') display: block; @else display: none; @endif @else display: none; @endisset "
+                         id="day">
+                        <input type="text" name="day" lay-verify="" placeholder="请输入天数或年月日" autocomplete="off"
+                               value="@isset($admin['rule_details'][3]) {{ $admin['rule_details'][3] }} @endisset"
+                               class="layui-input">如:天数:2---年月日:2018-09-18
+                    </div>
+                </div>
+            @endif @endisset
+    <!-- <div class="layui-form-item">
             <label class="layui-form-label">充值{{ trans('grade.money') }}:</label>
             <div class="layui-input-block">
                 <input type="text" name="rechargemoney"  id="rechargemoney"  required  lay-verify="" placeholder="请输入充值金额" autocomplete="off" value="@isset($admin['rule_details'][1]) {{ $admin['rule_details'][1] }} @endisset" class="layui-input">
             </div>
         </div> -->
-        <!-- <div class="layui-form-item">
+    <!-- <div class="layui-form-item">
             <label class="layui-form-label">投注{{ trans('grade.money') }}:</label>
             <div class="layui-input-block">
                 <input type="text" name="bettingmoney"  id="bettingmoney"  required  lay-verify="" placeholder="请输入投注金额" autocomplete="off" value="@isset($admin['rule_details'][2]) {{ $admin['rule_details'][2] }} @endisset" class="layui-input">
@@ -58,16 +81,20 @@
         <div class="layui-form-item">
             <label class="layui-form-label">投注{{ trans('grade.lower_limit') }}{{ trans('grade.money') }}:</label>
             <div class="layui-input-block">
-                <input type="text" name="lower_limit"  id="lower_limit"  required  lay-verify="" placeholder="请输入投注下限金额" autocomplete="off" value="@isset($admin){{ $admin['lower_limit'] }}@endisset" class="layui-input">
+                <input type="text" name="lower_limit" id="lower_limit" required lay-verify="" placeholder="请输入投注下限金额"
+                       autocomplete="off" value="@isset($admin){{ $admin['lower_limit'] }}@endisset"
+                       class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">投注{{ trans('grade.upper_limit') }}{{ trans('grade.money') }}:</label>
             <div class="layui-input-block">
-                <input type="text" name="upper_limit"  id="upper_limit"  required  lay-verify="" placeholder="请输入投注上限金额" autocomplete="off" value="@isset($admin){{ $admin['upper_limit'] }}@endisset" class="layui-input">
+                <input type="text" name="upper_limit" id="upper_limit" required lay-verify="" placeholder="请输入投注上限金额"
+                       autocomplete="off" value="@isset($admin){{ $admin['upper_limit'] }}@endisset"
+                       class="layui-input">
             </div>
         </div>
-        
+
         @if(S('ACTION')!='view')
             <div class="layui-form-item">
                 <div class="layui-input-block">
@@ -80,27 +107,39 @@
 
     <script>
         //Demo
-        layui.use(['form'], function(){
+        layui.use(['form'], function () {
             var form = layui.form;
 
             //监听提交
-            form.on('submit(submitForm)', function(data){
+            form.on('submit(submitForm)', function (data) {
+                var lowlimit = $("#lower_limit").val(), uplimit = $("#upper_limit").val();
+
+                if (!jsReg('number', lowlimit) || lowlimit < 0) {
+                    alert("投注下限金额只能为数字且大于0");
+                    return false;
+                }
+
+                if (!jsReg('number', uplimit) || uplimit < 0) {
+                    alert("投注下限金额只能为数字且大于0");
+                    return false;
+                }
                 return true;
             });
             //时间类型筛选时间
             form.on('select(time_type)', function (data) {
-                if(data.value =='day' || data.value =='ymd'){
+                if (data.value == 'day' || data.value == 'ymd') {
                     $("#day").show();
-                }else{
+                } else {
                     $("#day").hide();
                 }
             });
         });
-        function cbFormSuccess(data){
+
+        function cbFormSuccess(data) {
             layer.msg(data.msg);
-            setTimeout(function(){
+            setTimeout(function () {
                 window.history.go(-1);//返回上一页
-            },2500);
+            }, 2500);
         }
 
 

+ 33 - 242
resources/views/admin/sportsfoot/outcome.blade.php

@@ -3,103 +3,6 @@
     足球赛事
 @endsection
 @section('content')
-<style type="text/css">
-    /* 弹窗 (background) */
-    .modal {
-        display: none; /* 默认隐藏 */
-        /*生成绝对定位的元素,相对于浏览器窗口进行定位。*/
-        position: fixed; 
-        z-index: 1; 
-        left: 0;
-        top: 0;
-        /*设置弹窗位置*/
-        padding-top: 100px;
-        padding-bottom: 200px;
-        /*浮在全屏上*/
-        width: 100%; 
-        height:  100%; 
-        /*overflow:auto;如果内容被修剪,则浏览器会显示滚动条,以便查看其余内容。*/
-        overflow: auto; 
-        background-color: rgb(0,0,0); 
-        background-color: rgba(0,0,0,0.4);
-        text-align: right;
-    }
-
-    /* 弹窗内容 */
-    .modal-content {
-        /*position: relative;*/
-        /*弹窗背景色设置*/
-        background-color: #fefefe;
-        margin: auto;
-        padding: 260px auto;
-        width: 600px;
-        box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19);
-        -webkit-animation-name: animatetop;
-        -webkit-animation-duration: 0.4s;
-        animation-name: animatetop;
-        animation-duration: 0.4s;
-        border-radius: 10px;
-       }
-
-    /* 添加动画 */
-    @-webkit-keyframes animatetop {
-        from {top:-200px; opacity:0} 
-        to {top:0; opacity:1}
-    }
-
-    @keyframes animatetop {
-        from {top:-200px; opacity:0}
-        to {top:0; opacity:1}
-    }
-
-    /* 关闭按钮 */
-    .close {
-        color: white;
-        float: right;
-        font-size: 28px;
-        font-weight: bold;
-    }
-
-    .close:hover, .close:focus {
-        color: #000;
-        text-decoration: none;
-        cursor: pointer;
-    }
-
-    .modal-header {
-        display: block;
-        line-height: 30px;
-        padding: 2px 10px;
-        background-color: #AEAEAE;
-        color: white;
-        text-align: left;
-        border-radius: 5px 5px 0 0;
-    }
-
-    .modal-body {
-        padding: 2px 16px;
-        font-size: 18px;
-        /*height: 200px;*/
-    }
-
-    .modal-footer {
-        display: flex;
-        justify-content: space-around;
-        align-items: center;
-        width: 520px;
-        padding: 0 40px;
-        height: 50px;
-       border-radius:0 0 5px 5px;
-        display: block;
-        line-height: 39px;
-        background-color: #AEAEAE;
-        color: white;
-    }
-    .ok,.no{
-        width: 100px;
-        height: 40px;
-    }
-</style>
 
     <script type="text/html" id="newtime">
       @{{#if(d.match_id!=null){ }}
@@ -237,71 +140,6 @@
         </div>
     </div>
 
-    <!-- 弹窗隐藏区域 -->
-       
-    <div id="myModal" class="modal">
-            <input type="hidden" id="matchid" name="matchid" value="">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <span class="close">&times;</span>
-                    <h2>赛事结果添加</h2>
-                </div>
-                <div class="modal-body">
-                    <p style="text-align:left;color:#5f7788;">请认真填写赛事结果,将会按照改结果结算</p><br>
-                    <div style="text-align:left;">
-                        <div style="display: flex;">
-                            <li>主队全场角球:</li><input type="text" id="homeallcorner" name="homeallcorner" value="" autocomplete="off">
-                        </div>
-                        <div style="display: flex;">
-                            <li>客队全场角球:</li><input type="text" id="guestallcorner" name="guestallcorner" value="" autocomplete="off">
-                        </div>
-                        <div style="display: flex;">
-                            <li>主队半场角球:</li><input type="text" id="homehalfcorner" name="homehalfcorner" value="" autocomplete="off">
-                        </div>
-                        <div style="display: flex;">
-                            <li>客队半场角球:</li><input type="text" id="guesthalfcorner" name="guesthalfcorner" value="" autocomplete="off">
-                        </div>
-                        <div style="display: flex;"> 
-                            <li>主队全场罚牌:</li><input type="text" id="homeallcard" name="homeallcard" value="" autocomplete="off">
-                        </div>
-                        <div style="display: flex;">
-                            <li>客队全场罚牌:</li><input type="text" id="guestallcard" name="guestallcard" value="" autocomplete="off">
-                        </div>
-                        <div style="display: flex;">
-                            <li>主队半场罚牌:</li><input type="text" id="homehalfcard" name="homehalfcard" value="" autocomplete="off">
-                        </div> 
-                        <div style="display: flex;">
-                            <li>客队半场罚牌:</li><input type="text" id="guesthalfcard" name="guesthalfcard" value="" autocomplete="off">
-                        </div>
-                        <div style="display: flex;">
-                            <li>最先进球球队:</li>
-                            <select name="firstscore" id="firstscore">
-                            </select>
-                        </div>
-                        <div style="display: flex;">
-                            <li>最后进球球队:</li>
-                            <select name="lastscore" id="lastscore">
-                            </select>
-                        </div>
-                        <div style="display: flex;">
-                            <li> 进 &nbsp; 球&nbsp; 方&nbsp;式&nbsp;:</li>
-                            <select name="firststye" id="firststye">
-                            </select>
-                        </div>
-                        <div style="display: flex;">
-                            <li>最先进球时间:</li><input type="text" id="onescoretime" name="onescoretime" value="" autocomplete="off">分钟
-                        </div>
-                        <div style="display: flex;">
-                            <li> 获 &nbsp; 胜&nbsp; 球&nbsp;队&nbsp;:</li><input type="text" id="matchwiner" name="matchwiner" value="">
-                        </div><br>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button class="ok" onchange="buttonClick()"><h3>确定</h3></button>&nbsp;<button class="no"><h3>取消</h3></button>
-                </div>
-            </div>
-    </div>
-    
     <script type="text/javascript">
         $(function () {
             $('body').on('click', 'a[eventtype="event-delete"]', function () {
@@ -317,104 +155,57 @@
                 }
             })
         })
-        
-        function addResult($match_id){
-            $(":input",$("#myModal")).each(function(i){  $(this).val('');});
-            var match_id = $match_id;
-            document.getElementById("matchid").value=$match_id;//赋值个弹窗
-            
+
+        //layer弹窗开始
+        function addResult(match_id){
             $.ajax({
                 type: 'POST',
                 dataType: 'json',
                 url: '/admin/Sportsfoot/Matchresult',
                 data: {match_id:match_id},
                 success: function(data) {
-                    document.getElementById("matchwiner").value=data.newapp.match_winer;
-                    document.getElementById("homeallcard").value=data.penalty_card.home;
-                    document.getElementById("guestallcard").value=data.penalty_card.guest;
-                    document.getElementById("homehalfcard").value=data.penalty_card.home_half;
-                    document.getElementById("guesthalfcard").value=data.penalty_card.guest_half;
-                    document.getElementById("homeallcorner").value=data.corner_ball.home;
-                    document.getElementById("guestallcorner").value=data.corner_ball.guest;
-                    document.getElementById("homehalfcorner").value=data.corner_ball.home_half;
-                    document.getElementById("guesthalfcorner").value=data.corner_ball.guest_half;
-                    document.getElementById("onescoretime").value=data.first_score.scoretime;//首进球时间
-
-                    if(data.newapp.home_score>0 || data.newapp.guest_score>0){
-                        firstscore = "<option value='"+ data.first_score.teamscore +"' selected=''> ";
-                        if (data.first_score.teamscore.length>0){
-                            firstscore += data.first_score.teamscore;
-                            firstscore += "</option><option value=''>无进球";
+                    var  conttxt ='<div style="margin-left:100px;margin-top:20px;font-size:18px;line-height:150%;"><input type="hidden" id="matchid" name="matchid" value="'+match_id+'" /><div style="display: flex;"><li>主队全场角球:</li><input type="text" id="homeallcorner" name="homeallcorner" value="'+data.corner_ball.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队全场角球:</li><input type="text" id="guestallcorner" name="guestallcorner" value="'+data.corner_ball.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队半场角球:</li><input type="text" id="homehalfcorner" name="homehalfcorner" value="'+data.corner_ball.home_half+'" autocomplete="off"></div><div style="display: flex;"><li>客队半场角球:</li><input type="text" id="guesthalfcorner" name="guesthalfcorner" value="'+data.corner_ball.guest_half+'" autocomplete="off"></div><div style="display: flex;"><li>主队全场罚牌:</li><input type="text" id="homeallcard" name="homeallcard" value="'+data.penalty_card.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队全场罚牌:</li><input type="text" id="guestallcard" name="guestallcard" value="'+data.penalty_card.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队半场罚牌:</li><input type="text" id="homehalfcard" name="homehalfcard" value="'+data.penalty_card.home_half+'" autocomplete="off"></div><div style="display: flex;"><li>客队半场罚牌:</li><input type="text" id="guesthalfcard" name="guesthalfcard" value="'+data.penalty_card.guest_half+'" autocomplete="off"></div>';
+                    if (data.newapp.home_score!=0 || data.newapp.guest_score!=0){
+                        conttxt += '<div style="display: flex;"><li>最先进球球队:</li><select name="firstscore" id="firstscore">';
+                        if(data.first_score.teamscore!=0){
+                            conttxt += '<option value="'+ data.first_score.teamscore +'" selected="">'+data.first_score.teamscore+'</option><option value="">无最先进球</option>';
                         }else{
-                            firstscore += '请选择最先进球';
+                            conttxt += '<option value="">请选择最先进球</option>';
                         }
-                        firstscore += " </option><option value=" +data.newapp.home_team + ">" + data.newapp.home_team + "</option><option value=" +data.newapp.guest_team + ">" + data.newapp.guest_team + "</option>";
-                        $("#firstscore").html(firstscore);
+                        conttxt += '<option value="'+ data.newapp.home_team +'">'+data.newapp.home_team+'</option><option value="'+ data.newapp.guest_team +'">'+data.newapp.guest_team+'</option></select></div>';
 
-                        firststye = "<option value='"+ data.first_score.scoretype +"' selected=''> ";
-                        if (data.first_score.scoretype.length>0){
-                            firststye += data.first_score.scoretype ;
-                            firststye += "</option><option value=''>无方式";
+                        conttxt += '<div style="display: flex;"><li>首球进球方式:</li><select name="firststye" id="firststye">';
+                        if(data.first_score.scoretype!=0){
+                            conttxt += '<option value="'+ data.first_score.scoretype +'" selected="">'+data.first_score.scoretype+'</option><option value="">无进球方式</option>';
                         }else{
-                            firststye += '请选择最先进球方式';
+                            conttxt += '<option value="">请选择进球方式</option>';
                         }
-                        firststye += " </option><option value='射门'>射门</option><option value='头球'>头球</option><option value='无进球'>无进球</option><option value='点球'>点球</option><option value='任意球'>任意球</option><option value='乌龙球'>乌龙球</option>";
-                        $("#firststye").html(firststye);
+                        conttxt += '<option value="射门">射门</option><option value="头球">头球</option><option value="点球">点球</option><option value="任意球">任意球</option><option value="乌龙球">乌龙球</option></select></div>';
 
-                        lastscore = "<option value='"+data.newapp.last_score+"' selected=''>";
-                        if (data.newapp.last_score){
-                            lastscore += data.newapp.last_score;
-                            lastscore += "</option><option value=''>无进球";
+                        conttxt += '<div style="display: flex;"><li>最后进球球队:</li><select name="lastscore" id="lastscore">';
+                        if(data.newapp.last_score!=0){
+                            conttxt += '<option value="'+ data.newapp.last_score +'" selected="">'+data.newapp.last_score+'</option><option value="">无最后进球</option>';
                         }else{
-                            lastscore += '请选择最后进球';
+                            conttxt += '<option value="">请选择最后进球</option>';
                         }
-                        lastscore += "</option><option value=" + data.newapp.home_team + ">" + data.newapp.home_team + "</option><option value=" + data.newapp.guest_team + ">" + data.newapp.guest_team + "</option>";
-                        $("#lastscore").html(lastscore);
-                    }else{
-                        firstscore = "";
-                        $("#firstscore").html(firstscore);
-                        firststye = "";
-                        $("#firststye").html(firststye);
-                        lastscore = "";
-                        $("#lastscore").html(lastscore);
+                        conttxt += '<option value="'+ data.newapp.home_team +'">'+data.newapp.home_team+'</option><option value="'+ data.newapp.guest_team +'">'+data.newapp.guest_team+'</option></select></div><div style="display: flex;"><li>首 进 球 时 间:</li><input type="text" id="onescoretime" name="onescoretime" value="'+data.first_score.scoretime+'" autocomplete="off"></div><div style="display: flex;"><li>最终获胜球队:</li><input type="text" id="matchwiner" name="matchwiner" value="'+data.newapp.match_winer+'" autocomplete="off"></div><br>';
+
                     }
+                    conttxt += '<div style="margin-left:230px;"><button class="layui-btn layui-btn-sm layui-btn-green set" onclick="buttonClick()"><h3>确定</h3></button>&nbsp;<button class="layui-btn layui-btn-sm layui-btn-danger"><h3>取消</h3></button></div></div>';
+                
+                layer.open({
+                  type: 1 //Page层类型
+                  ,area: ['600px', '500px']
+                  ,title: '<h2>赛事结果添加<h2>'
+                  ,shade: 0.6 //遮罩透明度
+                  ,maxmin: true //允许全屏最小化
+                  ,anim: 1 //0-6的动画形式,-1不开启
+                  ,content:conttxt
+                }); 
                 }
             }) 
-
-            //获取弹窗得div
-            var modal = document.getElementById('myModal');
-            // 获取 <span> 元素,用于关闭弹窗 (X)
-            var span = document.getElementsByClassName("close")[0];
-            //获取弹窗中得确定按钮
-            var ok=document.getElementsByClassName("ok")[0];
-            //获取弹窗中得取消按钮
-            var no=document.getElementsByClassName("no")[0];
-            //窗体弹出
-            modal.style.display = "block";
-            //点击窗体ok
-            ok.onclick=function(){
-                //执行弹出窗体得确定后得操作
-                alert("执行确定按钮点击得操作");
-                //关闭窗口
-                modal.style.display = "none";
-                buttonClick();
-            }
-            //点击窗体取消按钮
-            no.onclick=function(){
-                //直接关闭窗口
-                modal.style.display = "none";
-            }
-            // 点击 <span> (x), 关闭弹窗
-            span.onclick = function() {
-                //直接关闭窗口
-                modal.style.display = "none";
-            }
-            // 在用户点击其他地方时,关闭弹窗
-            window.onclick = function(event) {
-                //点击窗口外内容,关闭窗口
-                if (event.target == modal) modal.style.display = "none";
-            }
         }
+        //layer弹窗结束
         
         function buttonClick(){
             var matchid = $("#matchid").val();