Explorar o código

追加推送 5/7

彭俊 %!s(int64=6) %!d(string=hai) anos
pai
achega
ff3fc0f93c

+ 6 - 12
app/Http/Controllers/Admin/SoccerStringNoteListController.php

@@ -34,16 +34,15 @@ class SoccerStringNoteListController extends Controller
         $dt->setLang('sportsnotelist');
         //$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
         $dt->addColsFields('order_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 200));
-        $dt->addColsFields('str_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('str_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
         $dt->addColsFields('detail_content', array('sort' => false, 'width' => 150));
-        $dt->addColsFields('money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-        $dt->addColsFields('water_return', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-        $dt->addColsFields('prize_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-        $dt->addColsFields('result', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('money', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
+        $dt->addColsFields('water_return', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
+        $dt->addColsFields('prize_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
+        $dt->addColsFields('result', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
         $dt->addColsFields('money_match_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('account', array('templet' => '#userdetail', 'sort' => false, 'width' => 240));
         $dt->addColsFields('settle_status', array('sort' => false, 'width' => 100));
-        //$arr[] = 'view';
 //        if (checkRriv('/admin/SoccerStringNoteList/edit')) {
 //            $arr[] ='edit';
 //        }
@@ -161,12 +160,7 @@ class SoccerStringNoteListController extends Controller
         $SettlementOrder = new SettlementOrder();
         $bet_type = 2; //串关注单
         $data = $SettlementOrder->reSettlement($order_ids,$bet_type);
-        //dd($SettlementOrder);
         return  $data;
-//        if($data['status'] == 1){
-//            return responseToJson(1, trans('menu.delete_success')); //id����
-//        }
-//        return "<script language=javascript>history.back();</script>";
 
         $m = explode('串',$order->str_type);
         //获取此订单下包含的赛事
@@ -228,7 +222,7 @@ class SoccerStringNoteListController extends Controller
         $model->settle_status = 2;
         $model->gain_money = $win_money;
         $model->save();
-        return "<script>history.go(-1);</script>";
+        return 1;
     }
 
     /**

+ 38 - 7
app/Http/Controllers/Api/SettlementController.php

@@ -1,9 +1,10 @@
 <?php
 namespace App\Http\Controllers\Api;
 use App\Http\Controllers\Controller;
-use App\Lib\Settlement\SettlementSql;
+use App\Lib\Settlement\SettlementOrder;
+use App\Lib\Settlement\SettlementWinFail;
 use App\Lib\Settlement\Adapter\ZqRule;
-use App\Lib\Settlement\Adapter\LqRule;
+
 
 class SettlementController extends Controller{
     public function index(){
@@ -12,19 +13,49 @@ class SettlementController extends Controller{
         dd($dd->bodan(1,2,1));
     }
     public function dd(){
-        dd(1111);
+        $obj = new SettlementOrder();
+        $ret = $obj->stringComputing(1);
+        var_dump($ret);
     }
 
     public function  debug(){
 
-        echo intval(1.232);
+        $str  = " function pr(\$mstr) {  echo  'outval '.\$mstr ; }  \r\n class A { public function  mypr(\$str){  echo \$str; }  }  \r\n  ";
+        $str .= " \$obj = new A(); \$obj->mypr('vvvv   ') ;  \r\n  pr('你妹');  " ;
+        $str .= " \$_var_1 = ' aaaaaaaaa';   echo \$_var_1 ; " ;
+
+        eval($str);
+
+        exit ;
+
+
+        $obj = new SettlementOrder();
+        $data = [
+            [
+                ['odds'=>1.8,'winOrLose'=>1],
+                ['odds'=>1.5,'winOrLose'=>1],
+                ['odds'=>1.66,'winOrLose'=>1],
+            ],3
+        ];
+
+        $ret = $obj->stringComputing($data);
+        var_dump($ret);
+
+
+        exit ;
+
 
-        $obj = new SettlementSql();
+        $obj  = new SettlementWinFail();
         $ret = $obj->doRun();
-        $sql = $obj->GetSQL();
+        var_dump($ret);
+        exit ;
 
-        echo json_encode([$ret,$sql]);
+       $obj = new SettlementOrder();
+       $order = '20190429114726972659385';
 
+       $ret = $obj->reSettlement([$order],2);
+       var_dump($ret);
+       exit ;
     }
 
 }

+ 35 - 2
app/Lib/Settlement/SettlementBase.php

@@ -84,6 +84,39 @@ class SettlementBase
         return ['earnMoney' => $earnMoney, 'returnMoney' => $returnMoney];
     }
 
+    /**
+     * 注单返现计算
+     * @param mixed $dataArray 结果表数据 [['odds'=>xx,'winOrLose'=>1],[...]];
+     * @return array 注单返现额
+     */
+    public function   stringOdds($dataArray){
+        $returnMoney = 1;
+        // 循环计算每注返现赔率
+        foreach ($dataArray as $value) {
+            $odds = floatval($value['odds']);
+            // 因结果不同更改赔率
+            switch (intval($value['winOrLose'])) {
+                case 1:
+                    $oddsDiscount = 1 + $odds;
+                    break;
+                case 2:
+                    $oddsDiscount = 1;
+                    break;
+                case 3:
+                    $oddsDiscount = 1 + $odds * 0.5;
+                    break;
+                default:
+                    $oddsDiscount = 0.5;
+            }
+            // 计算每注返现
+            $returnMoney = $returnMoney * $oddsDiscount;
+        }
+        // 计算赚钱
+        $earnMoney = $returnMoney - 1;
+
+        return ['earnMoney' => $earnMoney, 'returnMoney' => $returnMoney];
+    }
+
     /**
      * 注单返现计算
      * @param mixed $dataArray 结果表数据
@@ -98,11 +131,11 @@ class SettlementBase
                 ['odds'=>2.94,'winOrLose'=>1]
             ], 2
         ];*/
-        $data = $this->combination($dataArray[0],$dataArray[1]);
+        $data = $this -> combination($dataArray[0],$dataArray[1]);
         $dataCount = count($data);
         $returnMoney = 0;
         foreach ($data as $key => $value) {
-            $getReturnMoney = $this->winOddsCalculation($value);
+            $getReturnMoney = $this -> stringOdds($value);
             $returnMoney += $getReturnMoney['returnMoney'];
         }
         $returnMoney = $returnMoney / $dataCount;

+ 15 - 11
app/Lib/Settlement/SettlementOrder.php

@@ -36,11 +36,13 @@ class SettlementOrder extends SettlementBase
 
 
     public function  reSettlement($order_ids,$bettype=2){
+          if (empty($order_ids)){                return  self::makeData(5,'订单号不能为空');        }
+
           try{
               DB::beginTransaction ();
               foreach ($order_ids as $order_id){
                   $this->BuyDatasMainModel = $this->orderTypeGet($order_id,$bettype);
-                  if (empty($this->BuyDatasMainModel)){  return   self::makeData(2,'查无此订单数据'); }
+                  if ( $this->BuyDatasMainModel->settle_status==2 ){  throw new  \Exception('此订单已经结算过了,不能重复结算! '.$order_id ); }
                   if ($this->orderType==1){
                       $this->SingOrder($order_id);
                   }else{
@@ -84,7 +86,7 @@ class SettlementOrder extends SettlementBase
             -> where(['order_id' => $order_id])
             -> first();
         // 查询单式注单下的所有玩法
-        $matchData = DB :: table('money_buy_match') -> select('odds', 'result', 'batch_id') -> where(['bet_type' => 1, 'batch_id' => $simplexData -> batch_id]);
+        $matchData = DB :: table('money_buy_match') -> select('odds', 'result', 'batch_id', 'bet_money') -> where(['bet_type' => 1, 'batch_id' => $simplexData -> batch_id]);
         $matchData = $matchData -> where(function($query) {
             $query = $query -> where(['result' => 1])
                 -> orWhere(['result' => 2])
@@ -95,20 +97,19 @@ class SettlementOrder extends SettlementBase
         // 计算总回款
         $settlementBase = new \App\Lib\Settlement\SettlementBase;
         $returnMoney = 0;
-        $earnMoney = 0;
         foreach ($matchData as $k => $v) {
             $oddsResult[0]['winOrLose'] = $v -> result;
             $oddsResult[0]['odds'] = $v -> odds;
             $getReturnMoney = $settlementBase -> winOddsCalculation($oddsResult);
-            $returnMoney += $getReturnMoney['returnMoney'];
-            $earnMoney += $getReturnMoney['earnMoney'];
+            $returnMoney += ($getReturnMoney['returnMoney'] + 1) * $v -> bet_money;
         }
+        $returnMoney = sprintf("%.2f",substr(sprintf("%.3f", $returnMoney), 0, -1));
         // 判断盈亏  1 赢  2 输  3 平
         $game_status = $returnMoney > $simplexData -> money ? 1 : ($returnMoney == $simplexData -> money ? 3 : 2);
         // 修改投注表状态及盈亏
         DB :: table('money_buy_simplex')
             -> where(['order_id' => $order_id])
-            -> update(['settle_status' => 2, 'game_status' => $game_status, 'gain_money' => $earnMoney]);
+            -> update(['settle_status' => 2, 'game_status' => $game_status, 'gain_money' => $returnMoney]);
         $this -> insertData(
             $order_id,
             $returnMoney,
@@ -221,13 +222,16 @@ class SettlementOrder extends SettlementBase
                   $in_array[] = ['odds'=>$val->odds,'winOrLose'=>$val->result] ;
               }
 
-              $chuanNum = intval(substr($this->BuyDatasMainModel->str_type,0,1));
-              $lasPeilv  = $this->stringComputing([$in_array,$chuanNum]);
-              $money = sprintf('%.2f',$this->BuyDatasMainModel->money *  ( $lasPeilv - 1) ) ;
+               $chuanNum = intval(substr($this->BuyDatasMainModel->str_type,0,1));
+               $lasPeilv  = $this->stringComputing([$in_array,$chuanNum]);
+               $money = floatPointDigit($this->BuyDatasMainModel->money *  $lasPeilv ) ;
+
+               $ret = DB::update('update money_buy_str  set settle_status=2 , game_status=1 , gain_money=?  where order_id = ?', [$money,$order_id]);
+               if(!($ret || $ret===0)){                     throw  new \Exception('更新数据出错3!');             }
 
-              $this->insertData($order_id,$money,$this->BuyDatasMainModel->account_identity,2,$val->game_code,$this->BuyDatasMainModel->info_identity,$money);
+               $this->insertData($order_id,$money,$this->BuyDatasMainModel->account_identity,2,$val->game_code,$this->BuyDatasMainModel->info_identity,$money);
 
-              return true ;
+               return true ;
 
                   /*
                   $ret = DB::update('update money_buy_str  set settle_status=2 , game_status=1 , gain_money=?  where order_id = ?', [$money,$order_id]);

+ 5 - 6
app/Models/MoneyBuyStr.php

@@ -30,8 +30,6 @@ class MoneyBuyStr extends BaseModel {
         if (!$data < 0) {
             return -2021052003; //
         }
-        //反水比例
-        $res = DB::table('setinfo')->where('infoname','fanshui')->first();
 
         for($i=0;$i<count($data);$i++){
             if($data[$i]->status==1){
@@ -60,9 +58,9 @@ class MoneyBuyStr extends BaseModel {
 
             //反水
             $data[$i]->water_return = '0';
-            $iffanshui = DB::table('account')->where('account',$data[$i]->account_name)->where('fanshui',1)->first();
-            if(!empty($iffanshui)){
-                $data[$i]->water_return = $data[$i]->money*$res->infocontent;
+            $water_return_money = DB::table('money_details')->where('trade_id',$data[$i]->order_id)->where('trade_type','7')->first();
+            if(!empty($water_return_money)){
+                $data[$i]->water_return = $water_return_money->money;
             }
             $data[$i]->result = $data[$i]->water_return+$data[$i]->gain_money;
 
@@ -85,7 +83,8 @@ class MoneyBuyStr extends BaseModel {
                 }
 
             }else if($data[$i]->settle_status == '已结算'){
-                $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="/admin/SoccerStringNoteList/resettlement/?id=" href="javascript:resettlement(\'/admin/SoccerStringNoteList/resettlement/?id='.$data[$i]->id.'\');"> 重新结算 </a>';
+//                $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="/admin/SoccerStringNoteList/resettlement/?id=" href="javascript:resettlement(\'/admin/SoccerStringNoteList/resettlement/?id='.$data[$i]->id.'\');"> 重新结算 </a>';
+                $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement settlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="" href="javascript:void(0)" style="background-color: grey;"> 已结算 </a>';
             }
 
         }

+ 5 - 1
app/Models/SportsBase.php

@@ -58,7 +58,11 @@ class SportsBase extends BaseModel {
             }else if($data[$i]->status==2){
                 $data[$i]->status = '已结束';
             }
-            $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
+            if($data[$i]->guest_team == ''){
+                $data[$i]->home_guest = $data[$i]->home_team;
+            }else{
+                $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
+            }
         }
         return $data->toArray();
 

+ 5 - 1
app/Models/SportsBasket.php

@@ -58,7 +58,11 @@ class SportsBasket extends BaseModel {
             }else if($data[$i]->status==2){
                 $data[$i]->status = '已结束';
             }
-            $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
+            if($data[$i]->guest_team == ''){
+                $data[$i]->home_guest = $data[$i]->home_team;
+            }else{
+                $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
+            }
         }
         return $data->toArray();
 

+ 8 - 13
app/Models/SportsNoteList.php

@@ -16,15 +16,14 @@ class SportsNoteList extends BaseModel {
         $data = $this
             ->join('money_details','money_details.info_identity','=','money_buy_simplex.info_identity')
             ->join('st_'.$type.'_competition','st_'.$type.'_competition.match_id','=','money_buy_simplex.match_id')
-            ->select('money_buy_simplex.id','money_buy_simplex.account_name','money_buy_simplex.order_id','money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.status','money_buy_simplex.money_time','money_buy_simplex.settle_status','money_buy_simplex.gain_money','money_buy_simplex.game_code','money_buy_simplex.match_id','money_buy_simplex.game_status','st_'.$type.'_competition.home_team','st_'.$type.'_competition.guest_team','st_'.$type.'_competition.match_date','st_'.$type.'_competition.match_time','st_'.$type.'_competition.lg_id','money_details.money_cash','money_buy_simplex.batch_id')
+            ->join('st_'.$type.'_league','st_'.$type.'_competition.lg_id','=','st_'.$type.'_league.lg_id')
+            ->select('money_buy_simplex.id','money_buy_simplex.account_name','money_buy_simplex.order_id','money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.status','money_buy_simplex.money_time','money_buy_simplex.settle_status','money_buy_simplex.gain_money','money_buy_simplex.game_code','money_buy_simplex.match_id','money_buy_simplex.game_status','st_'.$type.'_competition.home_team','st_'.$type.'_competition.guest_team','st_'.$type.'_competition.match_date','st_'.$type.'_competition.match_time','st_'.$type.'_competition.lg_id','money_details.money_cash','money_buy_simplex.batch_id','st_'.$type.'_league.name_chinese')
             ->where($where)
             ->orderby('money_buy_simplex.money_time','desc')
             ->paginate ($list);
         if (!$data < 0) {
             return -2021052003; //
         }
-        //反水比例
-        $res = DB::table('setinfo')->where('infoname','fanshui')->first();
 
         for($i=0;$i<count($data);$i++){
             if($data[$i]->settle_status==1){
@@ -40,12 +39,13 @@ class SportsNoteList extends BaseModel {
                 $data[$i]->game_status = '输';
             }
             $data[$i]->match_id_order = '<span>'.$data[$i]->match_id.'</span><br>'.$data[$i]->order_id;
+            $data[$i]->league = $data[$i]->name_chinese;
 
             //反水
             $data[$i]->water_return = '0';
-            $iffanshui = DB::table('account')->where('account',$data[$i]->account_name)->where('fanshui',1)->first();
-            if(!empty($iffanshui)){
-                $data[$i]->water_return = $data[$i]->money*$res->infocontent;
+            $water_return_money = DB::table('money_details')->where('trade_id',$data[$i]->order_id)->where('trade_type','7')->first();
+            if(!empty($water_return_money)){
+                $data[$i]->water_return = $water_return_money->money;
             }
             $data[$i]->result = $data[$i]->water_return+$data[$i]->gain_money;
 
@@ -53,12 +53,6 @@ class SportsNoteList extends BaseModel {
             $data[$i]->match_time = '开赛:'.$data[$i]->match_date.' '.$data[$i]->match_time;
             $data[$i]->money_match_time = '投注:'.$data[$i]->money_time.'<br>'.$data[$i]->match_time;
 
-            $league = DB::table('st_'.$type.'_league')->where('lg_id',$data[$i]->lg_id)->first();
-            if(!empty($league)){
-                $data[$i]->league = $league->name_chinese;
-            }else{
-                $data[$i]->league = '';
-            }
             //用户投注后账户金额
             $data[$i]->frozen_cash = $data[$i]->money_cash;
             //用户投注前账户金额
@@ -72,7 +66,8 @@ class SportsNoteList extends BaseModel {
                 if($data[$i]->game_status == '未处理'){
                     $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm settlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/settlement/?id=" href="javascript:settlement(\'/admin/SoccerNoteList/settlement/?id='.$data[$i]->id.'\');"> 结算 </a>';
                 }else{
-                    $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/resettlement/?id=" href="javascript:resettlement(\'/admin/SoccerNoteList/resettlement/?id='.$data[$i]->id.'\');"> 重新结算 </a>';
+                    //$data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/resettlement/?id=" href="javascript:resettlement(\'/admin/SoccerNoteList/resettlement/?id='.$data[$i]->id.'\');"> 重新结算 </a>';
+                    $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已结算 </a>';
                 }
             }
 

+ 6 - 1
app/Models/SportsSoccer.php

@@ -58,7 +58,12 @@ class SportsSoccer extends BaseModel {
             }else if($data[$i]->status==2){
                 $data[$i]->status = '已结束';
             }
-            $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
+            if($data[$i]->guest_team == ''){
+                $data[$i]->home_guest = $data[$i]->home_team;
+            }else{
+                $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
+            }
+
         }
         return $data->toArray();
 

+ 5 - 1
app/Models/SportsTennis.php

@@ -58,7 +58,11 @@ class SportsTennis extends BaseModel {
             }else if($data[$i]->status==2){
                 $data[$i]->status = '已结束';
             }
-            $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
+            if($data[$i]->guest_team == ''){
+                $data[$i]->home_guest = $data[$i]->home_team;
+            }else{
+                $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
+            }
         }
         return $data->toArray();
 

+ 8 - 0
public/function.php

@@ -298,3 +298,11 @@ function checkToken($admin_id,$token){
     $db=new \App\Models\System_user;
     return $db->checkToken($admin_id,$token);
 }
+
+//保留小数位数
+function  floatPointDigit($data,$long=2){
+    $long = intval($long) ;
+    $for1 = "%.".$long."f" ;
+    $for2 = "%.".($long+1)."f" ;
+    return  sprintf($for1,substr(sprintf($for2, $data), 0, -1));
+}

+ 0 - 154
resources/views/sports/soccer_notelist.blade.php

@@ -1,154 +0,0 @@
-@extends('vip.layouts')
-@section('seo_title')
-    足球注单管理
-@endsection
-@section('content')
-    <style>
-        .layui-laydate-range {
-            width: auto;
-        }
-
-        .layui-form-switch em {
-            width: auto;
-        }
-
-        .layui-form-switch {
-            width: 44px;
-            line-height: 23px;
-        }
-
-        .layui-form-item .checkbox {
-            width: auto;
-        }
-    </style>
-
-    <script type="text/html" id="status">
-        @if(checkRriv('/admin/SportsSoccer/score'))<input type="checkbox" name="status" value="@{{d.id}}" lay-skin="switch" lay-text="进行中|已结束" lay-filter="openStatus" @{{ d.status == '1' ? 'checked' : '' }}>@endif
-    </script>
-
-    <div class="layui-row">
-        <div class="layui-col-xs12">
-            <form class="layui-form rewrite" eventType="eventForm"  action="" method="get">
-                <div class="layui-form-item">
-                    <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.search') }}</label>
-                        <div class="layui-input-inline">
-                            <input type="text" name="name_chinese" id="name_chinese" eventType="event-query"  value="{{ $name_chinese }}" lay-verify="required" autocomplete="off" class="layui-input">
-                        </div>
-                        <div class="layui-input-inline checkbox">
-                            <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>
-                            <input type="hidden" name="sureblurs" id="form_sureblurs" lay-verify="required" autocomplete="off" class="layui-input" eventType=event-query  value="{{ $sureblurs }}">
-                        </div>
-                    </div>
-
-                    {{--//选择日期--}}
-                    {{--<div class="layui-input-inline" >--}}
-                    {{--<input type="text" name="create_at_end" id="form_create_at_end" lay-verify="" autocomplete="off" class="layui-input test-item">--}}
-                    {{--</div>--}}
-
-                    <div class="layui-inline">
-                        <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>
-                        {{--@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
-                    </div>
-
-                    <!-- &nbsp;&nbsp;&nbsp;&nbsp;<div class="layui-inline"><a href="javascript:openWin('/admin/user/infoAdd','{{ trans('menu.menu_add') }}','700px','500px')" class="layui-btn layui-btn-sm  ">添加</a></div>
-                    <div class="layui-inline"><a href="/admin/menu/add" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a></div> -->
-
-                </div>
-            </form>
-        </div>
-    </div>
-    <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
-    <script>
-        $(function () {
-            $('body').on('click', 'a[eventtype="event-delete"]', function () {
-                var span = $(this).prev();
-                var id = span.attr('data-id');
-                // openWin('/admin/system/AddMenu','{{ trans("menu.menu_edit")}}','600px','500px',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 = {
-    //    reload: function(){
-    //      //执行重载
-    //      table.reload('{{ $dataId }}', {
-    //        page: {
-    //          curr: 1 //重新从第 1 页开始
-    //        }
-    //        ,where: {
-    //            infoname:$('#infoname').val(),
-    //        }
-    //      });
-    //    }
-    //  };
-
-    //启用|禁用用户
-    form.on('switch(openStatus)', function(obj){
-    var status = 0;
-    if(obj.elem.checked==true){
-    status = 1;
-    }
-    setcolumn('/admin/BankSet/UserStart',this.name,status,this.value,obj);
-    console.log(this.name);
-    console.log(status);
-    console.log(this.value);
-    console.log(obj);
-    //layer.tips(msg, obj.othis);
-    });
-
-    function setcolumn(url,column,value,id,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>';
-    }
-    }
-    }
-    });
-    }
-
-    //$('.lay-btn-diy').on('click', function(){
-    //    var type = $(this).data('type');
-    //    active[type] ? active[type].call(this) : '';
-    //  });
-
-    //重置表单
-    $('.reset').on('click',function(){
-    $('input').val('');
-    $('#infoname').val('');
-    //	  var type = $(this).data('type');
-    //	  active[type] ? active[type].call(this) : '';
-    });
-
-    //刷新表单
-    //    $('.set').on('click',function(){
-    //    var type = $(this).data('type');
-    //    active[type] ? active[type].call(this) : '';
-    //    });
-
-    @endpush
-
-    @include('vip.datatable')
-@endsection

+ 1 - 1
resources/views/sports/sports_stringnotelist.blade.php

@@ -277,7 +277,7 @@
                 btn: ['确认', '取消'] //按钮
             }, function() {
                 $.getJSON(url, function(data, textStatus) {
-                    //console.log(data);
+                    console.log(data);
                     if (data.status == '1') {
                         reloadDataTable();
                         layer.msg('重新结算成功');