lip пре 5 дана
родитељ
комит
8f862f14a6
5 измењених фајлова са 121 додато и 16 уклоњено
  1. 17 0
      app/Http/Controllers/api/Issue.php
  2. 17 15
      app/Http/Controllers/api/NewPc.php
  3. 29 1
      lang/en/messages.php
  4. 29 0
      lang/vi/messages.php
  5. 29 0
      lang/zh/messages.php

+ 17 - 0
app/Http/Controllers/api/Issue.php

@@ -232,6 +232,23 @@ class Issue extends BaseController
             $res = IssueService::paginate($params);
             $res = IssueService::paginate($params);
             foreach ($res['data'] as &$item) {
             foreach ($res['data'] as &$item) {
                 $item['day'] = date("m-d H:i", strtotime($item['end_time']));
                 $item['day'] = date("m-d H:i", strtotime($item['end_time']));
+                if ($item['combo']) {
+                    $combo = explode(" ", $item['combo']);
+                    foreach($combo as &$v) {
+                        if (stripos($v, '尾') !== false) {
+                            $v = str_replace('尾', lang('尾'), $v);
+                        } elseif (stripos($v, '头') !== false) {
+                            $v = str_replace('头', lang('头'), $v);
+                        } elseif (stripos($v, '操') !== false) {
+                            $v = str_replace('操', lang('操'), $v);
+                        } else {
+                            $v = lang($v);
+                        }
+                    }
+                    $item['combo'] = $combo;
+                } else {
+                    $item['combo'] = [];
+                }
             }
             }
         } catch (ValidationException $e) {
         } catch (ValidationException $e) {
             return $this->error($e->validator->errors()->first());
             return $this->error($e->validator->errors()->first());

+ 17 - 15
app/Http/Controllers/api/NewPc.php

@@ -45,21 +45,6 @@ class NewPc extends BaseController
             $item['openCode1'] = $item['winning_array'][0];
             $item['openCode1'] = $item['winning_array'][0];
             $item['openCode2'] = $item['winning_array'][1];
             $item['openCode2'] = $item['winning_array'][1];
             $item['openCode3'] = $item['winning_array'][2];
             $item['openCode3'] = $item['winning_array'][2];
-            if ($item['combo']) {
-                $combo = explode(" ", $item['combo']);
-                foreach($combo as &$v) {
-                    if (stripos($v, '尾') !== false) {
-                        $v = str_replace('尾', lang('尾'), $v);
-                    } elseif (stripos($v, '头') !== false) {
-                        $v = str_replace('头', lang('头'), $v);
-                    } elseif (stripos($v, '操') !== false) {
-                        $v = str_replace('操', lang('操'), $v);
-                    } else {
-                        $v = lang($v);
-                    }
-                }
-                $item['combo'] = implode(" ", $combo);
-            }
         }
         }
         return $this->success($data);
         return $this->success($data);
     }
     }
@@ -259,6 +244,23 @@ class NewPc extends BaseController
                 ->orderByDesc('id')->get();
                 ->orderByDesc('id')->get();
             foreach ($res['data'] as &$item) {
             foreach ($res['data'] as &$item) {
                 $item['day'] = date("m-d H:i", strtotime($item['end_time']));
                 $item['day'] = date("m-d H:i", strtotime($item['end_time']));
+                if ($item['combo']) {
+                    $combo = explode(" ", $item['combo']);
+                    foreach($combo as &$v) {
+                        if (stripos($v, '尾') !== false) {
+                            $v = str_replace('尾', lang('尾'), $v);
+                        } elseif (stripos($v, '头') !== false) {
+                            $v = str_replace('头', lang('头'), $v);
+                        } elseif (stripos($v, '操') !== false) {
+                            $v = str_replace('操', lang('操'), $v);
+                        } else {
+                            $v = lang($v);
+                        }
+                    }
+                    $item['combo'] = $combo;
+                } else {
+                    $item['combo'] = [];
+                }
             }
             }
         } catch (ValidationException $e) {
         } catch (ValidationException $e) {
             return $this->error($e->validator->errors()->first());
             return $this->error($e->validator->errors()->first());

+ 29 - 1
lang/en/messages.php

@@ -369,5 +369,33 @@ return [
     '小' => 'Small',
     '小' => 'Small',
     '单' => 'Odd',
     '单' => 'Odd',
     '双' => 'Even',
     '双' => 'Even',
-
+    '大单' => 'Big Odd',
+    '大双' => 'Big Even',
+    '小单' => 'Small Odd',
+    '小双' => 'Small Even',
+    '极大' => 'Huge',
+    '极小' => 'Tiny',
+    '对子' => 'Pair',
+    '顺子' => 'Straight',
+    '豹子' => 'Triple',
+    '尾大' => 'Tail Big',
+    '尾小' => 'Tail Small',
+    '尾单' => 'Tail Odd',
+    '尾双' => 'Tail Even',
+    '尾大单' => 'Tail Big Odd',
+    '尾小单' => 'Tail Small Odd',
+    '尾大双' => 'Tail Big Even',
+    '尾小双' => 'Tail Small Even',
+    'A大' => 'A Big',
+    'A小' => 'A Small',
+    'A单' => 'A Odd',
+    'A双' => 'A Even',
+    'B大' => 'B Big',
+    'B小' => 'B Small',
+    'B单' => 'B Odd',
+    'B双' => 'B Even',
+    'C大' => 'C Big',
+    'C小' => 'C Small',
+    'C单' => 'C Odd',
+    'C双' => 'C Even',
 ];
 ];

+ 29 - 0
lang/vi/messages.php

@@ -369,4 +369,33 @@ return [
     '小' => 'Xỉu (Nhỏ)',
     '小' => 'Xỉu (Nhỏ)',
     '单' => 'Lẻ',
     '单' => 'Lẻ',
     '双' => 'Chẵn',
     '双' => 'Chẵn',
+    '大单' => 'Tài Lẻ',
+    '大双' => 'Tài Chẵn',
+    '小单' => 'Xỉu Lẻ',
+    '小双' => 'Xỉu Chẵn',
+    '极大' => 'Cực lớn',
+    '极小' => 'Cực nhỏ',
+    '对子' => 'Đôi',
+    '顺子' => 'Sảnh',
+    '豹子' => 'Bão (Ba con giống nhau)',
+    '尾大' => 'Đuôi Lớn',
+    '尾小' => 'Đuôi Nhỏ',
+    '尾单' => 'Đuôi Lẻ',
+    '尾双' => 'Đuôi Chẵn',
+    '尾大单' => 'Đuôi Lớn Lẻ',
+    '尾小单' => 'Đuôi Nhỏ Lẻ',
+    '尾大双' => 'Đuôi Lớn Chẵn',
+    '尾小双' => 'Đuôi Nhỏ Chẵn',
+    'A大' => 'A Lớn',
+    'A小' => 'A Nhỏ',
+    'A单' => 'A Lẻ',
+    'A双' => 'A Chẵn',
+    'B大' => 'B Lớn',
+    'B小' => 'B Nhỏ',
+    'B单' => 'B Lẻ',
+    'B双' => 'B Chẵn',
+    'C大' => 'C Lớn',
+    'C小' => 'C Nhỏ',
+    'C单' => 'C Lẻ',
+    'C双' => 'C Chẵn',
 ];
 ];

+ 29 - 0
lang/zh/messages.php

@@ -369,4 +369,33 @@ return [
     "小" => "小",
     "小" => "小",
     "单" => "单",
     "单" => "单",
     "双" => "双",
     "双" => "双",
+    '大单' => '大单',
+    '大双' => '大双',
+    '小单' => '小单',
+    '小双' => '小双',
+    '极大' => '极大',
+    '极小' => '极小',
+    '对子' => '对子',
+    '顺子' => '顺子',
+    '豹子' => '豹子',
+    '尾大' => '尾大',
+    '尾小' => '尾小',
+    '尾单' => '尾单',
+    '尾双' => '尾双',
+    '尾大单' => '尾大单',
+    '尾小单' => '尾小单',
+    '尾大双' => '尾大双',
+    '尾小双' => '尾小双',
+    'A大' => 'A大',
+    'A小' => 'A小',
+    'A单' => 'A单',
+    'A双' => 'A双',
+    'B大' => 'B大',
+    'B小' => 'B小',
+    'B单' => 'B单',
+    'B双' => 'B双',
+    'C大' => 'C大',
+    'C小' => 'C小',
+    'C单' => 'C单',
+    'C双' => 'C双',
 ];
 ];