彭俊 6 gadi atpakaļ
vecāks
revīzija
93e04f34e0

+ 12 - 5
app/Http/Controllers/Api/WriteSportsController.php

@@ -369,7 +369,9 @@ class WriteSportsController extends BaseController
             $match_uuids = array_unique($match_uuids);
             sort($match_uuids);
 
-            $l_match_data = $models['model_local_match']::whereIn('identity', $match_uuids)->where('source', $source)->select('match_id', 'identity')->get()->toArray();
+            // $l_match_data = $models['model_local_match']::whereIn('identity', $match_uuids)->where('source', $source)->select('match_id', 'identity')->get()->toArray();
+            $l_match_data = $models['model_local_match']::whereIn('identity', $match_uuids)->select('match_id', 'identity')->get()->toArray();
+
 
             //二维数组去重
             $l_match_data = commonFunction::uniquArrV2($l_match_data, 'identity');
@@ -847,7 +849,9 @@ class WriteSportsController extends BaseController
             sort($match_uuids);
 
             //获取 本地 已存在 赛事
-            $l_match_data = $models['model_local_match']::whereIn('identity', $match_uuids)->where('source', $source)->select('identity', 'match_id')->get()->toArray();
+            // $l_match_data = $models['model_local_match']::whereIn('identity', $match_uuids)->where('source', $source)->select('identity', 'match_id')->get()->toArray();
+            $l_match_data = $models['model_local_match']::whereIn('identity', $match_uuids)->select('identity', 'match_id')->get()->toArray();
+
             //二维数组去重
             $l_match_data = commonFunction::uniquArrV2($l_match_data, 'identity');
 
@@ -2058,7 +2062,9 @@ class WriteSportsController extends BaseController
     public function matchVerify_v2($models = [], $match_identity = '', $source = '', $gameName = '')
     {
         if (empty($models) || empty($match_identity)) throw new \Exception(Response::generate('', Response::ABNORMAL));
-        $l_match_id = $models['model_local_match']::where(['identity' => $match_identity, 'source' => $source])->value('match_id');
+        // $l_match_id = $models['model_local_match']::where(['identity' => $match_identity, 'source' => $source])->value('match_id');
+        $l_match_id = $models['model_local_match']::where(['identity' => $match_identity])->value('match_id');
+
 
         if ($l_match_id < 1) throw new \Exception(Response::generate($gameName . 'match_identity-' . $match_identity, Response::MATCH_ERROR));
         return $l_match_id;
@@ -2776,8 +2782,9 @@ class WriteSportsController extends BaseController
 
              //获取赛事 match_id
              $match_id = $models['model_local_match']::SELECT('others_match_id', 'match_id')
-             ->where(['source' => $source,'identity' => $match_identity])
-             ->first()->match_id;
+            //  ->where(['source' => $source,'identity' => $match_identity])
+                ->where(['identity' => $match_identity])
+                ->first()->match_id;
 
              if(!empty($match_id)){
                 //更新 危险球

+ 2 - 0
public/admin/css/rewrite.css

@@ -58,4 +58,6 @@
 }
 .layui-form{
     margin-top: 0px;
+    width: fit-content;
+    width: -moz-fit-content;
 }

+ 6 - 6
resources/views/admin/baseSet/index.blade.php

@@ -45,7 +45,7 @@
 
                     <div class="layui-input-block">
                 <textarea name="infocontent" id="LAY_demo_editor"
-                 style="width:1000px;height:240px;" lay-verify="infocontent">{{isset($notice['infocontent'])?$notice['infocontent']:''}}</textarea>
+                 style="width:780px;height:240px;" lay-verify="infocontent">{{isset($notice['infocontent'])?$notice['infocontent']:''}}</textarea>
                     </div>
 
                 </div>
@@ -81,7 +81,7 @@
                     <input type="hidden" name="infoname" value="{{$tan_box['infoname']?$tan_box['infoname']:'弹窗内容'}}">
                     <div class="layui-input-block">
                         <textarea name="infocontent" id="LAY_demo_editors"
-                                  style="width:1000px;height:240px;">{{isset($tan_box['infocontent'])?$tan_box['infocontent']:''}}</textarea>
+                                  style="style="width:780px;height:240px;">{{isset($tan_box['infocontent'])?$tan_box['infocontent']:''}}</textarea>
                     </div>
                 </div>
                 <div class="layui-form-item" id="showimg">
@@ -233,7 +233,7 @@
                     <label class="layui-form-label">重要消息</label>
                     <div class="layui-input-block">
                         <textarea name="important_news" id="LAY_news_editors"
-                                  style="width:1000px;height:240px;">{{isset($new_box['important_news']['infocontent'])?$new_box['important_news']['infocontent']:''}}</textarea>
+                                  style="width:780px;height:240px;">{{isset($new_box['important_news']['infocontent'])?$new_box['important_news']['infocontent']:''}}</textarea>
                     </div>
                 </div> -->--}}
 
@@ -242,7 +242,7 @@
 
                     <div class="layui-input-block">
                         <textarea name="site_navigation" id="LAY_site_editors"
-                                  style="width:1000px;height:240px;">{{isset($new_box['site_navigation']['infocontent'])?$new_box['site_navigation']['infocontent']:''}}</textarea>
+                                  style="width:780px;height:240px;">{{isset($new_box['site_navigation']['infocontent'])?$new_box['site_navigation']['infocontent']:''}}</textarea>
                     </div>
                 </div>
 
@@ -250,7 +250,7 @@
                     <label class="layui-form-label">联系客服</label>
                     <div class="layui-input-block">
                         <textarea name="contact_customer" id="LAY_customer_editors"
-                                  style="width:1000px;height:240px;">{{isset($new_box['contact_customer']['infocontent'])?$new_box['contact_customer']['infocontent']:''}}</textarea>
+                                  style="width:780px;height:240px;">{{isset($new_box['contact_customer']['infocontent'])?$new_box['contact_customer']['infocontent']:''}}</textarea>
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -644,7 +644,7 @@
                     <label class="layui-form-label">内容:</label>
                     <div class="layui-input-block">
                         <textarea name="infocontent" id="LAY_demo_editorss"
-                                  style="width:1000px;height:240px;">{{$regInfo['infocontent']?$regInfo['infocontent']:''}}</textarea>
+                                  style="width:780px;height:240px;">{{$regInfo['infocontent']?$regInfo['infocontent']:''}}</textarea>
                     </div>
                 </div>
                 <div class="layui-form-item">