diff --git a/application/admin/controller/zy/Activity.php b/application/admin/controller/zy/game/Activity.php similarity index 94% rename from application/admin/controller/zy/Activity.php rename to application/admin/controller/zy/game/Activity.php index 166fa0f..578f88b 100644 --- a/application/admin/controller/zy/Activity.php +++ b/application/admin/controller/zy/game/Activity.php @@ -1,6 +1,6 @@ model = new \app\admin\model\zy\Activity; + $this->model = new \app\admin\model\zy\game\Activity; } diff --git a/application/admin/controller/zy/Game.php b/application/admin/controller/zy/game/Game.php similarity index 95% rename from application/admin/controller/zy/Game.php rename to application/admin/controller/zy/game/Game.php index 37d5e56..9673390 100644 --- a/application/admin/controller/zy/Game.php +++ b/application/admin/controller/zy/game/Game.php @@ -1,6 +1,6 @@ model = new \app\admin\model\zy\Game; + $this->model = new \app\admin\model\zy\game\Game; } diff --git a/application/admin/controller/zy/GameJoin.php b/application/admin/controller/zy/game/GameJoin.php similarity index 95% rename from application/admin/controller/zy/GameJoin.php rename to application/admin/controller/zy/game/GameJoin.php index be5f38a..50706fc 100644 --- a/application/admin/controller/zy/GameJoin.php +++ b/application/admin/controller/zy/game/GameJoin.php @@ -1,6 +1,6 @@ model = new \app\admin\model\zy\GameJoin; + $this->model = new \app\admin\model\zy\game\GameJoin; } diff --git a/application/admin/controller/zy/GameMatch.php b/application/admin/controller/zy/game/GameMatch.php similarity index 94% rename from application/admin/controller/zy/GameMatch.php rename to application/admin/controller/zy/game/GameMatch.php index 047bb15..c9a52d9 100644 --- a/application/admin/controller/zy/GameMatch.php +++ b/application/admin/controller/zy/game/GameMatch.php @@ -1,6 +1,6 @@ model = new \app\admin\model\zy\GameMatch; + $this->model = new \app\admin\model\zy\game\GameMatch; } diff --git a/application/admin/controller/zy/Participant.php b/application/admin/controller/zy/game/Participant.php similarity index 94% rename from application/admin/controller/zy/Participant.php rename to application/admin/controller/zy/game/Participant.php index 5ca75a7..4947a71 100644 --- a/application/admin/controller/zy/Participant.php +++ b/application/admin/controller/zy/game/Participant.php @@ -1,6 +1,6 @@ model = new \app\admin\model\zy\Participant; + $this->model = new \app\admin\model\zy\game\Participant; } diff --git a/application/admin/lang/zh-cn/zy/circle/circle.php b/application/admin/lang/zh-cn/zy/circle/circle.php index dc49e12..6e89086 100644 --- a/application/admin/lang/zh-cn/zy/circle/circle.php +++ b/application/admin/lang/zh-cn/zy/circle/circle.php @@ -1,8 +1,8 @@ '俱乐部id', - 'User_id' => '用户id', + 'Club_id' => '俱乐部', + 'User_id' => '用户', 'Username' => '用户名称', 'Avatar' => '头像', 'Gender' => '性别', diff --git a/application/admin/lang/zh-cn/zy/circle/comment.php b/application/admin/lang/zh-cn/zy/circle/comment.php index 2181655..c2403f4 100644 --- a/application/admin/lang/zh-cn/zy/circle/comment.php +++ b/application/admin/lang/zh-cn/zy/circle/comment.php @@ -1,9 +1,9 @@ '影圈id', - 'Pid' => '回复评论id', - 'User_id' => '用户id', + 'Circle_id' => '影圈', + 'Pid' => '回复评论', + 'User_id' => '用户', 'Username' => '用户名称', 'Avatar' => '用户头像', 'Gender' => '性别', diff --git a/application/admin/lang/zh-cn/zy/circle/likes.php b/application/admin/lang/zh-cn/zy/circle/likes.php index 20b4c7e..fcf2cce 100644 --- a/application/admin/lang/zh-cn/zy/circle/likes.php +++ b/application/admin/lang/zh-cn/zy/circle/likes.php @@ -1,8 +1,8 @@ '影圈id', - 'User_id' => '用户id', + 'Circle_id' => '影圈', + 'User_id' => '用户', 'Username' => '用户名称', 'Avatar' => '用户头像', 'Gender' => '性别', diff --git a/application/admin/lang/zh-cn/zy/activity.php b/application/admin/lang/zh-cn/zy/game/activity.php similarity index 100% rename from application/admin/lang/zh-cn/zy/activity.php rename to application/admin/lang/zh-cn/zy/game/activity.php diff --git a/application/admin/lang/zh-cn/zy/game.php b/application/admin/lang/zh-cn/zy/game/game.php similarity index 100% rename from application/admin/lang/zh-cn/zy/game.php rename to application/admin/lang/zh-cn/zy/game/game.php diff --git a/application/admin/lang/zh-cn/zy/game_join.php b/application/admin/lang/zh-cn/zy/game/game_join.php similarity index 100% rename from application/admin/lang/zh-cn/zy/game_join.php rename to application/admin/lang/zh-cn/zy/game/game_join.php diff --git a/application/admin/lang/zh-cn/zy/game_match.php b/application/admin/lang/zh-cn/zy/game/game_match.php similarity index 100% rename from application/admin/lang/zh-cn/zy/game_match.php rename to application/admin/lang/zh-cn/zy/game/game_match.php diff --git a/application/admin/lang/zh-cn/zy/participant.php b/application/admin/lang/zh-cn/zy/game/participant.php similarity index 100% rename from application/admin/lang/zh-cn/zy/participant.php rename to application/admin/lang/zh-cn/zy/game/participant.php diff --git a/application/admin/model/zy/Activity.php b/application/admin/model/zy/game/Activity.php similarity index 71% rename from application/admin/model/zy/Activity.php rename to application/admin/model/zy/game/Activity.php index b1b5384..5580701 100644 --- a/application/admin/model/zy/Activity.php +++ b/application/admin/model/zy/game/Activity.php @@ -1,6 +1,6 @@ belongsTo('Stadium', 'gym_id', 'id', [], 'LEFT')->setEagerlyType(0); + return $this->belongsTo('app\admin\model\zy\Stadium', 'gym_id', 'id', [], 'LEFT')->setEagerlyType(0); } public function club() { - return $this->belongsTo('Club', 'club_id', 'id', [], 'LEFT')->setEagerlyType(0); + return $this->belongsTo('app\admin\model\zy\Club', 'club_id', 'id', [], 'LEFT')->setEagerlyType(0); } diff --git a/application/admin/model/zy/Game.php b/application/admin/model/zy/game/Game.php similarity index 75% rename from application/admin/model/zy/Game.php rename to application/admin/model/zy/game/Game.php index 40e150c..1ea5b50 100644 --- a/application/admin/model/zy/Game.php +++ b/application/admin/model/zy/game/Game.php @@ -1,6 +1,6 @@ belongsTo('Stadium', 'gym_id', 'id', [], 'LEFT')->setEagerlyType(0); + return $this->belongsTo('app\admin\model\zy\Stadium', 'gym_id', 'id', [], 'LEFT')->setEagerlyType(0); } public function club() { - return $this->belongsTo('Club', 'club_id', 'id', [], 'LEFT')->setEagerlyType(0); + return $this->belongsTo('app\admin\model\zy\Club', 'club_id', 'id', [], 'LEFT')->setEagerlyType(0); } diff --git a/application/admin/model/zy/GameJoin.php b/application/admin/model/zy/game/GameJoin.php similarity index 96% rename from application/admin/model/zy/GameJoin.php rename to application/admin/model/zy/game/GameJoin.php index 9be2413..c1ed418 100644 --- a/application/admin/model/zy/GameJoin.php +++ b/application/admin/model/zy/game/GameJoin.php @@ -1,6 +1,6 @@ belongsTo('Stadium', 'gym_id', 'id', [], 'LEFT')->setEagerlyType(0); + return $this->belongsTo('app\admin\model\zy\Stadium', 'gym_id', 'id', [], 'LEFT')->setEagerlyType(0); } public function club() { - return $this->belongsTo('Club', 'club_id', 'id', [], 'LEFT')->setEagerlyType(0); + return $this->belongsTo('app\admin\model\zy\Club', 'club_id', 'id', [], 'LEFT')->setEagerlyType(0); } diff --git a/application/admin/model/zy/Participant.php b/application/admin/model/zy/game/Participant.php similarity index 83% rename from application/admin/model/zy/Participant.php rename to application/admin/model/zy/game/Participant.php index 863585f..a980757 100644 --- a/application/admin/model/zy/Participant.php +++ b/application/admin/model/zy/game/Participant.php @@ -1,6 +1,6 @@ belongsTo('app\admin\model\zy\GameJoin', 'game_join_id', 'id', [], 'LEFT')->setEagerlyType(0); + return $this->belongsTo('GameJoin', 'game_join_id', 'id', [], 'LEFT')->setEagerlyType(0); } diff --git a/application/admin/validate/zy/Activity.php b/application/admin/validate/zy/game/Activity.php similarity index 89% rename from application/admin/validate/zy/Activity.php rename to application/admin/validate/zy/game/Activity.php index de83def..e9f350e 100644 --- a/application/admin/validate/zy/Activity.php +++ b/application/admin/validate/zy/game/Activity.php @@ -1,6 +1,6 @@