彭俊 6 år sedan
förälder
incheckning
79deb50b9b
2 ändrade filer med 18 tillägg och 1 borttagningar
  1. 9 1
      app/Http/Controllers/Admin/AdvertController.php
  2. 9 0
      app/Http/Model/StZqResult.php

+ 9 - 1
app/Http/Controllers/Admin/AdvertController.php

@@ -58,15 +58,23 @@ class AdvertController extends Controller {
 
         $db = new \App\Models\Advert();
         $data = $db->getlist($limit, $where);
+
         if (!($data < 0)) {
             $langinfo = trans('status.advert');
             $langstatus = trans('status.system_user.status');
             foreach ($data['data'] as $k => $v) {
+                if($v['status'] == 1){
+                    $status = '可用';
+                }else{
+                    $status = '禁用';
+                }
                 $data['data'][$k]['type'] = $langinfo[$v['type']];
-                $data['data'][$k]['status'] = $langstatus[$v['status']];
+                // $data['data'][$k]['status'] = $langstatus[$v['status']];
+                $data['data'][$k]['status'] = $status;
                 $data['data'][$k]['typeid'] = $v['type'];
             }
         }
+
         $result=\App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
 
         if (empty($result)){

+ 9 - 0
app/Http/Model/StZqResult.php

@@ -124,10 +124,12 @@ class StZqResult extends Model
                     }                   
                 }
             }
+            /*
             if(!empty($set_match_r)){
                 $ret = $model['model_result']::insert($set_match_r);
                 if($ret != true) throw new \Exception( Response::generate('',Response::ADD_MATCH_R_ERROR));
             }
+            */
             
         }else {
             //如果结果表有数据,则获取结果表没有的赛事
@@ -175,13 +177,20 @@ class StZqResult extends Model
                         }                   
                     }
                 }
+                /*
                 if(!empty($set_match_r)){
                     $ret = $model['model_result']::insert($set_match_r);
                     if($ret != true) throw new \Exception( Response::generate('',Response::ADD_MATCH_R_ERROR));
                 }
+                */
             }
         }
 
+        if(!empty($set_match_r)){
+            $ret = $model['model_result']::insert($set_match_r);
+            if($ret != true) throw new \Exception( Response::generate('',Response::ADD_MATCH_R_ERROR));
+        }
+
         return 1;
     }