彭俊 6 lat temu
rodzic
commit
30002d6813

+ 2 - 2
app/Http/Controllers/Admin/MoneyController.php

@@ -645,11 +645,11 @@ class MoneyController extends Controller
         $sureblur = Request::has('sureblur') ? Request::get('sureblur') : '';
         if (empty($account)) {
             $data = array(
-                /*array(
+                array(
                     'account_name' => '',
                     'account_identity' => '',
                     'cash' => '',
-                ),*/
+                ),
             );
             return \App\Lib\DataTable\DataTable::init()->toJson($data, 1);
         }

+ 5 - 5
app/Http/Controllers/Admin/WagentController.php

@@ -53,11 +53,11 @@ class WagentController extends Controller {
         $dt->setDataSource('/admin/wagent/zjrecordinfo');
         $dt->setLang('wagent');
         //$dt->addColsFields('agent_name', array('templet' => '#newtime', 'sort' => false, 'width' => 80));
-        $dt->addColsFields('ordernumber', array('templet' => '#newtime', 'sort' => false, 'width' => 150));
-        $dt->addColsFields('credit', array('templet' => '#newtime', 'sort' => false, 'width' => 100));
-        $dt->addColsFields('agent_money_before', array('templet' => '#newtime', 'sort' => false, 'width' => 100));
-        $dt->addColsFields('agent_money_after', array('templet' => '#newtime', 'sort' => false, 'width' => 100));
-		$dt->addColsFields('datetime', array('templet' => '#newtime', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('ordernumber', array('templet' => '#newtime', 'sort' => false));
+        $dt->addColsFields('credit', array('templet' => '#newtime', 'sort' => false));
+        $dt->addColsFields('agent_money_before', array('templet' => '#newtime', 'sort' => false));
+        $dt->addColsFields('agent_money_after', array('templet' => '#newtime', 'sort' => false));
+		$dt->addColsFields('datetime', array('templet' => '#newtime', 'sort' => false));
         $dt->enableCheckBox();
 		return view('admin.wagent/zjrecord', $dt->render($request));
 	}

+ 11 - 1
app/Http/Controllers/Api/WriteSportsController.php

@@ -2714,7 +2714,17 @@ class WriteSportsController extends BaseController
            
             if(!empty($match_r_data)){
                 foreach($match_r_data as $k=>$v){
-                    $del = $models['model_result_express']::where('match_id',$v['match_id'])->delete();
+                    //删除已存在
+                    // $del = $models['model_result_express']::where('match_id',$v['match_id'])->delete();
+                    //==处理 赛事时间==
+                    // dd($v['match_date'].' '.$v['match_time']);
+                    $match_time_o = strtotime ($v['match_date'].' '.$v['match_time']);//原始美东时间 时间戳
+                    $match_time_new = strtotime(commonFunction::qgmdate('Y-m-d H:i:s', $match_time_o, 20));//本地时间 时间戳 20=8+12
+                    $match_date = date('Y-m-d',$match_time_new);
+                    $match_time = date('H:i:s',$match_time_new);
+                    //==end==
+                    $v['match_date'] = $match_date;
+                    $v['match_time'] = $match_time;
                     $v['c_time'] = date('Y-m-d H:i:s',time());
                     $v['u_time'] = date('Y-m-d H:i:s',time());
                     $v['source'] = $source;

+ 2 - 2
resources/views/admin/Regulation/index.blade.php

@@ -45,7 +45,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('money.account_name') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="account_name" id="form_account_name" lay-verify="required"
+                            <input type="text" name="account_name" id="form_account_name" placeholder="请输入完整用户名" lay-verify="required"
                                    autocomplete="off" class="layui-input" eventType=event-query value="{{$account_name}}">
                         </div>
                         {{--<div class="layui-input-inline checkbox">--}}
@@ -113,7 +113,7 @@
     </script>
 
     @include('vip.datatable')
-    <div id="content_iframe" style="width: 1000px;">
+    <div id="content_iframe" style="width: 1000px;height: 326px">
 
     </div>
 @endsection