单式注单修改

app/Models/MoneyBuyStr.php

@@ -41,8 +41,10 @@ class MoneyBuyStr extends BaseModel {
         $content = \App\Models\MoneyBuyMatch::where('bet_type','2')->get();
 
         for($i=0;$i<count($data);$i++){
-            if($data[$i]->status==1){
+            if($data[$i]->status==1 && $data[$i]->settle_status==1){
                 $data[$i]->order_status = '投注'.'<br><a class="layui-btn layui-btn-sm invalid" lay-event="detail" pid="id" uri="/admin/SoccerStringNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerStringNoteList/invalid/?id='.$data[$i]->id.'\');"> 作废 </a>';
+            }else if($data[$i]->status==1 && $data[$i]->settle_status==1){
+                $data[$i]->order_status = '投注';
             }else if($data[$i]->status==2){
                 $data[$i]->order_status = '作废'.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已作废 </a>';
             }else if($data[$i]->status==3){

app/Models/SportsNoteList.php

@@ -60,8 +60,10 @@ class SportsNoteList extends BaseModel {
 
 
         for($i=0;$i<count($data);$i++){
-            if($data[$i]->status==1){
+            if($data[$i]->status==1 && $data[$i]->settle_status==1){
                 $data[$i]->order_status = '投注'.'<br><a class="layui-btn layui-btn-sm invalid" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerNoteList/invalid/?id='.$data[$i]->id.'\');"> 作废 </a>';
+            }else if($data[$i]->status==1 && $data[$i]->settle_status==2){
+                $data[$i]->order_status = '投注';
             }else if($data[$i]->status==2){
                 $data[$i]->order_status = '作废'.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已作废 </a>';
             }else if($data[$i]->status==3){