@@ -38,14 +38,14 @@ class SettlementAuto
if (empty($model)) {
return 0;
}
- Common::SET_NOMAM_RECORD('开始自动结算! ', ['id' => $model->id, 'match_id' => $model->match_id]);
+ Common::SET_NOMAM_RECORD('开始自动结算! ', ['id' => $model->id, 'match_id' => $model->match_id, 'game_code' => $model->game_code]);
$model->pcount = 1;
$model->start_time = date('Y-m-d H:i:s', time());
$model->status = 1;
$model->save();
- $mbmm = (new MoneyBuyMatchModel())->countByMatch($model->match_id,$model->game_code);
+ $mbmm = (new MoneyBuyMatchModel())->countByMatch($model->match_id, $model->game_code);
$count = $mbmm['count'];
if (!$count) {
$model->status = 4;
@@ -94,7 +94,11 @@ class SettlementAuto
Common::SET_NOMAM_RECORD('自动结算返回: ', ['type' => $type, 'req' => $datas, 'rt' => $retarr]);
if (isset($retarr['status']) && $retarr['status'] == 1) {
return true;
+ } else {
+ Common::SET_NOMAM_RECORD('自动结算返回-1-Error: ', ['type' => $type, 'req' => $datas, 'ret' => $ret]);
+ Common::SET_NOMAM_RECORD('自动结算返回-2-Error: ', ['type' => $type, 'req' => $datas, 'ret' => $ret]);
return false;
@@ -60,21 +60,15 @@
.container .layui-col-xs12 .layui-row{
position: fixed;
width: 100%;
- height: 60px;
+ /* height: 60px;*/
z-index: 2;
top: 0px;
padding-top: 5px;
background: white;
.container .layui-border-box{
- margin-top: 62px;
+ /*margin-top: 62px;*/
width: fit-content;
width: -moz-fit-content;
height: 100%;
-
-.layui-tab-content{
- height: 100%;
-}
@@ -25,6 +25,12 @@
</style>
<script>
+ function initcss(){
+ let height = $(".container .layui-col-xs12 .layui-row form").height();
+ $(".container .layui-border-box").css('margin-top', height+2);
+ //$(".layui-tab-content").height("100%");
+ }
+
function loadCols()
{
var cols= @json($dataCols);
@@ -79,7 +85,7 @@ layui.use(['table','form','tree','laydate'], function(){
,limits: [5, 7, 10,20,30,50,100,200,500,1000,2000]
,limit: 50 //每页默认显示的数量
,done: function(res, curr, count){
+ initcss();
// var width = $('.layui-table').find('th .layui-table-cell').width();
//
// width = parseFloat(width);