彭俊 6 éve
szülő
commit
ece39cba30

+ 5 - 0
app/Http/Controllers/Admin/AdminmanageController.php

@@ -17,6 +17,11 @@ class AdminmanageController extends Controller {
 		$request=array();
 		$request['loginname'] = isset($req->loginname) ? trim($req->loginname) : null;
 		$request['role_name'] = isset($req->role_name) ? trim($req->role_name) : null;
+		
+			$request['sureblur'] = isset($req->sureblur) ? $req->sureblur : 'on';
+		// }else{
+		// 	$request['sureblur'] = isset($req->sureblur) ? $req->sureblur : $_GET['sureblur'];
+		// }
 
 		$dt = \App\Lib\DataTable\DataTable::init();
 		$dt->setDataSource('/admin/manager/adminInfo');

+ 2 - 2
app/Http/Controllers/Admin/ManagerController.php

@@ -64,10 +64,10 @@ class ManagerController extends Controller {
             $status = Request::has('status') ? Request::get('status') : '';
             $star_time = Request::get('star_time') ? Request::get('star_time').' 00:00:00' : '';
             $end_time = Request::get('end_time') ? Request::get('end_time').' 23:59:59' : '';
-            $sureblur = Request::has('sureblur') ? Request::get('sureblur') : '';
+            $sureblur = Request::has('sureblur') ? Request::get('sureblur') : 'off';
             $where = array();
             if (!empty($loginname)) {
-                if (empty($sureblur) || $sureblur == '模糊') {
+                if (empty($sureblur) || $sureblur == 'off') {
                     $where[] = array('loginname', 'like', '%' . $loginname . '%');
                 } else {
                     $where[] = array('loginname', '=', $loginname);

+ 9 - 3
app/Http/Controllers/Admin/SportsfootController.php

@@ -105,9 +105,15 @@ class SportsfootController extends Controller {
 	//危险球查询
 	function warnresult(Req $req){
 		$match_id = $req->match_id;
-		$warnonlys = \App\Models\Stzqresult::where('match_id', $match_id)->select("warn_more")->first();
-		$warnonly = json_decode($warnonlys['warn_more'],true);
-		return $warnonly;
+		$wid = $req->wid;
+		$warnonlys = \App\Models\Stzqresult::where('match_id', $match_id)->select("warn_more","start_time")->first();
+
+		$warno = array(
+			'warn_more' => json_decode($warnonlys['warn_more'],true),
+			'starttime' => $warnonlys['start_time'],
+		);
+
+		return $warno;
 	}
 
 	//添加编辑危险球

+ 6 - 1
app/Http/Response/Response.php

@@ -53,6 +53,9 @@ class Response
     //球队数据处理失败
     const SET_TEAM_ERR = 10040;
 
+    //===删除无效赔率失败===
+    const DEL_ODDS_ERR = 10041;
+
 
     private static $errorMsgs = [
         self::SUCCESS => '成功',
@@ -97,7 +100,9 @@ class Response
         //===删除历史直播数据失败===
         self::DEL_PAST_BROADCAST_ERR=>'删除历史直播数据失败',
         //===球队数据处理失败===
-        self::SET_TEAM_ERR =>'球队数据处理失败'
+        self::SET_TEAM_ERR =>'球队数据处理失败',
+        //===删除无效赔率失败===
+        self::DEL_ODDS_ERR =>'删除无效赔率失败',
 
     ];
 

+ 21 - 3
resources/views/admin/Adminmanage/index.blade.php

@@ -63,9 +63,10 @@
 						<input type="text" name="loginname" id="loginname" lay-verify="required" eventType="event-query" value="{{ $loginname }}" autocomplete="off" class="layui-input">
 					</div>
 
-					<div class="layui-input-inline checkbox">
-						<input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>
-					</div>
+                    <div class="layui-input-inline checkbox">
+                        <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblur) || $sureblur=='on') checked @endif  class="layui-input" eventType=event-query>
+                        <input type="hidden" name="sureblur" id="form_sureblurs" lay-verify="required" autocomplete="off" class="layui-input" eventType=event-query  value="{{ $sureblur }}">
+                    </div>
                 </div>
                 <div class="layui-inline">
 					<label class="layui-form-label">{{ trans('system_user.status') }}</label>
@@ -103,6 +104,23 @@
 		</form>
     </div>
     </div>
+    
+    <script  type="text/javascript">
+        $(function () {
+            $('body').on('click', 'a[eventtype="event-delete"]', function () {
+                var span = $(this).prev();
+                var id = span.attr('data-id');
+            })
+            $('body').on('click','#form_sureblur~.layui-form-switch',function(){
+                var sus = $('#form_sureblur').next().text();
+                if(sus=='精确'){
+                    $('#form_sureblurs').val('on');
+                }else{
+                    $('#form_sureblurs').val('off');
+                }
+            })
+        })
+    </script>
 @push('dataTableJS')
 
 /*var active = {

+ 10 - 4
resources/views/admin/sportsfoot/addwarn.blade.php

@@ -179,10 +179,16 @@
                 url: '/admin/Sportsfoot/warnresult',
                 data: {match_id:match_id,wid:wid},
                 success: function(data) {
-                    document.getElementById("timei").value=data[wid].timei;
-                    warntype = "<option value='"+data[wid].rtype+"' selected=''>";
-                    if (data[wid].rtype!=0){
-                        warntype += data[wid].rtype;
+                    // alert(data);
+                    // console.log(data.warn_more[0].timei);
+                    if(wid!=0){
+                        document.getElementById("timei").value=data.warn_more[wid].timei;
+                    }else{
+                        document.getElementById("timei").value=data['starttime'];
+                    }
+                    warntype = "<option value='"+data.warn_more[wid].rtype+"' selected=''>";
+                    if (data.warn_more[wid].rtype!=0){
+                        warntype += data.warn_more[wid].rtype;
                     }else{
                         warntype += '请选择危险球';
                     }