diff --git a/app/services/process/ResetNumberTabService.php b/app/services/process/ResetNumberTabService.php index 686a01e..ea2aef6 100644 --- a/app/services/process/ResetNumberTabService.php +++ b/app/services/process/ResetNumberTabService.php @@ -30,7 +30,7 @@ class ResetNumberTabService } // 调试日志 \think\facade\Log::write('resetNumberTab debug: bet_status=' . $numberTabInfo['bet_status'] . ', rob_status=' . $numberTabInfo['rob_status'] . ', id=' . $numberTabInfo['id'] . ', boot_id=' . $numberTabInfo['boot_id'], 'info'); - if($numberTabInfo['bet_status'] == 1 || $numberTabInfo['bet_status'] == 2 || ($numberTabInfo['bet_status'] == 0 && $numberTabInfo['rob_status'] == 1) || ($numberTabInfo['bet_status'] == 0 && $numberTabInfo['rob_status'] == 2)){ + if($numberTabInfo['bet_status'] == 1 || $numberTabInfo['bet_status'] == 2 || $numberTabInfo['bet_status'] == 3 || ($numberTabInfo['bet_status'] == 0 && ($numberTabInfo['rob_status'] == 1 || $numberTabInfo['rob_status'] == 2))){ //事务处理 $res = NumberTab::resetNumberTab($numberTabInfo); \think\facade\Log::write('resetNumberTab result: ' . ($res ? 'true' : 'false'), 'info'); diff --git a/public/static/handle/js/handle.js b/public/static/handle/js/handle.js index 5bc3521..0a496a0 100644 --- a/public/static/handle/js/handle.js +++ b/public/static/handle/js/handle.js @@ -195,7 +195,7 @@ var endRob = function(){ var resetNumberTab = function(){ isCBoot = true; var betStatus = $("#number_tab_status").val(); - if(betStatus == 1 || betStatus == 2){ + if(betStatus == 1 || betStatus == 2 || betStatus == 3){ layer.confirm(lang.is_reset_number,{btn: [lang.confirm,lang.cancel],title:lang.message}, function(index){ websocket.emit('resetNumberTab',{table_id : table_id}); isCBoot = false; diff --git a/public/static/handle/js/handle_b.js b/public/static/handle/js/handle_b.js index 79a1e97..87f1210 100644 --- a/public/static/handle/js/handle_b.js +++ b/public/static/handle/js/handle_b.js @@ -46,7 +46,7 @@ var endRob = function(){ var resetNumberTab = function(){ isCBoot = true; var betStatus = $("#number_tab_status").val(); - if(betStatus == 1 || betStatus == 2){ + if(betStatus == 1 || betStatus == 2 || betStatus == 3){ layer.confirm(lang.is_reset_number,{btn: [lang.confirm,lang.cancel],title:lang.message}, function(index){ websocket.emit('resetNumberTab',{table_id : table_id}); isCBoot = false; diff --git a/public/static/handle/js/handle_b_sb.js b/public/static/handle/js/handle_b_sb.js index 1dd7fa7..7a0952b 100644 --- a/public/static/handle/js/handle_b_sb.js +++ b/public/static/handle/js/handle_b_sb.js @@ -160,7 +160,7 @@ var stopSB = function(){ var resetNumberTab = function(){ isCBoot = true; var betStatus = $("#number_tab_status").val(); - if(betStatus == 1 || betStatus == 2){ + if(betStatus == 1 || betStatus == 2 || betStatus == 3){ layer.confirm(lang.is_reset_number,{btn: [lang.confirm,lang.cancel],title:lang.message}, function(index){ websocket.emit('resetNumberTab',{table_id : table_id}); isCBoot = false; diff --git a/public/static/handle/js/handle_b_sb_scan_four.js b/public/static/handle/js/handle_b_sb_scan_four.js index 3992dc4..f3bed70 100644 --- a/public/static/handle/js/handle_b_sb_scan_four.js +++ b/public/static/handle/js/handle_b_sb_scan_four.js @@ -161,7 +161,7 @@ var stopSB = function(){ var resetNumberTab = function(){ isCBoot = true; var betStatus = $("#number_tab_status").val(); - if(betStatus == 1 || betStatus == 2){ + if(betStatus == 1 || betStatus == 2 || betStatus == 3){ layer.confirm(lang.is_reset_number,{btn: [lang.confirm,lang.cancel],title:lang.message}, function(index){ websocket.emit('resetNumberTab',{table_id : table_id}); isCBoot = false; diff --git a/public/static/handle/js/handle_dice.js b/public/static/handle/js/handle_dice.js index 8d3efea..5030c6d 100644 --- a/public/static/handle/js/handle_dice.js +++ b/public/static/handle/js/handle_dice.js @@ -34,7 +34,7 @@ var endBet = function (){ var resetNumberTab = function(){ isCBoot = true; var betStatus = $("#number_tab_status").val(); - if(betStatus == 1 || betStatus == 2){ + if(betStatus == 1 || betStatus == 2 || betStatus == 3){ layer.confirm(lang.is_reset_number,{btn: [lang.confirm,lang.cancel],title:lang.message}, function(index){ websocket.emit('resetNumberTab',{table_id : table_id}); isCBoot = false; diff --git a/public/static/handle/js/handle_dt_sb.js b/public/static/handle/js/handle_dt_sb.js index 835e164..ff884f5 100644 --- a/public/static/handle/js/handle_dt_sb.js +++ b/public/static/handle/js/handle_dt_sb.js @@ -146,7 +146,7 @@ var stopSB = function(){ var resetNumberTab = function(){ isCBoot = true; var betStatus = $("#number_tab_status").val(); - if(betStatus == 1 || betStatus == 2){ + if(betStatus == 1 || betStatus == 2 || betStatus == 3){ layer.confirm(lang.is_reset_number,{btn: [lang.confirm,lang.cancel],title:lang.message}, function(index){ websocket.emit('resetNumberTab',{table_id : table_id}); isCBoot = false; diff --git a/public/static/handle/js/handle_nn_sb.js b/public/static/handle/js/handle_nn_sb.js index 774c7fc..a094ad5 100644 --- a/public/static/handle/js/handle_nn_sb.js +++ b/public/static/handle/js/handle_nn_sb.js @@ -207,7 +207,7 @@ var stopSB = function(){ var resetNumberTab = function(){ isCBoot = true; var betStatus = $("#number_tab_status").val(); - if(betStatus == 1 || betStatus == 2){ + if(betStatus == 1 || betStatus == 2 || betStatus == 3){ layer.confirm(lang.is_reset_number,{btn: [lang.confirm,lang.cancel],title:lang.message}, function(index){ websocket.emit('resetNumberTab',{table_id : table_id}); isCBoot = false; diff --git a/public/static/handle/js/handle_roulette.js b/public/static/handle/js/handle_roulette.js index f3fff6e..dbd0925 100644 --- a/public/static/handle/js/handle_roulette.js +++ b/public/static/handle/js/handle_roulette.js @@ -34,7 +34,7 @@ var endBet = function (){ var resetNumberTab = function(){ isCBoot = true; var betStatus = $("#number_tab_status").val(); - if(betStatus == 1 || betStatus == 2){ + if(betStatus == 1 || betStatus == 2 || betStatus == 3){ layer.confirm(lang.is_reset_number,{btn: [lang.confirm,lang.cancel],title:lang.message}, function(index){ websocket.emit('resetNumberTab',{table_id : table_id}); isCBoot = false;