异常处理

app/Http/Controllers/Admin/CheckRollingController.php

@@ -38,7 +38,7 @@ class CheckRollingController extends Controller
         $dt->setDataSource('/admin/CheckRolling/getinfo');
         $dt->setLang('sportsnotelist');
         //$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
-        $dt->addColsFields('match_id_order', array('sort' => true, 'width' => 200));
+        $dt->addColsFields('match_id_order', array('sort' => true, 'width' => 210, 'minWidth'=>200));
         $dt->addColsFields('league', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         $dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 260));
         $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 250));
@@ -213,7 +213,7 @@ class CheckRollingController extends Controller
         $dt->setDataSource('/admin/CheckRolling/info');
         $dt->setLang('sportsnotelist');
         //$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
-        $dt->addColsFields('match_id_order', array('sort' => true, 'width' => 200));
+        $dt->addColsFields('match_id_order', array('sort' => true, 'width' => 210, 'minWidth'=>200));
         $dt->addColsFields('league', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         $dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 260));
         $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 250));

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -39,7 +39,7 @@ class SoccerNoteListController extends Controller
         $dt->setDataSource('/admin/SoccerNoteList/getinfo');
         $dt->setLang('sportsnotelist');
         //$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
-        $dt->addColsFields('match_id_order', array('sort' => true, 'width' => 200));
+        $dt->addColsFields('match_id_order', array('sort' => true, 'width' => 210, 'minWidth'=>200));
         $dt->addColsFields('league', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         $dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 260));
         $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 250));
@@ -77,7 +77,7 @@ class SoccerNoteListController extends Controller
         $dt->setDataSource('/admin/SoccerNoteList/championsetinfo');
         $dt->setLang('sportsnotelist');
         //$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
-        $dt->addColsFields('lg_id_order', array('sort' => true, 'width' => 200));
+        $dt->addColsFields('lg_id_order', array('sort' => true, 'width' => 210, 'minWidth' => 200));
         $dt->addColsFields('league', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         $dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 260));
         $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 250));
@@ -324,7 +324,7 @@ class SoccerNoteListController extends Controller
         $dt->setDataSource('/admin/SoccerNoteList/info');
         $dt->setLang('sportsnotelist');
         //$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
-        $dt->addColsFields('match_id_order', array('sort' => true, 'width' => 200));
+        $dt->addColsFields('match_id_order', array('sort' => true, 'width' => 210, 'minWidth'=>200));
         $dt->addColsFields('league', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         $dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 260));
         $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 250));
@@ -362,7 +362,7 @@ class SoccerNoteListController extends Controller
         $dt->setDataSource('/admin/SoccerNoteList/championinfo');
         $dt->setLang('sportsnotelist');
         //$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
-        $dt->addColsFields('lg_id_order', array('sort' => true, 'width' => 200));
+        $dt->addColsFields('lg_id_order', array('sort' => true, 'width' => 210, 'minWidth' => 200));
         $dt->addColsFields('league', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         $dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 260));
         $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 250));

app/Http/Controllers/Admin/SoccerStringNoteListController.php

