Explorar o código

b c端概念引入

shish %!s(int64=6) %!d(string=hai) anos
pai
achega
2bdd47f472
Modificáronse 100 ficheiros con 17 adicións e 27 borrados
  1. 5 15
      .gitignore
  2. 1 1
      app/business/assets/AppAsset.php
  3. 0 0
      app/business/config/bootstrap.php
  4. 0 0
      app/business/config/main-local.php
  5. 1 1
      app/business/config/main.php
  6. 0 0
      app/business/config/params-local.php
  7. 0 0
      app/business/config/params.php
  8. 1 1
      app/business/controllers/AdminController.php
  9. 1 1
      app/business/controllers/AuthController.php
  10. 1 1
      app/business/controllers/BaseController.php
  11. 1 1
      app/business/controllers/OrderController.php
  12. 1 1
      app/business/controllers/PublicController.php
  13. 1 1
      app/business/controllers/UploadController.php
  14. 1 1
      app/business/controllers/UserController.php
  15. 1 1
      app/business/filter/TestFilter.php
  16. 0 0
      app/business/models/.gitkeep
  17. 1 1
      app/business/modules/api/Module.php
  18. 1 1
      app/business/modules/api/controllers/DefaultController.php
  19. 0 0
      app/business/modules/api/views/default/index.php
  20. 0 0
      app/business/views/active/add.php
  21. 0 0
      app/business/views/active/edit.php
  22. 0 0
      app/business/views/active/join.php
  23. 0 0
      app/business/views/active/list.php
  24. 0 0
      app/business/views/active/print.php
  25. 0 0
      app/business/views/admin/execReplace.php
  26. 0 0
      app/business/views/admin/generate.php
  27. 0 0
      app/business/views/admin/replace.php
  28. 0 0
      app/business/views/admin/replaceResult.php
  29. 0 0
      app/business/views/admin/result.php
  30. 0 0
      app/business/views/apply/list.php
  31. 0 0
      app/business/views/article/add.php
  32. 0 0
      app/business/views/article/edit.php
  33. 0 0
      app/business/views/article/list.php
  34. 0 0
      app/business/views/capital/activeOrderDetail.php
  35. 0 0
      app/business/views/capital/balance.php
  36. 0 0
      app/business/views/capital/cashPaymentDetail.php
  37. 0 0
      app/business/views/capital/drawCash.php
  38. 0 0
      app/business/views/capital/list.php
  39. 0 0
      app/business/views/capital/orderDetail.php
  40. 0 0
      app/business/views/capital/paymentDetail.php
  41. 0 0
      app/business/views/capital/user.php
  42. 0 0
      app/business/views/capital/userUnite.php
  43. 0 0
      app/business/views/cart/detail.php
  44. 0 0
      app/business/views/cart/user.php
  45. 0 0
      app/business/views/category/goodsList.php
  46. 0 0
      app/business/views/category/list.php
  47. 0 0
      app/business/views/chat/index.php
  48. 0 0
      app/business/views/class/add.php
  49. 0 0
      app/business/views/class/list.php
  50. 0 0
      app/business/views/class/update.php
  51. 0 0
      app/business/views/coupon/all.php
  52. 0 0
      app/business/views/coupon/detail.php
  53. 0 0
      app/business/views/coupon/list.php
  54. 0 0
      app/business/views/coupon/model.php
  55. 0 0
      app/business/views/coupon/reward.php
  56. 0 0
      app/business/views/coupon/right.php
  57. 0 0
      app/business/views/coupon/userList.php
  58. 0 0
      app/business/views/course/detail.php
  59. 0 0
      app/business/views/course/list.php
  60. 0 0
      app/business/views/draw-cash/list.php
  61. 0 0
      app/business/views/error/error.php
  62. 0 0
      app/business/views/goods/add.php
  63. 0 0
      app/business/views/goods/category.php
  64. 0 0
      app/business/views/goods/detailAjax.php
  65. 0 0
      app/business/views/goods/edit.php
  66. 0 0
      app/business/views/goods/list.php
  67. 0 0
      app/business/views/goods/priceSetting.php
  68. 0 0
      app/business/views/goods/put.php
  69. 0 0
      app/business/views/goods/setting.php
  70. 0 0
      app/business/views/goods/sold.php
  71. 0 0
      app/business/views/goods/usage.php
  72. 0 0
      app/business/views/gua-gua/add.php
  73. 0 0
      app/business/views/gua-gua/awardDetail.php
  74. 0 0
      app/business/views/gua-gua/edit.php
  75. 0 0
      app/business/views/gua-gua/joinList.php
  76. 0 0
      app/business/views/gua-gua/list.php
  77. 0 0
      app/business/views/gua-gua/winList.php
  78. 0 0
      app/business/views/init/clear.php
  79. 0 0
      app/business/views/integral/user.php
  80. 0 0
      app/business/views/invite/list.php
  81. 0 0
      app/business/views/layouts/main.php
  82. 0 0
      app/business/views/lottery/add.php
  83. 0 0
      app/business/views/lottery/awardDetail.php
  84. 0 0
      app/business/views/lottery/edit.php
  85. 0 0
      app/business/views/lottery/joinList.php
  86. 0 0
      app/business/views/lottery/list.php
  87. 0 0
      app/business/views/lottery/winList.php
  88. 0 0
      app/business/views/main/approve.php
  89. 0 0
      app/business/views/main/error.php
  90. 0 0
      app/business/views/main/index.php
  91. 0 0
      app/business/views/main/location.php
  92. 0 0
      app/business/views/main/login.php
  93. 0 0
      app/business/views/main/relogin.php
  94. 0 0
      app/business/views/main/setLoginPassword.php
  95. 0 0
      app/business/views/marketing/everyday.php
  96. 0 0
      app/business/views/marketing/iframeIndex.php
  97. 0 0
      app/business/views/marketing/index.php
  98. 0 0
      app/business/views/marketing/worksShow.php
  99. 0 0
      app/business/views/merchant/gatheringUrl.php
  100. 0 0
      app/business/views/merchant/index.php

