异常处理

app/Http/Controllers/Admin/IndexController.php

@@ -231,6 +231,7 @@ class IndexController extends Controller {
     function getNotice() {
         $db = new \App\Models\Article();
         $data = $db->getMsg(2, 2);
+
         return $data;
     }
 

app/Http/Controllers/Admin/LqChampionsLeagueController.php

@@ -25,7 +25,7 @@ class LqChampionsLeagueController extends Controller
         $request['area_id'] = isset($req->area_id) ? trim($req->area_id) : '';
         $request['country_id'] = isset($req->country_id) ? trim($req->country_id) : '';
         $request['id'] = isset($req->id) ? trim($req->id) : '';
-        $request['status'] = isset($req->status) ? trim($req->status) : '0';
+        $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
         $data = \App\Models\BasketLeague::select('id','lg_id','name_chinese')->get();
         $area = \App\Models\StAreaCountry::where('pid',0)->get();
@@ -78,7 +78,7 @@ class LqChampionsLeagueController extends Controller
         if(!empty($country_id)){
             $where[] = array('st_lq_league.country_id', '=', $country_id);
         }
-        if($status != 0){
+        if($status != -1){
             $where[] = array('st_lq_league.status', '=', $status);
         }
 

app/Http/Controllers/Api/WriteSportsController.php

@@ -1713,9 +1713,9 @@ class WriteSportsController extends BaseController
 
             //请求 数据 为空
             if (empty($obt)) throw new \Exception(Response::generate('请求数据为空，', Response::ABNORMAL));
-            $getData = $this->getAddData($obt);
+            $data = $this->getAddData($obt);
             //不是 直播 数据
-            if ($getData['title'] != 'match_status') throw new \Exception(Response::generate('不是更新赛事状态数据', Response::ABNORMAL));
+            if ($data['title'] != 'match_status') throw new \Exception(Response::generate('不是更新赛事状态数据', Response::ABNORMAL));
 
             /*
             //写请求数据 日志记录
@@ -1761,13 +1761,13 @@ class WriteSportsController extends BaseController
             //提交事务
             DB::commit();
             //写请求数据 日志记录
-            if ($this->isRecord) commonFunction::SET_SPORTS_RECORD($game_code, $getData, $getData['title'], Response::success());
+            if ($this->isRecord) commonFunction::SET_SPORTS_RECORD($game_code, $data, $data['title'], Response::success());
             return Response::success();
         } catch (\Exception $e) {
             //回滚事务
             DB::rollBack();
             //写请求数据 日志记录
-            if ($this->isRecord) commonFunction::SET_SPORTS_RECORD($game_code, $getData, $getData['title'], $e->getMessage());
+            if ($this->isRecord) commonFunction::SET_SPORTS_RECORD($game_code, $data, $data['title'], $e->getMessage());
             return $e->getMessage();
         }
     }

app/Lib/Settlement/Adapter/ZqRule.php

@@ -1548,7 +1548,7 @@ class ZqRule
     * Date: 2019/6/28
     * Time: 10:19
     */
-    public function WEH($bet_match = '', $result_match = '', $result_match_r = [])
+    public function WAH($bet_match = '', $result_match = '', $result_match_r = [])
     {
         if (empty($bet_match) || empty($result_match)) return false;
 

resources/lang/zh-cn/status.php

@@ -369,6 +369,12 @@ return array(
 			'1' => '启用',
 		),
 	),
+	'lqsais_status' => array(
+		'status' => array(
+			'0' => '未启用',
+			'1' => '启用',
+		),
+	),
 	'team_status' => array(
 		'status' => array(
 			'0' => '关闭',

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

@@ -100,7 +100,8 @@
                 <div class="layui-inline">
                 <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" style="opacity: 1; pointer-events: auto;" eventType=event-query-submit>搜索</a>
 				<a  class="layui-btn   layui-btn-sm  layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                <!-- <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a> -->
+                <a class="layui-btn layui-btn-sm layui-btn-green " href="javascript:window.location.reload()" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
                </div>
 
             </div>

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

@@ -109,7 +109,8 @@
                 <div class="layui-inline">
                 <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" style="opacity: 1; pointer-events: auto;" eventType=event-query-submit>提交</a>
 				<a  class="layui-btn   layui-btn-sm  layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                <!-- <i class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a> -->
+                <a class="layui-btn layui-btn-sm layui-btn-green " href="javascript:window.location.reload()" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
                </div>
 
             </div>

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

@@ -198,7 +198,8 @@
                 <div class="layui-inline">
                 <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" style="opacity: 1; pointer-events: auto;" eventType="event-query-submit">提交</a>
 				<a  class="layui-btn   layui-btn-sm  layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                <!-- <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a> -->
+                <a class="layui-btn layui-btn-sm layui-btn-green " href="javascript:window.location.reload()" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
                </div>
 
             </div>

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

@@ -96,7 +96,8 @@
                 <div class="layui-inline">
                 <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" style="opacity: 1; pointer-events: auto;" eventType=event-query-submit>提交</a>
 				<a  class="layui-btn   layui-btn-sm  layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                <!-- <i class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a> -->
+                <a class="layui-btn layui-btn-sm layui-btn-green " href="javascript:window.location.reload()" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
 				</div>
 				 
 				<div class="layui-inline">

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

@@ -183,7 +183,7 @@
 							</div>
 						</div>
 					
-						 <div class="layui-inline" style="width: 480px">
+						 <div class="layui-inline" style="width: 45%">
 							<div class="layui-input-inline"  style="width: 200px">
 								<select name="select_type" id="form_select_type" lay-verify="" autocomplete="off" class="layui-input" eventType=event-query>
 									<option value="">{{ trans('user.select_option') }}</option>
@@ -201,7 +201,7 @@
 							</div>
 						</div>
 					
-						<div class="layui-inline" style="width: 360px">
+						<div class="layui-inline" style="width: 45%">
 							<label class="layui-form-label">{{ trans('user.grade') }}</label>
 							<div class="layui-input-inline"  style="width: 200px">
 								<select name="grade" id="form_grade" lay-verify="" autocomplete="off" class="layui-input" eventType=event-query>
@@ -217,7 +217,7 @@
 							</div>
 						</div>
 
-						<div class="layui-inline" style="width: 360px">
+						<div class="layui-inline" style="width: 45%">
 							<label class="layui-form-label">{{ trans('user.group') }}</label>
 							<div class="layui-input-inline"  style="width: 200px">
 								<select name="group" id="form_group" lay-verify="" autocomplete="off" class="layui-input" eventType=event-query>
@@ -233,7 +233,7 @@
 							</div>
 						</div>
 
-						<div class="layui-inline" style="width: 360px">
+						<div class="layui-inline" style="width: 45%">
 							<label class="layui-form-label">{{ trans('user.statuss') }}</label>
 							<div class="layui-input-inline" style="width: 200px">
 								<select name="statuss" id="form_statuss" lay-verify="" autocomplete="off" class="layui-input" eventType=event-query>
@@ -249,7 +249,7 @@
 							</div>
 						</div>
 						
-						<div class="layui-inline" style="width: 360px">
+						<div class="layui-inline" style="width: 45%">
 							<label class="layui-form-label">{{ trans('user.isfs') }}</label>
 							<div class="layui-input-inline" style="width: 200px">
 								<select name="fanshui" id="form_fanshui" lay-verify="" autocomplete="off" class="layui-input" eventType=event-query>

resources/views/admin/welcome.blade.php

@@ -199,8 +199,8 @@
 
 <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
     <ul class="layui-tab-title">
-        <!-- <li>最近注册用户记录</li> -->
-        <li  class="layui-this">最近7天财务情况</li>
+        <li class="layui-this">最近注册用户记录</li>
+        <li>最近7天财务情况</li>
         <li>今日来源分析</li>
         <li>今日注单分析</li>
         <li>最近7天投注总额趋势图</li>
@@ -270,6 +270,8 @@
     var chart6 = echarts.init(document.getElementById('sevenMember'));
     var chart7 = echarts.init(document.getElementById('total'));
 
+    console.log(chart7);
+
     var n = [chart5, chart6,chart7];
     var  pie= [chart1, chart2, chart3, chart4];
     // 配置

resources/views/sports/base_league.blade.php

@@ -136,7 +136,7 @@
                         {{--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>--}}
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                        <!-- <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a> -->
                         @if(checkRriv('/admin/BaseLeague/add'))<a href="/admin/BaseLeague/add" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/BaseLeague/delete'))<a href="javascript:delWin('/admin/BaseLeague/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

resources/views/sports/base_match.blade.php

@@ -120,7 +120,7 @@
                         {{--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>--}}
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                        <!-- <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a> -->
                         @if(checkRriv('/admin/SportsBase/add'))<a href="/admin/SportsBase/add" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/SportsBase/delete'))<a href="javascript:delWin('/admin/SportsBase/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

resources/views/sports/basket_league.blade.php

@@ -121,8 +121,8 @@
                         <label class="layui-form-label">{{ trans('sportssoccer.league_status_search') }}</label>
                         <div class="layui-input-inline" style="width: 100px">
                             <select name="status"  id="form_status"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
-                                <option value="0"></option>
-                                @foreach(trans('status.league_status.status') as $k=>$v):
+                                <option value="-1">请选择状态</option>
+                                @foreach(trans('status.lqsais_status.status') as $k=>$v):
                                 @if($status==$k))
                                 <option value="{{$k}}" selected="selected">{{$v}}</option>
                                 @else
@@ -137,7 +137,7 @@
                         {{--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>--}}
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                        <!-- <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a> -->
                         @if(checkRriv('/admin/BasketLeague/add'))<a href="/admin/BasketLeague/add" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/BasketLeague/delete'))<a href="javascript:delWin('/admin/BasketLeague/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

resources/views/sports/basket_match.blade.php

@@ -126,7 +126,7 @@
                         {{--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>--}}
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                        <!-- <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a> -->
                         @if(checkRriv('/admin/SportsBasket/add'))<a href="/admin/SportsBasket/add" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/SportsBasket/delete'))<a href="javascript:delWin('/admin/SportsBasket/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

resources/views/sports/soccer_league.blade.php

@@ -136,7 +136,7 @@
                         {{--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>--}}
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                        <!-- <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a> -->
                         @if(checkRriv('/admin/SoccerLeague/add'))<a href="/admin/SoccerLeague/add" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/SoccerLeague/delete'))<a href="javascript:delWin('/admin/SoccerLeague/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

resources/views/sports/soccer_match.blade.php

@@ -120,7 +120,7 @@
                         {{--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>--}}
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                        <!-- <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a> -->
                         @if(checkRriv('/admin/SportsSoccer/add'))<a href="/admin/SportsSoccer/add" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/SportsSoccer/delete'))<a href="javascript:delWin('/admin/SportsSoccer/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

resources/views/sports/tennis_league.blade.php

@@ -136,7 +136,7 @@
                         {{--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>--}}
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                        <!-- <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a> -->
                         @if(checkRriv('/admin/TennisLeague/add'))<a href="/admin/TennisLeague/add" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/TennisLeague/delete'))<a href="javascript:delWin('/admin/TennisLeague/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

resources/views/sports/tennis_match.blade.php

@@ -120,7 +120,7 @@
                         {{--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>--}}
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                        <!-- <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a> -->
                         @if(checkRriv('/admin/SportsTennis/add'))<a href="/admin/SportsTennis/add" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/SportsTennis/delete'))<a href="javascript:delWin('/admin/SportsTennis/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>