彭俊 6 lat temu
rodzic
commit
db150a7cc0

+ 88 - 86
app/Http/Controllers/Admin/MessageController.php

@@ -23,45 +23,45 @@ class MessageController extends Controller
     function Index(Req $req)
     {
         $request = array();
-        $request['title'] = isset($req->title) ? trim ($req->title) : null;
-        $request['type'] = isset($req->type) ? trim ($req->type) : null;
+        $request['title'] = isset($req->title) ? trim($req->title) : null;
+        $request['type'] = isset($req->type) ? trim($req->type) : null;
 //        $request['message_type'] = isset($req->message_type) ? trim($req->message_type) : null;
-        $request['toname'] = isset($req->toname) ? trim ($req->toname) : null;
-        $request['fromname'] = isset($req->fromname) ? trim ($req->fromname) : null;
+        $request['toname'] = isset($req->toname) ? trim($req->toname) : null;
+        $request['fromname'] = isset($req->fromname) ? trim($req->fromname) : null;
 
-        $dt = \App\Lib\DataTable\DataTable::init ();
-        $dt->setDataSource ('/admin/Message/getArticle');
-        $dt->setLang ('notice');
+        $dt = \App\Lib\DataTable\DataTable::init();
+        $dt->setDataSource('/admin/Message/getArticle');
+        $dt->setLang('notice');
         // $dt->addColsFields('id');
-        $dt->addColsFields ('title');
-        $dt->addColsFields ('toname');
-        $dt->addColsFields ('group_name');
-        $dt->addColsFields ('formname');
-        $dt->addColsFields ('add_type');
-        $dt->addColsFields ('is_show');
+        $dt->addColsFields('title');
+        $dt->addColsFields('toname');
+        $dt->addColsFields('group_name');
+        $dt->addColsFields('formname');
+        $dt->addColsFields('add_type');
+        $dt->addColsFields('is_show');
         // $dt->addColsFields('content');
-        $dt->addColsFields ('add_time');
+        $dt->addColsFields('add_time');
 //        $dt->addColsFields('message_type');
-        $dt->addColsFields ('type');
-        $dt->enableCheckBox ();
+        $dt->addColsFields('type');
+        $dt->enableCheckBox();
         $arr[] = 'view';
-        $dt->setToolBar ($arr, array('width' => 140));
-        return view ('admin.Manager/arictle', $dt->render ($request));
+        $dt->setToolBar($arr, array('width' => 140));
+        return view('admin.Manager/arictle', $dt->render($request));
     }
 
     //获取信息
     //获取活动信息
     function getArticle()
     {
-        $limit = Request::has ('limit') ? Request::get ('limit') : 10;
+        $limit = Request::has('limit') ? Request::get('limit') : 10;
 
-        $title = Request::has ('title') ? Request::get ('title') : '';
-        $content = Request::has ('content') ? Request::get ('content') : '';
-        $message_type = Request::has ('message_type') ? Request::get ('message_type') : '';
-        $type = Request::has ('type') ? Request::get ('type') : '';
-        $forname = Request::has ('forname') ? Request::get ('forname') : '';
-        $toname = Request::has ('toname') ? Request::get ('toname') : '';
-        $add_time = Request::has ('add_time') ? Request::get ('add_time') : '';
+        $title = Request::has('title') ? Request::get('title') : '';
+        $content = Request::has('content') ? Request::get('content') : '';
+        $message_type = Request::has('message_type') ? Request::get('message_type') : '';
+        $type = Request::has('type') ? Request::get('type') : '';
+        $forname = Request::has('forname') ? Request::get('forname') : '';
+        $toname = Request::has('toname') ? Request::get('toname') : '';
+        $add_time = Request::has('add_time') ? Request::get('add_time') : '';
 
 
         $where = array();
@@ -71,8 +71,8 @@ class MessageController extends Controller
         if (!empty($type)) {
             $where[] = array('type', '=', $type);
         } else {
-            $where[] = array('type', '!=', 2);
-            $where[] = array('type', '!=', 4);
+            //$where[] = array('type', '!=', 2);
+            //$where[] = array('type', '!=', 4);
         }
         if (!empty($content)) {
             $where[] = array('content', 'like', '%' . $content . '%');
@@ -84,16 +84,18 @@ class MessageController extends Controller
             $where[] = array('toname', 'like', '%' . $toname . '%');
         }
         if (!empty($add_time)) {
-            $add_time = date ('Y-m-d H:i:s', strtotime ($add_time));
+            $add_time = date('Y-m-d H:i:s', strtotime($add_time));
             $where[] = array('add_time', '<=', $add_time);
         }
 
+
+
         $db = new \App\Models\Manager();
-        $data = $db->getlist ($limit, $where);
+        $data = $db->getlist($limit, $where);
         if (!($data < 0)) {
-            $langinfo = trans ('status.manager');
-            $messged = trans ('notice.message_status');
-            $show = trans ('notice.show');
+            $langinfo = trans('status.manager');
+            $messged = trans('notice.message_status');
+            $show = trans('notice.show');
             foreach ($data['data'] as $k => $v) {
                 $data['data'][$k]['type'] = $langinfo[$v['type']];
                 if (!empty($v['add_type'])) {
@@ -102,38 +104,38 @@ class MessageController extends Controller
                 $data['data'][$k]['is_show'] = $show[$v['is_show']];
             }
         }
-        return \App\Lib\DataTable\DataTable::init ()->toJson ($data['data'], $data['total']);
+        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
     }
 
     function view(Req $req)
     {
-        return $this->Edit ($req);
+        return $this->Edit($req);
     }
 
     function Edit(Req $req)
     {
         $id = $req->id;
 //        $id=Request::has('id')?Request::get('id'):'';
-        if (intval ($id) < 1) {
-            abort (404);
+        if (intval($id) < 1) {
+            abort(404);
         }
         $db = new \App\Models\Manager;
-        $groupdata = \App\Models\Account_group::getAllInfo ();
-        if (!$req->isMethod ('post')) {
-            $data = $db->getDmsg ($id, 1);
+        $groupdata = \App\Models\Account_group::getAllInfo();
+        if (!$req->isMethod('post')) {
+            $data = $db->getDmsg($id, 1);
             if (!$data) {
-                return responseToJson ($data);
+                return responseToJson($data);
             }
-            return view ('admin.Manager/editNotice', ['data' => $data, 'group' => $groupdata]);
+            return view('admin.Manager/editNotice', ['data' => $data, 'group' => $groupdata]);
         } else {
-            $data['title'] = $req->input ('title');
+            $data['title'] = $req->input('title');
             $data['content'] = $req->desc;
-            $res = $db->updateMsg ($data, $id);
+            $res = $db->updateMsg($data, $id);
 //            $log = array(
 //                session('adminInfo.admin_name'),
 //            );
 //            OperationLog(session('adminInfo.admin_id'), 'edit_game', $log);
-            return responseToJson ($res);
+            return responseToJson($res);
         }
     }
 
@@ -144,36 +146,36 @@ class MessageController extends Controller
      */
     function delete(Req $req)
     {
-        $id = $req->input ('id');
+        $id = $req->input('id');
         if (empty($id)) {
-            return responseToJson (-2001); //id������
+            return responseToJson(-2001); //id������
         }
-        $ids = explode (',', $id);
-        if (!is_array ($ids) && intval ($ids) < 0) {
-            return responseToJson (-2002); //id����
+        $ids = explode(',', $id);
+        if (!is_array($ids) && intval($ids) < 0) {
+            return responseToJson(-2002); //id����
         }
-        if (is_array ($ids) && count ($ids) > 0) {
+        if (is_array($ids) && count($ids) > 0) {
             foreach ($ids as $k => $v) {
-                if (intval ($v) < 1) {
+                if (intval($v) < 1) {
                     unset($ids[$k]);
                 }
             }
         }
-        $rows = \App\Models\Manager::whereIn ('id', $ids)->delete ();
+        $rows = \App\Models\Manager::whereIn('id', $ids)->delete();
         if (!$rows) {
-            return responseToJson (-2003); //id����
+            return responseToJson(-2003); //id����
         }
         $log = array(
             session('adminInfo.admin_name'),
         );
         OperationLog(session('adminInfo.admin_id'), 'del_mess', $log);
-        return responseToJson (1); //id����
+        return responseToJson(1); //id����
     }
 
     function MessageView()
     {
-        $id = Request::has ('id') ? Request::get ('id') : '';
-        $admin_id = session ('adminInfo.admin_id');
+        $id = Request::has('id') ? Request::get('id') : '';
+        $admin_id = session('adminInfo.admin_id');
         $where = [
             'id',
             $id
@@ -185,12 +187,12 @@ class MessageController extends Controller
         ];
         $db = new \App\Models\Manager();
         $dbRead = new \App\Models\MessageRead;
-        $data = $db->getlistd ($where);
-        $dataRead = $dbRead->Messagelist ($id, $admin_id);
+        $data = $db->getlistd($where);
+        $dataRead = $dbRead->Messagelist($id, $admin_id);
         if ($dataRead < 0) {
-            $dat = $dbRead->addMessage ($dataWhwew);
+            $dat = $dbRead->addMessage($dataWhwew);
         }
-        return view ('admin.Manager/view', ['data' => $data]);
+        return view('admin.Manager/view', ['data' => $data]);
     }
 
     /**
@@ -200,27 +202,27 @@ class MessageController extends Controller
      */
     function addNotice(Req $req)
     {
-        $groupdata = \App\Models\Account_group::getAllInfo ();
+        $groupdata = \App\Models\Account_group::getAllInfo();
 
-        if (!$req->isMethod ('post')) {
+        if (!$req->isMethod('post')) {
             $groupdatas = $groupdata;
-            return view ('admin.Manager/editNotice', ['select' => 1, 'group' => $groupdatas]);
+            return view('admin.Manager/editNotice', ['select' => 1, 'group' => $groupdatas]);
         } else {
-            $data['title'] = $req->input ('title');
-            $data['type'] = $req->type ? intval ($req->type) : '';
+            $data['title'] = $req->input('title');
+            $data['type'] = $req->type ? intval($req->type) : '';
             if (empty($data['type'])) {
-                return responseToJson (-3001341);
+                return responseToJson(-3001341);
             }
             $data['content'] = strip_tags($req->desc);//过滤html标签
             $log = array(
-                session ('adminInfo.admin_name'),
+                session('adminInfo.admin_name'),
                 $data['title']
             );
-            $data['add_time'] = date ('Y-m-d H:i:s');
-            $data['formname'] = $req->input ('formname');
-            $data['toname'] = str_replace (',', ',', strip_tags (trim ($req->input ('toname'))));
-            $data['add_type'] = isset($req->add_type) ? trim ($req->add_type) : '1';
-            $data['is_show'] = isset($req->is_show) ? trim ($req->is_show) : 0;  //首页是否弹出显示
+            $data['add_time'] = date('Y-m-d H:i:s');
+            $data['formname'] = $req->input('formname');
+            $data['toname'] = str_replace(',', ',', strip_tags(trim($req->input('toname'))));
+            $data['add_type'] = isset($req->add_type) ? trim($req->add_type) : '1';
+            $data['is_show'] = isset($req->is_show) ? trim($req->is_show) : 0;  //首页是否弹出显示
             $groups = $req->groups;
             $send = [
                 'name' => $data['title'],
@@ -232,8 +234,8 @@ class MessageController extends Controller
             $db = new \App\Models\Manager;
             //普通消息
             if ($data['type'] == 1) {
-                $dataName = explode (',', $data['toname']);
-                $send['to'] = $this->getIdBy ($dataName);//接收者列表
+                $dataName = explode(',', $data['toname']);
+                $send['to'] = $this->getIdBy($dataName);//接收者列表
             }
             //系统消息
             if ($data['type'] == 2) {
@@ -244,12 +246,12 @@ class MessageController extends Controller
             if ($data['type'] == 3) {
                 $data['formname'] = '系统通知';
                 //获取发送用户组
-                if (is_array ($groups) && count ($groups) > 0) {
+                if (is_array($groups) && count($groups) > 0) {
                     $data['toname'] = 'groups';
-                    $data['group_code'] = '0,' . implode (',', $groups) . ',';
+                    $data['group_code'] = '0,' . implode(',', $groups) . ',';
                     $data['group_name'] = '|';
                     foreach ($groupdata as $k => $v) {
-                        if (in_array ($v['group_code'], $groups)) {
+                        if (in_array($v['group_code'], $groups)) {
                             $data['group_name'] .= $v['group_name'] . '|';
                         }
                     }
@@ -260,12 +262,12 @@ class MessageController extends Controller
             if (!$data['toname']) {
                 $data['toname'] = 'all';
             }
-            $res = $db->addNotice ($data);
+            $res = $db->addNotice($data);
             if ($res < 0)
-                return responseToJson ($res);
-            OperationLog (session ('adminInfo.admin_id'), 'add_no', $log);
+                return responseToJson($res);
+            OperationLog(session('adminInfo.admin_id'), 'add_no', $log);
 
-            return responseToJson (1);
+            return responseToJson(1);
         }
     }
 
@@ -277,11 +279,11 @@ class MessageController extends Controller
      */
     protected function getIdBy($names)
     {
-        if (!is_array ($names)) $names = explode (',', $names);
-        $names = array_unique ($names);
+        if (!is_array($names)) $names = explode(',', $names);
+        $names = array_unique($names);
         if (!$names) return null;
-        $ids = (new Account())->whereIn ('account', $names)->pluck ('identity');
-        return $ids ? $ids->toArray () : null;
+        $ids = (new Account())->whereIn('account', $names)->pluck('identity');
+        return $ids ? $ids->toArray() : null;
     }
 
 

+ 7 - 7
app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -218,7 +218,7 @@ class SoccerNoteListController extends Controller
             $saisjg['penalty_card'] = json_decode($saisjg['penalty_card'],true);
             $saisjg['warn_more'] = json_decode($saisjg['warn_more'],true);
             
-            $model->single_result = json_encode([$saisjg]);
+            $model->single_result = json_encode([$saisjg],JSON_UNESCAPED_UNICODE);
             $model->save();
             $newm = \App\Models\SportsNoteList::where('id', $did)->first();
             return $newm['single_result'];
@@ -228,8 +228,8 @@ class SoccerNoteListController extends Controller
             $newa[0]['home_score'] = $req->home_score;//主队进球
             $newa[0]['guest_score'] = $req->guest_score;//客队进球
             $newa[0]['all_goal'] = intval($req->guest_score)+intval($req->home_score);//总进球
-            $newa[0]['last_score'] = $req->lastscore;//最后进球球队
-            $newa[0]['match_winer'] = $req->matchwiner;//赢球球队
+            $newa[0]['last_score'] = $req->lastscore?$req->lastscore:'';//最后进球球队
+            $newa[0]['match_winer'] = $req->matchwiner?$req->matchwiner:'';//赢球球队
             $newa[0]['update_time'] = time();//更新时间
             $newa[0]['u_guest_score'] = $req->u_guest_score;//上半场-主队进球数
             $newa[0]['u_home_score'] = $req->u_home_score;//上半场-客队进球数
@@ -247,12 +247,12 @@ class SoccerNoteListController extends Controller
             );
             //最新进球
             $newa[0]['first_score'] = array(
-                'teamscore'=>$req->firstscore,//最先进球球队
-                'scoretime'=> $req->onescoretime,//进球时间
-                'scoretype'=> $req->firststye,//进球方式
+                'teamscore'=>$req->firstscore?$req->firstscore:0,//最先进球球队
+                'scoretime'=> $req->onescoretime?$req->onescoretime:'',//进球时间
+                'scoretype'=> $req->firststye?$req->firststye:'',//进球方式
             );
 
-            $model->single_result = json_encode($newa);
+            $model->single_result = json_encode($newa,JSON_UNESCAPED_UNICODE);
             $model->result_flag = 1;
 
             $model->save();

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

@@ -211,8 +211,8 @@ class SportsfootController extends Controller {
         	'scoretype'=>$req->firststye ? $req->firststye:0,
         );
 
-		$model->last_score = $req->lastscore;
-		$model->match_winer = $req->matchwiner;
+		$model->last_score = $req->lastscore?$req->lastscore:'';
+		$model->match_winer = $req->matchwiner?$req->matchwiner:'';
 		$model->penalty_card = json_encode($penaltycard,JSON_UNESCAPED_UNICODE);
 		$model->corner_ball = json_encode($cornerball,JSON_UNESCAPED_UNICODE);
 		$model->first_score = json_encode($firstone,JSON_UNESCAPED_UNICODE ); 

+ 2 - 1
app/Http/Controllers/Admin/UserController.php

@@ -62,7 +62,7 @@ class UserController extends Controller
         // $dt->addColsFields('last_time',array('width'=>90)); //'templet' => '#selectphone',
         //$dt->addColsFields('money_num', array('templet' => '#moneynum', 'sort' => false, 'width' => 110));
         $dt->addColsFields('statuss', array('templet' => '#openstatus', 'sort' => false,'width'=>100));
-        $dt->addColsFields('isfs', array('sort' => false, 'templet' => '#agent','width'=>100,));
+        // $dt->addColsFields('isfs', array('sort' => false, 'templet' => '#agent','width'=>100,));
         $dt->addColsFields('action_user', array('templet' => '#waterTool', 'sort' => false,'width'=>160));
         $dt->setPriKey('id');
         return view('admin.user/index', $dt->render($request));
@@ -355,6 +355,7 @@ class UserController extends Controller
         //     }
         // }
 
+
         return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total'], 0, $where);
     }
 

+ 3 - 3
app/Http/Controllers/Api/SettlementController.php

@@ -35,13 +35,13 @@ class SettlementController extends Controller
     public function debug()
     {
 
-        $match = DB::table('money_buy_match')->where(['batch_id' => '156635466014'])->first();
-        $result = DB::table('st_zq_result')->where(['match_id' => '1259'])->get();
+        $match = DB::table('money_buy_match')->where(['batch_id' => '15671599105'])->first();
+        $result = DB::table('st_zq_result')->where(['match_id' => '1'])->get();
         $rule = new  ZqRule();
 
         //print_r([$match,$result]);exit ;
 
-        $result = $rule->GunqiuWeixian($match,$result,[]);
+        $result = $rule->B($match,$result,[]);
         print_r($result);
 
 

+ 2 - 0
app/Models/SportsBase.php

@@ -13,6 +13,7 @@ class SportsBase extends BaseModel {
 
     function getinfo($list = 10, $page, $where = '',$orwhere = '')
     {
+        /* 暂时取消
         $bqmatch = $this->where('status','<','2')->where('match_date','<=',date("Y-m-d",time()))->get();
         for($b=0;$b<count($bqmatch);$b++){
             if($bqmatch[$b]->match_date < date("Y-m-d",time()) && strtotime($bqmatch[$b]->match_time.' '.$bqmatch[$b]->match_time)+10800 < time()){
@@ -24,6 +25,7 @@ class SportsBase extends BaseModel {
                 \App\Models\Stbqresultrecord::where('match_id',$bqmatch[$b]->match_id)->update(['status'=>'2']);
             }
         }
+        */
         
         $where[] = array('st_bq_league.name_chinese','<>','');
 

+ 2 - 0
app/Models/SportsBasket.php

@@ -13,6 +13,7 @@ class SportsBasket extends BaseModel {
 
     function getinfo($list = 10, $page, $where = '',$orwhere = '')
     {
+        /* 暂时取消
         $lqmatch = $this->where('status','<','2')->where('match_date','<=',date("Y-m-d",time()))->get();
         for($b=0;$b<count($lqmatch);$b++){
             if($lqmatch[$b]->match_date < date("Y-m-d",time()) && strtotime($lqmatch[$b]->match_time.' '.$lqmatch[$b]->match_time)+4200 < time()){
@@ -24,6 +25,7 @@ class SportsBasket extends BaseModel {
                 \App\Models\Stlqresultrecord::where('match_id',$lqmatch[$b]->match_id)->update(['status'=>'2']);
             }
         }
+        */
 
         $where[] = array('st_lq_league.name_chinese','<>','');
 

+ 2 - 0
app/Models/SportsSoccer.php

@@ -13,6 +13,7 @@ class SportsSoccer extends BaseModel {
 
     function getinfo($list = 10, $page, $where = '',$orwhere = '')
     {
+        /* 暂时取消
         $zqmatch = $this->where('status','<','2')->where('match_date','<=',date("Y-m-d",time()))->get();
         for($b=0;$b<count($zqmatch);$b++){
             if($zqmatch[$b]->match_date < date("Y-m-d",time()) && strtotime($zqmatch[$b]->match_time.' '.$zqmatch[$b]->match_time)+7200 < time()){
@@ -24,6 +25,7 @@ class SportsSoccer extends BaseModel {
                 \App\Models\Stzqresultrecord::where('match_id',$zqmatch[$b]->match_id)->update(['status'=>'2']);
             }
         }
+        */
         
         $where[] = array('st_zq_league.name_chinese','<>','');
 

+ 2 - 0
app/Models/SportsTennis.php

@@ -13,6 +13,7 @@ class SportsTennis extends BaseModel {
 
     function getinfo($list = 10, $page, $where = '',$orwhere = '')
     {
+        /* 暂时取消
         $wqmatch = $this->where('status','<','2')->where('match_date','<=',date("Y-m-d",time()))->get();
         for($b=0;$b<count($wqmatch);$b++){
             if($wqmatch[$b]->match_date < date("Y-m-d",time()) && strtotime($wqmatch[$b]->match_time.' '.$wqmatch[$b]->match_time)+10800 < time()){
@@ -24,6 +25,7 @@ class SportsTennis extends BaseModel {
                 \App\Models\Stwqresultrecord::where('match_id',$wqmatch[$b]->match_id)->update(['status'=>'2']);
             }
         }
+        */
         
         $where[] = array('st_wq_league.name_chinese','<>','');
 

+ 2 - 2
resources/views/admin/baseSet/index.blade.php

@@ -440,7 +440,7 @@
     <div class="layui-colla-item">
         <h2 class="layui-colla-title" data-type="{{$run['infotype']}}">跑马灯设置[9]<span style="font-size: 10px;">[9/id-1006]</span>
         </h2>
-        {{--<!-- <div class="layui-colla-content">
+        <div class="layui-colla-content">
             <form class="layui-form" action="">
                 <input type="hidden" name="id" value="1106">
                 <input type="hidden" name="type" value="{{$run['infotype']}}">
@@ -461,7 +461,7 @@
                     </div>
                 </div>
             </form>
-        </div> -->--}}
+        </div>
     </div>
 
 

+ 5 - 2
resources/views/admin/sportsfoot/outcome.blade.php

@@ -349,7 +349,8 @@
 
                     firstscore = "<option value='"+ data.first_score.teamscore +"' selected=''> ";
                     if (data.first_score.teamscore.length>0){
-                        firstscore += data.first_score.teamscore ;
+                        firstscore += data.first_score.teamscore;
+                        firstscore += "</option><option value=''>请选择最先进球";
                     }else{
                         firstscore += '请选择最先进球';
                     }
@@ -359,6 +360,7 @@
                     firststye = "<option value='"+ data.first_score.scoretype +"' selected=''> ";
                     if (data.first_score.scoretype.length>0){
                         firststye += data.first_score.scoretype ;
+                        firststye += "</option><option value=''>请选择最先进球方式";
                     }else{
                         firststye += '请选择最先进球方式';
                     }
@@ -366,8 +368,9 @@
                     $("#firststye").html(firststye);
 
                     lastscore = "<option value='"+data.newapp.last_score+"' selected=''>";
-                    if (data.newapp.last_score.length>0){
+                    if (data.newapp.last_score){
                         lastscore += data.newapp.last_score;
+                        lastscore += "</option><option value=''>请选择最后进球";
                     }else{
                         lastscore += '请选择最后进球';
                     }

+ 40 - 63
resources/views/admin/user/index.blade.php

@@ -44,19 +44,22 @@
 			padding: 0.5em;
 			line-height: 2em;
 		}
-    </style>
+	</style>
+	
+	
 
 	<script type="text/html" id="agent">
-		@{{#if(d.fanshui==1){ }}
-			<div onclick="isfs(1,@{{d.id}})" class="layui-input-inline checkbox">
-				<input type="checkbox" lay-skin="switch" lay-text="是|否" class="layui-input" eventType=event-query>    
-			</div>
-		@{{#}else{ }}
-			<div onclick="isfs(2,@{{d.id}})" class="layui-input-inline checkbox">
-				<input type="checkbox" lay-skin="switch" lay-text="否|是" class="layui-input" eventType=event-query>  
-			</div>
-		@{{#} }}
-	</script>	
+        @{{#if(d.fanshui==1){ }}
+            <div onclick="isfs(2,@{{d.id}})" class="layui-input-inline checkbox">
+                <input type="checkbox" lay-skin="switch" lay-text="否|是" class="layui-input" eventType=event-query checked>    
+            </div>
+        @{{#}else{ }}
+            <div onclick="isfs(1,@{{d.id}})" class="layui-input-inline checkbox">
+                <input type="checkbox" lay-skin="switch" lay-text="是|否" class="layui-input" eventType=event-query >  
+            </div>
+        @{{#} }}
+	</script>
+	
     <script type="text/html" id="waterTool">
         <a href="/admin/MoneyList/index?account_name=@{{d.account}}&star_time=&end_time=&" class="green"><strong>流水</strong></a> <!-- style="margin-bottom:5px;margin-left:0px;" -->
 		@if(checkRriv('/admin/User/setPwdview'))<a href="/admin/User/setPwdview?id=@{{d.id}}&parentid=@{{d.parent_id}}" class="red"><strong>修改</strong></a>@endif
@@ -217,7 +220,7 @@
 							</div>
 						</div>
 
-						<div class="layui-inline" style="width: 45%">
+						<!-- <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>
@@ -231,7 +234,7 @@
 									@endforeach
 								</select>
 							</div>
-						</div>
+						</div> -->
 
 						<div class="layui-inline" style="width: 45%">
 							<label class="layui-form-label">{{ trans('user.statuss') }}</label>
@@ -249,7 +252,7 @@
 							</div>
 						</div>
 						
-						<div class="layui-inline" style="width: 45%">
+						<!-- <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>
@@ -263,7 +266,7 @@
 									@endforeach
 								</select>
 							</div>
-						</div>
+						</div> -->
 
 					</div>
 
@@ -283,7 +286,7 @@
 							 eventType=event-query  value="{{ $regist_endtime }}">
 						</div>
 				   </div>
-                    <div class="layui-inline">
+                    <!-- <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('user.rechargenum_area') }}</label>
                         <div class="layui-input-inline" style="width: 100px;">
                             <input type="text" name="rechargenum_small" id="form_rechargenum_small" placeholder="0" autocomplete="off" class="layui-input" eventType=event-query value="{{ $rechargenum_small }}">
@@ -292,7 +295,7 @@
                         <div class="layui-input-inline" style="width: 100px;">
                             <input type="text" name="rechargenum_big" id="form_rechargenum_big" placeholder="0" autocomplete="off" class="layui-input" eventType=event-query value="{{ $rechargenum_big }}">
                         </div>
-                    </div>
+                    </div> -->
                     <!-- <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('user.takenum_area') }}</label>
                         <div class="layui-input-inline" style="width: 100px;">
@@ -341,7 +344,10 @@
             		$('#form_sureblurs').val('off');
             	}
             })
-        })
+    	});
+
+    // })
+		
 
     	function exportWord(){
 //    		var data = setData();
@@ -353,6 +359,7 @@
 			});
 		}
 
+
 		function isfs(type,id){
 			$.ajax({
                 type: 'POST',
@@ -360,13 +367,16 @@
                 url: '/admin/User/ajaxfsup',
                 data: {id:id,type:type},
                 success: function(data) {
-                	// location. reload()//刷新当前页面
-                }
+                	location. reload()//刷新当前页面
+                },
+				error:function(){
+					alert(12312);
+            	}
             })
 		}
 
     </script>
-    @push('dataTableJS')
+	@push('dataTableJS')
         /*var active = {
 			reload: function(){
 			//执行重载
@@ -464,7 +474,7 @@
 			//active[type] ? active[type].call(this) : '';
 		  });
 
-        //重置表单
+		//重置表单
         $('.reset').on('click',function(){
 			$('input').val('');
 			$('#form_statuss').val('');
@@ -482,12 +492,12 @@
         });
 
 
-function dataTableLoadFinished(res,curr,count){
-    var str='';
-    if(document.getElementById("statistics")){
+	function dataTableLoadFinished(res,curr,count){
+    	var str='';
+    	if(document.getElementById("statistics")){
 
-    }else{
-    $('.layui-table-page').after('<div id="statistics"></div>');
+    	}else{
+    	$('.layui-table-page').after('<div id="statistics"></div>');
     }
 
 	var datau=res.data;
@@ -508,45 +518,12 @@ function dataTableLoadFinished(res,curr,count){
         $('#statistics').html(str);
         }
     });
-var height1=$('.layui-table-view').height();
-var height2=$('#statistics').height();
-
-$('.layui-table-view').css({height:(height1+height2)});
+	var height1=$('.layui-table-view').height();
+	var height2=$('#statistics').height();
 
-}
+	$('.layui-table-view').css({height:(height1+height2)});
 
-	//启用|禁用用户
-	form.on('switch(openStatus)', function(obj){
-		var status = -1;
-		if(obj.elem.checked==true){
-			status =1;
-		}
-		setcolumn('/admin/User/UserStart',this.name,status,this.value,obj);
-		//layer.tips(msg, obj.othis);
-	});
-
-	function setcolumn(url,column,value,id,obj){
-		//console.log('aa');
-		//console.log(this.name+','+status+','+this.value+','+obj);
-		$.ajax({
-			url: url+'?'+column+'='+value+'&id='+id,
-			dataType: 'json',
-			type: 'get',
-			success:function(data){
-				layer.msg(data.msg);
-				if(data.status!=1){
-					if(value==1){
-						obj.othis[0].setAttribute("class", "layui-unselect layui-form-switch");
-						obj.othis[0].innerHTML='<em>禁用</em><i></i>';
-					}else{
-						obj.othis[0].setAttribute("class",'layui-unselect layui-form-switch layui-form-onswitch');
-						obj.othis[0].innerHTML='<em>启用</em><i></i>';
-					}
-				}
-			}
-		});
 	}
-
     @endpush
 
     @include('vip.datatable')

+ 4 - 1
resources/views/sports/sports_notelist.blade.php

@@ -284,7 +284,7 @@
                         <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>
                         {{--@if(checkRriv('/admin/SoccerNoteList/batchsettlement'))<a href="javascript:batchsettlement('/admin/SoccerNoteList/batchsettlement');" class="layui-btn layui-btn-sm  layui-btn-danger">批量结算</a>@endif--}}
-                        <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/SoccerNoteList/orderstatus'))<a href="/admin/SoccerNoteList/orderstatus" class="layui-btn layui-btn-sm ">订单状态审核</a>@endif--}}
                         @if(checkRriv('/admin/SoccerNoteList/delete'))<a href="javascript:delWin('/admin/SoccerNoteList/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
@@ -423,6 +423,7 @@
                     firstscore = "<option value='"+ data[0].first_score.teamscore +"' selected=''> ";
                     if (data[0].first_score.teamscore.length>0){
                         firstscore += data[0].first_score.teamscore;
+                        firstscore += "</option><option value=''>请选择最先进球";
                     }else{
                         firstscore += '请选择最先进球';
                     }
@@ -432,6 +433,7 @@
                     firststye = "<option value='"+ data[0].first_score.scoretype +"' selected=''> ";
                     if (data[0].first_score.scoretype.length>0){
                         firststye += data[0].first_score.scoretype;
+                        firststye += "</option><option value=''>请选择最先进球方式";
                     }else{
                         firststye += '请选择最先进球方式';
                     }
@@ -441,6 +443,7 @@
                     lastscore = "<option value='"+data[0].last_score+"' selected=''>";
                     if (data[0].last_score.length>0){
                         lastscore += data[0].last_score;
+                        lastscore += "</option><option value=''>请选择最后进球";
                     }else{
                         lastscore += '请选择最后进球';
                     }