From 38bb2a5e9efadee2e26b84366fa26ad56e9fbe4c Mon Sep 17 00:00:00 2001 From: linyaostalker <602604991@qq.com> Date: Wed, 4 Dec 2019 20:01:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86antgoods=E4=BF=AE=E6=94=B9=E4=B8=BAgoo?= =?UTF-8?q?ds?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._column_icon_type_in_antgoods_category.php | 22 --------------- ...n_icon_type_in_table_antgoods_category.php | 20 -------------- ...id_and_icon_in_table_antgoods_category.php | 26 ------------------ ...n_type_in_table_antgoods_shop_category.php | 20 -------------- ...d_icon_in_table_antgoods_shop_category.php | 26 ------------------ ..._is_manaul_in_table_antgoods_goods_sku.php | 20 -------------- ..._add_column_sku_mode_in_antgoods_goods.php | 20 -------------- ...d_attr_id_in_table_antgoods_goods_attr.php | 26 ------------------ ...umn_cat_id_in_table_antgoods_attribute.php | 20 -------------- ...op_columns_in_table_antgoods_goods_sku.php | 27 ------------------- backend/config/main.php | 6 ++--- backend/views/layouts/sidebar.php | 12 ++++----- {antgoods => goods}/Module.php | 6 ++--- .../assets/custom/sku.49a56a9198d9c3ec233c.js | 0 .../assets/custom/sku.52802ed907a316501cd7.js | 0 .../assets/custom/sku.9a46222d01b3d601e5ad.js | 0 .../custom/sku_item.6649e882bedbeb22ea3d.js | 0 {antgoods => goods}/assets/js/jquery.js | 0 .../controllers/AttributeController.php | 6 ++--- .../controllers/BrandController.php | 6 ++--- .../controllers/CategoryController.php | 8 +++--- .../controllers/GoodsController.php | 14 +++++----- .../controllers/ShopCategoryController.php | 8 +++--- .../controllers/SupplierController.php | 6 ++--- .../logic/goods/GoodsManager.php | 14 +++++----- ...1119_021851_create_table_shop_category.php | 4 +-- .../m191119_022641_create_table_category.php | 4 +-- .../m191119_022939_create_table_attribute.php | 4 +-- ...m191119_023115_create_table_goods_attr.php | 4 +-- .../m191119_024029_create_table_brand.php | 4 +-- .../m191119_024205_create_table_goods.php | 2 +- .../m191119_024345_create_table_goods_sku.php | 2 +- .../m191119_025607_create_table_supplier.php | 4 +-- ...191119_025843_create_table_filter_attr.php | 4 +-- ...pdate_column_icon_type_in_atg_category.php | 22 +++++++++++++++ ...column_icon_type_in_table_atg_category.php | 20 ++++++++++++++ ...umn_pid_and_icon_in_table_atg_category.php | 26 ++++++++++++++++++ ...n_icon_type_in_table_atg_shop_category.php | 20 ++++++++++++++ ...id_and_icon_in_table_atg_shop_category.php | 26 ++++++++++++++++++ ...olumn_is_manaul_in_table_atg_goods_sku.php | 20 ++++++++++++++ ...10349_add_column_sku_mode_in_atg_goods.php | 20 ++++++++++++++ ...id_and_attr_id_in_table_atg_goods_attr.php | 26 ++++++++++++++++++ ...d_column_cat_id_in_table_atg_attribute.php | 20 ++++++++++++++ ...41_drop_columns_in_table_atg_goods_sku.php | 27 +++++++++++++++++++ {antgoods => goods}/migrations/sql/goods.sql | 4 +-- .../migrations/sql/goods_sku.sql | 4 +-- {antgoods => goods}/models/ars/Attribute.php | 8 +++--- {antgoods => goods}/models/ars/Brand.php | 6 ++--- {antgoods => goods}/models/ars/Category.php | 6 ++--- {antgoods => goods}/models/ars/FilterAttr.php | 6 ++--- {antgoods => goods}/models/ars/Goods.php | 14 +++++----- {antgoods => goods}/models/ars/GoodsAttr.php | 6 ++--- {antgoods => goods}/models/ars/GoodsSku.php | 6 ++--- .../models/ars/ShopCategory.php | 6 ++--- {antgoods => goods}/models/ars/Supplier.php | 8 +++--- .../models/searchs/AttributeSearch.php | 6 ++--- .../models/searchs/BrandSearch.php | 6 ++--- .../models/searchs/CategorySearch.php | 6 ++--- .../models/searchs/GoodsSearch.php | 10 +++---- .../models/searchs/ShopCategorySearch.php | 6 ++--- .../models/searchs/SupplierSearch.php | 6 ++--- {antgoods => goods}/views/attribute/_form.php | 4 +-- .../views/attribute/_search.php | 0 .../views/attribute/create.php | 2 +- {antgoods => goods}/views/attribute/index.php | 0 .../views/attribute/update.php | 2 +- {antgoods => goods}/views/attribute/view.php | 2 +- {antgoods => goods}/views/brand/_form.php | 2 +- {antgoods => goods}/views/brand/_search.php | 0 {antgoods => goods}/views/brand/create.php | 2 +- {antgoods => goods}/views/brand/index.php | 0 {antgoods => goods}/views/brand/update.php | 2 +- {antgoods => goods}/views/brand/view.php | 2 +- {antgoods => goods}/views/category/_form.php | 4 +-- .../views/category/_search.php | 0 {antgoods => goods}/views/category/create.php | 2 +- {antgoods => goods}/views/category/index.php | 0 {antgoods => goods}/views/category/update.php | 2 +- {antgoods => goods}/views/category/view.php | 4 +-- {antgoods => goods}/views/config/index.php | 0 {antgoods => goods}/views/goods/_form.php | 10 +++---- {antgoods => goods}/views/goods/_search.php | 0 {antgoods => goods}/views/goods/attribute.php | 4 +-- {antgoods => goods}/views/goods/create.php | 2 +- .../views/goods/filter_attribute.php | 4 +-- {antgoods => goods}/views/goods/goods.php | 12 ++++----- {antgoods => goods}/views/goods/index.php | 0 .../views/goods/new_editor.php | 0 {antgoods => goods}/views/goods/picture.php | 2 +- {antgoods => goods}/views/goods/sku_edit.php | 2 +- {antgoods => goods}/views/goods/update.php | 2 +- {antgoods => goods}/views/goods/view.php | 4 +-- .../views/shop-category/_form.php | 6 ++--- .../views/shop-category/_search.php | 0 .../views/shop-category/create.php | 2 +- .../views/shop-category/index.php | 0 .../views/shop-category/update.php | 2 +- .../views/shop-category/view.php | 6 ++--- {antgoods => goods}/views/supplier/_form.php | 2 +- .../views/supplier/_search.php | 0 {antgoods => goods}/views/supplier/create.php | 2 +- {antgoods => goods}/views/supplier/index.php | 0 {antgoods => goods}/views/supplier/update.php | 2 +- {antgoods => goods}/views/supplier/view.php | 2 +- .../web/GoodsAttributeAsset.php | 4 +-- .../web/GoodsFilterAttributeAsset.php | 4 +-- {antgoods => goods}/web/GoodsSkuEditAsset.php | 4 +-- 107 files changed, 397 insertions(+), 397 deletions(-) delete mode 100644 antgoods/migrations/m191125_012449_update_column_icon_type_in_antgoods_category.php delete mode 100644 antgoods/migrations/m191125_083820_drop_column_icon_type_in_table_antgoods_category.php delete mode 100644 antgoods/migrations/m191125_084547_update_column_pid_and_icon_in_table_antgoods_category.php delete mode 100644 antgoods/migrations/m191125_104137_drop_column_icon_type_in_table_antgoods_shop_category.php delete mode 100644 antgoods/migrations/m191125_104510_update_column_pid_and_icon_in_table_antgoods_shop_category.php delete mode 100644 antgoods/migrations/m191127_114228_add_column_is_manaul_in_table_antgoods_goods_sku.php delete mode 100644 antgoods/migrations/m191129_010349_add_column_sku_mode_in_antgoods_goods.php delete mode 100644 antgoods/migrations/m191129_020131_add_columns_goods_id_and_attr_id_in_table_antgoods_goods_attr.php delete mode 100644 antgoods/migrations/m191130_004933_add_column_cat_id_in_table_antgoods_attribute.php delete mode 100644 antgoods/migrations/m191202_082041_drop_columns_in_table_antgoods_goods_sku.php rename {antgoods => goods}/Module.php (68%) rename {antgoods => goods}/assets/custom/sku.49a56a9198d9c3ec233c.js (100%) rename {antgoods => goods}/assets/custom/sku.52802ed907a316501cd7.js (100%) rename {antgoods => goods}/assets/custom/sku.9a46222d01b3d601e5ad.js (100%) rename {antgoods => goods}/assets/custom/sku_item.6649e882bedbeb22ea3d.js (100%) rename {antgoods => goods}/assets/js/jquery.js (100%) rename {antgoods => goods}/controllers/AttributeController.php (97%) rename {antgoods => goods}/controllers/BrandController.php (97%) rename {antgoods => goods}/controllers/CategoryController.php (98%) rename {antgoods => goods}/controllers/GoodsController.php (97%) rename {antgoods => goods}/controllers/ShopCategoryController.php (98%) rename {antgoods => goods}/controllers/SupplierController.php (97%) rename {antgoods => goods}/logic/goods/GoodsManager.php (98%) rename {antgoods => goods}/migrations/m191119_021851_create_table_shop_category.php (93%) rename {antgoods => goods}/migrations/m191119_022641_create_table_category.php (93%) rename {antgoods => goods}/migrations/m191119_022939_create_table_attribute.php (91%) rename {antgoods => goods}/migrations/m191119_023115_create_table_goods_attr.php (90%) rename {antgoods => goods}/migrations/m191119_024029_create_table_brand.php (90%) rename {antgoods => goods}/migrations/m191119_024205_create_table_goods.php (90%) rename {antgoods => goods}/migrations/m191119_024345_create_table_goods_sku.php (89%) rename {antgoods => goods}/migrations/m191119_025607_create_table_supplier.php (91%) rename {antgoods => goods}/migrations/m191119_025843_create_table_filter_attr.php (90%) create mode 100644 goods/migrations/m191125_012449_update_column_icon_type_in_atg_category.php create mode 100644 goods/migrations/m191125_083820_drop_column_icon_type_in_table_atg_category.php create mode 100644 goods/migrations/m191125_084547_update_column_pid_and_icon_in_table_atg_category.php create mode 100644 goods/migrations/m191125_104137_drop_column_icon_type_in_table_atg_shop_category.php create mode 100644 goods/migrations/m191125_104510_update_column_pid_and_icon_in_table_atg_shop_category.php create mode 100644 goods/migrations/m191127_114228_add_column_is_manaul_in_table_atg_goods_sku.php create mode 100644 goods/migrations/m191129_010349_add_column_sku_mode_in_atg_goods.php create mode 100644 goods/migrations/m191129_020131_add_columns_goods_id_and_attr_id_in_table_atg_goods_attr.php create mode 100644 goods/migrations/m191130_004933_add_column_cat_id_in_table_atg_attribute.php create mode 100644 goods/migrations/m191202_082041_drop_columns_in_table_atg_goods_sku.php rename {antgoods => goods}/migrations/sql/goods.sql (93%) rename {antgoods => goods}/migrations/sql/goods_sku.sql (89%) rename {antgoods => goods}/models/ars/Attribute.php (94%) rename {antgoods => goods}/models/ars/Brand.php (93%) rename {antgoods => goods}/models/ars/Category.php (95%) rename {antgoods => goods}/models/ars/FilterAttr.php (93%) rename {antgoods => goods}/models/ars/Goods.php (96%) rename {antgoods => goods}/models/ars/GoodsAttr.php (93%) rename {antgoods => goods}/models/ars/GoodsSku.php (95%) rename {antgoods => goods}/models/ars/ShopCategory.php (95%) rename {antgoods => goods}/models/ars/Supplier.php (90%) rename {antgoods => goods}/models/searchs/AttributeSearch.php (97%) rename {antgoods => goods}/models/searchs/BrandSearch.php (96%) rename {antgoods => goods}/models/searchs/CategorySearch.php (97%) rename {antgoods => goods}/models/searchs/GoodsSearch.php (97%) rename {antgoods => goods}/models/searchs/ShopCategorySearch.php (97%) rename {antgoods => goods}/models/searchs/SupplierSearch.php (97%) rename {antgoods => goods}/views/attribute/_form.php (91%) rename {antgoods => goods}/views/attribute/_search.php (100%) rename {antgoods => goods}/views/attribute/create.php (87%) rename {antgoods => goods}/views/attribute/index.php (100%) rename {antgoods => goods}/views/attribute/update.php (90%) rename {antgoods => goods}/views/attribute/view.php (93%) rename {antgoods => goods}/views/brand/_form.php (92%) rename {antgoods => goods}/views/brand/_search.php (100%) rename {antgoods => goods}/views/brand/create.php (88%) rename {antgoods => goods}/views/brand/index.php (100%) rename {antgoods => goods}/views/brand/update.php (90%) rename {antgoods => goods}/views/brand/view.php (93%) rename {antgoods => goods}/views/category/_form.php (94%) rename {antgoods => goods}/views/category/_search.php (100%) rename {antgoods => goods}/views/category/create.php (88%) rename {antgoods => goods}/views/category/index.php (100%) rename {antgoods => goods}/views/category/update.php (90%) rename {antgoods => goods}/views/category/view.php (84%) rename {antgoods => goods}/views/config/index.php (100%) rename {antgoods => goods}/views/goods/_form.php (94%) rename {antgoods => goods}/views/goods/_search.php (100%) rename {antgoods => goods}/views/goods/attribute.php (90%) rename {antgoods => goods}/views/goods/create.php (98%) rename {antgoods => goods}/views/goods/filter_attribute.php (90%) rename {antgoods => goods}/views/goods/goods.php (89%) rename {antgoods => goods}/views/goods/index.php (100%) rename {antgoods => goods}/views/goods/new_editor.php (100%) rename {antgoods => goods}/views/goods/picture.php (96%) rename {antgoods => goods}/views/goods/sku_edit.php (89%) rename {antgoods => goods}/views/goods/update.php (98%) rename {antgoods => goods}/views/goods/view.php (97%) rename {antgoods => goods}/views/shop-category/_form.php (93%) rename {antgoods => goods}/views/shop-category/_search.php (100%) rename {antgoods => goods}/views/shop-category/create.php (87%) rename {antgoods => goods}/views/shop-category/index.php (100%) rename {antgoods => goods}/views/shop-category/update.php (90%) rename {antgoods => goods}/views/shop-category/view.php (93%) rename {antgoods => goods}/views/supplier/_form.php (94%) rename {antgoods => goods}/views/supplier/_search.php (100%) rename {antgoods => goods}/views/supplier/create.php (87%) rename {antgoods => goods}/views/supplier/index.php (100%) rename {antgoods => goods}/views/supplier/update.php (90%) rename {antgoods => goods}/views/supplier/view.php (93%) rename {antgoods => goods}/web/GoodsAttributeAsset.php (83%) rename {antgoods => goods}/web/GoodsFilterAttributeAsset.php (81%) rename {antgoods => goods}/web/GoodsSkuEditAsset.php (80%) diff --git a/antgoods/migrations/m191125_012449_update_column_icon_type_in_antgoods_category.php b/antgoods/migrations/m191125_012449_update_column_icon_type_in_antgoods_category.php deleted file mode 100644 index 00fb52e..0000000 --- a/antgoods/migrations/m191125_012449_update_column_icon_type_in_antgoods_category.php +++ /dev/null @@ -1,22 +0,0 @@ -dropColumn('antgoods_category', 'icon_type'); - $this->addColumn('antgoods_category', 'icon_type', $this->tinyInteger(1)->defaultValue(1)->comment('图标类型')); - } - - public function down() - { - $this->dropColumn('antgoods_category', 'icon_type'); - $this->addColumn('antgoods_category', 'icon_type', $this->tinyInteger(1)->defaultValue(null)->comment('图标类型')); - return true; - } -} diff --git a/antgoods/migrations/m191125_083820_drop_column_icon_type_in_table_antgoods_category.php b/antgoods/migrations/m191125_083820_drop_column_icon_type_in_table_antgoods_category.php deleted file mode 100644 index 04c6a2b..0000000 --- a/antgoods/migrations/m191125_083820_drop_column_icon_type_in_table_antgoods_category.php +++ /dev/null @@ -1,20 +0,0 @@ -dropColumn('antgoods_category', 'icon_type'); - } - - public function down() - { - $this->addColumn('antgoods_category', 'icon_type', $this->tinyInteger(1)->defaultValue(null)->comment('图标类型')); - return true; - } -} diff --git a/antgoods/migrations/m191125_084547_update_column_pid_and_icon_in_table_antgoods_category.php b/antgoods/migrations/m191125_084547_update_column_pid_and_icon_in_table_antgoods_category.php deleted file mode 100644 index 055e84c..0000000 --- a/antgoods/migrations/m191125_084547_update_column_pid_and_icon_in_table_antgoods_category.php +++ /dev/null @@ -1,26 +0,0 @@ -dropColumn('antgoods_category', 'icon'); - $this->addColumn('antgoods_category', 'icon', $this->integer(11)->defaultValue(null)->comment('图标')); - $this->dropColumn('antgoods_category', 'pid'); - $this->addColumn('antgoods_category', 'pid', $this->integer(11)->defaultValue(0)->comment('父级id')); - } - - public function down() - { - $this->dropColumn('antgoods_category', 'icon'); - $this->addColumn('antgoods_category', 'icon', $this->string(64)->defaultValue(null)->comment('图标')); - $this->dropColumn('antgoods_category', 'pid'); - $this->addColumn('antgoods_category', 'pid', $this->integer(11)->defaultValue(null)->comment('父级id')); - return true; - } -} diff --git a/antgoods/migrations/m191125_104137_drop_column_icon_type_in_table_antgoods_shop_category.php b/antgoods/migrations/m191125_104137_drop_column_icon_type_in_table_antgoods_shop_category.php deleted file mode 100644 index 2f182eb..0000000 --- a/antgoods/migrations/m191125_104137_drop_column_icon_type_in_table_antgoods_shop_category.php +++ /dev/null @@ -1,20 +0,0 @@ -dropColumn('antgoods_shop_category', 'icon_type'); - } - - public function down() - { - $this->addColumn('antgoods_shop_category', 'icon_type', $this->tinyInteger(1)->defaultValue(null)->comment('图标类型')); - return true; - } -} diff --git a/antgoods/migrations/m191125_104510_update_column_pid_and_icon_in_table_antgoods_shop_category.php b/antgoods/migrations/m191125_104510_update_column_pid_and_icon_in_table_antgoods_shop_category.php deleted file mode 100644 index b1536ac..0000000 --- a/antgoods/migrations/m191125_104510_update_column_pid_and_icon_in_table_antgoods_shop_category.php +++ /dev/null @@ -1,26 +0,0 @@ -dropColumn('antgoods_shop_category', 'icon'); - $this->addColumn('antgoods_shop_category', 'icon', $this->integer(11)->defaultValue(null)->comment('图标')); - $this->dropColumn('antgoods_shop_category', 'pid'); - $this->addColumn('antgoods_shop_category', 'pid', $this->integer(11)->defaultValue(0)->comment('父级id')); - } - - public function down() - { - $this->dropColumn('antgoods_shop_category', 'icon'); - $this->addColumn('antgoods_shop_category', 'icon', $this->string(64)->defaultValue(null)->comment('图标')); - $this->dropColumn('antgoods_shop_category', 'pid'); - $this->addColumn('antgoods_shop_category', 'pid', $this->integer(11)->defaultValue(null)->comment('父级id')); - return true; - } -} diff --git a/antgoods/migrations/m191127_114228_add_column_is_manaul_in_table_antgoods_goods_sku.php b/antgoods/migrations/m191127_114228_add_column_is_manaul_in_table_antgoods_goods_sku.php deleted file mode 100644 index a6584d6..0000000 --- a/antgoods/migrations/m191127_114228_add_column_is_manaul_in_table_antgoods_goods_sku.php +++ /dev/null @@ -1,20 +0,0 @@ -addColumn('antgoods_goods_sku', 'is_manaul', $this->tinyInteger(1)->notNull()->defaultValue(0)->comment('是否手动')); - } - - public function down() - { - $this->dropColumn('antgoods_goods_sku', 'is_manaul'); - return true; - } -} diff --git a/antgoods/migrations/m191129_010349_add_column_sku_mode_in_antgoods_goods.php b/antgoods/migrations/m191129_010349_add_column_sku_mode_in_antgoods_goods.php deleted file mode 100644 index 3d4b3ed..0000000 --- a/antgoods/migrations/m191129_010349_add_column_sku_mode_in_antgoods_goods.php +++ /dev/null @@ -1,20 +0,0 @@ -addColumn('antgoods_goods', 'sku_mode', $this->tinyInteger(1)->notNull()->defaultValue(1)->comment('sku类型')); - } - - public function down() - { - $this->dropColumn('antgoods_goods', 'sku_mode'); - return true; - } -} diff --git a/antgoods/migrations/m191129_020131_add_columns_goods_id_and_attr_id_in_table_antgoods_goods_attr.php b/antgoods/migrations/m191129_020131_add_columns_goods_id_and_attr_id_in_table_antgoods_goods_attr.php deleted file mode 100644 index 3ee066e..0000000 --- a/antgoods/migrations/m191129_020131_add_columns_goods_id_and_attr_id_in_table_antgoods_goods_attr.php +++ /dev/null @@ -1,26 +0,0 @@ -dropColumn('antgoods_goods_attr', 'goods_id'); - $this->dropColumn('antgoods_goods_attr', 'attr_id'); - $this->addColumn('antgoods_goods_attr', 'goods_id', $this->integer(11)->notNull()->defaultValue(0)->comment('商品id')); - $this->addColumn('antgoods_goods_attr', 'attr_id', $this->integer(11)->notNull()->defaultValue(0)->comment('属性id')); - } - - public function down() - { - $this->dropColumn('antgoods_goods_attr', 'goods_id'); - $this->dropColumn('antgoods_goods_attr', 'attr_id'); - $this->addColumn('antgoods_goods_attr', 'goods_id', $this->integer(11)->notNull()->comment('商品id')); - $this->addColumn('antgoods_goods_attr', 'attr_id', $this->integer(11)->notNull()->comment('属性id')); - return true; - } -} diff --git a/antgoods/migrations/m191130_004933_add_column_cat_id_in_table_antgoods_attribute.php b/antgoods/migrations/m191130_004933_add_column_cat_id_in_table_antgoods_attribute.php deleted file mode 100644 index f7992f5..0000000 --- a/antgoods/migrations/m191130_004933_add_column_cat_id_in_table_antgoods_attribute.php +++ /dev/null @@ -1,20 +0,0 @@ -addColumn('antgoods_attribute', 'cat_id', $this->integer(11)->notNull()->defaultValue(0)->comment('后台商品分类id')); - } - - public function down() - { - $this->dropColumn('antgoods_attribute', 'cat_id'); - return true; - } -} diff --git a/antgoods/migrations/m191202_082041_drop_columns_in_table_antgoods_goods_sku.php b/antgoods/migrations/m191202_082041_drop_columns_in_table_antgoods_goods_sku.php deleted file mode 100644 index 52d5ca7..0000000 --- a/antgoods/migrations/m191202_082041_drop_columns_in_table_antgoods_goods_sku.php +++ /dev/null @@ -1,27 +0,0 @@ -dropColumn('antgoods_goods_sku', 'weight'); - $this->dropColumn('antgoods_goods_sku', 'length'); - $this->dropColumn('antgoods_goods_sku', 'width'); - $this->dropColumn('antgoods_goods_sku', 'height'); - $this->dropColumn('antgoods_goods_sku', 'diameter'); - } - - public function down() - { - $this->addColumn('antgoods_goods_sku', 'weight', $this->integer(8)->defaultValue(null)->comment('重量')); - $this->addColumn('antgoods_goods_sku', 'length', $this->integer(8)->defaultValue(null)->comment('长度')); - $this->addColumn('antgoods_goods_sku', 'width', $this->integer(8)->defaultValue(null)->comment('宽度')); - $this->addColumn('antgoods_goods_sku', 'height', $this->integer(8)->defaultValue(null)->comment('高度')); - $this->addColumn('antgoods_goods_sku', 'diameter', $this->integer(8)->defaultValue(null)->comment('直径')); - } -} diff --git a/backend/config/main.php b/backend/config/main.php index c236292..62e4ad3 100644 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -10,8 +10,8 @@ return [ 'controllerNamespace' => 'backend\controllers', 'bootstrap' => ['log'], 'modules' => [ - 'antgoods' => [ - 'class' => 'antgoods\Module', + 'goods' => [ + 'class' => 'goods\Module', ], ], 'components' => [ @@ -59,7 +59,7 @@ return [ ], ], 'file' => ['class' => 'backend\logic\file\FileManager'], - 'goods' => ['class' => 'antgoods\goods\logic\goods\GoodsManager'], + 'goods' => ['class' => 'goods\goods\logic\goods\GoodsManager'], ], 'params' => $params, ]; diff --git a/backend/views/layouts/sidebar.php b/backend/views/layouts/sidebar.php index a3524d4..31e09b2 100755 --- a/backend/views/layouts/sidebar.php +++ b/backend/views/layouts/sidebar.php @@ -21,12 +21,12 @@ use iron\widgets\Menu; ] ], ['label' => '商品管理', 'url' => '#', 'icon' => 'far fa-box', 'items' => [ - ['label' => '后台商品分类', 'url' => ['/antgoods/category/index']], - ['label' => '规格管理', 'url' => ['/antgoods/attribute/index']], - ['label' => '前端商品分类', 'url' => ['/antgoods/shop-category/index']], - ['label' => '品牌管理', 'url' => ['/antgoods/brand/index']], - ['label' => '供应商管理', 'url' => ['/antgoods/supplier/index']], - ['label' => '商品列表', 'url' => ['/antgoods/goods/index']], + ['label' => '后台商品分类', 'url' => ['/goods/category/index']], + ['label' => '规格管理', 'url' => ['/goods/attribute/index']], + ['label' => '前端商品分类', 'url' => ['/goods/shop-category/index']], + ['label' => '品牌管理', 'url' => ['/goods/brand/index']], + ['label' => '供应商管理', 'url' => ['/goods/supplier/index']], + ['label' => '商品列表', 'url' => ['/goods/goods/index']], ] ], ['label' => '订单管理', 'url' => '#', 'icon' => 'far fa-list-alt', 'items' => [ diff --git a/antgoods/Module.php b/goods/Module.php similarity index 68% rename from antgoods/Module.php rename to goods/Module.php index 974e55c..03fbc5d 100644 --- a/antgoods/Module.php +++ b/goods/Module.php @@ -1,16 +1,16 @@ createTable('antgoods_shop_category', [ + $this->createTable('atg_shop_category', [ 'id' => $this->primaryKey(), 'name'=>$this->string(60)->notNull()->comment('类别名称'), 'pid'=>$this->integer(11)->defaultValue(null)->comment('父级id'), @@ -36,7 +36,7 @@ class m191119_021851_create_table_shop_category extends Migration */ public function down() { - $this->dropTable('antgoods_shop_category'); + $this->dropTable('atg_shop_category'); return true; } } diff --git a/antgoods/migrations/m191119_022641_create_table_category.php b/goods/migrations/m191119_022641_create_table_category.php similarity index 93% rename from antgoods/migrations/m191119_022641_create_table_category.php rename to goods/migrations/m191119_022641_create_table_category.php index 60dd21e..30863e6 100644 --- a/antgoods/migrations/m191119_022641_create_table_category.php +++ b/goods/migrations/m191119_022641_create_table_category.php @@ -13,7 +13,7 @@ class m191119_022641_create_table_category extends Migration public function up() { $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB COMMENT="后台商品类别表"'; - $this->createTable('antgoods_category', [ + $this->createTable('atg_category', [ 'id' => $this->primaryKey(), 'name'=>$this->string(60)->notNull()->comment('类别名称'), 'pid'=>$this->integer(11)->defaultValue(null)->comment('父级id'), @@ -33,7 +33,7 @@ class m191119_022641_create_table_category extends Migration */ public function down() { - $this->dropTable('antgoods_category'); + $this->dropTable('atg_category'); return true; } } diff --git a/antgoods/migrations/m191119_022939_create_table_attribute.php b/goods/migrations/m191119_022939_create_table_attribute.php similarity index 91% rename from antgoods/migrations/m191119_022939_create_table_attribute.php rename to goods/migrations/m191119_022939_create_table_attribute.php index 8f77f8f..3b95401 100644 --- a/antgoods/migrations/m191119_022939_create_table_attribute.php +++ b/goods/migrations/m191119_022939_create_table_attribute.php @@ -13,7 +13,7 @@ class m191119_022939_create_table_attribute extends Migration public function up() { $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB COMMENT="属性表"'; - $this->createTable('antgoods_attribute', [ + $this->createTable('atg_attribute', [ 'id' => $this->primaryKey(), 'name'=>$this->string(50)->notNull()->comment('属性名'), 'value'=>$this->text()->notNull()->comment('属性值'), @@ -30,7 +30,7 @@ class m191119_022939_create_table_attribute extends Migration */ public function down() { - $this->dropTable('antgoods_attribute'); + $this->dropTable('atg_attribute'); return true; } } diff --git a/antgoods/migrations/m191119_023115_create_table_goods_attr.php b/goods/migrations/m191119_023115_create_table_goods_attr.php similarity index 90% rename from antgoods/migrations/m191119_023115_create_table_goods_attr.php rename to goods/migrations/m191119_023115_create_table_goods_attr.php index 19a263c..43355c0 100644 --- a/antgoods/migrations/m191119_023115_create_table_goods_attr.php +++ b/goods/migrations/m191119_023115_create_table_goods_attr.php @@ -13,7 +13,7 @@ class m191119_023115_create_table_goods_attr extends Migration public function up() { $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB COMMENT="商品属性表"'; - $this->createTable('antgoods_goods_attr', [ + $this->createTable('atg_goods_attr', [ 'id' => $this->primaryKey(), 'goods_id'=>$this->integer(11)->notNull()->comment('商品id'), 'attr_id'=>$this->integer(11)->notNull()->comment('属性id'), @@ -29,7 +29,7 @@ class m191119_023115_create_table_goods_attr extends Migration */ public function down() { - $this->dropTable('antgoods_goods_attr'); + $this->dropTable('atg_goods_attr'); return true; } } diff --git a/antgoods/migrations/m191119_024029_create_table_brand.php b/goods/migrations/m191119_024029_create_table_brand.php similarity index 90% rename from antgoods/migrations/m191119_024029_create_table_brand.php rename to goods/migrations/m191119_024029_create_table_brand.php index 48984d4..0ef5182 100644 --- a/antgoods/migrations/m191119_024029_create_table_brand.php +++ b/goods/migrations/m191119_024029_create_table_brand.php @@ -13,7 +13,7 @@ class m191119_024029_create_table_brand extends Migration public function up() { $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB COMMENT="品牌表"'; - $this->createTable('antgoods_brand', [ + $this->createTable('atg_brand', [ 'id' => $this->primaryKey(), 'name'=>$this->string(50)->notNull()->comment('品牌名'), 'is_delete'=>$this->tinyInteger(1)->defaultValue(0)->comment('是否删除，1为已删除'), @@ -27,7 +27,7 @@ class m191119_024029_create_table_brand extends Migration */ public function down() { - $this->dropTable('antgoods_brand'); + $this->dropTable('atg_brand'); return true; } } diff --git a/antgoods/migrations/m191119_024205_create_table_goods.php b/goods/migrations/m191119_024205_create_table_goods.php similarity index 90% rename from antgoods/migrations/m191119_024205_create_table_goods.php rename to goods/migrations/m191119_024205_create_table_goods.php index d16c1e5..9c3c562 100644 --- a/antgoods/migrations/m191119_024205_create_table_goods.php +++ b/goods/migrations/m191119_024205_create_table_goods.php @@ -21,7 +21,7 @@ class m191119_024205_create_table_goods extends Migration */ public function down() { - $this->dropTable("antgoods_goods"); + $this->dropTable("atg_goods"); return true; } } diff --git a/antgoods/migrations/m191119_024345_create_table_goods_sku.php b/goods/migrations/m191119_024345_create_table_goods_sku.php similarity index 89% rename from antgoods/migrations/m191119_024345_create_table_goods_sku.php rename to goods/migrations/m191119_024345_create_table_goods_sku.php index 227b38b..9ff1ba8 100644 --- a/antgoods/migrations/m191119_024345_create_table_goods_sku.php +++ b/goods/migrations/m191119_024345_create_table_goods_sku.php @@ -21,7 +21,7 @@ class m191119_024345_create_table_goods_sku extends Migration */ public function down() { - $this->dropTable("antgoods_goods_sku"); + $this->dropTable("atg_goods_sku"); return true; } } diff --git a/antgoods/migrations/m191119_025607_create_table_supplier.php b/goods/migrations/m191119_025607_create_table_supplier.php similarity index 91% rename from antgoods/migrations/m191119_025607_create_table_supplier.php rename to goods/migrations/m191119_025607_create_table_supplier.php index c7d8f6c..2755595 100644 --- a/antgoods/migrations/m191119_025607_create_table_supplier.php +++ b/goods/migrations/m191119_025607_create_table_supplier.php @@ -13,7 +13,7 @@ class m191119_025607_create_table_supplier extends Migration public function up() { $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB COMMENT="供应商表"'; - $this->createTable('antgoods_supplier', [ + $this->createTable('atg_supplier', [ 'id' => $this->primaryKey(), 'name'=>$this->string(50)->notNull()->comment('供应商名称'), 'full_name'=>$this->string(50)->notNull()->comment('供应商全称'), @@ -30,7 +30,7 @@ class m191119_025607_create_table_supplier extends Migration */ public function down() { - $this->dropTable('antgoods_supplier'); + $this->dropTable('atg_supplier'); return true; } } diff --git a/antgoods/migrations/m191119_025843_create_table_filter_attr.php b/goods/migrations/m191119_025843_create_table_filter_attr.php similarity index 90% rename from antgoods/migrations/m191119_025843_create_table_filter_attr.php rename to goods/migrations/m191119_025843_create_table_filter_attr.php index 0409292..990ead9 100644 --- a/antgoods/migrations/m191119_025843_create_table_filter_attr.php +++ b/goods/migrations/m191119_025843_create_table_filter_attr.php @@ -13,7 +13,7 @@ class m191119_025843_create_table_filter_attr extends Migration public function up() { $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB COMMENT="筛选属性表"'; - $this->createTable('antgoods_filter_attr', [ + $this->createTable('atg_filter_attr', [ 'id' => $this->primaryKey(), 'goods_id'=>$this->integer(11)->notNull()->comment('商品id'), 'attr_id'=>$this->integer(11)->notNull()->comment('属性id'), @@ -29,7 +29,7 @@ class m191119_025843_create_table_filter_attr extends Migration */ public function down() { - $this->dropTable('antgoods_filter_attr'); + $this->dropTable('atg_filter_attr'); return true; } } diff --git a/goods/migrations/m191125_012449_update_column_icon_type_in_atg_category.php b/goods/migrations/m191125_012449_update_column_icon_type_in_atg_category.php new file mode 100644 index 0000000..c1489b9 --- /dev/null +++ b/goods/migrations/m191125_012449_update_column_icon_type_in_atg_category.php @@ -0,0 +1,22 @@ +dropColumn('atg_category', 'icon_type'); + $this->addColumn('atg_category', 'icon_type', $this->tinyInteger(1)->defaultValue(1)->comment('图标类型')); + } + + public function down() + { + $this->dropColumn('atg_category', 'icon_type'); + $this->addColumn('atg_category', 'icon_type', $this->tinyInteger(1)->defaultValue(null)->comment('图标类型')); + return true; + } +} diff --git a/goods/migrations/m191125_083820_drop_column_icon_type_in_table_atg_category.php b/goods/migrations/m191125_083820_drop_column_icon_type_in_table_atg_category.php new file mode 100644 index 0000000..c052fd6 --- /dev/null +++ b/goods/migrations/m191125_083820_drop_column_icon_type_in_table_atg_category.php @@ -0,0 +1,20 @@ +dropColumn('atg_category', 'icon_type'); + } + + public function down() + { + $this->addColumn('atg_category', 'icon_type', $this->tinyInteger(1)->defaultValue(null)->comment('图标类型')); + return true; + } +} diff --git a/goods/migrations/m191125_084547_update_column_pid_and_icon_in_table_atg_category.php b/goods/migrations/m191125_084547_update_column_pid_and_icon_in_table_atg_category.php new file mode 100644 index 0000000..e61cd2d --- /dev/null +++ b/goods/migrations/m191125_084547_update_column_pid_and_icon_in_table_atg_category.php @@ -0,0 +1,26 @@ +dropColumn('atg_category', 'icon'); + $this->addColumn('atg_category', 'icon', $this->integer(11)->defaultValue(null)->comment('图标')); + $this->dropColumn('atg_category', 'pid'); + $this->addColumn('atg_category', 'pid', $this->integer(11)->defaultValue(0)->comment('父级id')); + } + + public function down() + { + $this->dropColumn('atg_category', 'icon'); + $this->addColumn('atg_category', 'icon', $this->string(64)->defaultValue(null)->comment('图标')); + $this->dropColumn('atg_category', 'pid'); + $this->addColumn('atg_category', 'pid', $this->integer(11)->defaultValue(null)->comment('父级id')); + return true; + } +} diff --git a/goods/migrations/m191125_104137_drop_column_icon_type_in_table_atg_shop_category.php b/goods/migrations/m191125_104137_drop_column_icon_type_in_table_atg_shop_category.php new file mode 100644 index 0000000..86de82a --- /dev/null +++ b/goods/migrations/m191125_104137_drop_column_icon_type_in_table_atg_shop_category.php @@ -0,0 +1,20 @@ +dropColumn('atg_shop_category', 'icon_type'); + } + + public function down() + { + $this->addColumn('atg_shop_category', 'icon_type', $this->tinyInteger(1)->defaultValue(null)->comment('图标类型')); + return true; + } +} diff --git a/goods/migrations/m191125_104510_update_column_pid_and_icon_in_table_atg_shop_category.php b/goods/migrations/m191125_104510_update_column_pid_and_icon_in_table_atg_shop_category.php new file mode 100644 index 0000000..8b54491 --- /dev/null +++ b/goods/migrations/m191125_104510_update_column_pid_and_icon_in_table_atg_shop_category.php @@ -0,0 +1,26 @@ +dropColumn('atg_shop_category', 'icon'); + $this->addColumn('atg_shop_category', 'icon', $this->integer(11)->defaultValue(null)->comment('图标')); + $this->dropColumn('atg_shop_category', 'pid'); + $this->addColumn('atg_shop_category', 'pid', $this->integer(11)->defaultValue(0)->comment('父级id')); + } + + public function down() + { + $this->dropColumn('atg_shop_category', 'icon'); + $this->addColumn('atg_shop_category', 'icon', $this->string(64)->defaultValue(null)->comment('图标')); + $this->dropColumn('atg_shop_category', 'pid'); + $this->addColumn('atg_shop_category', 'pid', $this->integer(11)->defaultValue(null)->comment('父级id')); + return true; + } +} diff --git a/goods/migrations/m191127_114228_add_column_is_manaul_in_table_atg_goods_sku.php b/goods/migrations/m191127_114228_add_column_is_manaul_in_table_atg_goods_sku.php new file mode 100644 index 0000000..6e43560 --- /dev/null +++ b/goods/migrations/m191127_114228_add_column_is_manaul_in_table_atg_goods_sku.php @@ -0,0 +1,20 @@ +addColumn('atg_goods_sku', 'is_manaul', $this->tinyInteger(1)->notNull()->defaultValue(0)->comment('是否手动')); + } + + public function down() + { + $this->dropColumn('atg_goods_sku', 'is_manaul'); + return true; + } +} diff --git a/goods/migrations/m191129_010349_add_column_sku_mode_in_atg_goods.php b/goods/migrations/m191129_010349_add_column_sku_mode_in_atg_goods.php new file mode 100644 index 0000000..90c260d --- /dev/null +++ b/goods/migrations/m191129_010349_add_column_sku_mode_in_atg_goods.php @@ -0,0 +1,20 @@ +addColumn('atg_goods', 'sku_mode', $this->tinyInteger(1)->notNull()->defaultValue(1)->comment('sku类型')); + } + + public function down() + { + $this->dropColumn('atg_goods', 'sku_mode'); + return true; + } +} diff --git a/goods/migrations/m191129_020131_add_columns_goods_id_and_attr_id_in_table_atg_goods_attr.php b/goods/migrations/m191129_020131_add_columns_goods_id_and_attr_id_in_table_atg_goods_attr.php new file mode 100644 index 0000000..7de3e97 --- /dev/null +++ b/goods/migrations/m191129_020131_add_columns_goods_id_and_attr_id_in_table_atg_goods_attr.php @@ -0,0 +1,26 @@ +dropColumn('atg_goods_attr', 'goods_id'); + $this->dropColumn('atg_goods_attr', 'attr_id'); + $this->addColumn('atg_goods_attr', 'goods_id', $this->integer(11)->notNull()->defaultValue(0)->comment('商品id')); + $this->addColumn('atg_goods_attr', 'attr_id', $this->integer(11)->notNull()->defaultValue(0)->comment('属性id')); + } + + public function down() + { + $this->dropColumn('atg_goods_attr', 'goods_id'); + $this->dropColumn('atg_goods_attr', 'attr_id'); + $this->addColumn('atg_goods_attr', 'goods_id', $this->integer(11)->notNull()->comment('商品id')); + $this->addColumn('atg_goods_attr', 'attr_id', $this->integer(11)->notNull()->comment('属性id')); + return true; + } +} diff --git a/goods/migrations/m191130_004933_add_column_cat_id_in_table_atg_attribute.php b/goods/migrations/m191130_004933_add_column_cat_id_in_table_atg_attribute.php new file mode 100644 index 0000000..bbbccd3 --- /dev/null +++ b/goods/migrations/m191130_004933_add_column_cat_id_in_table_atg_attribute.php @@ -0,0 +1,20 @@ +addColumn('atg_attribute', 'cat_id', $this->integer(11)->notNull()->defaultValue(0)->comment('后台商品分类id')); + } + + public function down() + { + $this->dropColumn('atg_attribute', 'cat_id'); + return true; + } +} diff --git a/goods/migrations/m191202_082041_drop_columns_in_table_atg_goods_sku.php b/goods/migrations/m191202_082041_drop_columns_in_table_atg_goods_sku.php new file mode 100644 index 0000000..f5a9a16 --- /dev/null +++ b/goods/migrations/m191202_082041_drop_columns_in_table_atg_goods_sku.php @@ -0,0 +1,27 @@ +dropColumn('atg_goods_sku', 'weight'); + $this->dropColumn('atg_goods_sku', 'length'); + $this->dropColumn('atg_goods_sku', 'width'); + $this->dropColumn('atg_goods_sku', 'height'); + $this->dropColumn('atg_goods_sku', 'diameter'); + } + + public function down() + { + $this->addColumn('atg_goods_sku', 'weight', $this->integer(8)->defaultValue(null)->comment('重量')); + $this->addColumn('atg_goods_sku', 'length', $this->integer(8)->defaultValue(null)->comment('长度')); + $this->addColumn('atg_goods_sku', 'width', $this->integer(8)->defaultValue(null)->comment('宽度')); + $this->addColumn('atg_goods_sku', 'height', $this->integer(8)->defaultValue(null)->comment('高度')); + $this->addColumn('atg_goods_sku', 'diameter', $this->integer(8)->defaultValue(null)->comment('直径')); + } +} diff --git a/antgoods/migrations/sql/goods.sql b/goods/migrations/sql/goods.sql similarity index 93% rename from antgoods/migrations/sql/goods.sql rename to goods/migrations/sql/goods.sql index 3944770..35e72bf 100755 --- a/antgoods/migrations/sql/goods.sql +++ b/goods/migrations/sql/goods.sql @@ -1,5 +1,5 @@ -DROP TABLE IF EXISTS `antgoods_goods`; -CREATE TABLE `antgoods_goods` ( +DROP TABLE IF EXISTS `atg_goods`; +CREATE TABLE `atg_goods` ( `id` int(11) NOT NULL AUTO_INCREMENT, `pid` int(11) DEFAULT NULL COMMENT '父级id', `cat_id` int(11) NOT NULL COMMENT '后台商品类别id', diff --git a/antgoods/migrations/sql/goods_sku.sql b/goods/migrations/sql/goods_sku.sql similarity index 89% rename from antgoods/migrations/sql/goods_sku.sql rename to goods/migrations/sql/goods_sku.sql index a599a39..5821438 100755 --- a/antgoods/migrations/sql/goods_sku.sql +++ b/goods/migrations/sql/goods_sku.sql @@ -1,5 +1,5 @@ -DROP TABLE IF EXISTS `antgoods_goods_sku`; -CREATE TABLE `antgoods_goods_sku` ( +DROP TABLE IF EXISTS `atg_goods_sku`; +CREATE TABLE `atg_goods_sku` ( `id` int(11) NOT NULL AUTO_INCREMENT, `goods_id` int(11) NOT NULL COMMENT '商品id', `goods_code` varchar(50) DEFAULT NULL COMMENT '商品条码', diff --git a/antgoods/models/ars/Attribute.php b/goods/models/ars/Attribute.php similarity index 94% rename from antgoods/models/ars/Attribute.php rename to goods/models/ars/Attribute.php index 0b077d7..b2bddad 100644 --- a/antgoods/models/ars/Attribute.php +++ b/goods/models/ars/Attribute.php @@ -1,13 +1,13 @@ 20], ['phone', 'filter', 'filter' => 'trim'], ['phone','match','pattern'=>'/^[1][34578][0-9]{9}$/'], - ['phone', 'unique', 'targetClass' => '\antgoods\models\ars\Supplier', 'message' => '手机号已被使用'], + ['phone', 'unique', 'targetClass' => '\goods\models\ars\Supplier', 'message' => '手机号已被使用'], ]; } diff --git a/antgoods/models/searchs/AttributeSearch.php b/goods/models/searchs/AttributeSearch.php similarity index 97% rename from antgoods/models/searchs/AttributeSearch.php rename to goods/models/searchs/AttributeSearch.php index dc97a43..7474d17 100644 --- a/antgoods/models/searchs/AttributeSearch.php +++ b/goods/models/searchs/AttributeSearch.php @@ -1,14 +1,14 @@ diff --git a/antgoods/views/attribute/_search.php b/goods/views/attribute/_search.php similarity index 100% rename from antgoods/views/attribute/_search.php rename to goods/views/attribute/_search.php diff --git a/antgoods/views/attribute/create.php b/goods/views/attribute/create.php similarity index 87% rename from antgoods/views/attribute/create.php rename to goods/views/attribute/create.php index 2192559..4d16c28 100644 --- a/antgoods/views/attribute/create.php +++ b/goods/views/attribute/create.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Attribute */ +/* @var $model goods\models\ars\Attribute */ $this->title = '创建规格'; $this->params['breadcrumbs'][] = ['label' => '规格管理', 'url' => ['index']]; diff --git a/antgoods/views/attribute/index.php b/goods/views/attribute/index.php similarity index 100% rename from antgoods/views/attribute/index.php rename to goods/views/attribute/index.php diff --git a/antgoods/views/attribute/update.php b/goods/views/attribute/update.php similarity index 90% rename from antgoods/views/attribute/update.php rename to goods/views/attribute/update.php index d21423f..24b0135 100644 --- a/antgoods/views/attribute/update.php +++ b/goods/views/attribute/update.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Attribute */ +/* @var $model goods\models\ars\Attribute */ $this->title = '编辑规格: ' . $model->name; $this->params['breadcrumbs'][] = ['label' => '规格管理', 'url' => ['index']]; diff --git a/antgoods/views/attribute/view.php b/goods/views/attribute/view.php similarity index 93% rename from antgoods/views/attribute/view.php rename to goods/views/attribute/view.php index 9475eb3..a803a39 100644 --- a/antgoods/views/attribute/view.php +++ b/goods/views/attribute/view.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use yii\widgets\DetailView; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Attribute */ +/* @var $model goods\models\ars\Attribute */ $this->title = $model->name; $this->params['breadcrumbs'][] = ['label' => '规格管理', 'url' => ['index']]; diff --git a/antgoods/views/brand/_form.php b/goods/views/brand/_form.php similarity index 92% rename from antgoods/views/brand/_form.php rename to goods/views/brand/_form.php index fe87664..ce5517d 100644 --- a/antgoods/views/brand/_form.php +++ b/goods/views/brand/_form.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use yii\bootstrap4\ActiveForm; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Brand */ +/* @var $model goods\models\ars\Brand */ /* @var $form yii\widgets\ActiveForm */ ?> diff --git a/antgoods/views/brand/_search.php b/goods/views/brand/_search.php similarity index 100% rename from antgoods/views/brand/_search.php rename to goods/views/brand/_search.php diff --git a/antgoods/views/brand/create.php b/goods/views/brand/create.php similarity index 88% rename from antgoods/views/brand/create.php rename to goods/views/brand/create.php index ab0e683..617b6a2 100644 --- a/antgoods/views/brand/create.php +++ b/goods/views/brand/create.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Brand */ +/* @var $model goods\models\ars\Brand */ $this->title = '创建品牌'; $this->params['breadcrumbs'][] = ['label' => '品牌管理', 'url' => ['index']]; diff --git a/antgoods/views/brand/index.php b/goods/views/brand/index.php similarity index 100% rename from antgoods/views/brand/index.php rename to goods/views/brand/index.php diff --git a/antgoods/views/brand/update.php b/goods/views/brand/update.php similarity index 90% rename from antgoods/views/brand/update.php rename to goods/views/brand/update.php index c8453dc..8b9d0b8 100644 --- a/antgoods/views/brand/update.php +++ b/goods/views/brand/update.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Brand */ +/* @var $model goods\models\ars\Brand */ $this->title = '编辑品牌: ' . $model->name; $this->params['breadcrumbs'][] = ['label' => '品牌管理', 'url' => ['index']]; diff --git a/antgoods/views/brand/view.php b/goods/views/brand/view.php similarity index 93% rename from antgoods/views/brand/view.php rename to goods/views/brand/view.php index f5cb312..2f0c1cb 100644 --- a/antgoods/views/brand/view.php +++ b/goods/views/brand/view.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use yii\widgets\DetailView; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Brand */ +/* @var $model goods\models\ars\Brand */ $this->title = $model->name; $this->params['breadcrumbs'][] = ['label' => '品牌管理', 'url' => ['index']]; diff --git a/antgoods/views/category/_form.php b/goods/views/category/_form.php similarity index 94% rename from antgoods/views/category/_form.php rename to goods/views/category/_form.php index 482e25b..2adebff 100644 --- a/antgoods/views/category/_form.php +++ b/goods/views/category/_form.php @@ -4,10 +4,10 @@ use yii\helpers\Html; use yii\bootstrap4\ActiveForm; use blobt\widgets\Icheck; use yii\helpers\Url; -use antgoods\models\ars\Category; +use goods\models\ars\Category; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Category */ +/* @var $model goods\models\ars\Category */ /* @var $form yii\widgets\ActiveForm */ ?> diff --git a/antgoods/views/category/_search.php b/goods/views/category/_search.php similarity index 100% rename from antgoods/views/category/_search.php rename to goods/views/category/_search.php diff --git a/antgoods/views/category/create.php b/goods/views/category/create.php similarity index 88% rename from antgoods/views/category/create.php rename to goods/views/category/create.php index a88ba47..8584d6c 100644 --- a/antgoods/views/category/create.php +++ b/goods/views/category/create.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Category */ +/* @var $model goods\models\ars\Category */ $this->title = '创建后台商品分类'; $this->params['breadcrumbs'][] = ['label' => '后台商品分类', 'url' => ['index']]; diff --git a/antgoods/views/category/index.php b/goods/views/category/index.php similarity index 100% rename from antgoods/views/category/index.php rename to goods/views/category/index.php diff --git a/antgoods/views/category/update.php b/goods/views/category/update.php similarity index 90% rename from antgoods/views/category/update.php rename to goods/views/category/update.php index cb213ab..e4a77c6 100644 --- a/antgoods/views/category/update.php +++ b/goods/views/category/update.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Category */ +/* @var $model goods\models\ars\Category */ $this->title = '编辑后台商品分类: ' . $model->name; $this->params['breadcrumbs'][] = ['label' => '后台商品分类', 'url' => ['index']]; diff --git a/antgoods/views/category/view.php b/goods/views/category/view.php similarity index 84% rename from antgoods/views/category/view.php rename to goods/views/category/view.php index 37a7243..def1c8c 100644 --- a/antgoods/views/category/view.php +++ b/goods/views/category/view.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use yii\widgets\DetailView; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Category */ +/* @var $model goods\models\ars\Category */ $this->title = $model->name; $this->params['breadcrumbs'][] = ['label' => '后台商品分类', 'url' => ['index']]; @@ -30,7 +30,7 @@ $this->params['breadcrumbs'][] = $this->title; [ 'attribute' => 'is_show', 'value' => function ($model) { - return $model->is_show == \antgoods\models\ars\Category::IS_SHOW_DISPLAY ? '显示':'隐藏'; + return $model->is_show == \goods\models\ars\Category::IS_SHOW_DISPLAY ? '显示':'隐藏'; } ], 'created_at:datetime', diff --git a/antgoods/views/config/index.php b/goods/views/config/index.php similarity index 100% rename from antgoods/views/config/index.php rename to goods/views/config/index.php diff --git a/antgoods/views/goods/_form.php b/goods/views/goods/_form.php similarity index 94% rename from antgoods/views/goods/_form.php rename to goods/views/goods/_form.php index 6ee45ba..4de114b 100644 --- a/antgoods/views/goods/_form.php +++ b/goods/views/goods/_form.php @@ -2,14 +2,14 @@ use yii\helpers\Html; use yii\bootstrap4\ActiveForm; -use antgoods\models\ars\Category; -use antgoods\models\ars\Brand; -use antgoods\models\ars\ShopCategory; -use antgoods\models\ars\Supplier; +use goods\models\ars\Category; +use goods\models\ars\Brand; +use goods\models\ars\ShopCategory; +use goods\models\ars\Supplier; use yii\helpers\Url; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Goods */ +/* @var $model goods\models\ars\Goods */ /* @var $form yii\widgets\ActiveForm */ ?> diff --git a/antgoods/views/goods/_search.php b/goods/views/goods/_search.php similarity index 100% rename from antgoods/views/goods/_search.php rename to goods/views/goods/_search.php diff --git a/antgoods/views/goods/attribute.php b/goods/views/goods/attribute.php similarity index 90% rename from antgoods/views/goods/attribute.php rename to goods/views/goods/attribute.php index cf3b70c..3ce4f45 100755 --- a/antgoods/views/goods/attribute.php +++ b/goods/views/goods/attribute.php @@ -1,7 +1,7 @@ title = '创建商品'; $this->params['breadcrumbs'][] = ['label' => '商品列表', 'url' => ['index']]; diff --git a/antgoods/views/goods/filter_attribute.php b/goods/views/goods/filter_attribute.php similarity index 90% rename from antgoods/views/goods/filter_attribute.php rename to goods/views/goods/filter_attribute.php index 9980068..55eab29 100755 --- a/antgoods/views/goods/filter_attribute.php +++ b/goods/views/goods/filter_attribute.php @@ -1,7 +1,7 @@ field($model, 'cat_id')->dropDownList(Category::modelColumn(), ['prompt' => '请选择', 'disabled' => $judgeGoodsCategory]) ?> diff --git a/antgoods/views/goods/index.php b/goods/views/goods/index.php similarity index 100% rename from antgoods/views/goods/index.php rename to goods/views/goods/index.php diff --git a/antgoods/views/goods/new_editor.php b/goods/views/goods/new_editor.php similarity index 100% rename from antgoods/views/goods/new_editor.php rename to goods/views/goods/new_editor.php diff --git a/antgoods/views/goods/picture.php b/goods/views/goods/picture.php similarity index 96% rename from antgoods/views/goods/picture.php rename to goods/views/goods/picture.php index 0b77d7c..984211d 100644 --- a/antgoods/views/goods/picture.php +++ b/goods/views/goods/picture.php @@ -3,7 +3,7 @@ use yii\helpers\Url; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Goods */ +/* @var $model goods\models\ars\Goods */ /* @var $form yii\widgets\ActiveForm */ ?> field($model, 'coverImageId')->hiddenInput()->label('') ?> diff --git a/antgoods/views/goods/sku_edit.php b/goods/views/goods/sku_edit.php similarity index 89% rename from antgoods/views/goods/sku_edit.php rename to goods/views/goods/sku_edit.php index af194a9..c44f91a 100644 --- a/antgoods/views/goods/sku_edit.php +++ b/goods/views/goods/sku_edit.php @@ -1,6 +1,6 @@ title = '添加SKU'; $this->params['breadcrumbs'][] = ['label' => '商品列表', 'url' => ['index']]; diff --git a/antgoods/views/goods/update.php b/goods/views/goods/update.php similarity index 98% rename from antgoods/views/goods/update.php rename to goods/views/goods/update.php index 7a99414..1cdd317 100644 --- a/antgoods/views/goods/update.php +++ b/goods/views/goods/update.php @@ -5,7 +5,7 @@ use yii\bootstrap4\ActiveForm; use kartik\tabs\TabsX; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Goods */ +/* @var $model goods\models\ars\Goods */ $this->title = '编辑商品: ' . $model->name; $this->params['breadcrumbs'][] = ['label' => '商品管理', 'url' => ['index']]; diff --git a/antgoods/views/goods/view.php b/goods/views/goods/view.php similarity index 97% rename from antgoods/views/goods/view.php rename to goods/views/goods/view.php index 7d08515..5a2f7c5 100644 --- a/antgoods/views/goods/view.php +++ b/goods/views/goods/view.php @@ -1,12 +1,12 @@ title = $model->name; $this->params['breadcrumbs'][] = ['label' => '商品管理', 'url' => ['index']]; diff --git a/antgoods/views/shop-category/_form.php b/goods/views/shop-category/_form.php similarity index 93% rename from antgoods/views/shop-category/_form.php rename to goods/views/shop-category/_form.php index ecc4a20..0d6c1e6 100644 --- a/antgoods/views/shop-category/_form.php +++ b/goods/views/shop-category/_form.php @@ -4,12 +4,12 @@ use yii\helpers\Html; use yii\bootstrap4\ActiveForm; use blobt\widgets\Icheck; use yii\helpers\Url; -use antgoods\models\ars\Attribute; +use goods\models\ars\Attribute; use linyao\widgets\Select2; -use antgoods\models\ars\ShopCategory; +use goods\models\ars\ShopCategory; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\ShopCategory */ +/* @var $model goods\models\ars\ShopCategory */ /* @var $form yii\widgets\ActiveForm */ ?> diff --git a/antgoods/views/shop-category/_search.php b/goods/views/shop-category/_search.php similarity index 100% rename from antgoods/views/shop-category/_search.php rename to goods/views/shop-category/_search.php diff --git a/antgoods/views/shop-category/create.php b/goods/views/shop-category/create.php similarity index 87% rename from antgoods/views/shop-category/create.php rename to goods/views/shop-category/create.php index 73f3eae..c6bb5d5 100644 --- a/antgoods/views/shop-category/create.php +++ b/goods/views/shop-category/create.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\ShopCategory */ +/* @var $model goods\models\ars\ShopCategory */ $this->title = '创建前端商品分类'; $this->params['breadcrumbs'][] = ['label' => '前端商品分类', 'url' => ['index']]; diff --git a/antgoods/views/shop-category/index.php b/goods/views/shop-category/index.php similarity index 100% rename from antgoods/views/shop-category/index.php rename to goods/views/shop-category/index.php diff --git a/antgoods/views/shop-category/update.php b/goods/views/shop-category/update.php similarity index 90% rename from antgoods/views/shop-category/update.php rename to goods/views/shop-category/update.php index 5c97d16..21c62cb 100644 --- a/antgoods/views/shop-category/update.php +++ b/goods/views/shop-category/update.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\ShopCategory */ +/* @var $model goods\models\ars\ShopCategory */ $this->title = '编辑前端商品分类: ' . $model->name; $this->params['breadcrumbs'][] = ['label' => '前端商品分类', 'url' => ['index']]; diff --git a/antgoods/views/shop-category/view.php b/goods/views/shop-category/view.php similarity index 93% rename from antgoods/views/shop-category/view.php rename to goods/views/shop-category/view.php index c6ef07e..2efdec0 100644 --- a/antgoods/views/shop-category/view.php +++ b/goods/views/shop-category/view.php @@ -2,11 +2,11 @@ use yii\helpers\Html; use yii\widgets\DetailView; -use antgoods\models\ars\ShopCategory; -use antgoods\models\ars\Attribute; +use goods\models\ars\ShopCategory; +use goods\models\ars\Attribute; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\ShopCategory */ +/* @var $model goods\models\ars\ShopCategory */ $this->title = $model->name; $this->params['breadcrumbs'][] = ['label' => '前端商品分类', 'url' => ['index']]; diff --git a/antgoods/views/supplier/_form.php b/goods/views/supplier/_form.php similarity index 94% rename from antgoods/views/supplier/_form.php rename to goods/views/supplier/_form.php index 93942e2..ec1d23d 100644 --- a/antgoods/views/supplier/_form.php +++ b/goods/views/supplier/_form.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use yii\bootstrap4\ActiveForm; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Supplier */ +/* @var $model goods\models\ars\Supplier */ /* @var $form yii\widgets\ActiveForm */ ?> diff --git a/antgoods/views/supplier/_search.php b/goods/views/supplier/_search.php similarity index 100% rename from antgoods/views/supplier/_search.php rename to goods/views/supplier/_search.php diff --git a/antgoods/views/supplier/create.php b/goods/views/supplier/create.php similarity index 87% rename from antgoods/views/supplier/create.php rename to goods/views/supplier/create.php index 57e0b0e..2eb536e 100644 --- a/antgoods/views/supplier/create.php +++ b/goods/views/supplier/create.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Supplier */ +/* @var $model goods\models\ars\Supplier */ $this->title = '创建供应商'; $this->params['breadcrumbs'][] = ['label' => '供应商管理', 'url' => ['index']]; diff --git a/antgoods/views/supplier/index.php b/goods/views/supplier/index.php similarity index 100% rename from antgoods/views/supplier/index.php rename to goods/views/supplier/index.php diff --git a/antgoods/views/supplier/update.php b/goods/views/supplier/update.php similarity index 90% rename from antgoods/views/supplier/update.php rename to goods/views/supplier/update.php index a6aca3d..a9ac487 100644 --- a/antgoods/views/supplier/update.php +++ b/goods/views/supplier/update.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Supplier */ +/* @var $model goods\models\ars\Supplier */ $this->title = '编辑供应商: ' . $model->name; $this->params['breadcrumbs'][] = ['label' => '供应商管理', 'url' => ['index']]; diff --git a/antgoods/views/supplier/view.php b/goods/views/supplier/view.php similarity index 93% rename from antgoods/views/supplier/view.php rename to goods/views/supplier/view.php index 6619f91..79cbe18 100644 --- a/antgoods/views/supplier/view.php +++ b/goods/views/supplier/view.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use yii\widgets\DetailView; /* @var $this yii\web\View */ -/* @var $model antgoods\models\ars\Supplier */ +/* @var $model goods\models\ars\Supplier */ $this->title = $model->name; $this->params['breadcrumbs'][] = ['label' => '供应商管理', 'url' => ['index']]; diff --git a/antgoods/web/GoodsAttributeAsset.php b/goods/web/GoodsAttributeAsset.php similarity index 83% rename from antgoods/web/GoodsAttributeAsset.php rename to goods/web/GoodsAttributeAsset.php index 9cd6e4a..8d28844 100644 --- a/antgoods/web/GoodsAttributeAsset.php +++ b/goods/web/GoodsAttributeAsset.php @@ -1,6 +1,6 @@