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 @@
- +
- +
diff --git a/application/admin/view/zy/circle/comment/edit.html b/application/admin/view/zy/circle/comment/edit.html index da34963..5de7a1e 100644 --- a/application/admin/view/zy/circle/comment/edit.html +++ b/application/admin/view/zy/circle/comment/edit.html @@ -2,14 +2,14 @@
-
- +
+
- +
diff --git a/application/admin/view/zy/circle/likes/add.html b/application/admin/view/zy/circle/likes/add.html index 41d0186..988f5b5 100644 --- a/application/admin/view/zy/circle/likes/add.html +++ b/application/admin/view/zy/circle/likes/add.html @@ -3,7 +3,7 @@
- +
diff --git a/application/admin/view/zy/circle/likes/edit.html b/application/admin/view/zy/circle/likes/edit.html index b4607c3..093d2b8 100644 --- a/application/admin/view/zy/circle/likes/edit.html +++ b/application/admin/view/zy/circle/likes/edit.html @@ -3,7 +3,7 @@
- +
diff --git a/application/admin/view/zy/activity/add.html b/application/admin/view/zy/game/activity/add.html similarity index 98% rename from application/admin/view/zy/activity/add.html rename to application/admin/view/zy/game/activity/add.html index d755083..3d969e7 100644 --- a/application/admin/view/zy/activity/add.html +++ b/application/admin/view/zy/game/activity/add.html @@ -3,7 +3,7 @@
- +
diff --git a/application/admin/view/zy/activity/edit.html b/application/admin/view/zy/game/activity/edit.html similarity index 99% rename from application/admin/view/zy/activity/edit.html rename to application/admin/view/zy/game/activity/edit.html index 1e8d739..2f28e60 100644 --- a/application/admin/view/zy/activity/edit.html +++ b/application/admin/view/zy/game/activity/edit.html @@ -3,7 +3,7 @@
-
diff --git a/application/admin/view/zy/game/index.html b/application/admin/view/zy/game/activity/index.html similarity index 68% rename from application/admin/view/zy/game/index.html rename to application/admin/view/zy/game/activity/index.html index 18f3617..62692fa 100644 --- a/application/admin/view/zy/game/index.html +++ b/application/admin/view/zy/game/activity/index.html @@ -7,9 +7,9 @@ diff --git a/application/admin/view/zy/game/add.html b/application/admin/view/zy/game/game/add.html similarity index 97% rename from application/admin/view/zy/game/add.html rename to application/admin/view/zy/game/game/add.html index 3803ef2..791164e 100644 --- a/application/admin/view/zy/game/add.html +++ b/application/admin/view/zy/game/game/add.html @@ -3,13 +3,13 @@
- +
- +
diff --git a/application/admin/view/zy/game/edit.html b/application/admin/view/zy/game/game/edit.html similarity index 97% rename from application/admin/view/zy/game/edit.html rename to application/admin/view/zy/game/game/edit.html index 7dbefdb..2f7c1b2 100644 --- a/application/admin/view/zy/game/edit.html +++ b/application/admin/view/zy/game/game/edit.html @@ -3,13 +3,13 @@
- +
- +
diff --git a/application/admin/view/zy/activity/index.html b/application/admin/view/zy/game/game/index.html similarity index 70% rename from application/admin/view/zy/activity/index.html rename to application/admin/view/zy/game/game/index.html index 525ee44..c60e686 100644 --- a/application/admin/view/zy/activity/index.html +++ b/application/admin/view/zy/game/game/index.html @@ -7,9 +7,9 @@ diff --git a/application/admin/view/zy/game_join/add.html b/application/admin/view/zy/game/game_join/add.html similarity index 91% rename from application/admin/view/zy/game_join/add.html rename to application/admin/view/zy/game/game_join/add.html index 7dad5ab..b133d40 100644 --- a/application/admin/view/zy/game_join/add.html +++ b/application/admin/view/zy/game/game_join/add.html @@ -3,13 +3,13 @@
- +
- +
diff --git a/application/admin/view/zy/game_join/edit.html b/application/admin/view/zy/game/game_join/edit.html similarity index 89% rename from application/admin/view/zy/game_join/edit.html rename to application/admin/view/zy/game/game_join/edit.html index 29be8db..db34718 100644 --- a/application/admin/view/zy/game_join/edit.html +++ b/application/admin/view/zy/game/game_join/edit.html @@ -3,13 +3,13 @@
- +
- +
diff --git a/application/admin/view/zy/game_join/index.html b/application/admin/view/zy/game/game_join/index.html similarity index 72% rename from application/admin/view/zy/game_join/index.html rename to application/admin/view/zy/game/game_join/index.html index 17d4e97..f3f6889 100644 --- a/application/admin/view/zy/game_join/index.html +++ b/application/admin/view/zy/game/game_join/index.html @@ -7,9 +7,9 @@
- - - + + + @@ -17,8 +17,8 @@
diff --git a/application/admin/view/zy/game_match/add.html b/application/admin/view/zy/game/game_match/add.html similarity index 95% rename from application/admin/view/zy/game_match/add.html rename to application/admin/view/zy/game/game_match/add.html index 2410d5f..c2f47b4 100644 --- a/application/admin/view/zy/game_match/add.html +++ b/application/admin/view/zy/game/game_match/add.html @@ -15,13 +15,13 @@
- +
- +
diff --git a/application/admin/view/zy/game_match/edit.html b/application/admin/view/zy/game/game_match/edit.html similarity index 94% rename from application/admin/view/zy/game_match/edit.html rename to application/admin/view/zy/game/game_match/edit.html index 350aeb7..a6928d6 100644 --- a/application/admin/view/zy/game_match/edit.html +++ b/application/admin/view/zy/game/game_match/edit.html @@ -15,13 +15,13 @@
- +
- +
diff --git a/application/admin/view/zy/game_match/index.html b/application/admin/view/zy/game/game_match/index.html similarity index 69% rename from application/admin/view/zy/game_match/index.html rename to application/admin/view/zy/game/game_match/index.html index af91c00..e85e3bd 100644 --- a/application/admin/view/zy/game_match/index.html +++ b/application/admin/view/zy/game/game_match/index.html @@ -7,9 +7,9 @@
- @@ -17,8 +17,8 @@
diff --git a/application/admin/view/zy/participant/add.html b/application/admin/view/zy/game/participant/add.html similarity index 98% rename from application/admin/view/zy/participant/add.html rename to application/admin/view/zy/game/participant/add.html index a0ef011..bde8762 100644 --- a/application/admin/view/zy/participant/add.html +++ b/application/admin/view/zy/game/participant/add.html @@ -41,7 +41,7 @@
- +
diff --git a/application/admin/view/zy/participant/edit.html b/application/admin/view/zy/game/participant/edit.html similarity index 97% rename from application/admin/view/zy/participant/edit.html rename to application/admin/view/zy/game/participant/edit.html index e20db6e..8e31f7c 100644 --- a/application/admin/view/zy/participant/edit.html +++ b/application/admin/view/zy/game/participant/edit.html @@ -41,7 +41,7 @@
- +
diff --git a/application/admin/view/zy/participant/index.html b/application/admin/view/zy/game/participant/index.html similarity index 68% rename from application/admin/view/zy/participant/index.html rename to application/admin/view/zy/game/participant/index.html index 20a1135..5de3aac 100644 --- a/application/admin/view/zy/participant/index.html +++ b/application/admin/view/zy/game/participant/index.html @@ -7,9 +7,9 @@
- + @@ -17,8 +17,8 @@
diff --git a/public/assets/js/backend/zy/activity.js b/public/assets/js/backend/zy/game/activity.js similarity index 92% rename from public/assets/js/backend/zy/activity.js rename to public/assets/js/backend/zy/game/activity.js index cc12396..59c0ac9 100644 --- a/public/assets/js/backend/zy/activity.js +++ b/public/assets/js/backend/zy/game/activity.js @@ -5,12 +5,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin // 初始化表格参数配置 Table.api.init({ extend: { - index_url: 'zy/activity/index' + location.search, - add_url: 'zy/activity/add', - edit_url: 'zy/activity/edit', - del_url: 'zy/activity/del', - multi_url: 'zy/activity/multi', - import_url: 'zy/activity/import', + index_url: 'zy/game/activity/index' + location.search, + add_url: 'zy/game/activity/add', + edit_url: 'zy/game/activity/edit', + del_url: 'zy/game/activity/del', + multi_url: 'zy/game/activity/multi', + import_url: 'zy/game/activity/import', table: 'zy_activity', } }); diff --git a/public/assets/js/backend/zy/game.js b/public/assets/js/backend/zy/game/game.js similarity index 93% rename from public/assets/js/backend/zy/game.js rename to public/assets/js/backend/zy/game/game.js index 8115094..c49bfc8 100644 --- a/public/assets/js/backend/zy/game.js +++ b/public/assets/js/backend/zy/game/game.js @@ -5,12 +5,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin // 初始化表格参数配置 Table.api.init({ extend: { - index_url: 'zy/game/index' + location.search, - add_url: 'zy/game/add', - edit_url: 'zy/game/edit', - del_url: 'zy/game/del', - multi_url: 'zy/game/multi', - import_url: 'zy/game/import', + index_url: 'zy/game/game/index' + location.search, + add_url: 'zy/game/game/add', + edit_url: 'zy/game/game/edit', + del_url: 'zy/game/game/del', + multi_url: 'zy/game/game/multi', + import_url: 'zy/game/game/import', table: 'zy_game', } }); diff --git a/public/assets/js/backend/zy/game_join.js b/public/assets/js/backend/zy/game/game_join.js similarity index 86% rename from public/assets/js/backend/zy/game_join.js rename to public/assets/js/backend/zy/game/game_join.js index 96060d7..6ba4dd1 100644 --- a/public/assets/js/backend/zy/game_join.js +++ b/public/assets/js/backend/zy/game/game_join.js @@ -5,12 +5,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin // 初始化表格参数配置 Table.api.init({ extend: { - index_url: 'zy/game_join/index' + location.search, - add_url: 'zy/game_join/add', - edit_url: 'zy/game_join/edit', - del_url: 'zy/game_join/del', - multi_url: 'zy/game_join/multi', - import_url: 'zy/game_join/import', + index_url: 'zy/game/game_join/index' + location.search, + add_url: 'zy/game/game_join/add', + edit_url: 'zy/game/game_join/edit', + del_url: 'zy/game/game_join/del', + multi_url: 'zy/game/game_join/multi', + import_url: 'zy/game/game_join/import', table: 'zy_game_join', } }); diff --git a/public/assets/js/backend/zy/game_match.js b/public/assets/js/backend/zy/game/game_match.js similarity index 90% rename from public/assets/js/backend/zy/game_match.js rename to public/assets/js/backend/zy/game/game_match.js index fe68ed7..6c36303 100644 --- a/public/assets/js/backend/zy/game_match.js +++ b/public/assets/js/backend/zy/game/game_match.js @@ -5,12 +5,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin // 初始化表格参数配置 Table.api.init({ extend: { - index_url: 'zy/game_match/index' + location.search, - add_url: 'zy/game_match/add', - edit_url: 'zy/game_match/edit', - del_url: 'zy/game_match/del', - multi_url: 'zy/game_match/multi', - import_url: 'zy/game_match/import', + index_url: 'zy/game/game_match/index' + location.search, + add_url: 'zy/game/game_match/add', + edit_url: 'zy/game/game_match/edit', + del_url: 'zy/game/game_match/del', + multi_url: 'zy/game/game_match/multi', + import_url: 'zy/game/game_match/import', table: 'zy_game_match', } }); diff --git a/public/assets/js/backend/zy/participant.js b/public/assets/js/backend/zy/game/participant.js similarity index 89% rename from public/assets/js/backend/zy/participant.js rename to public/assets/js/backend/zy/game/participant.js index ba199db..244ce5a 100644 --- a/public/assets/js/backend/zy/participant.js +++ b/public/assets/js/backend/zy/game/participant.js @@ -5,12 +5,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin // 初始化表格参数配置 Table.api.init({ extend: { - index_url: 'zy/participant/index' + location.search, - add_url: 'zy/participant/add', - edit_url: 'zy/participant/edit', - del_url: 'zy/participant/del', - multi_url: 'zy/participant/multi', - import_url: 'zy/participant/import', + index_url: 'zy/game/participant/index' + location.search, + add_url: 'zy/game/participant/add', + edit_url: 'zy/game/participant/edit', + del_url: 'zy/game/participant/del', + multi_url: 'zy/game/participant/multi', + import_url: 'zy/game/participant/import', table: 'zy_participant', } });