root 3 лет назад
Родитель
Сommit
22a58e1090
100 измененных файлов с 10 добавлено и 10 удалено
  1. 0 0
      .gitignore
  2. 0 0
      LICENSE.md
  3. 0 0
      README.md
  4. 0 0
      REGION_insert.sql
  5. 0 0
      Vagrantfile
  6. 0 0
      ak-upload-server/ar.upload.ming.conf
  7. 0 0
      ak-upload-server/auth.dev.lua
  8. 0 0
      ak-upload-server/auth.prod.lua
  9. 0 0
      ak-upload-server/server.dev.py
  10. 0 0
      ak-upload-server/server.prod.py
  11. 0 0
      ak-upload-server/token.php
  12. 0 0
      ak-upload-server/upload.py
  13. 0 0
      ak-upload-server/upload_img_filter.conf
  14. 0 0
      ak-upload-server/upload_img_filter.dev.conf
  15. 0 0
      ak-upload-server/upload_img_filter.prod.conf
  16. 0 0
      ak-upload-server/venv/bin/activate
  17. 0 0
      ak-upload-server/venv/bin/activate.csh
  18. 0 0
      ak-upload-server/venv/bin/activate.fish
  19. 0 0
      ak-upload-server/venv/bin/easy_install
  20. 0 0
      ak-upload-server/venv/bin/easy_install-3.6
  21. 0 0
      ak-upload-server/venv/bin/pip
  22. 0 0
      ak-upload-server/venv/bin/pip3
  23. 0 0
      ak-upload-server/venv/bin/pip3.6
  24. 0 0
      ak-upload-server/venv/bin/python
  25. 0 0
      ak-upload-server/venv/bin/python3
  26. 0 0
      ak-upload-server/venv/bin/python3.6
  27. 0 0
      ak-upload-server/venv/lib/python3.6/site-packages/easy-install.pth
  28. 0 0
      ak-upload-server/venv/lib/python3.6/site-packages/setuptools-28.8.0-py3.6.egg
  29. 0 0
      ak-upload-server/venv/lib/python3.6/site-packages/setuptools.pth
  30. 0 0
      ak-upload-server/venv/pyvenv.cfg
  31. 0 0
      backend/assets/AppAsset.php
  32. 0 0
      backend/codeception.yml
  33. 0 0
      backend/config/.gitignore
  34. 0 0
      backend/config/bootstrap.php
  35. 0 0
      backend/config/main-local.php
  36. 0 0
      backend/config/main.php
  37. 0 0
      backend/config/params.php
  38. 0 0
      backend/config/test.php
  39. 0 0
      backend/controllers/SiteController.php
  40. 0 0
      backend/controllers/TestController.php
  41. 0 0
      backend/models/.gitkeep
  42. 0 0
      backend/runtime/.gitignore
  43. 0 0
      backend/tests/_bootstrap.php
  44. 0 0
      backend/tests/_data/.gitignore
  45. 0 0
      backend/tests/_data/login_data.php
  46. 0 0
      backend/tests/_output/.gitignore
  47. 0 0
      backend/tests/_support/.gitignore
  48. 0 0
      backend/tests/_support/FunctionalTester.php
  49. 0 0
      backend/tests/_support/UnitTester.php
  50. 0 0
      backend/tests/functional.suite.yml
  51. 0 0
      backend/tests/functional/LoginCest.php
  52. 0 0
      backend/tests/functional/_bootstrap.php
  53. 0 0
      backend/tests/unit.suite.yml
  54. 0 0
      backend/tests/unit/_bootstrap.php
  55. 0 0
      backend/views/layouts/main.php
  56. 0 0
      backend/views/site/addDecTest.php
  57. 0 0
      backend/views/site/error.php
  58. 0 0
      backend/views/site/index.php
  59. 0 0
      backend/views/site/login.php
  60. 0 0
      backend/web/.gitignore
  61. 0 0
      backend/web/assets/.gitignore
  62. 0 0
      backend/web/css/site.css
  63. 0 0
      backend/web/favicon.ico
  64. 0 0
      backend/web/index.php
  65. 0 0
      backend/web/robots.txt
  66. 0 0
      backend/web/test.php
  67. 0 0
      backendApi/config/bootstrap.php
  68. 0 0
      backendApi/config/main.php
  69. 10 10
      backendApi/config/menu.php
  70. 0 0
      backendApi/config/params.php
  71. 0 0
      backendApi/config/urlManagerRules.php
  72. 0 0
      backendApi/modules/v1/Module.php
  73. 0 0
      backendApi/modules/v1/components/UserAuth.php
  74. 0 0
      backendApi/modules/v1/controllers/AdController.php
  75. 0 0
      backendApi/modules/v1/controllers/AdminController.php
  76. 0 0
      backendApi/modules/v1/controllers/ArticleController.php
  77. 0 0
      backendApi/modules/v1/controllers/AtlasController.php
  78. 0 0
      backendApi/modules/v1/controllers/BaseController.php
  79. 0 0
      backendApi/modules/v1/controllers/BonusController.php
  80. 0 0
      backendApi/modules/v1/controllers/ConfigController.php
  81. 0 0
      backendApi/modules/v1/controllers/DashboardController.php
  82. 0 0
      backendApi/modules/v1/controllers/FileController.php
  83. 0 0
      backendApi/modules/v1/controllers/FinanceController.php
  84. 0 0
      backendApi/modules/v1/controllers/LogController.php
  85. 0 0
      backendApi/modules/v1/controllers/MessageController.php
  86. 0 0
      backendApi/modules/v1/controllers/OauthController.php
  87. 0 0
      backendApi/modules/v1/controllers/ReconsumeController.php
  88. 0 0
      backendApi/modules/v1/controllers/ReportController.php
  89. 0 0
      backendApi/modules/v1/controllers/ShopController.php
  90. 0 0
      backendApi/modules/v1/controllers/SiteController.php
  91. 0 0
      backendApi/modules/v1/controllers/UserController.php
  92. 0 0
      backendApi/modules/v1/models/Admin.php
  93. 0 0
      backendApi/modules/v1/models/AdminForm.php
  94. 0 0
      backendApi/modules/v1/models/AdminRole.php
  95. 0 0
      backendApi/modules/v1/models/AdminRoleForm.php
  96. 0 0
      backendApi/modules/v1/models/AdminToken.php
  97. 0 0
      backendApi/modules/v1/models/LoginForm.php
  98. 0 0
      backendApi/modules/v1/models/User.php
  99. 0 0
      backendApi/modules/v1/models/exportForms/AtlasExportForm.php
  100. 0 0
      backendApi/modules/v1/models/exportForms/BaseExportForm.php

