异常处理

app/Http/Controllers/Admin/SportsfootController.php

@@ -31,6 +31,10 @@ class SportsfootController extends Controller {
 		$simplex_ids = array_column($newapp->allsimplexorder($match_id,'zq'),'order_id');
 		$str_ids = array_column($newapp->allstrorder($match_id),'order_id');
 
+		//去重
+		$simplex_ids = array_unique($simplex_ids);
+		$str_ids = array_unique($str_ids);
+
 		//判断赛事下注单输赢
 		$datas = array('noticeid' => $noticeid , 'token' => $token);
 		$settlementAuto = new \App\Lib\Settlement\SettlementAuto();

app/Models/MoneyBuyMatch.php

@@ -39,7 +39,7 @@ class MoneyBuyMatch extends Model
         if(empty($select)){
             //一个赛事所有注单
             $select = ['money_buy_simplex.order_id', 'money_buy_simplex.money', 'money_buy_simplex.account_identity', 'money_buy_simplex.info_identity', 'money_buy_simplex.match_id'];
-            $data = $this->join('money_buy_simplex', 'money_buy_match.batch_id', '=', 'money_buy_simplex.batch_id')->select($select)->where($where)->get()->toArray();
+            $data = $this->join('money_buy_simplex', 'money_buy_match.order_id', '=', 'money_buy_simplex.order_id')->select($select)->where($where)->get()->toArray();
         }else if(!empty($match_ids) and !empty($select)){
             //多赛事所有注单
             $typeWhere = [
@@ -47,9 +47,9 @@ class MoneyBuyMatch extends Model
                 ['money_buy_match.game_code', '=', $code],
                 ['money_buy_simplex.status', '=', 1],
             ];
-            $data = $this->join('money_buy_simplex', 'money_buy_match.batch_id', '=', 'money_buy_simplex.batch_id')->select($select)->whereIn('money_buy_match.match_id',$match_ids)->where($typeWhere)->get();
+            $data = $this->join('money_buy_simplex', 'money_buy_match.order_id', '=', 'money_buy_simplex.order_id')->select($select)->whereIn('money_buy_match.match_id',$match_ids)->where($typeWhere)->get();
         }else{
-            $data = $this->join('money_buy_simplex', 'money_buy_match.batch_id', '=', 'money_buy_simplex.batch_id')->join('st_odds_code', 'money_buy_match.odds_code', '=', 'st_odds_code.odds_code')->select($select)->where($where)->get();
+            $data = $this->join('money_buy_simplex', 'money_buy_match.order_id', '=', 'money_buy_simplex.order_id')->join('st_odds_code', 'money_buy_match.odds_code', '=', 'st_odds_code.odds_code')->select($select)->where($where)->get();
         }
         return $data;
     }

app/Models/MoneyBuySimplex.php

@@ -56,9 +56,6 @@ class MoneyBuySimplex extends BaseModel
             $resultsModel['result'] = '';
         }
 