+ 5 - 15
.gitignore

@@ -7,24 +7,14 @@
 console/runtime/
 
 #ignore
-app/admin/runtime/
+app/business/runtime/
 app/api/runtime/
-app/back/runtime/
-app/front/runtime/
-app/mini/runtime/
-app/mobile/runtime/
+app/client/runtime/
 app/open/runtime/
 app/saas/runtime/
-app/teach/runtime/
-app/whole/runtime/
 
-app/admin/web/assets/
+app/business/web/assets/
 app/api/web/assets/
-app/back/web/assets/
-app/front/web/assets/
-app/mini/web/assets/
-app/mobile/web/assets/
+app/client/web/assets/
 app/open/web/assets/
-app/saas/web/assets/
-app/teach/web/assets/
-app/whole/web/assets/
+app/saas/web/assets/

+ 1 - 1
app/admin/assets/AppAsset.php → app/business/assets/AppAsset.php

@@ -5,7 +5,7 @@
  * @license http://www.yiiframework.com/license/
  */
 
-namespace admin\assets;
+namespace business\assets;
 
 use yii\web\AssetBundle;
 

+ 0 - 0
app/admin/config/bootstrap.php → app/business/config/bootstrap.php


+ 0 - 0
app/admin/config/main-local.php → app/business/config/main-local.php


+ 1 - 1
app/admin/config/main.php → app/business/config/main.php