+ 0 - 0
.gitignore


+ 0 - 0
LICENSE.md



+ 0 - 0
REGION_insert.sql


+ 0 - 0
Vagrantfile


+ 0 - 0
ak-upload-server/ar.upload.ming.conf


+ 0 - 0
ak-upload-server/auth.dev.lua


+ 0 - 0
ak-upload-server/auth.prod.lua


+ 0 - 0
ak-upload-server/server.dev.py


+ 0 - 0
ak-upload-server/server.prod.py


+ 0 - 0
ak-upload-server/token.php


+ 0 - 0
ak-upload-server/upload.py


+ 0 - 0
ak-upload-server/upload_img_filter.conf


+ 0 - 0
ak-upload-server/upload_img_filter.dev.conf


+ 0 - 0
ak-upload-server/upload_img_filter.prod.conf


+ 0 - 0
ak-upload-server/venv/bin/activate


+ 0 - 0
ak-upload-server/venv/bin/activate.csh


+ 0 - 0
ak-upload-server/venv/bin/activate.fish


+ 0 - 0
ak-upload-server/venv/bin/easy_install


+ 0 - 0
ak-upload-server/venv/bin/easy_install-3.6


+ 0 - 0
ak-upload-server/venv/bin/pip


+ 0 - 0
ak-upload-server/venv/bin/pip3


+ 0 - 0
ak-upload-server/venv/bin/pip3.6


+ 0 - 0
ak-upload-server/venv/bin/python


+ 0 - 0
ak-upload-server/venv/bin/python3


+ 0 - 0
ak-upload-server/venv/bin/python3.6


+ 0 - 0
ak-upload-server/venv/lib/python3.6/site-packages/easy-install.pth


+ 0 - 0
ak-upload-server/venv/lib/python3.6/site-packages/setuptools-28.8.0-py3.6.egg


+ 0 - 0
ak-upload-server/venv/lib/python3.6/site-packages/setuptools.pth


+ 0 - 0
ak-upload-server/venv/pyvenv.cfg


+ 0 - 0
backend/assets/AppAsset.php


+ 0 - 0
backend/codeception.yml


+ 0 - 0
backend/config/.gitignore


+ 0 - 0
backend/config/bootstrap.php


+ 0 - 0
backend/config/main-local.php


+ 0 - 0
backend/config/main.php


+ 0 - 0
backend/config/params.php


+ 0 - 0
backend/config/test.php


+ 0 - 0
backend/controllers/SiteController.php


+ 0 - 0
backend/controllers/TestController.php


+ 0 - 0
backend/models/.gitkeep


+ 0 - 0
backend/runtime/.gitignore


+ 0 - 0
backend/tests/_bootstrap.php


+ 0 - 0
backend/tests/_data/.gitignore


+ 0 - 0
backend/tests/_data/login_data.php