-        //处理足球角球数据
-        $corner_ball_json = $resultModel->corner_ball;
-
         return [
             'order' => $Ordermodel,
             'result' => $resultModel,

app/Models/SportsNoteList.php

@@ -198,7 +198,8 @@ class SportsNoteList extends BaseModel
                 $v->order_status = '投注<br>'.$settle_status;
             }
             else if ($v->status == 1 && $v->settle_status != 1) {
-                $v->order_status = '投注<br>'.$settle_status;
+                //$v->order_status = '投注<br>'.$settle_status;
+                $v->order_status = '<span>'.$contentData['result'].'</span>';
 
             } else if ($v->status == 2) {
                 $v->order_status = '作废<br>'.$v->use_mark;
@@ -220,35 +221,6 @@ class SportsNoteList extends BaseModel
             //根据球类/玩法名称 获取需设置比分项 
             $ScoreTitle = $this->getScoreTitle($odds_name,$type);
 
-            /*
-            //操作
-            //未结算时 加载结算按钮
-            if($v->status==1 and $v->settle_status ==1){
-                $v->game_status = '
-                <button style="margin-left: 0;" onclick="setScore_v2(\'' . $v->order_id . '\',\''.$v->match_id.'\',\''.$type.'\',\''.$ScoreTitle.'\')"  class="layui-btn layui-btn-sm settlement">结算</button>';
-            }else{
-                $v->game_status = '
-                <button style="margin-left: 0;" onclick="setScore_v2(\'' . $v->order_id . '\',\''.$v->match_id.'\',\''.$type.'\')"  class="layui-btn layui-btn-sm settlement">结算</button>
-                <br>
-                <a class="layui-btn layui-btn-sm invalid" style="background-color:red" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerNoteList/invalid/?id=' . $v->id . '\',\''.$v->order_id.'\',\''.$v->league.'\');"> 作废 </a>';
-            } 
-
-            //操作栏 按钮
-            if($v->status==1){
-                $v->game_status = '
-                <button style="margin-left: 0;" onclick="'.$function.'(\'' . $v->order_id . '\',\''.$v->match_id.'\',\''.$type.'\')"  class="layui-btn layui-btn-sm settlement">结算</button>
-                <br>
-                <a class="layui-btn layui-btn-sm invalid" style="background-color:red" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerNoteList/invalid/?id=' . $v->id . '\',\''.$v->order_id.'\',\''.$v->league.'\');"> 作废 </a>';
-            }else{
-                $v->game_status = '';
-                // $v->game_status = '
-                // <button style="margin-left: 0;" onclick="'.$function.'(\'' . $v->order_id . '\',\''.$v->match_id.'\',\''.$type.'\')"  class="layui-btn layui-btn-sm settlement">结算</button>
-                // <br>
-                // <a class="layui-btn layui-btn-sm invalid" style="background-color:red" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerNoteList/invalid/?id=' . $v->id . '\',\''.$v->order_id.'\',\''.$v->league.'\');"> 作废 </a>';
-      
-            }
-            */
-
             //操作 按钮
             //投注/未结算 则有结算/作废 按钮  
             if($v->status==1 and $v->settle_status ==1){
@@ -302,6 +274,59 @@ class SportsNoteList extends BaseModel
                 $ScoreTitle = '角球全场';
             }
         }
+        //篮球
+        if($gameCode == 'lq'){
+
+            //[{"home_team":0,"guest_team":0,"home_score":0,"guest_score":0,"all_goal":0,"first_score":0,"last_score":0,"match_winer":0,"update_time":0,"match_id":0,"u_guest_score":0,"u_home_score":0,"penaltycard":{"home":0,"guest":0,"home_half":0,"guest_half":0},"cornerball":{"home":0,"guest":0,"home_half":0,"guest_half":0}}]
+
+            //得分最后一位数
+            $ScoreTitle_dfNum = commonFunction::checkstr($oddsName,'得分最后一位数');
+            //上半场
+            $ScoreTitle_h = commonFunction::checkstr($oddsName,'上半场');
+            //全场
+            $ScoreTitle_f = commonFunction::checkstr($oddsName,'全场');
+            //下半场
+            $ScoreTitle_s = commonFunction::checkstr($oddsName,'下半场');
+            //第一节
+            $ScoreTitle_1 = commonFunction::checkstr($oddsName,'一节');
+            //第二节
+            $ScoreTitle_2 = commonFunction::checkstr($oddsName,'二节');
+            //第三节
+            $ScoreTitle_3 = commonFunction::checkstr($oddsName,'三节');
+            //第四节
+            $ScoreTitle_4 = commonFunction::checkstr($oddsName,'四节');
+
+            //有上半场 为上半场比分
+            if($ScoreTitle_h == 1){
+                $ScoreTitle = '上半';
+            }
+            //有下半场 为下半场比分
+            if($ScoreTitle_s == 1){
+                $ScoreTitle = '下半';
+            }
+            //有全场 为全场比分
+            if($ScoreTitle_f == 1 || $ScoreTitle_dfNum == 1){
+                $ScoreTitle = '全场';
+            }
+
+            //有第一节 为第一节比分
+            if($ScoreTitle_1 == 1){
+                $ScoreTitle = '第一节';
+            }
+            //有第二节 为第二节比分
+            if($ScoreTitle_2 == 1){
+                $ScoreTitle = '第二节';
+            }
+            //有第三节 为第三节比分
+            if($ScoreTitle_3 == 1){
+                $ScoreTitle = '第三节';
+            }
+            //有第四节 为第四节比分
+            if($ScoreTitle_4 == 1){
+                $ScoreTitle = '第四节';
+            }
+         
+        }
 
         return $ScoreTitle;
     }
