|
@@ -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());
|