+ 0 - 0
backend/tests/_output/.gitignore


+ 0 - 0
backend/tests/_support/.gitignore


+ 0 - 0
backend/tests/_support/FunctionalTester.php


+ 0 - 0
backend/tests/_support/UnitTester.php


+ 0 - 0
backend/tests/functional.suite.yml


+ 0 - 0
backend/tests/functional/LoginCest.php


+ 0 - 0
backend/tests/functional/_bootstrap.php


+ 0 - 0
backend/tests/unit.suite.yml


+ 0 - 0
backend/tests/unit/_bootstrap.php


+ 0 - 0
backend/views/layouts/main.php


+ 0 - 0
backend/views/site/addDecTest.php


+ 0 - 0
backend/views/site/error.php


+ 0 - 0
backend/views/site/index.php


+ 0 - 0
backend/views/site/login.php


+ 0 - 0
backend/web/.gitignore


+ 0 - 0
backend/web/assets/.gitignore


+ 0 - 0
backend/web/css/site.css


+ 0 - 0
backend/web/favicon.ico


+ 0 - 0
backend/web/index.php


+ 0 - 0
backend/web/robots.txt


+ 0 - 0
backend/web/test.php


+ 0 - 0
backendApi/config/bootstrap.php


+ 0 - 0
backendApi/config/main.php


+ 10 - 10
backendApi/config/menu.php

