diff --git a/addons/shopro/controller/zy/Club.php b/addons/shopro/controller/zy/Club.php index 29598cd..cf6a07e 100644 --- a/addons/shopro/controller/zy/Club.php +++ b/addons/shopro/controller/zy/Club.php @@ -71,6 +71,24 @@ class Club extends Base $this->success('Success', ['list' => $list, 'count' => $res->total()]); } + public function view() + { + $model = $this->model->get($this->request->param('id'))->toarray(); + + if (empty($model)) { + $this->error(__('No rows were found')); + } + $menber = Menber::alias('m') + ->join([User::$tableName => 'u'], 'u.id = m.user_id') + ->where('club_id', $model['id'])->field('gender,count(*) as num')->group('u.gender') + ->column('count(*) as num','gender'); + $model['gender0'] = $menber[0] ?? 0; + $model['gender1'] = $menber[1] ?? 0; + $this->model->where('id', $model['id'])->setInc('attention'); + + $this->success('Success', $model); + } + public function add() { $result = false; diff --git a/addons/shopro/controller/zy/Game.php b/addons/shopro/controller/zy/Game.php index 76dd7f3..382fa22 100644 --- a/addons/shopro/controller/zy/Game.php +++ b/addons/shopro/controller/zy/Game.php @@ -63,6 +63,7 @@ class Game extends Base $this->error(__('No rows were found')); } + $this->model->where('id', $model['id'])->setInc('attention'); $model['cost'] = json_decode($model['cost'] ?? '[]', true); $model['referee'] = explode(',', $model['referee']); diff --git a/application/admin/lang/zh-cn/zy/game/activity.php b/application/admin/lang/zh-cn/zy/game/activity.php index 9832eee..ffd9f19 100644 --- a/application/admin/lang/zh-cn/zy/game/activity.php +++ b/application/admin/lang/zh-cn/zy/game/activity.php @@ -66,10 +66,10 @@ return [ "Type0" => "一次性", "Type1" => "周期性", - "Status0" => "未开始", + "Status0" => "发布", "Status1" => "报名中", - "Status2" => "进行中", - "Status3" => "已结束", + "Status2" => "比赛中", + "Status3" => "结束", "Week0" => "周日", "Week1" => "周一", diff --git a/thinkphp/helper.php b/thinkphp/helper.php index a43f6be..e0437be 100644 --- a/thinkphp/helper.php +++ b/thinkphp/helper.php @@ -593,13 +593,14 @@ if (!function_exists('dd')) { */ function dd(...$params) { - echo '
';
+        echo '
+        ';
         foreach ($params as $p) {
             print_r($p);
             echo '
-            
'; + '; } - echo '
'; + // echo ''; die; } } @@ -610,9 +611,10 @@ if (!function_exists('getsql')) { */ function getsql($query) { - echo '
';
+        echo '
+        ';
         print_r($query->fetchSql()->select());
-        echo '
'; + // echo ''; die; } }