@@ -346,7 +371,8 @@ class SportsNoteList extends BaseModel
                 $content_str['content'] = $content1.$content_str['content'];
             }
             else if($order->status == 1) {
-                $content_str['content'] = $content1.$content_str['content']. '<span>' . $content_str['result'] . '</span>(' . $content_str['matchresult'] . ')<br>';
+//                $content_str['content'] = $content1.$content_str['content']. '<span>' . $content_str['result'] . '</span>(' . $content_str['matchresult'] . ')<br>';
+                $content_str['content'] = $content1.$content_str['content']. '<span>' .  '</span>(' . $content_str['matchresult'] . ')<br>';
             }
         }
         //冠军联赛注单 详情

resources/views/admin/Sportsbq/outcome.blade.php

@@ -217,7 +217,7 @@
         //layer弹窗结束
         
         function buttonClick(){
-             $("#buttonClick").attr('disabled', true);
+//             $("#buttonClick").attr('disabled', true);
 
             var match_id = $("#match_id").val();
             var homea = $("#homea").val();
@@ -245,6 +245,56 @@
             var homel = $("#homel").val();
             var guestl = $("#guestl").val();
 
+            if(homea == -1 && guesta != -1 || homea != -1 && guesta == -1 || homea<-1 || guesta<-1){
+                layer.alert('请输入正确的第一局比分');
+                return false;
+            }
+            if(homeb == -1 && guestb != -1 || homeb != -1 && guestb == -1 || homeb<-1 || guestb<-1){
+                layer.alert('请输入正确的第二局比分');
+                return false;
+            }
+            if(homec == -1 && guestc != -1 || homec != -1 && guestc == -1 || homec<-1 || guestc<-1){
+                layer.alert('请输入正确的第三局比分');
+                return false;
+            }
+            if(homed == -1 && guestd != -1 || homed != -1 && guestd == -1 || homed<-1 || guestd<-1){
+                layer.alert('请输入正确的第四局比分');
+                return false;
+            }
+            if(homee == -1 && gueste != -1 || homee != -1 && gueste == -1 || homee<-1 || gueste<-1){
+                layer.alert('请输入正确的第五局比分');
+                return false;
+            }
+            if(homef == -1 && guestf != -1 || homef != -1 && guestf == -1 || homef<-1 || guestf<-1){
+                layer.alert('请输入正确的第六局比分');
+                return false;
+            }
+            if(homeg == -1 && guestg != -1 || homeg != -1 && guestg == -1 || homeg<-1 || guestg<-1){
+                layer.alert('请输入正确的第七局比分');
+                return false;
+            }
+            if(homeh == -1 && guesth != -1 || homeh != -1 && guesth == -1 || homeh<-1 || guesth<-1){
+                layer.alert('请输入正确的第八局比分');
+                return false;
+            }
+            if(homei == -1 && guesti != -1 || homei != -1 && guesti == -1 || homei<-1 || guesti<-1){
+                layer.alert('请输入正确的第九局比分');
+                return false;
+            }
+            if(homej == -1 && guestj != -1 || homej != -1 && guestj == -1 || homej<-1 || guestj<-1){
+                layer.alert('请输入正确的第十局比分');
+                return false;
+            }
+            if(homek == -1 && guestk != -1 || homek != -1 && guestk == -1 || homek<-1 || guestk<-1){
+                layer.alert('请输入正确的前五局比分');
+                return false;
+            }
+            if(homel == -1 && guestl != -1 || homel != -1 && guestl == -1 || homel<-1 || guestl<-1){
+                layer.alert('请输入正确的全场比分');
+                return false;
+            }
+
+
             $.ajax({
                 type: 'POST',
                 dataType: 'json',
@@ -412,7 +462,7 @@
                         }
                     }
 
-                    html += '<br><div style="margin:0px auto 10px;width: 112px;"><button class="layui-btn layui-btn-sm set" id="buttonClick" onclick="rlClick()"><h3>确定</h3></button>&nbsp;<button onclick="rlClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button></div></div>';
+                    html += '<br><div style="margin:0px auto 10px;width: 112px;"><button class="layui-btn layui-btn-sm set" id="buttonClick" onclick="rlClick()"><h3>确定</h3></button>&nbsp;<!--<button onclick="rlClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button>--></div></div>';
 
                     resultLogOpen = layer.open({
                         type: 1 //Page层类型

resources/views/admin/Sportswq/outcome.blade.php

@@ -209,7 +209,7 @@
         //layer弹窗结束
 
         function buttonClick(){
-            $("#buttonClick").attr('disabled', true);
+//            $("#buttonClick").attr('disabled', true);
             var matchid = $("#matchid").val();
             var homeo = $("#homeo").val();
             var guesto = $("#guesto").val();
@@ -224,6 +224,31 @@
             var homen = $("#homen").val();
             var guestn = $("#guestn").val();
 
+            if(homeo == -1 && guesto != -1 || homeo != -1 && guesto == -1 || homeo<-1 || guesto<-1){
+                layer.alert('请输入正确的第一盘比分');
+                return false;
+            }
+            if(homet == -1 && guestt != -1 || homet != -1 && guestt == -1 || homet<-1 || guestt<-1){
+                layer.alert('请输入正确的第二盘比分');
+                return false;
+            }
+            if(homes == -1 && guests != -1 || homes != -1 && guests == -1 || homes<-1 || guests<-1){
+                layer.alert('请输入正确的第三盘比分');
+                return false;
+            }
+            if(homef == -1 && guestf != -1 || homef != -1 && guestf == -1 || homef<-1 || guestf<-1){
+                layer.alert('请输入正确的第四盘比分');
+                return false;
+            }
+            if(homee == -1 && gueste != -1 || homee != -1 && gueste == -1 || homee<-1 || gueste<-1){
+                layer.alert('请输入正确的第五盘比分');
+                return false;
+            }
+            if(homen == -1 && guestn != -1 || homen != -1 && guestn == -1 || homen<-1 || guestn<-1){
+                layer.alert('请输入正确的全场比分');
+                return false;
+            }
+
             $.ajax({
                 type: 'POST',
                 dataType: 'json',
@@ -375,11 +400,11 @@
                         }
                     }
 
-                    html += '<br><div style="margin:0px auto 10px;width: 112px;"><button class="layui-btn layui-btn-sm set" id="buttonClick" onclick="rlClick()"><h3>确定</h3></button>&nbsp;<button onclick="rlClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button></div></div>';
+                    html += '<br><div style="margin:0px auto 10px;width: 112px;"><button class="layui-btn layui-btn-sm set" id="buttonClick" onclick="rlClick()"><h3>确定</h3></button>&nbsp;<!--<button onclick="rlClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button>--></div></div>';
 
                     resultLogOpen = layer.open({
                         type: 1 //Page层类型
-                        ,area: ['660px', '500px']
+                        ,area: ['800px', '500px']
                         ,title: '<h2>比分记录<h2>'
                         ,shade: 0.6 //遮罩透明度
                         ,maxmin: true //允许全屏最小化

resources/views/admin/sportsbk/outcome.blade.php

@@ -396,7 +396,7 @@
         //layer弹窗结束
 
         function buttonClick(){
-            $("#buttonClick").attr('disabled', true);
+//            $("#buttonClick").attr('disabled', true);
             var matchid = $("#matchid").val();
             var homeo = $("#homeo").val();
             var guesto = $("#guesto").val();
@@ -413,6 +413,35 @@
             var homen = $("#homen").val();
             var guestn = $("#guestn").val();
 
+            if(homeo == -1 && guesto != -1 || homeo != -1 && guesto == -1 || homeo<-1 || guesto<-1){
+                layer.alert('请输入正确的第一节比分');
+                return false;
+            }
+            if(homet == -1 && guestt != -1 || homet != -1 && guestt == -1 || homet<-1 || guestt<-1){
+                layer.alert('请输入正确的第二节比分');
+                return false;
+            }
+            if(homes == -1 && guests != -1 || homes != -1 && guests == -1 || homes<-1 || guests<-1){
+                layer.alert('请输入正确的第三节比分');
+                return false;
+            }
+            if(homef == -1 && guestf != -1 || homef != -1 && guestf == -1 || homef<-1 || guestf<-1){
+                layer.alert('请输入正确的第四节比分');
+                return false;
+            }
+            if(homeu == -1 && guestu != -1 || homeu != -1 && guestu == -1 || homeu<-1 || guestu<-1){
+                layer.alert('请输入正确的上半场比分');
+                return false;
+            }
+            if(homeb == -1 && guestb != -1 || homeb != -1 && guestb == -1 || homeb<-1 || guestb<-1){
+                layer.alert('请输入正确的下半场比分');
+                return false;
+            }
+            if(homen == -1 && guestn != -1 || homen != -1 && guestn == -1 || homen<-1 || guestn<-1){
+                layer.alert('请输入正确的全场比分');
+                return false;
+            }
+
             $.ajax({
                 type: 'POST',
                 dataType: 'json',
@@ -529,11 +558,11 @@
                         }
                     }
 
-                    html += '<br><div style="margin:0px auto 10px;width: 112px;"><button class="layui-btn layui-btn-sm set" id="buttonClick" onclick="rlClick()"><h3>确定</h3></button>&nbsp;<button onclick="rlClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button></div></div>';
+                    html += '<br><div style="margin:0px auto 10px;width: 112px;"><button class="layui-btn layui-btn-sm set" id="buttonClick" onclick="rlClick()"><h3>确定</h3></button>&nbsp;<!--<button onclick="rlClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button>--></div></div>';
                     //console.log(html);
                     resultLogOpen = layer.open({
                         type: 1 //Page层类型
-                        ,area: ['660px', '500px']
+                        ,area: ['800px', '500px']
                         ,title: '<h2>比分记录<h2>'
                         ,shade: 0.6 //遮罩透明度
                         ,maxmin: true //允许全屏最小化

resources/views/admin/sportsfoot/outcome.blade.php

@@ -278,6 +278,15 @@
             var guestall = $("#guestall").val();
             var reg = /^[0-99]\d*$/;
 
+            if(homehalf == -1 && guesthalf != -1 || homehalf != -1 && guesthalf == -1 || homehalf<-1 || guesthalf<-1){
+                layer.alert('请输入正确的上半场比分');
+                return false;
+            }
+            if(homeall == -1 && guestall != -1 || homeall != -1 && guestall == -1 || homeall<-1 || guestall<-1){
+                layer.alert('请输入正确的全场比分');
+                return false;
+            }
+
             $.ajax({
                 type: 'POST',
                 dataType: 'json',

resources/views/sports/sports_notelist.blade.php

@@ -3,6 +3,11 @@
     足球单式注单管理
 @endsection
 @section('content')
+    <style>
+        tbody span{
+            color: red;
+        }
+    </style>
 
     <script type="text/html" id="game_status">
         <!--
@@ -554,7 +559,7 @@
                             setScore_v2_zq(res.data.order, res.data.result,res.data.results,order_id, match_id, game_code,ScoreTitle,leagueName,home_team,guest_team);
                             break;
                         case 'lq':
-                            setScore_v2_lq(res.data.order, res.data.result,res.data.results,order_id, match_id, game_code);
+                            setScore_v2_lq(res.data.order, res.data.result,res.data.results,order_id, match_id, game_code,ScoreTitle,leagueName,home_team,guest_team);
                             break;
                         case 'bq':
                             setScore_v2_bq(res.data.order, res.data.result,res.data.results,order_id, match_id, game_code);
@@ -718,7 +723,7 @@ console.log(matchdata);
         }
 
 
-        function setScore_v2_lq(orderObj, resultObj,order_id,match_id,game_code) {
+        function ___setScore_v2_lq(orderObj, resultObj,order_id,match_id,game_code) {
             let home = JSON.parse(resultObj.home_score);
             let guest = JSON.parse(resultObj.guest_score);
 
@@ -775,7 +780,82 @@ console.log(matchdata);
 
             return;
         }
+        function setScore_v2_lq(orderObj, resultObj,resultsObj,order_id,match_id,game_code,ScoreTitle,leagueName,home_team,guest_team) {
+            let home = JSON.parse(resultObj.home_score);
+            let guest = JSON.parse(resultObj.guest_score);
+             //主队比分
+             var home_score;
+            //客队比分
+            var guest_score;
+            //全场
+            if(ScoreTitle == '全场'){
+                home_score = home[1]+home[2]+home[3]+home[4];
+                guest_score = guest[1]+guest[2]+guest[3]+guest[4];
+            }
+            //上半场
+            if(ScoreTitle == '上半'){
+                home_score = home[1]+home[2];
+                guest_score = guest[1]+guest[2];
+            }
+            if(ScoreTitle == '下半'){
+                home_score = home[3]+home[4];
+                guest_score = guest[3]+guest[4];
+            }
+            if(ScoreTitle == '第一节'){
+                home_score = home[1];
+                guest_score = guest[1];
+            }
+            if(ScoreTitle == '第二节'){
+                home_score = home[2];
+                guest_score = guest[2];
+            }
+            if(ScoreTitle == '第三节'){
+                home_score = home[3];
+                guest_score = guest[3];
+            }
+            if(ScoreTitle == '第四节'){
+                home_score = home[4];
+                guest_score = guest[4];
+            }
+    
+          
+                let content = '<div style="width: 100%;height:25px;"></div><div class="layui-form-item">' ;
 
+                content += '  <div class="layui-inline" style="width: -webkit-fill-available;height: 80px;">' +
+                        '    <label class="layui-form-label" style="text-align:center;width: -webkit-fill-available;height: 25px;">'+leagueName+'</label><br></br>' +
+                        '    <label class="layui-form-label"  style="width:200px;">'+resultObj.home_team+'-（'+ScoreTitle+'）</label>' +
+                        '    <div class="layui-input-inline" style="width: 50px;">' +
+                        '      <input type="text" name="set_zq_home_score" id="set_lq_home_score" placeholder="主"  value="' + home_score +'"  required   autocomplete="off" class="layui-input">' +
+                        '    </div>' +
+                        '    <label class="layui-form-label"  style="width:200px;">'+resultObj.guest_team+'-（'+ScoreTitle+'）</label>' +
+                        '    <div class="layui-input-inline" style="width: 50px;">' +
+                        '      <input type="text" name="set_zq_home_score" id="set_lq_guest_score" placeholder="主"  value="' + home_score +'"  required   autocomplete="off" class="layui-input">' +
+                        '    </div>' +
+                        '  </div>' ;
+
+
+            layer.open({
+                area: ['800px', '300px'], //宽高
+                type: 1,
+                title: '设置结算比分',
+                content: content, //这里content是一个DOM，注意：最好该元素要存放在body最外层，否则可能被其它的相对元素所影响,
+                btn: ['提交', '取消'],
+                yes: function (index, layero) {
+                            var home = $("#set_lq_home_score").val();
+                            var guest = $("#set_lq_guest_score").val();
+                        matchdata = JSON.stringify({
+                            'home': [$("#set_lq_home_score_1").val(), $("#set_lq_home_score_2").val(), $("#set_lq_home_score_3").val(), $("#set_lq_home_score_4").val(),],
+                            'guest': [$("#set_lq_gueste_score_1").val(), $("#set_lq_gueste_score_2").val(), $("#set_lq_gueste_score_3").val(), $("#set_lq_gueste_score_4").val(),],
+                    });
+
+                    // 请求设置接口
+                    ajax_setScore_all_v2(order_id,game_code,match_id,matchdata,ScoreTitle,home,guest);
+                    return true;
+                },
+            });
+
+            return;
+        }
 
         function setScore_v2_bq(orderObj, resultObj,order_id,match_id,game_code) {
             let match_score = JSON.parse(resultObj.match_score_t);

resources/views/sports/sports_stringnotelistSet.blade.php

@@ -78,7 +78,7 @@
         <button onclick="invalid('/admin/SoccerStringNoteList/RevokeStrOrder','@{{d.order_id}}')" class="layui-btn layui-btn-sm settlement">作废</button><br/>
         <button onclick="settlement('/admin/SoccerStringNoteList/resettlement','@{{d.id}}')" class="layui-btn layui-btn-sm">结算</button>
         @{{#}else{ }}
-        <button onclick="resetNoset('/admin/SoccerStringNoteList/resetStrOrder','@{{d.id}}')" class="layui-btn layui-btn-sm">重下单</button>
+        <button onclick="resetNoset('/admin/SoccerStringNoteList/resetStrOrder','@{{d.id}}')" class="layui-btn layui-btn-sm">取消作废</button>
         @{{#} }}