@@ -270,11 +270,11 @@ return [
             ['name'=>'Performance sheet', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-order', 'routePath'=>'bonus/perf-order', 'show'=>1,],//业绩单
             ['name'=>'业绩单导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-order-export', 'routePath'=>'bonus/perf-order-export', 'show'=>0,],
 //            ['name'=>'会员实时业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'real-time-perf', 'routePath'=>'bonus/real-time-perf', 'show'=>1,],
-            ['name'=>'期业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-period-list', 'routePath'=>'bonus/perf-period-list', 'show'=>1,],
+            ['name'=>'Interim performance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-period-list', 'routePath'=>'bonus/perf-period-list', 'show'=>1,],//期业绩
             ['name'=>'期业绩导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-period-list-export', 'routePath'=>'bonus/perf-period-list-export', 'show'=>0,],
-            ['name'=>'月业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-month', 'routePath'=>'bonus/perf-month', 'show'=>1,],
+            ['name'=>'Monthly performance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-month', 'routePath'=>'bonus/perf-month', 'show'=>1,],//月业绩
             ['name'=>'月业绩导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-month-export', 'routePath'=>'bonus/perf-month-export', 'show'=>0,],
-            ['name'=>'月积分', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'score-month', 'routePath'=>'bonus/score-month', 'show'=>1,],
+            ['name'=>'score-month', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'score-month', 'routePath'=>'bonus/score-month', 'show'=>1,],//月积分
             ['name'=>'月积分导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'score-month-export', 'routePath'=>'bonus/score-month-export', 'show'=>0,],
         ]
     ],
@@ -384,7 +384,7 @@ return [
 //        ]
 //    ],
     'file'=>[
-        'name'=>'文件管理',
+        'name'=>'file management',//文件管理
         'class' => '',
         'icon'=>'el-icon-files',
         'controller'=>'file',
@@ -392,7 +392,7 @@ return [
         'routePath'=>'file',
         'show'=>1,
         'child'=>[
-            ['name'=>'导出文件', 'class'=>'', 'icon'=>'', 'controller'=>'file', 'action'=>'export', 'routePath'=>'file/export', 'show'=>1,],
+            ['name'=>'Export file', 'class'=>'', 'icon'=>'', 'controller'=>'file', 'action'=>'export', 'routePath'=>'file/export', 'show'=>1,],//导出文件
 //            ['name'=>'删除文件', 'class'=>'', 'icon'=>'', 'controller'=>'file', 'action'=>'export-delete', 'routePath'=>'file/export-delete', 'show'=>0,],
 
         ]
@@ -402,7 +402,7 @@ return [
 //        'class' => 'list-header',
 //    ],
     'admin'=>[
-        'name'=>'管理员管理',
+        'name'=>'Administrator',//管理员管理
         'class' => '',
         'icon'=>'el-icon-coordinate',
         'controller'=>'admin',
@@ -420,7 +420,7 @@ return [
             ['name'=>'添加管理员', 'class'=>'', 'icon'=>'', 'controller'=>'admin', 'action'=>'add', 'routePath'=>'admin/add', 'show'=>0,],
             ['name'=>'编辑管理员', 'class'=>'', 'icon'=>'', 'controller'=>'admin', 'action'=>'edit', 'routePath'=>'admin/edit', 'show'=>0,],
             ['name'=>'删除管理员', 'class'=>'', 'icon'=>'', 'controller'=>'admin', 'action'=>'admin-delete', 'routePath'=>'admin/admin-delete', 'show'=>0,],
-            ['name'=>'重置密码', 'class'=>'', 'icon'=>'', 'controller'=>'admin', 'action'=>'change-password', 'routePath'=>'admin/change-password', 'show'=>1,],
+            ['name'=>'reset password', 'class'=>'', 'icon'=>'', 'controller'=>'admin', 'action'=>'change-password', 'routePath'=>'admin/change-password', 'show'=>1,],//重置密码
         ]
     ],
     'ad'=>[
@@ -440,7 +440,7 @@ return [
         ]
     ],
     'log'=>[
-        'name'=>'日志管理',
+        'name'=>'Log management',//日志管理
         'class' => '',
         'icon'=>'el-icon-collection',
         'controller'=>'log',
@@ -449,9 +449,9 @@ return [
         'show'=>1,
         'child'=>[
             ['name'=>'管理员登录日志', 'class'=>'', 'icon'=>'', 'controller'=>'log', 'action'=>'admin-login', 'routePath'=>'log/admin-login', 'show'=>1,],
-            ['name'=>'会员登录日志', 'class'=>'', 'icon'=>'', 'controller'=>'log', 'action'=>'user-login', 'routePath'=>'log/user-login', 'show'=>1,],
+            ['name'=>'Member login log', 'class'=>'', 'icon'=>'', 'controller'=>'log', 'action'=>'user-login', 'routePath'=>'log/user-login', 'show'=>1,],//会员登录日志
             ['name'=>'管理员操作日志', 'class'=>'', 'icon'=>'', 'controller'=>'log', 'action'=>'admin-handle', 'routePath'=>'log/admin-handle', 'show'=>1,],
-            ['name'=>'会员操作日志', 'class'=>'', 'icon'=>'', 'controller'=>'log', 'action'=>'user-handle', 'routePath'=>'log/user-handle', 'show'=>1,],
+            ['name'=>'Member operation log', 'class'=>'', 'icon'=>'', 'controller'=>'log', 'action'=>'user-handle', 'routePath'=>'log/user-handle', 'show'=>1,],//会员操作日志
             ['name'=>'系统日志', 'class'=>'', 'icon'=>'', 'controller'=>'log', 'action'=>'system', 'routePath'=>'log/system', 'show'=>1,],
 
         ]

+ 0 - 0
backendApi/config/params.php


+ 0 - 0
backendApi/config/urlManagerRules.php


+ 0 - 0
backendApi/modules/v1/Module.php


+ 0 - 0
backendApi/modules/v1/components/UserAuth.php


+ 0 - 0
backendApi/modules/v1/controllers/AdController.php


+ 0 - 0
backendApi/modules/v1/controllers/AdminController.php


+ 0 - 0
backendApi/modules/v1/controllers/ArticleController.php


+ 0 - 0
backendApi/modules/v1/controllers/AtlasController.php


+ 0 - 0
backendApi/modules/v1/controllers/BaseController.php


+ 0 - 0
backendApi/modules/v1/controllers/BonusController.php


+ 0 - 0
backendApi/modules/v1/controllers/ConfigController.php


+ 0 - 0
backendApi/modules/v1/controllers/DashboardController.php


+ 0 - 0
backendApi/modules/v1/controllers/FileController.php


+ 0 - 0
backendApi/modules/v1/controllers/FinanceController.php


+ 0 - 0
backendApi/modules/v1/controllers/LogController.php


+ 0 - 0
backendApi/modules/v1/controllers/MessageController.php


+ 0 - 0
backendApi/modules/v1/controllers/OauthController.php


+ 0 - 0
backendApi/modules/v1/controllers/ReconsumeController.php


+ 0 - 0
backendApi/modules/v1/controllers/ReportController.php


+ 0 - 0
backendApi/modules/v1/controllers/ShopController.php


+ 0 - 0
backendApi/modules/v1/controllers/SiteController.php


+ 0 - 0
backendApi/modules/v1/controllers/UserController.php


+ 0 - 0
backendApi/modules/v1/models/Admin.php


+ 0 - 0
backendApi/modules/v1/models/AdminForm.php


+ 0 - 0
backendApi/modules/v1/models/AdminRole.php


+ 0 - 0
backendApi/modules/v1/models/AdminRoleForm.php


+ 0 - 0
backendApi/modules/v1/models/AdminToken.php


+ 0 - 0
backendApi/modules/v1/models/LoginForm.php


+ 0 - 0
backendApi/modules/v1/models/User.php


+ 0 - 0
backendApi/modules/v1/models/exportForms/AtlasExportForm.php


+ 0 - 0
backendApi/modules/v1/models/exportForms/BaseExportForm.php


Некоторые файлы не были показаны из-за большого количества измененных файлов