@@ -38,7 +38,7 @@ class SoccerStringNoteListController extends Controller
         $dt->setDataSource('/admin/SoccerStringNoteList/info');
         $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('order_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 210, 'minWidth' => 200));
         $dt->addColsFields('str_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
         $dt->addColsFields('detail_content', array('sort' => false, 'width' => 150));
         $dt->addColsFields('money', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
@@ -160,7 +160,7 @@ class SoccerStringNoteListController extends Controller
         $dt->addColsFields('time', array('templet' => '#userdetail', 'sort' => false, 'width' => 180));
         $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('result', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
-        $dt->enableCheckBox();
+        //$dt->enableCheckBox();
         return view('sports/sports_notelistdetail', $dt->render($request));
     }
     function detailinfo(Req $req) {

app/Models/SportsNoteList.php

@@ -1188,7 +1188,7 @@ class SportsNoteList extends BaseModel
             ['money_time','>',date('Y-m-d H:i:s',$time_unx_s)],//查询开始时间 大于 当前时间-审核延迟时间-执行间隔时间（默认60秒）
             ['money_time','<',date('Y-m-d H:i:s',$time_unx_e)],//查询结束时间 小于 当前时间-审核延迟时间
             ['roll_ratify','=',2],//查询  时间段内未审核 滚球投注 注单
-            ['status','=',1],//查询 时间段内注单 投注状态
+            ['money_buy_simplex.status','=',1],//查询 时间段内注单 投注状态
         ];
         //获取 待处理订单数据
         $order_data = self::join('money_buy_match','money_buy_match.order_id','=','money_buy_simplex.order_id')

resources/views/admin/moneylist/view.blade.php

@@ -103,6 +103,11 @@
       <textarea type="text" name="reason"   lay-verify="" autocomplete="off" disabled="disabled" rows="5" cols="50">{{$data['reason']}}</textarea>
     </div>
   </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <a class="layui-btn lay-btn-diy" href="javascript:history.go(-1)">返回</a>
+        </div>
+    </div>
 </form>
  
 <script>

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

@@ -21,11 +21,12 @@
 
     				<div class="layui-inline">
                         <button class="layui-btn layui-btn-sm lay-btn-diy" data-type="reload" style="opacity: 1; pointer-events: auto;">提交</button>
+                        <button onclick="addResult({{$match_id}},'',10000)" class="layui-btn layui-btn-sm lay-btn-diy" style="margin-left: 20px">添加危险球</button>
+                        <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)">返回</a>
     				</div>
-                    
 				</div>
             </form>
-            <div class="layui-inline" style="margin-left:320px;margin-top:-55px;"><button onclick="addResult({{$match_id}},'',10000)" class="layui-btn layui-btn-sm set">添加危险球</button></div>
+
             </div>
 		</div>
     </div>

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

@@ -235,7 +235,7 @@
 
                 layerOpen = layer.open({
                   type: 1 //Page层类型
-                  ,area: ['600px', '500px']
+                  ,area: ['600px', '80%']
                   ,title: '<h2>赛事结果添加<h2>'
                   ,shade: 0.6 //遮罩透明度
                   ,maxmin: true //允许全屏最小化
@@ -465,7 +465,7 @@
 
                     resultLogOpen = layer.open({
                         type: 1 //Page层类型
-                        ,area: ['900px', '500px']
+                        ,area: ['900px', '85%']
                         ,title: '<h2>赛事结果比分记录<h2>'
                         ,shade: 0.6 //遮罩透明度
                         ,maxmin: true //允许全屏最小化

resources/views/admin/user/changeStatus.blade.php

@@ -39,6 +39,7 @@
 
   <div class="layui-form-item">
     <div class="layui-input-block">
+        <a class="layui-btn lay-btn-diy" href="javascript:history.go(-1)">返回</a>
       @if(checkRriv('/admin/User/changeStatus'))<button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>@endif
     </div>
   </div>

resources/views/admin/user/changeStatuss.blade.php

@@ -35,8 +35,8 @@
 
   <div class="layui-form-item">
     <div class="layui-input-block">
+        <a class="layui-btn lay-btn-diy" href="javascript:history.go(-1)">返回</a>
       @if(checkRriv('/admin/User/changeStatuss'))<button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>@endif
-    </div>
   </div>
 </form>
 

resources/views/admin/user/editvip.blade.php

@@ -46,14 +46,16 @@
         <textarea name="remark" required  lay-verify="required" autocomplete="off" style="width: 600px; height: 180px;">{{isset($data['remark'])?$data['remark']:''}}</textarea>
       </div>
     </div>
-@if(isset($data['status']) && $data['status'] == 1)
+
     <div class="layui-form-item">
       <div class="layui-input-block">
-                    <a class="layui-btn lay-btn-diy" href="javascript:history.go(-1)">返回</a>
+          <a class="layui-btn lay-btn-diy" href="javascript:history.go(-1)">返回</a>
+          @if(isset($data['status']) && $data['status'] == 1)
                     <button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>
+          @endif
       </div>
     </div>
-@endif
+
   </form>
 
   <script>

resources/views/admin/user/index.blade.php

@@ -62,7 +62,7 @@
 	
     <script type="text/html" id="waterTool">
         <a href="/admin/MoneyList/index?account_name=@{{d.account}}&star_time=&end_time=&" class="layui-btn layui-btn-xs">流水</a> <!-- style="margin-bottom:5px;margin-left:0px;" -->
-		@if(checkRriv('/admin/User/setPwdview'))<a href="/admin/User/setPwdview?id=@{{d.id}}&parentid=@{{d.parent_id}}" class="layui-btn layui-btn-xs"><strong>修改</strong></a>@endif
+		@if(checkRriv('/admin/User/setPwdview'))<a href="/admin/User/setPwdview?id=@{{d.id}}&parentid=@{{d.parent_id}}" class="layui-btn layui-btn-xs">修改</a>@endif
 		<!-- <a href="/admin/Hitcode/index?account_identity=@{{d.identity}}" class="blue"><strong>打码量</strong></a> -->
     </script>
 

resources/views/admin/wagent/zjrecord.blade.php

@@ -60,6 +60,7 @@
                         <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/wagent/add'))<a href="/admin/wagent/add" class="layui-btn layui-btn-sm ">添加</a>@endif
                         <!-- @if(checkRriv('/admin/wagent/deleteoutcome'))<a href="javascript:delWin('/admin/wagent/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif -->
+                        <a class="layui-btn layui-btn-sm" href="javascript:history.go(-1)">返回</a>
                     </div>
                 </div>
             </form>

resources/views/sports/sports_notelist.blade.php

@@ -832,7 +832,7 @@
                     content += '</div>';
                     // 打开弹窗.
                     layer.open({
-                        area: ['400px', '480px'], //宽高
+                        area: ['400px', '380px'], //宽高
                         type: 1,
                         title: '注单作废',
                         content: content, //这里content是一个DOM，注意：最好该元素要存放在body最外层，否则可能被其它的相对元素所影响,

resources/views/vip/menu_form.blade.php

@@ -80,15 +80,17 @@
   </div>
   -->
 
-@if(S('ACTION')!='view')
+
   <div class="layui-form-item">
     <div class="layui-input-block">
       <a class="layui-btn lay-btn-diy" href="javascript:history.go(-1)">返回</a>
+      @if(S('ACTION')!='view')
       <button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>
       <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+      @endif
     </div>
   </div>
-@endif
+
 </form>
 
 <script>