@@ -11,7 +11,7 @@ return [
 	'basePath' => dirname(__DIR__),
 	'bootstrap' => ['log'],
 	'defaultRoute' => 'main/index',//默认控制器
-	'controllerNamespace' => 'admin\controllers',
+	'controllerNamespace' => 'business\controllers',
 	'modules' => [],
 	'components' => [
 		'user' => [

+ 0 - 0
app/admin/config/params-local.php → app/business/config/params-local.php


+ 0 - 0
app/admin/config/params.php → app/business/config/params.php


+ 1 - 1
app/admin/controllers/AdminController.php → app/business/controllers/AdminController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace admin\controllers;
+namespace business\controllers;
 
 use biz\admin\services\AdminService;
 use common\components\jwt;

+ 1 - 1
app/admin/controllers/AuthController.php → app/business/controllers/AuthController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace admin\controllers;
+namespace business\controllers;
 
 use biz\admin\services\AdminService;
 use common\components\httpUtil;

+ 1 - 1
app/admin/controllers/BaseController.php → app/business/controllers/BaseController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace admin\controllers;
+namespace business\controllers;
 
 use biz\admin\services\AdminToMerchantService;
 use biz\auth\services\MenuService;

+ 1 - 1
app/admin/controllers/OrderController.php → app/business/controllers/OrderController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace admin\controllers;
+namespace business\controllers;
 
 use biz\order\services\OrderService;
 use Yii;

+ 1 - 1
app/admin/controllers/PublicController.php → app/business/controllers/PublicController.php

@@ -1,5 +1,5 @@
 <?php
-namespace admin\controllers;
+namespace business\controllers;
 use common\components\baseController;
 
 /**

+ 1 - 1
app/admin/controllers/UploadController.php → app/business/controllers/UploadController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace admin\controllers;
+namespace business\controllers;
 
 use Yii;
 use yii\web\Controller;

+ 1 - 1
app/admin/controllers/UserController.php → app/business/controllers/UserController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace admin\controllers;
+namespace business\controllers;
 
 use biz\admin\services\AdminService;
 use biz\user\services\UserAssetService;

+ 1 - 1
app/admin/filter/TestFilter.php → app/business/filter/TestFilter.php

@@ -1,5 +1,5 @@
 <?php
-namespace admin\filter;
+namespace business\filter;
 
 use Yii;
 use yii\base\Action;

+ 0 - 0
app/admin/models/.gitkeep → app/business/models/.gitkeep


+ 1 - 1
app/admin/modules/api/Module.php → app/business/modules/api/Module.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace admin\modules\api;
+namespace business\modules\api;
 
 class Module extends \yii\base\Module
 {

+ 1 - 1
app/admin/modules/api/controllers/DefaultController.php → app/business/modules/api/controllers/DefaultController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace admin\modules\api\controllers;
+namespace business\modules\api\controllers;
 
 use yii\web\Controller;
 

+ 0 - 0
app/admin/modules/api/views/default/index.php → app/business/modules/api/views/default/index.php


+ 0 - 0
app/admin/views/active/add.php → app/business/views/active/add.php


+ 0 - 0
app/admin/views/active/edit.php → app/business/views/active/edit.php


+ 0 - 0
app/admin/views/active/join.php → app/business/views/active/join.php


+ 0 - 0
app/admin/views/active/list.php → app/business/views/active/list.php


+ 0 - 0
app/admin/views/active/print.php → app/business/views/active/print.php


+ 0 - 0
app/admin/views/admin/execReplace.php → app/business/views/admin/execReplace.php


+ 0 - 0
app/admin/views/admin/generate.php → app/business/views/admin/generate.php


+ 0 - 0
app/admin/views/admin/replace.php → app/business/views/admin/replace.php


+ 0 - 0
app/admin/views/admin/replaceResult.php → app/business/views/admin/replaceResult.php


+ 0 - 0
app/admin/views/admin/result.php → app/business/views/admin/result.php


+ 0 - 0
app/admin/views/apply/list.php → app/business/views/apply/list.php


+ 0 - 0
app/admin/views/article/add.php → app/business/views/article/add.php


+ 0 - 0
app/admin/views/article/edit.php → app/business/views/article/edit.php


+ 0 - 0
app/admin/views/article/list.php → app/business/views/article/list.php


+ 0 - 0
app/admin/views/capital/activeOrderDetail.php → app/business/views/capital/activeOrderDetail.php


+ 0 - 0
app/admin/views/capital/balance.php → app/business/views/capital/balance.php


+ 0 - 0
app/admin/views/capital/cashPaymentDetail.php → app/business/views/capital/cashPaymentDetail.php


+ 0 - 0
app/admin/views/capital/drawCash.php → app/business/views/capital/drawCash.php


+ 0 - 0
app/admin/views/capital/list.php → app/business/views/capital/list.php


+ 0 - 0
app/admin/views/capital/orderDetail.php → app/business/views/capital/orderDetail.php


+ 0 - 0
app/admin/views/capital/paymentDetail.php → app/business/views/capital/paymentDetail.php


+ 0 - 0
app/admin/views/capital/user.php → app/business/views/capital/user.php


+ 0 - 0
app/admin/views/capital/userUnite.php → app/business/views/capital/userUnite.php


+ 0 - 0
app/admin/views/cart/detail.php → app/business/views/cart/detail.php


+ 0 - 0
app/admin/views/cart/user.php → app/business/views/cart/user.php


+ 0 - 0
app/admin/views/category/goodsList.php → app/business/views/category/goodsList.php


+ 0 - 0
app/admin/views/category/list.php → app/business/views/category/list.php


+ 0 - 0
app/admin/views/chat/index.php → app/business/views/chat/index.php


+ 0 - 0
app/admin/views/class/add.php → app/business/views/class/add.php


+ 0 - 0
app/admin/views/class/list.php → app/business/views/class/list.php


+ 0 - 0
app/admin/views/class/update.php → app/business/views/class/update.php


+ 0 - 0
app/admin/views/coupon/all.php → app/business/views/coupon/all.php


+ 0 - 0
app/admin/views/coupon/detail.php → app/business/views/coupon/detail.php


+ 0 - 0
app/admin/views/coupon/list.php → app/business/views/coupon/list.php


+ 0 - 0
app/admin/views/coupon/model.php → app/business/views/coupon/model.php


+ 0 - 0
app/admin/views/coupon/reward.php → app/business/views/coupon/reward.php


+ 0 - 0
app/admin/views/coupon/right.php → app/business/views/coupon/right.php


+ 0 - 0
app/admin/views/coupon/userList.php → app/business/views/coupon/userList.php


+ 0 - 0
app/admin/views/course/detail.php → app/business/views/course/detail.php


+ 0 - 0
app/admin/views/course/list.php → app/business/views/course/list.php


+ 0 - 0
app/admin/views/draw-cash/list.php → app/business/views/draw-cash/list.php


+ 0 - 0
app/admin/views/error/error.php → app/business/views/error/error.php


+ 0 - 0
app/admin/views/goods/add.php → app/business/views/goods/add.php


+ 0 - 0
app/admin/views/goods/category.php → app/business/views/goods/category.php


+ 0 - 0
app/admin/views/goods/detailAjax.php → app/business/views/goods/detailAjax.php


+ 0 - 0
app/admin/views/goods/edit.php → app/business/views/goods/edit.php


+ 0 - 0
app/admin/views/goods/list.php → app/business/views/goods/list.php


+ 0 - 0
app/admin/views/goods/priceSetting.php → app/business/views/goods/priceSetting.php


+ 0 - 0
app/admin/views/goods/put.php → app/business/views/goods/put.php


+ 0 - 0
app/admin/views/goods/setting.php → app/business/views/goods/setting.php


+ 0 - 0
app/admin/views/goods/sold.php → app/business/views/goods/sold.php


+ 0 - 0
app/admin/views/goods/usage.php → app/business/views/goods/usage.php


+ 0 - 0
app/admin/views/gua-gua/add.php → app/business/views/gua-gua/add.php


+ 0 - 0
app/admin/views/gua-gua/awardDetail.php → app/business/views/gua-gua/awardDetail.php


+ 0 - 0
app/admin/views/gua-gua/edit.php → app/business/views/gua-gua/edit.php


+ 0 - 0
app/admin/views/gua-gua/joinList.php → app/business/views/gua-gua/joinList.php


+ 0 - 0
app/admin/views/gua-gua/list.php → app/business/views/gua-gua/list.php


+ 0 - 0
app/admin/views/gua-gua/winList.php → app/business/views/gua-gua/winList.php


+ 0 - 0
app/admin/views/init/clear.php → app/business/views/init/clear.php


+ 0 - 0
app/admin/views/integral/user.php → app/business/views/integral/user.php


+ 0 - 0
app/admin/views/invite/list.php → app/business/views/invite/list.php


+ 0 - 0
app/admin/views/layouts/main.php → app/business/views/layouts/main.php


+ 0 - 0
app/admin/views/lottery/add.php → app/business/views/lottery/add.php


+ 0 - 0
app/admin/views/lottery/awardDetail.php → app/business/views/lottery/awardDetail.php


+ 0 - 0
app/admin/views/lottery/edit.php → app/business/views/lottery/edit.php


+ 0 - 0
app/admin/views/lottery/joinList.php → app/business/views/lottery/joinList.php


+ 0 - 0
app/admin/views/lottery/list.php → app/business/views/lottery/list.php


+ 0 - 0
app/admin/views/lottery/winList.php → app/business/views/lottery/winList.php


+ 0 - 0
app/admin/views/main/approve.php → app/business/views/main/approve.php


+ 0 - 0
app/admin/views/main/error.php → app/business/views/main/error.php


+ 0 - 0
app/admin/views/main/index.php → app/business/views/main/index.php


+ 0 - 0
app/admin/views/main/location.php → app/business/views/main/location.php


+ 0 - 0
app/admin/views/main/login.php → app/business/views/main/login.php


+ 0 - 0
app/admin/views/main/relogin.php → app/business/views/main/relogin.php


+ 0 - 0
app/admin/views/main/setLoginPassword.php → app/business/views/main/setLoginPassword.php


+ 0 - 0
app/admin/views/marketing/everyday.php → app/business/views/marketing/everyday.php


+ 0 - 0
app/admin/views/marketing/iframeIndex.php → app/business/views/marketing/iframeIndex.php


+ 0 - 0
app/admin/views/marketing/index.php → app/business/views/marketing/index.php


+ 0 - 0
app/admin/views/marketing/worksShow.php → app/business/views/marketing/worksShow.php


+ 0 - 0
app/admin/views/merchant/gatheringUrl.php → app/business/views/merchant/gatheringUrl.php


+ 0 - 0
app/admin/views/merchant/index.php → app/business/views/merchant/index.php


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio