pdkj
/
guessing-miniprogram
generated from liutk/owl-admin-base
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整

main
liutk 2024-09-01 15:18:20 +08:00
parent 8f5047f572
commit af84bc65cb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Admin/Controllers/ActivityController.php
View File

@ -341,9 +341,9 @@ class ActivityController extends AdminController
public function finish(Activity $activity) public function finish(Activity $activity)
{ {
//若存在未公布结果的比赛场次，无法结算； //若存在未公布结果的比赛场次，无法结算；
if($activity->games()->where('state', '<>', 2)->exists()){ // if($activity->games()->where('state', '<>', 2)->exists()){
return $this->response()->fail('该活动存在未公布结果的竞猜场次，请先公布结果'); // return $this->response()->fail('该活动存在未公布结果的竞猜场次，请先公布结果');
} // }
$res = $this->service->finishActivity($activity); $res = $this->service->finishActivity($activity);
return $this->autoResponse($res, '结算'); return $this->autoResponse($res, '结算');
} }

4
app/Admin/Controllers/HomeController.php
View File

@ -212,9 +212,9 @@ tooltip: { trigger: 'axis' },
xAxis: { type: 'category', boundaryGap: false, data: ['".implode("','", $days)."']}, xAxis: { type: 'category', boundaryGap: false, data: ['".implode("','", $days)."']},
yAxis: { type: 'value' }, yAxis: { type: 'value' },
grid:{ left: '7%', right:'3%', top: 60, bottom: 30, }, grid:{ left: '7%', right:'3%', top: 60, bottom: 30, },
legend: { data: ['访问量','注册量'] }, legend: { data: ['新增访问量','注册量'] },
series: [ series: [
{ name: '访问量', data: {$dayCreateUser}, type: 'line', areaStyle: {}, smooth: true, symbol: 'none', }, { name: '新增访问量', data: {$dayCreateUser}, type: 'line', areaStyle: {}, smooth: true, symbol: 'none', },
{ name:'注册量', data: {$dayBindUser}, type: 'line', areaStyle: {}, smooth: true, symbol: 'none', }, { name:'注册量', data: {$dayBindUser}, type: 'line', areaStyle: {}, smooth: true, symbol: 'none', },
]}"); ]}");