From f556edc7b1afcabbf620534bfc6be6f232efa0b6 Mon Sep 17 00:00:00 2001 From: linyaostalker <602604991@qq.com> Date: Thu, 5 Dec 2019 13:54:59 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9D=97module?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=EF=BC=8C=E6=94=BE=E5=9C=A8backend/modules?= =?UTF-8?q?=E4=B8=8B=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=8A=E9=97=A8=E8=87=AA=E6=8F=90=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/modules/file/Module.php | 24 ++++++++ .../file}/logic/file/FileManager.php | 6 +- .../m191112_022131_create_table_file.php | 0 .../m191112_022532_create_table_tem_file.php | 0 .../{ => modules/file}/models/ars/File.php | 2 +- .../{ => modules/file}/models/ars/TemFile.php | 2 +- {goods => backend/modules/goods}/Module.php | 4 +- .../assets/custom/sku.49a56a9198d9c3ec233c.js | 0 .../assets/custom/sku.52802ed907a316501cd7.js | 0 .../assets/custom/sku.9a46222d01b3d601e5ad.js | 0 .../custom/sku_item.6649e882bedbeb22ea3d.js | 0 .../modules/goods}/assets/js/jquery.js | 0 .../controllers/AttributeController.php | 6 +- .../goods}/controllers/BrandController.php | 6 +- .../goods}/controllers/CategoryController.php | 36 ++++-------- .../goods}/controllers/GoodsController.php | 46 ++++++--------- .../controllers/ShopCategoryController.php | 36 ++++-------- .../goods}/controllers/SupplierController.php | 6 +- .../goods}/logic/goods/GoodsManager.php | 25 ++++---- ..._021851_create_table_atg_shop_category.php | 0 ...91119_022641_create_table_atg_category.php | 0 ...1119_022939_create_table_atg_attribute.php | 0 ...119_023115_create_table_atg_goods_attr.php | 0 .../m191119_024029_create_table_atg_brand.php | 0 .../m191119_024205_create_table_atg_goods.php | 0 ...1119_024345_create_table_atg_goods_sku.php | 0 ...91119_025607_create_table_atg_supplier.php | 0 ...19_025843_create_table_atg_filter_attr.php | 0 ...pdate_column_icon_type_in_atg_category.php | 0 ...column_icon_type_in_table_atg_category.php | 0 ...umn_pid_and_icon_in_table_atg_category.php | 0 ...n_icon_type_in_table_atg_shop_category.php | 0 ...id_and_icon_in_table_atg_shop_category.php | 0 ...olumn_is_manaul_in_table_atg_goods_sku.php | 0 ...10349_add_column_sku_mode_in_atg_goods.php | 0 ...id_and_attr_id_in_table_atg_goods_attr.php | 0 ...d_column_cat_id_in_table_atg_attribute.php | 0 ...41_drop_columns_in_table_atg_goods_sku.php | 0 .../modules/goods}/migrations/sql/goods.sql | 0 .../goods}/migrations/sql/goods_sku.sql | 0 .../modules/goods}/models/ars/Attribute.php | 4 +- .../modules/goods}/models/ars/Brand.php | 2 +- .../modules/goods}/models/ars/Category.php | 4 +- .../modules/goods}/models/ars/FilterAttr.php | 2 +- .../modules/goods}/models/ars/Goods.php | 12 ++-- .../modules/goods}/models/ars/GoodsAttr.php | 2 +- .../modules/goods}/models/ars/GoodsSku.php | 2 +- .../goods}/models/ars/ShopCategory.php | 4 +- .../modules/goods}/models/ars/Supplier.php | 4 +- .../goods}/models/searchs/AttributeSearch.php | 6 +- .../goods}/models/searchs/BrandSearch.php | 6 +- .../goods}/models/searchs/CategorySearch.php | 6 +- .../goods}/models/searchs/GoodsSearch.php | 10 ++-- .../models/searchs/ShopCategorySearch.php | 6 +- .../goods}/models/searchs/SupplierSearch.php | 6 +- .../modules/goods}/views/attribute/_form.php | 4 +- .../goods}/views/attribute/_search.php | 0 .../modules/goods}/views/attribute/create.php | 2 +- .../modules/goods}/views/attribute/index.php | 0 .../modules/goods}/views/attribute/update.php | 2 +- .../modules/goods}/views/attribute/view.php | 2 +- .../modules/goods}/views/brand/_form.php | 2 +- .../modules/goods}/views/brand/_search.php | 0 .../modules/goods}/views/brand/create.php | 2 +- .../modules/goods}/views/brand/index.php | 0 .../modules/goods}/views/brand/update.php | 2 +- .../modules/goods}/views/brand/view.php | 2 +- .../modules/goods}/views/category/_form.php | 4 +- .../modules/goods}/views/category/_search.php | 0 .../modules/goods}/views/category/create.php | 2 +- .../modules/goods}/views/category/index.php | 0 .../modules/goods}/views/category/update.php | 2 +- .../modules/goods}/views/category/view.php | 4 +- .../modules/goods}/views/config/index.php | 0 .../modules/goods}/views/goods/_form.php | 10 ++-- .../modules/goods}/views/goods/_search.php | 0 .../modules/goods}/views/goods/attribute.php | 4 +- .../modules/goods}/views/goods/create.php | 2 +- .../goods}/views/goods/filter_attribute.php | 4 +- .../modules/goods}/views/goods/goods.php | 12 ++-- .../modules/goods}/views/goods/index.php | 0 .../modules/goods}/views/goods/new_editor.php | 0 .../modules/goods}/views/goods/picture.php | 2 +- .../modules/goods}/views/goods/sku_edit.php | 2 +- .../modules/goods}/views/goods/update.php | 2 +- .../modules/goods}/views/goods/view.php | 6 +- .../goods}/views/shop-category/_form.php | 6 +- .../goods}/views/shop-category/_search.php | 0 .../goods}/views/shop-category/create.php | 2 +- .../goods}/views/shop-category/index.php | 0 .../goods}/views/shop-category/update.php | 2 +- .../goods}/views/shop-category/view.php | 6 +- .../modules/goods}/views/supplier/_form.php | 2 +- .../modules/goods}/views/supplier/_search.php | 0 .../modules/goods}/views/supplier/create.php | 2 +- .../modules/goods}/views/supplier/index.php | 0 .../modules/goods}/views/supplier/update.php | 2 +- .../modules/goods}/views/supplier/view.php | 2 +- .../goods}/web/GoodsAttributeAsset.php | 4 +- .../goods}/web/GoodsFilterAttributeAsset.php | 4 +- .../modules/goods}/web/GoodsSkuEditAsset.php | 4 +- backend/modules/shop/Module.php | 24 ++++++++ .../controllers/ExpressTemplateController.php | 10 ++-- .../shop}/controllers/OrderController.php | 6 +- .../controllers/TakingSiteController.php | 10 ++-- .../shop}/migrations/m130524_201442_init.php | 0 .../migrations/m140506_102106_rbac_init.php | 0 ...c_add_index_on_auth_assignment_user_id.php | 0 ...38_rbac_updates_indexes_without_prefix.php | 0 ...erification_token_column_to_user_table.php | 0 .../m190802_072830_add_category.php | 0 .../m191111_101658_create_table_area.php | 0 .../m191111_102644_create_table_province.php | 0 .../m191111_102730_create_table_city.php | 0 .../m191111_102925_create_table_cart.php | 0 .../m191111_112559_create_table_address.php | 0 ...m191111_113455_create_table_after_sale.php | 2 +- ...112_005106_create_table_search_history.php | 0 ...m191112_005545_create_table_collection.php | 0 .../m191112_005702_create_table_comment.php | 0 .../m191112_010421_create_table_order.php | 0 ...191112_011517_create_table_order_goods.php | 0 ...191112_012449_create_table_taking_site.php | 0 ...2_014508_create_table_express_template.php | 0 .../m191112_015939_create_table_delivery.php | 0 ...191112_020830_create_table_payment_log.php | 0 ...m191112_021528_create_table_refund_log.php | 0 ...column_weight_in_table_ats_order_goods.php | 0 ...column_sku_id_in_table_ats_order_goods.php | 0 ...nce_city_area_in_table_ats_taking_site.php | 0 ...olumn_address_in_table_ats_taking_site.php | 0 ...mn_is_default_in_table_ats_taking_site.php | 0 ..._add_column_address_in_table_ats_order.php | 0 ...112307_add_data_to_table_city_and_area.php | 0 ...mn_discount_description_in_table_order.php | 0 ...culation_in_table_ats_express_template.php | 0 ...c_amount_in_table_ats_express_template.php | 0 .../shop}/migrations/schema-mysql.sql | 0 .../shop}/migrations/sql/add_category.sql | 0 .../shop}/migrations/sql/add_data.sql | 0 .../shop}/migrations/sql/area.sql | 0 .../shop}/migrations/sql/city.sql | 0 .../shop}/migrations/sql/province.sql | 0 backend/modules/shop/models/.gitkeep | 1 + .../{ => modules/shop}/models/ars/Address.php | 2 +- .../shop}/models/ars/AfterSale.php | 2 +- .../{ => modules/shop}/models/ars/Area.php | 2 +- .../{ => modules/shop}/models/ars/Cart.php | 2 +- .../{ => modules/shop}/models/ars/City.php | 2 +- .../shop}/models/ars/Collection.php | 2 +- .../{ => modules/shop}/models/ars/Comment.php | 2 +- .../{ => modules/shop}/models/ars/Config.php | 2 +- .../shop}/models/ars/Delivery.php | 2 +- .../shop}/models/ars/ExpressTemplate.php | 2 +- .../{ => modules/shop}/models/ars/Order.php | 2 +- .../shop}/models/ars/OrderGoods.php | 2 +- .../shop}/models/ars/PaymentLog.php | 2 +- .../shop}/models/ars/Province.php | 2 +- .../shop}/models/ars/RefundLog.php | 2 +- .../shop}/models/ars/SearchHistory.php | 2 +- .../shop}/models/ars/TakingSite.php | 2 +- .../models/searchs/ExpressTemplateSearch.php | 6 +- .../shop}/models/searchs/OrderSearch.php | 6 +- .../shop}/models/searchs/TakingSiteSearch.php | 57 ++++++++++++++----- .../shop}/views/express-template/_form.php | 42 +++++++++----- .../shop}/views/express-template/_search.php | 0 .../shop}/views/express-template/area.php | 0 .../shop}/views/express-template/create.php | 2 +- .../shop}/views/express-template/index.php | 0 .../shop}/views/express-template/update.php | 2 +- .../shop}/views/express-template/view.php | 6 +- .../{ => modules/shop}/views/order/_form.php | 0 .../shop}/views/order/_search.php | 0 .../{ => modules/shop}/views/order/create.php | 0 .../{ => modules/shop}/views/order/index.php | 0 .../{ => modules/shop}/views/order/update.php | 0 .../{ => modules/shop}/views/order/view.php | 0 .../shop}/views/taking-site/_form.php | 6 +- .../shop}/views/taking-site/_search.php | 0 .../shop}/views/taking-site/create.php | 0 .../shop}/views/taking-site/index.php | 0 .../shop}/views/taking-site/update.php | 4 +- .../shop}/views/taking-site/view.php | 0 common/config/bootstrap.php | 1 - 184 files changed, 322 insertions(+), 282 deletions(-) create mode 100644 backend/modules/file/Module.php rename backend/{ => modules/file}/logic/file/FileManager.php (96%) mode change 100644 => 100755 rename backend/{ => modules/file}/migrations/m191112_022131_create_table_file.php (100%) rename backend/{ => modules/file}/migrations/m191112_022532_create_table_tem_file.php (100%) rename backend/{ => modules/file}/models/ars/File.php (98%) mode change 100644 => 100755 rename backend/{ => modules/file}/models/ars/TemFile.php (97%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/Module.php (72%) rename {goods => backend/modules/goods}/assets/custom/sku.49a56a9198d9c3ec233c.js (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/assets/custom/sku.52802ed907a316501cd7.js (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/assets/custom/sku.9a46222d01b3d601e5ad.js (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/assets/custom/sku_item.6649e882bedbeb22ea3d.js (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/assets/js/jquery.js (100%) rename {goods => backend/modules/goods}/controllers/AttributeController.php (97%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/controllers/BrandController.php (96%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/controllers/CategoryController.php (86%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/controllers/GoodsController.php (88%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/controllers/ShopCategoryController.php (87%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/controllers/SupplierController.php (96%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/logic/goods/GoodsManager.php (96%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191119_021851_create_table_atg_shop_category.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191119_022641_create_table_atg_category.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191119_022939_create_table_atg_attribute.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191119_023115_create_table_atg_goods_attr.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191119_024029_create_table_atg_brand.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191119_024205_create_table_atg_goods.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191119_024345_create_table_atg_goods_sku.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191119_025607_create_table_atg_supplier.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191119_025843_create_table_atg_filter_attr.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191125_012449_update_column_icon_type_in_atg_category.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191125_083820_drop_column_icon_type_in_table_atg_category.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191125_084547_update_column_pid_and_icon_in_table_atg_category.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191125_104137_drop_column_icon_type_in_table_atg_shop_category.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191125_104510_update_column_pid_and_icon_in_table_atg_shop_category.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191127_114228_add_column_is_manaul_in_table_atg_goods_sku.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191129_010349_add_column_sku_mode_in_atg_goods.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191129_020131_add_columns_goods_id_and_attr_id_in_table_atg_goods_attr.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191130_004933_add_column_cat_id_in_table_atg_attribute.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/m191202_082041_drop_columns_in_table_atg_goods_sku.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/migrations/sql/goods.sql (100%) rename {goods => backend/modules/goods}/migrations/sql/goods_sku.sql (100%) rename {goods => backend/modules/goods}/models/ars/Attribute.php (96%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/models/ars/Brand.php (97%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/models/ars/Category.php (96%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/models/ars/FilterAttr.php (97%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/models/ars/Goods.php (96%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/models/ars/GoodsAttr.php (97%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/models/ars/GoodsSku.php (98%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/models/ars/ShopCategory.php (97%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/models/ars/Supplier.php (93%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/models/searchs/AttributeSearch.php (96%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/models/searchs/BrandSearch.php (95%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/models/searchs/CategorySearch.php (97%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/models/searchs/GoodsSearch.php (96%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/models/searchs/ShopCategorySearch.php (96%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/models/searchs/SupplierSearch.php (96%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/attribute/_form.php (88%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/attribute/_search.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/attribute/create.php (84%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/attribute/index.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/attribute/update.php (87%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/attribute/view.php (92%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/brand/_form.php (89%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/brand/_search.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/brand/create.php (85%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/brand/index.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/brand/update.php (88%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/brand/view.php (91%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/category/_form.php (92%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/category/_search.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/category/create.php (85%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/category/index.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/category/update.php (88%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/category/view.php (82%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/config/index.php (100%) rename {goods => backend/modules/goods}/views/goods/_form.php (93%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/goods/_search.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/goods/attribute.php (87%) rename {goods => backend/modules/goods}/views/goods/create.php (97%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/goods/filter_attribute.php (87%) rename {goods => backend/modules/goods}/views/goods/goods.php (86%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/goods/index.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/goods/new_editor.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/goods/picture.php (95%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/goods/sku_edit.php (86%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/goods/update.php (97%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/goods/view.php (96%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/shop-category/_form.php (91%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/shop-category/_search.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/shop-category/create.php (84%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/shop-category/index.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/shop-category/update.php (87%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/shop-category/view.php (91%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/supplier/_form.php (92%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/supplier/_search.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/supplier/create.php (84%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/supplier/index.php (100%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/supplier/update.php (88%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/views/supplier/view.php (92%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/web/GoodsAttributeAsset.php (78%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/web/GoodsFilterAttributeAsset.php (75%) mode change 100644 => 100755 rename {goods => backend/modules/goods}/web/GoodsSkuEditAsset.php (75%) mode change 100644 => 100755 create mode 100644 backend/modules/shop/Module.php rename backend/{ => modules/shop}/controllers/ExpressTemplateController.php (96%) mode change 100644 => 100755 rename backend/{ => modules/shop}/controllers/OrderController.php (96%) rename backend/{ => modules/shop}/controllers/TakingSiteController.php (95%) mode change 100644 => 100755 rename backend/{ => modules/shop}/migrations/m130524_201442_init.php (100%) rename backend/{ => modules/shop}/migrations/m140506_102106_rbac_init.php (100%) rename backend/{ => modules/shop}/migrations/m170907_052038_rbac_add_index_on_auth_assignment_user_id.php (100%) rename backend/{ => modules/shop}/migrations/m180523_151638_rbac_updates_indexes_without_prefix.php (100%) rename backend/{ => modules/shop}/migrations/m190124_110200_add_verification_token_column_to_user_table.php (100%) rename backend/{ => modules/shop}/migrations/m190802_072830_add_category.php (100%) rename backend/{ => modules/shop}/migrations/m191111_101658_create_table_area.php (100%) rename backend/{ => modules/shop}/migrations/m191111_102644_create_table_province.php (100%) rename backend/{ => modules/shop}/migrations/m191111_102730_create_table_city.php (100%) rename backend/{ => modules/shop}/migrations/m191111_102925_create_table_cart.php (100%) rename backend/{ => modules/shop}/migrations/m191111_112559_create_table_address.php (100%) rename backend/{ => modules/shop}/migrations/m191111_113455_create_table_after_sale.php (99%) rename backend/{ => modules/shop}/migrations/m191112_005106_create_table_search_history.php (100%) rename backend/{ => modules/shop}/migrations/m191112_005545_create_table_collection.php (100%) rename backend/{ => modules/shop}/migrations/m191112_005702_create_table_comment.php (100%) rename backend/{ => modules/shop}/migrations/m191112_010421_create_table_order.php (100%) rename backend/{ => modules/shop}/migrations/m191112_011517_create_table_order_goods.php (100%) rename backend/{ => modules/shop}/migrations/m191112_012449_create_table_taking_site.php (100%) rename backend/{ => modules/shop}/migrations/m191112_014508_create_table_express_template.php (100%) rename backend/{ => modules/shop}/migrations/m191112_015939_create_table_delivery.php (100%) rename backend/{ => modules/shop}/migrations/m191112_020830_create_table_payment_log.php (100%) rename backend/{ => modules/shop}/migrations/m191112_021528_create_table_refund_log.php (100%) rename backend/{ => modules/shop}/migrations/m191130_071623_add_column_weight_in_table_ats_order_goods.php (100%) mode change 100644 => 100755 rename backend/{ => modules/shop}/migrations/m191203_022720_add_column_sku_id_in_table_ats_order_goods.php (100%) mode change 100644 => 100755 rename backend/{ => modules/shop}/migrations/m191203_030210_update_columns_province_city_area_in_table_ats_taking_site.php (100%) mode change 100644 => 100755 rename backend/{ => modules/shop}/migrations/m191203_030911_update_column_address_in_table_ats_taking_site.php (100%) mode change 100644 => 100755 rename backend/{ => modules/shop}/migrations/m191203_031446_drop_column_is_default_in_table_ats_taking_site.php (100%) mode change 100644 => 100755 rename backend/{ => modules/shop}/migrations/m191203_034004_add_column_address_in_table_ats_order.php (100%) mode change 100644 => 100755 rename backend/{ => modules/shop}/migrations/m191203_112307_add_data_to_table_city_and_area.php (100%) mode change 100644 => 100755 rename backend/{ => modules/shop}/migrations/m191203_114421_update_column_discount_description_in_table_order.php (100%) mode change 100644 => 100755 rename backend/{ => modules/shop}/migrations/m191204_004849_update_column_calculation_in_table_ats_express_template.php (100%) mode change 100644 => 100755 rename backend/{ => modules/shop}/migrations/m191204_012240_update_columns_basic_price_basic_amount_in_table_ats_express_template.php (100%) mode change 100644 => 100755 rename backend/{ => modules/shop}/migrations/schema-mysql.sql (100%) rename backend/{ => modules/shop}/migrations/sql/add_category.sql (100%) rename backend/{ => modules/shop}/migrations/sql/add_data.sql (100%) mode change 100644 => 100755 rename backend/{ => modules/shop}/migrations/sql/area.sql (100%) rename backend/{ => modules/shop}/migrations/sql/city.sql (100%) rename backend/{ => modules/shop}/migrations/sql/province.sql (100%) create mode 100755 backend/modules/shop/models/.gitkeep rename backend/{ => modules/shop}/models/ars/Address.php (97%) mode change 100644 => 100755 rename backend/{ => modules/shop}/models/ars/AfterSale.php (98%) mode change 100644 => 100755 rename backend/{ => modules/shop}/models/ars/Area.php (94%) mode change 100644 => 100755 rename backend/{ => modules/shop}/models/ars/Cart.php (97%) mode change 100644 => 100755 rename backend/{ => modules/shop}/models/ars/City.php (94%) mode change 100644 => 100755 rename backend/{ => modules/shop}/models/ars/Collection.php (97%) mode change 100644 => 100755 rename backend/{ => modules/shop}/models/ars/Comment.php (97%) mode change 100644 => 100755 rename backend/{ => modules/shop}/models/ars/Config.php (97%) rename backend/{ => modules/shop}/models/ars/Delivery.php (97%) mode change 100644 => 100755 rename backend/{ => modules/shop}/models/ars/ExpressTemplate.php (98%) mode change 100644 => 100755 rename backend/{ => modules/shop}/models/ars/Order.php (98%) mode change 100644 => 100755 rename backend/{ => modules/shop}/models/ars/OrderGoods.php (98%) mode change 100644 => 100755 rename backend/{ => modules/shop}/models/ars/PaymentLog.php (97%) mode change 100644 => 100755 rename backend/{ => modules/shop}/models/ars/Province.php (94%) mode change 100644 => 100755 rename backend/{ => modules/shop}/models/ars/RefundLog.php (97%) mode change 100644 => 100755 rename backend/{ => modules/shop}/models/ars/SearchHistory.php (97%) mode change 100644 => 100755 rename backend/{ => modules/shop}/models/ars/TakingSite.php (97%) mode change 100644 => 100755 rename backend/{ => modules/shop}/models/searchs/ExpressTemplateSearch.php (96%) mode change 100644 => 100755 rename backend/{ => modules/shop}/models/searchs/OrderSearch.php (96%) rename backend/{ => modules/shop}/models/searchs/TakingSiteSearch.php (71%) mode change 100644 => 100755 rename backend/{ => modules/shop}/views/express-template/_form.php (69%) mode change 100644 => 100755 rename backend/{ => modules/shop}/views/express-template/_search.php (100%) mode change 100644 => 100755 rename backend/{ => modules/shop}/views/express-template/area.php (100%) mode change 100644 => 100755 rename backend/{ => modules/shop}/views/express-template/create.php (95%) mode change 100644 => 100755 rename backend/{ => modules/shop}/views/express-template/index.php (100%) mode change 100644 => 100755 rename backend/{ => modules/shop}/views/express-template/update.php (96%) mode change 100644 => 100755 rename backend/{ => modules/shop}/views/express-template/view.php (83%) mode change 100644 => 100755 rename backend/{ => modules/shop}/views/order/_form.php (100%) rename backend/{ => modules/shop}/views/order/_search.php (100%) rename backend/{ => modules/shop}/views/order/create.php (100%) rename backend/{ => modules/shop}/views/order/index.php (100%) rename backend/{ => modules/shop}/views/order/update.php (100%) rename backend/{ => modules/shop}/views/order/view.php (100%) rename backend/{ => modules/shop}/views/taking-site/_form.php (92%) mode change 100644 => 100755 rename backend/{ => modules/shop}/views/taking-site/_search.php (100%) mode change 100644 => 100755 rename backend/{ => modules/shop}/views/taking-site/create.php (100%) mode change 100644 => 100755 rename backend/{ => modules/shop}/views/taking-site/index.php (100%) mode change 100644 => 100755 rename backend/{ => modules/shop}/views/taking-site/update.php (91%) mode change 100644 => 100755 rename backend/{ => modules/shop}/views/taking-site/view.php (100%) mode change 100644 => 100755 diff --git a/backend/modules/file/Module.php b/backend/modules/file/Module.php new file mode 100644 index 0000000..937b3f6 --- /dev/null +++ b/backend/modules/file/Module.php @@ -0,0 +1,24 @@ +request->get('data'); $file_name = Yii::$app->request->get('fileName')[0]; if ($data['status'] == true) { - $model = new \backend\models\ars\TemFile(); + $model = new \backend\modules\file\models\ars\TemFile(); $model->user_id = Yii::$app->user->identity->id; $model->name = $file_name; - $file_manager = new \backend\logic\file\FileManager(); - $type_res = $file_manager->searchType(\backend\logic\file\FileManager::$extension, pathinfo($data['path'])['extension']); + $file_manager = new \backend\modules\file\logic\file\FileManager(); + $type_res = $file_manager->searchType(\backend\modules\file\logic\file\FileManager::$extension, pathinfo($data['path'])['extension']); if ($type_res['status']) { $model->type = $type_res['type']; } @@ -222,22 +218,17 @@ class CategoryController extends Controller */ public function actionImgIdDel() { - //判断该类是否存在 - if(!class_exists('\backend\models\ars\TemFile') || !class_exists('\backend\models\ars\File')){ - return ''; - } - $img_id = Yii::$app->request->get('imgid'); $img_id_arr = explode(',', $img_id); if(isset(Yii::$app->request->get('data')['alias'])) { $alias = Yii::$app->request->get('data')['alias']; - $tem_file = \backend\models\ars\TemFile::findOne(['alias' => $alias]); + $tem_file = \backend\modules\file\models\ars\TemFile::findOne(['alias' => $alias]); if ($tem_file) { $img_id_arr = array_diff($img_id_arr, [$tem_file->id]); } }else{ foreach (Yii::$app->request->get() as $key => $value) { - $tem_file = \backend\models\ars\File::findOne(['alias' => $value]); + $tem_file = \backend\modules\file\models\ars\File::findOne(['alias' => $value]); if ($tem_file) { $img_id_arr = array_diff($img_id_arr, [$tem_file->id]); } @@ -253,14 +244,9 @@ class CategoryController extends Controller */ public function actionImageFile() { - //判断该类是否存在 - if(!class_exists('\backend\models\ars\File')){ - return false; - } - $file_id_str = Yii::$app->request->get('fileidstr'); $file_id_arr = explode(',', $file_id_str); - $data = \backend\models\ars\File::find()->where(['id' => $file_id_arr])->all(); + $data = \backend\modules\file\models\ars\File::find()->where(['id' => $file_id_arr])->all(); $res = array(); if($data) { $i = 0; diff --git a/goods/controllers/GoodsController.php b/backend/modules/goods/controllers/GoodsController.php old mode 100644 new mode 100755 similarity index 88% rename from goods/controllers/GoodsController.php rename to backend/modules/goods/controllers/GoodsController.php index bc0b2dd..e0d4833 --- a/goods/controllers/GoodsController.php +++ b/backend/modules/goods/controllers/GoodsController.php @@ -1,22 +1,22 @@ request->get('data'); $file_name = Yii::$app->request->get('fileName')[0]; if ($data['status'] == true) { - $model = new \backend\models\ars\TemFile(); + $model = new \backend\modules\file\models\ars\TemFile(); $model->user_id = Yii::$app->user->identity->id; $model->name = $file_name; - $file_manager = new \backend\logic\file\FileManager(); - $type_res = $file_manager->searchType(\backend\logic\file\FileManager::$extension, pathinfo($data['path'])['extension']); + $file_manager = new \backend\modules\file\logic\file\FileManager(); + $type_res = $file_manager->searchType(\backend\modules\file\logic\file\FileManager::$extension, pathinfo($data['path'])['extension']); if ($type_res['status']) { $model->type = $type_res['type']; } @@ -232,22 +228,17 @@ class GoodsController extends Controller */ public function actionImgIdDel() { - //判断该类是否存在 - if(!class_exists('\backend\models\ars\TemFile') || !class_exists('\backend\models\ars\File')){ - return ''; - } - $img_id = Yii::$app->request->get('imgid'); $img_id_arr = explode(',', $img_id); if(isset(Yii::$app->request->get('data')['alias'])) { $alias = Yii::$app->request->get('data')['alias']; - $tem_file = \backend\models\ars\TemFile::findOne(['alias' => $alias]); + $tem_file = \backend\modules\file\models\ars\TemFile::findOne(['alias' => $alias]); if ($tem_file) { $img_id_arr = array_diff($img_id_arr, [$tem_file->id]); } }else{ foreach (Yii::$app->request->get() as $key => $value) { - $tem_file = \backend\models\ars\File::findOne(['alias' => $value]); + $tem_file = \backend\modules\file\models\ars\File::findOne(['alias' => $value]); if ($tem_file) { $img_id_arr = array_diff($img_id_arr, [$tem_file->id]); } @@ -263,18 +254,13 @@ class GoodsController extends Controller */ public function actionImageFile() { - //判断该类是否存在 - if(!class_exists('\backend\models\ars\File')){ - return false; - } - $rule_verify = Yii::$app->request->get('ruleverify'); $file_id_str = Yii::$app->request->get('fileidstr'); $file_id_arr = explode(',', $file_id_str); if ($rule_verify == 1) { - $data = \backend\models\ars\TemFile::find()->where(['id' => $file_id_arr])->all(); + $data = \backend\modules\file\models\ars\TemFile::find()->where(['id' => $file_id_arr])->all(); } else { - $data = \backend\models\ars\File::find()->where(['id' => $file_id_arr])->all(); + $data = \backend\modules\file\models\ars\File::find()->where(['id' => $file_id_arr])->all(); } $res = array(); if($data) { diff --git a/goods/controllers/ShopCategoryController.php b/backend/modules/goods/controllers/ShopCategoryController.php old mode 100644 new mode 100755 similarity index 87% rename from goods/controllers/ShopCategoryController.php rename to backend/modules/goods/controllers/ShopCategoryController.php index 449f606..70d1515 --- a/goods/controllers/ShopCategoryController.php +++ b/backend/modules/goods/controllers/ShopCategoryController.php @@ -1,12 +1,12 @@ request->get('data'); $file_name = Yii::$app->request->get('fileName')[0]; if ($data['status'] == true) { - $model = new \backend\models\ars\TemFile(); + $model = new \backend\modules\file\models\ars\TemFile(); $model->user_id = Yii::$app->user->identity->id; $model->name = $file_name; - $file_manager = new \backend\logic\file\FileManager(); - $type_res = $file_manager->searchType(\backend\logic\file\FileManager::$extension, pathinfo($data['path'])['extension']); + $file_manager = new \backend\modules\file\logic\file\FileManager(); + $type_res = $file_manager->searchType(\backend\modules\file\logic\file\FileManager::$extension, pathinfo($data['path'])['extension']); if ($type_res['status']) { $model->type = $type_res['type']; } @@ -233,22 +229,17 @@ class ShopCategoryController extends Controller */ public function actionImgIdDel() { - //判断该类是否存在 - if(!class_exists('\backend\models\ars\TemFile') || !class_exists('\backend\models\ars\File')){ - return ''; - } - $img_id = Yii::$app->request->get('imgid'); $img_id_arr = explode(',', $img_id); if(isset(Yii::$app->request->get('data')['alias'])) { $alias = Yii::$app->request->get('data')['alias']; - $tem_file = \backend\models\ars\TemFile::findOne(['alias' => $alias]); + $tem_file = \backend\modules\file\models\ars\TemFile::findOne(['alias' => $alias]); if ($tem_file) { $img_id_arr = array_diff($img_id_arr, [$tem_file->id]); } }else{ foreach (Yii::$app->request->get() as $key => $value) { - $tem_file = \backend\models\ars\File::findOne(['alias' => $value]); + $tem_file = \backend\modules\file\models\ars\File::findOne(['alias' => $value]); if ($tem_file) { $img_id_arr = array_diff($img_id_arr, [$tem_file->id]); } @@ -264,14 +255,9 @@ class ShopCategoryController extends Controller */ public function actionImageFile() { - //判断该类是否存在 - if(!class_exists('\backend\models\ars\File')){ - return false; - } - $file_id_str = Yii::$app->request->get('fileidstr'); $file_id_arr = explode(',', $file_id_str); - $data = \backend\models\ars\File::find()->where(['id' => $file_id_arr])->all(); + $data = \backend\modules\file\models\ars\File::find()->where(['id' => $file_id_arr])->all(); $res = array(); if($data) { $i = 0; diff --git a/goods/controllers/SupplierController.php b/backend/modules/goods/controllers/SupplierController.php old mode 100644 new mode 100755 similarity index 96% rename from goods/controllers/SupplierController.php rename to backend/modules/goods/controllers/SupplierController.php index fce87bf..80684f4 --- a/goods/controllers/SupplierController.php +++ b/backend/modules/goods/controllers/SupplierController.php @@ -1,10 +1,10 @@ false, 'info' => '操作失败']; - } - //需要新建的文件id $createFileIdArr = array_diff($newFileIdArr, $oldFileIdArr); //创建文件 - $class = new \backend\logic\file\FileManager(); + $class = new \backend\modules\file\logic\file\FileManager(); $createFileRes = $class->saveTemFileToFile($createFileIdArr, $goodsModel->id, $fileType); //需要删除的文件id @@ -321,7 +316,7 @@ class GoodsManager /** * @param $attrId * @param $goodsId - * @return GoodsAttr[]|GoodsSku[]|array|File[]|\backend\models\ars\TemFile[]|\yii\db\ActiveRecord[] + * @return GoodsAttr[]|GoodsSku[]|array|File[]|\backend\modules\file\models\ars\TemFile[]|\yii\db\ActiveRecord[] * 获取属性值 */ public static function getAttrValue($attrId, $goodsId) diff --git a/goods/migrations/m191119_021851_create_table_atg_shop_category.php b/backend/modules/goods/migrations/m191119_021851_create_table_atg_shop_category.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191119_021851_create_table_atg_shop_category.php rename to backend/modules/goods/migrations/m191119_021851_create_table_atg_shop_category.php diff --git a/goods/migrations/m191119_022641_create_table_atg_category.php b/backend/modules/goods/migrations/m191119_022641_create_table_atg_category.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191119_022641_create_table_atg_category.php rename to backend/modules/goods/migrations/m191119_022641_create_table_atg_category.php diff --git a/goods/migrations/m191119_022939_create_table_atg_attribute.php b/backend/modules/goods/migrations/m191119_022939_create_table_atg_attribute.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191119_022939_create_table_atg_attribute.php rename to backend/modules/goods/migrations/m191119_022939_create_table_atg_attribute.php diff --git a/goods/migrations/m191119_023115_create_table_atg_goods_attr.php b/backend/modules/goods/migrations/m191119_023115_create_table_atg_goods_attr.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191119_023115_create_table_atg_goods_attr.php rename to backend/modules/goods/migrations/m191119_023115_create_table_atg_goods_attr.php diff --git a/goods/migrations/m191119_024029_create_table_atg_brand.php b/backend/modules/goods/migrations/m191119_024029_create_table_atg_brand.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191119_024029_create_table_atg_brand.php rename to backend/modules/goods/migrations/m191119_024029_create_table_atg_brand.php diff --git a/goods/migrations/m191119_024205_create_table_atg_goods.php b/backend/modules/goods/migrations/m191119_024205_create_table_atg_goods.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191119_024205_create_table_atg_goods.php rename to backend/modules/goods/migrations/m191119_024205_create_table_atg_goods.php diff --git a/goods/migrations/m191119_024345_create_table_atg_goods_sku.php b/backend/modules/goods/migrations/m191119_024345_create_table_atg_goods_sku.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191119_024345_create_table_atg_goods_sku.php rename to backend/modules/goods/migrations/m191119_024345_create_table_atg_goods_sku.php diff --git a/goods/migrations/m191119_025607_create_table_atg_supplier.php b/backend/modules/goods/migrations/m191119_025607_create_table_atg_supplier.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191119_025607_create_table_atg_supplier.php rename to backend/modules/goods/migrations/m191119_025607_create_table_atg_supplier.php diff --git a/goods/migrations/m191119_025843_create_table_atg_filter_attr.php b/backend/modules/goods/migrations/m191119_025843_create_table_atg_filter_attr.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191119_025843_create_table_atg_filter_attr.php rename to backend/modules/goods/migrations/m191119_025843_create_table_atg_filter_attr.php diff --git a/goods/migrations/m191125_012449_update_column_icon_type_in_atg_category.php b/backend/modules/goods/migrations/m191125_012449_update_column_icon_type_in_atg_category.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191125_012449_update_column_icon_type_in_atg_category.php rename to backend/modules/goods/migrations/m191125_012449_update_column_icon_type_in_atg_category.php diff --git a/goods/migrations/m191125_083820_drop_column_icon_type_in_table_atg_category.php b/backend/modules/goods/migrations/m191125_083820_drop_column_icon_type_in_table_atg_category.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191125_083820_drop_column_icon_type_in_table_atg_category.php rename to backend/modules/goods/migrations/m191125_083820_drop_column_icon_type_in_table_atg_category.php diff --git a/goods/migrations/m191125_084547_update_column_pid_and_icon_in_table_atg_category.php b/backend/modules/goods/migrations/m191125_084547_update_column_pid_and_icon_in_table_atg_category.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191125_084547_update_column_pid_and_icon_in_table_atg_category.php rename to backend/modules/goods/migrations/m191125_084547_update_column_pid_and_icon_in_table_atg_category.php diff --git a/goods/migrations/m191125_104137_drop_column_icon_type_in_table_atg_shop_category.php b/backend/modules/goods/migrations/m191125_104137_drop_column_icon_type_in_table_atg_shop_category.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191125_104137_drop_column_icon_type_in_table_atg_shop_category.php rename to backend/modules/goods/migrations/m191125_104137_drop_column_icon_type_in_table_atg_shop_category.php diff --git a/goods/migrations/m191125_104510_update_column_pid_and_icon_in_table_atg_shop_category.php b/backend/modules/goods/migrations/m191125_104510_update_column_pid_and_icon_in_table_atg_shop_category.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191125_104510_update_column_pid_and_icon_in_table_atg_shop_category.php rename to backend/modules/goods/migrations/m191125_104510_update_column_pid_and_icon_in_table_atg_shop_category.php diff --git a/goods/migrations/m191127_114228_add_column_is_manaul_in_table_atg_goods_sku.php b/backend/modules/goods/migrations/m191127_114228_add_column_is_manaul_in_table_atg_goods_sku.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191127_114228_add_column_is_manaul_in_table_atg_goods_sku.php rename to backend/modules/goods/migrations/m191127_114228_add_column_is_manaul_in_table_atg_goods_sku.php diff --git a/goods/migrations/m191129_010349_add_column_sku_mode_in_atg_goods.php b/backend/modules/goods/migrations/m191129_010349_add_column_sku_mode_in_atg_goods.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191129_010349_add_column_sku_mode_in_atg_goods.php rename to backend/modules/goods/migrations/m191129_010349_add_column_sku_mode_in_atg_goods.php diff --git a/goods/migrations/m191129_020131_add_columns_goods_id_and_attr_id_in_table_atg_goods_attr.php b/backend/modules/goods/migrations/m191129_020131_add_columns_goods_id_and_attr_id_in_table_atg_goods_attr.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191129_020131_add_columns_goods_id_and_attr_id_in_table_atg_goods_attr.php rename to backend/modules/goods/migrations/m191129_020131_add_columns_goods_id_and_attr_id_in_table_atg_goods_attr.php diff --git a/goods/migrations/m191130_004933_add_column_cat_id_in_table_atg_attribute.php b/backend/modules/goods/migrations/m191130_004933_add_column_cat_id_in_table_atg_attribute.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191130_004933_add_column_cat_id_in_table_atg_attribute.php rename to backend/modules/goods/migrations/m191130_004933_add_column_cat_id_in_table_atg_attribute.php diff --git a/goods/migrations/m191202_082041_drop_columns_in_table_atg_goods_sku.php b/backend/modules/goods/migrations/m191202_082041_drop_columns_in_table_atg_goods_sku.php old mode 100644 new mode 100755 similarity index 100% rename from goods/migrations/m191202_082041_drop_columns_in_table_atg_goods_sku.php rename to backend/modules/goods/migrations/m191202_082041_drop_columns_in_table_atg_goods_sku.php diff --git a/goods/migrations/sql/goods.sql b/backend/modules/goods/migrations/sql/goods.sql similarity index 100% rename from goods/migrations/sql/goods.sql rename to backend/modules/goods/migrations/sql/goods.sql diff --git a/goods/migrations/sql/goods_sku.sql b/backend/modules/goods/migrations/sql/goods_sku.sql similarity index 100% rename from goods/migrations/sql/goods_sku.sql rename to backend/modules/goods/migrations/sql/goods_sku.sql diff --git a/goods/models/ars/Attribute.php b/backend/modules/goods/models/ars/Attribute.php old mode 100644 new mode 100755 similarity index 96% rename from goods/models/ars/Attribute.php rename to backend/modules/goods/models/ars/Attribute.php index b2bddad..ad8870f --- a/goods/models/ars/Attribute.php +++ b/backend/modules/goods/models/ars/Attribute.php @@ -1,10 +1,10 @@ 20], ['phone', 'filter', 'filter' => 'trim'], ['phone','match','pattern'=>'/^[1][34578][0-9]{9}$/'], - ['phone', 'unique', 'targetClass' => '\goods\models\ars\Supplier', 'message' => '手机号已被使用'], + ['phone', 'unique', 'targetClass' => '\backend\modules\goods\models\ars\Supplier', 'message' => '手机号已被使用'], ]; } diff --git a/goods/models/searchs/AttributeSearch.php b/backend/modules/goods/models/searchs/AttributeSearch.php old mode 100644 new mode 100755 similarity index 96% rename from goods/models/searchs/AttributeSearch.php rename to backend/modules/goods/models/searchs/AttributeSearch.php index 7474d17..300dbce --- a/goods/models/searchs/AttributeSearch.php +++ b/backend/modules/goods/models/searchs/AttributeSearch.php @@ -1,14 +1,14 @@ diff --git a/goods/views/attribute/_search.php b/backend/modules/goods/views/attribute/_search.php old mode 100644 new mode 100755 similarity index 100% rename from goods/views/attribute/_search.php rename to backend/modules/goods/views/attribute/_search.php diff --git a/goods/views/attribute/create.php b/backend/modules/goods/views/attribute/create.php old mode 100644 new mode 100755 similarity index 84% rename from goods/views/attribute/create.php rename to backend/modules/goods/views/attribute/create.php index 4d16c28..0c86165 --- a/goods/views/attribute/create.php +++ b/backend/modules/goods/views/attribute/create.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Attribute */ +/* @var $model backend\modules\goods\models\ars\Attribute */ $this->title = '创建规格'; $this->params['breadcrumbs'][] = ['label' => '规格管理', 'url' => ['index']]; diff --git a/goods/views/attribute/index.php b/backend/modules/goods/views/attribute/index.php old mode 100644 new mode 100755 similarity index 100% rename from goods/views/attribute/index.php rename to backend/modules/goods/views/attribute/index.php diff --git a/goods/views/attribute/update.php b/backend/modules/goods/views/attribute/update.php old mode 100644 new mode 100755 similarity index 87% rename from goods/views/attribute/update.php rename to backend/modules/goods/views/attribute/update.php index 24b0135..05c1380 --- a/goods/views/attribute/update.php +++ b/backend/modules/goods/views/attribute/update.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Attribute */ +/* @var $model backend\modules\goods\models\ars\Attribute */ $this->title = '编辑规格: ' . $model->name; $this->params['breadcrumbs'][] = ['label' => '规格管理', 'url' => ['index']]; diff --git a/goods/views/attribute/view.php b/backend/modules/goods/views/attribute/view.php old mode 100644 new mode 100755 similarity index 92% rename from goods/views/attribute/view.php rename to backend/modules/goods/views/attribute/view.php index a803a39..230da51 --- a/goods/views/attribute/view.php +++ b/backend/modules/goods/views/attribute/view.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use yii\widgets\DetailView; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Attribute */ +/* @var $model backend\modules\goods\models\ars\Attribute */ $this->title = $model->name; $this->params['breadcrumbs'][] = ['label' => '规格管理', 'url' => ['index']]; diff --git a/goods/views/brand/_form.php b/backend/modules/goods/views/brand/_form.php old mode 100644 new mode 100755 similarity index 89% rename from goods/views/brand/_form.php rename to backend/modules/goods/views/brand/_form.php index ce5517d..a07f7d0 --- a/goods/views/brand/_form.php +++ b/backend/modules/goods/views/brand/_form.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use yii\bootstrap4\ActiveForm; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Brand */ +/* @var $model backend\modules\goods\models\ars\Brand */ /* @var $form yii\widgets\ActiveForm */ ?> diff --git a/goods/views/brand/_search.php b/backend/modules/goods/views/brand/_search.php old mode 100644 new mode 100755 similarity index 100% rename from goods/views/brand/_search.php rename to backend/modules/goods/views/brand/_search.php diff --git a/goods/views/brand/create.php b/backend/modules/goods/views/brand/create.php old mode 100644 new mode 100755 similarity index 85% rename from goods/views/brand/create.php rename to backend/modules/goods/views/brand/create.php index 617b6a2..ca18485 --- a/goods/views/brand/create.php +++ b/backend/modules/goods/views/brand/create.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Brand */ +/* @var $model backend\modules\goods\models\ars\Brand */ $this->title = '创建品牌'; $this->params['breadcrumbs'][] = ['label' => '品牌管理', 'url' => ['index']]; diff --git a/goods/views/brand/index.php b/backend/modules/goods/views/brand/index.php old mode 100644 new mode 100755 similarity index 100% rename from goods/views/brand/index.php rename to backend/modules/goods/views/brand/index.php diff --git a/goods/views/brand/update.php b/backend/modules/goods/views/brand/update.php old mode 100644 new mode 100755 similarity index 88% rename from goods/views/brand/update.php rename to backend/modules/goods/views/brand/update.php index 8b9d0b8..1d4b5bf --- a/goods/views/brand/update.php +++ b/backend/modules/goods/views/brand/update.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Brand */ +/* @var $model backend\modules\goods\models\ars\Brand */ $this->title = '编辑品牌: ' . $model->name; $this->params['breadcrumbs'][] = ['label' => '品牌管理', 'url' => ['index']]; diff --git a/goods/views/brand/view.php b/backend/modules/goods/views/brand/view.php old mode 100644 new mode 100755 similarity index 91% rename from goods/views/brand/view.php rename to backend/modules/goods/views/brand/view.php index 2f0c1cb..9d9b966 --- a/goods/views/brand/view.php +++ b/backend/modules/goods/views/brand/view.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use yii\widgets\DetailView; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Brand */ +/* @var $model backend\modules\goods\models\ars\Brand */ $this->title = $model->name; $this->params['breadcrumbs'][] = ['label' => '品牌管理', 'url' => ['index']]; diff --git a/goods/views/category/_form.php b/backend/modules/goods/views/category/_form.php old mode 100644 new mode 100755 similarity index 92% rename from goods/views/category/_form.php rename to backend/modules/goods/views/category/_form.php index 2adebff..87b09b9 --- a/goods/views/category/_form.php +++ b/backend/modules/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 goods\models\ars\Category; +use backend\modules\goods\models\ars\Category; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Category */ +/* @var $model backend\modules\goods\models\ars\Category */ /* @var $form yii\widgets\ActiveForm */ ?> diff --git a/goods/views/category/_search.php b/backend/modules/goods/views/category/_search.php old mode 100644 new mode 100755 similarity index 100% rename from goods/views/category/_search.php rename to backend/modules/goods/views/category/_search.php diff --git a/goods/views/category/create.php b/backend/modules/goods/views/category/create.php old mode 100644 new mode 100755 similarity index 85% rename from goods/views/category/create.php rename to backend/modules/goods/views/category/create.php index 8584d6c..d2bf93a --- a/goods/views/category/create.php +++ b/backend/modules/goods/views/category/create.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Category */ +/* @var $model backend\modules\goods\models\ars\Category */ $this->title = '创建后台商品分类'; $this->params['breadcrumbs'][] = ['label' => '后台商品分类', 'url' => ['index']]; diff --git a/goods/views/category/index.php b/backend/modules/goods/views/category/index.php old mode 100644 new mode 100755 similarity index 100% rename from goods/views/category/index.php rename to backend/modules/goods/views/category/index.php diff --git a/goods/views/category/update.php b/backend/modules/goods/views/category/update.php old mode 100644 new mode 100755 similarity index 88% rename from goods/views/category/update.php rename to backend/modules/goods/views/category/update.php index e4a77c6..3fe083b --- a/goods/views/category/update.php +++ b/backend/modules/goods/views/category/update.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Category */ +/* @var $model backend\modules\goods\models\ars\Category */ $this->title = '编辑后台商品分类: ' . $model->name; $this->params['breadcrumbs'][] = ['label' => '后台商品分类', 'url' => ['index']]; diff --git a/goods/views/category/view.php b/backend/modules/goods/views/category/view.php old mode 100644 new mode 100755 similarity index 82% rename from goods/views/category/view.php rename to backend/modules/goods/views/category/view.php index def1c8c..e9a6ccf --- a/goods/views/category/view.php +++ b/backend/modules/goods/views/category/view.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use yii\widgets\DetailView; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Category */ +/* @var $model backend\modules\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 == \goods\models\ars\Category::IS_SHOW_DISPLAY ? '显示':'隐藏'; + return $model->is_show == \backend\modules\goods\models\ars\Category::IS_SHOW_DISPLAY ? '显示':'隐藏'; } ], 'created_at:datetime', diff --git a/goods/views/config/index.php b/backend/modules/goods/views/config/index.php similarity index 100% rename from goods/views/config/index.php rename to backend/modules/goods/views/config/index.php diff --git a/goods/views/goods/_form.php b/backend/modules/goods/views/goods/_form.php old mode 100644 new mode 100755 similarity index 93% rename from goods/views/goods/_form.php rename to backend/modules/goods/views/goods/_form.php index 4de114b..564faa4 --- a/goods/views/goods/_form.php +++ b/backend/modules/goods/views/goods/_form.php @@ -2,14 +2,14 @@ use yii\helpers\Html; use yii\bootstrap4\ActiveForm; -use goods\models\ars\Category; -use goods\models\ars\Brand; -use goods\models\ars\ShopCategory; -use goods\models\ars\Supplier; +use backend\modules\goods\models\ars\Category; +use backend\modules\goods\models\ars\Brand; +use backend\modules\goods\models\ars\ShopCategory; +use backend\modules\goods\models\ars\Supplier; use yii\helpers\Url; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Goods */ +/* @var $model backend\modules\goods\models\ars\Goods */ /* @var $form yii\widgets\ActiveForm */ ?> diff --git a/goods/views/goods/_search.php b/backend/modules/goods/views/goods/_search.php old mode 100644 new mode 100755 similarity index 100% rename from goods/views/goods/_search.php rename to backend/modules/goods/views/goods/_search.php diff --git a/goods/views/goods/attribute.php b/backend/modules/goods/views/goods/attribute.php similarity index 87% rename from goods/views/goods/attribute.php rename to backend/modules/goods/views/goods/attribute.php index 3ce4f45..37084ff 100755 --- a/goods/views/goods/attribute.php +++ b/backend/modules/goods/views/goods/attribute.php @@ -1,7 +1,7 @@ title = '创建商品'; $this->params['breadcrumbs'][] = ['label' => '商品列表', 'url' => ['index']]; diff --git a/goods/views/goods/filter_attribute.php b/backend/modules/goods/views/goods/filter_attribute.php similarity index 87% rename from goods/views/goods/filter_attribute.php rename to backend/modules/goods/views/goods/filter_attribute.php index 55eab29..582e366 100755 --- a/goods/views/goods/filter_attribute.php +++ b/backend/modules/goods/views/goods/filter_attribute.php @@ -1,7 +1,7 @@ field($model, 'cat_id')->dropDownList(Category::modelColumn(), ['prompt' => '请选择', 'disabled' => $judgeGoodsCategory]) ?> diff --git a/goods/views/goods/index.php b/backend/modules/goods/views/goods/index.php old mode 100644 new mode 100755 similarity index 100% rename from goods/views/goods/index.php rename to backend/modules/goods/views/goods/index.php diff --git a/goods/views/goods/new_editor.php b/backend/modules/goods/views/goods/new_editor.php old mode 100644 new mode 100755 similarity index 100% rename from goods/views/goods/new_editor.php rename to backend/modules/goods/views/goods/new_editor.php diff --git a/goods/views/goods/picture.php b/backend/modules/goods/views/goods/picture.php old mode 100644 new mode 100755 similarity index 95% rename from goods/views/goods/picture.php rename to backend/modules/goods/views/goods/picture.php index 984211d..eb0cec4 --- a/goods/views/goods/picture.php +++ b/backend/modules/goods/views/goods/picture.php @@ -3,7 +3,7 @@ use yii\helpers\Url; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Goods */ +/* @var $model backend\modules\goods\models\ars\Goods */ /* @var $form yii\widgets\ActiveForm */ ?> field($model, 'coverImageId')->hiddenInput()->label('') ?> diff --git a/goods/views/goods/sku_edit.php b/backend/modules/goods/views/goods/sku_edit.php old mode 100644 new mode 100755 similarity index 86% rename from goods/views/goods/sku_edit.php rename to backend/modules/goods/views/goods/sku_edit.php index c44f91a..2baa1aa --- a/goods/views/goods/sku_edit.php +++ b/backend/modules/goods/views/goods/sku_edit.php @@ -1,6 +1,6 @@ title = '添加SKU'; $this->params['breadcrumbs'][] = ['label' => '商品列表', 'url' => ['index']]; diff --git a/goods/views/goods/update.php b/backend/modules/goods/views/goods/update.php old mode 100644 new mode 100755 similarity index 97% rename from goods/views/goods/update.php rename to backend/modules/goods/views/goods/update.php index 1cdd317..da346ef --- a/goods/views/goods/update.php +++ b/backend/modules/goods/views/goods/update.php @@ -5,7 +5,7 @@ use yii\bootstrap4\ActiveForm; use kartik\tabs\TabsX; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Goods */ +/* @var $model backend\modules\goods\models\ars\Goods */ $this->title = '编辑商品: ' . $model->name; $this->params['breadcrumbs'][] = ['label' => '商品管理', 'url' => ['index']]; diff --git a/goods/views/goods/view.php b/backend/modules/goods/views/goods/view.php old mode 100644 new mode 100755 similarity index 96% rename from goods/views/goods/view.php rename to backend/modules/goods/views/goods/view.php index 5a2f7c5..89146a0 --- a/goods/views/goods/view.php +++ b/backend/modules/goods/views/goods/view.php @@ -1,12 +1,12 @@ title = $model->name; $this->params['breadcrumbs'][] = ['label' => '商品管理', 'url' => ['index']]; diff --git a/goods/views/shop-category/_form.php b/backend/modules/goods/views/shop-category/_form.php old mode 100644 new mode 100755 similarity index 91% rename from goods/views/shop-category/_form.php rename to backend/modules/goods/views/shop-category/_form.php index 0d6c1e6..c953a9f --- a/goods/views/shop-category/_form.php +++ b/backend/modules/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 goods\models\ars\Attribute; +use backend\modules\goods\models\ars\Attribute; use linyao\widgets\Select2; -use goods\models\ars\ShopCategory; +use backend\modules\goods\models\ars\ShopCategory; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\ShopCategory */ +/* @var $model backend\modules\goods\models\ars\ShopCategory */ /* @var $form yii\widgets\ActiveForm */ ?> diff --git a/goods/views/shop-category/_search.php b/backend/modules/goods/views/shop-category/_search.php old mode 100644 new mode 100755 similarity index 100% rename from goods/views/shop-category/_search.php rename to backend/modules/goods/views/shop-category/_search.php diff --git a/goods/views/shop-category/create.php b/backend/modules/goods/views/shop-category/create.php old mode 100644 new mode 100755 similarity index 84% rename from goods/views/shop-category/create.php rename to backend/modules/goods/views/shop-category/create.php index c6bb5d5..1963d89 --- a/goods/views/shop-category/create.php +++ b/backend/modules/goods/views/shop-category/create.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\ShopCategory */ +/* @var $model backend\modules\goods\models\ars\ShopCategory */ $this->title = '创建前端商品分类'; $this->params['breadcrumbs'][] = ['label' => '前端商品分类', 'url' => ['index']]; diff --git a/goods/views/shop-category/index.php b/backend/modules/goods/views/shop-category/index.php old mode 100644 new mode 100755 similarity index 100% rename from goods/views/shop-category/index.php rename to backend/modules/goods/views/shop-category/index.php diff --git a/goods/views/shop-category/update.php b/backend/modules/goods/views/shop-category/update.php old mode 100644 new mode 100755 similarity index 87% rename from goods/views/shop-category/update.php rename to backend/modules/goods/views/shop-category/update.php index 21c62cb..4a56469 --- a/goods/views/shop-category/update.php +++ b/backend/modules/goods/views/shop-category/update.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\ShopCategory */ +/* @var $model backend\modules\goods\models\ars\ShopCategory */ $this->title = '编辑前端商品分类: ' . $model->name; $this->params['breadcrumbs'][] = ['label' => '前端商品分类', 'url' => ['index']]; diff --git a/goods/views/shop-category/view.php b/backend/modules/goods/views/shop-category/view.php old mode 100644 new mode 100755 similarity index 91% rename from goods/views/shop-category/view.php rename to backend/modules/goods/views/shop-category/view.php index 2efdec0..5c05ef0 --- a/goods/views/shop-category/view.php +++ b/backend/modules/goods/views/shop-category/view.php @@ -2,11 +2,11 @@ use yii\helpers\Html; use yii\widgets\DetailView; -use goods\models\ars\ShopCategory; -use goods\models\ars\Attribute; +use backend\modules\goods\models\ars\ShopCategory; +use backend\modules\goods\models\ars\Attribute; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\ShopCategory */ +/* @var $model backend\modules\goods\models\ars\ShopCategory */ $this->title = $model->name; $this->params['breadcrumbs'][] = ['label' => '前端商品分类', 'url' => ['index']]; diff --git a/goods/views/supplier/_form.php b/backend/modules/goods/views/supplier/_form.php old mode 100644 new mode 100755 similarity index 92% rename from goods/views/supplier/_form.php rename to backend/modules/goods/views/supplier/_form.php index ec1d23d..fccf803 --- a/goods/views/supplier/_form.php +++ b/backend/modules/goods/views/supplier/_form.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use yii\bootstrap4\ActiveForm; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Supplier */ +/* @var $model backend\modules\goods\models\ars\Supplier */ /* @var $form yii\widgets\ActiveForm */ ?> diff --git a/goods/views/supplier/_search.php b/backend/modules/goods/views/supplier/_search.php old mode 100644 new mode 100755 similarity index 100% rename from goods/views/supplier/_search.php rename to backend/modules/goods/views/supplier/_search.php diff --git a/goods/views/supplier/create.php b/backend/modules/goods/views/supplier/create.php old mode 100644 new mode 100755 similarity index 84% rename from goods/views/supplier/create.php rename to backend/modules/goods/views/supplier/create.php index 2eb536e..608a85a --- a/goods/views/supplier/create.php +++ b/backend/modules/goods/views/supplier/create.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Supplier */ +/* @var $model backend\modules\goods\models\ars\Supplier */ $this->title = '创建供应商'; $this->params['breadcrumbs'][] = ['label' => '供应商管理', 'url' => ['index']]; diff --git a/goods/views/supplier/index.php b/backend/modules/goods/views/supplier/index.php old mode 100644 new mode 100755 similarity index 100% rename from goods/views/supplier/index.php rename to backend/modules/goods/views/supplier/index.php diff --git a/goods/views/supplier/update.php b/backend/modules/goods/views/supplier/update.php old mode 100644 new mode 100755 similarity index 88% rename from goods/views/supplier/update.php rename to backend/modules/goods/views/supplier/update.php index a9ac487..e23a549 --- a/goods/views/supplier/update.php +++ b/backend/modules/goods/views/supplier/update.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Supplier */ +/* @var $model backend\modules\goods\models\ars\Supplier */ $this->title = '编辑供应商: ' . $model->name; $this->params['breadcrumbs'][] = ['label' => '供应商管理', 'url' => ['index']]; diff --git a/goods/views/supplier/view.php b/backend/modules/goods/views/supplier/view.php old mode 100644 new mode 100755 similarity index 92% rename from goods/views/supplier/view.php rename to backend/modules/goods/views/supplier/view.php index 79cbe18..68a7689 --- a/goods/views/supplier/view.php +++ b/backend/modules/goods/views/supplier/view.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use yii\widgets\DetailView; /* @var $this yii\web\View */ -/* @var $model goods\models\ars\Supplier */ +/* @var $model backend\modules\goods\models\ars\Supplier */ $this->title = $model->name; $this->params['breadcrumbs'][] = ['label' => '供应商管理', 'url' => ['index']]; diff --git a/goods/web/GoodsAttributeAsset.php b/backend/modules/goods/web/GoodsAttributeAsset.php old mode 100644 new mode 100755 similarity index 78% rename from goods/web/GoodsAttributeAsset.php rename to backend/modules/goods/web/GoodsAttributeAsset.php index 8d28844..b249ae2 --- a/goods/web/GoodsAttributeAsset.php +++ b/backend/modules/goods/web/GoodsAttributeAsset.php @@ -1,6 +1,6 @@ '2%', 'align' => 'center' ], - 'id', - 'name', - 'province', - 'city', - 'area', - //'address', - //'updated_at', - //'created_at', + 'id', + 'name', + [ + 'attribute' => 'province', + 'value' => function ($model) { + $province = Province::findOne(['province_id' => $model->province]); + if ($province) { + return $province->name; + } + } + ], + [ + 'attribute' => 'city', + 'value' => function ($model) { + $city = City::findOne(['city_id' => $model->city]); + if ($city) { + return $city->name; + } + } + ], + [ + 'attribute' => 'area', + 'value' => function ($model) { + $area = Area::findOne(['area_id' => $model->area]); + if ($area) { + return $area->name; + } + } + ], + //'address', + //'updated_at', + //'created_at', [ 'class' => 'iron\grid\ActionColumn', 'align' => 'center', @@ -67,10 +94,10 @@ class TakingSiteSearch extends TakingSite ]; } /** - * @param $params - * @return ActiveDataProvider - * 不分页的所有数据 - */ + * @param $params + * @return ActiveDataProvider + * 不分页的所有数据 + */ public function allData($params) { $query = TakingSite::find(); diff --git a/backend/views/express-template/_form.php b/backend/modules/shop/views/express-template/_form.php old mode 100644 new mode 100755 similarity index 69% rename from backend/views/express-template/_form.php rename to backend/modules/shop/views/express-template/_form.php index fa10bdd..1dfe48e --- a/backend/views/express-template/_form.php +++ b/backend/modules/shop/views/express-template/_form.php @@ -1,13 +1,24 @@ +request->get('status'); +if ($status == 1) { + ?> + + + field($model, 'name')->textInput(['maxlength' => true]) ?> field($model, 'calculation')->widget(Icheck::className(), ["items" => ExpressTemplate::$calculation, 'type' => "radio"]) ?> @@ -51,13 +62,14 @@ function changeCalType(type){//当切换计算方式 $("." + index).children("label").html(value) }); - $(".form-control").eq(1).val(udfVal[type][0])//重置初始值 - $(".form-control").eq(2).val(udfVal[type][1]) - + $("#expresstemplate-basic_amount").val(udfVal[type][0])//重置初始值 + $("#expresstemplate-basic_price").val(udfVal[type][1]) + $("#expresstemplate-extra_amount").val('') + $("#expresstemplate-extra_price").val('') calType = type; } $(document).ready(function(){ - $(".form-control").eq(1).blur(function(){ + $("#expresstemplate-basic_amount").blur(function(){ if (calType == 0) { if($(this).val() < 0.1){ $(this).val(0.1) @@ -72,14 +84,14 @@ $(document).ready(function(){ $(this).val(Math.floor(basicAmount * 1) / 1); } }) - $(".form-control").eq(2).blur(function(){ - if($(this).val() < 0){ - $(this).val("0.00") - } + $("#expresstemplate-basic_price").blur(function(){ + if($(this).val().indexOf('-') != -1){ + $(this).val("0.00") + } var basicPrice = $(this).val(); $(this).val(basicPrice.toString().match(/^\d+(?:\.\d{0,2})?/)); }) - $(".form-control").eq(3).blur(function(){ + $("#expresstemplate-extra_amount").blur(function(){ if (calType == 0) { if($(this).val() < 0){ $(this).val(0) @@ -94,10 +106,10 @@ $(document).ready(function(){ $(this).val(Math.floor(basicAmount * 1) / 1); } }) - $(".form-control").eq(4).blur(function(){ - if($(this).val() < 0){ - $(this).val("0.00") - } + $("#expresstemplate-extra_price").blur(function(){ + if($(this).val().indexOf('-') != -1){ + $(this).val("0.00") + } var basicPrice = $(this).val(); $(this).val(basicPrice.toString().match(/^\d+(?:\.\d{0,2})?/)); }) diff --git a/backend/views/express-template/_search.php b/backend/modules/shop/views/express-template/_search.php old mode 100644 new mode 100755 similarity index 100% rename from backend/views/express-template/_search.php rename to backend/modules/shop/views/express-template/_search.php diff --git a/backend/views/express-template/area.php b/backend/modules/shop/views/express-template/area.php old mode 100644 new mode 100755 similarity index 100% rename from backend/views/express-template/area.php rename to backend/modules/shop/views/express-template/area.php diff --git a/backend/views/express-template/create.php b/backend/modules/shop/views/express-template/create.php old mode 100644 new mode 100755 similarity index 95% rename from backend/views/express-template/create.php rename to backend/modules/shop/views/express-template/create.php index 306e96a..ad05035 --- a/backend/views/express-template/create.php +++ b/backend/modules/shop/views/express-template/create.php @@ -5,7 +5,7 @@ use yii\bootstrap4\ActiveForm; use kartik\tabs\TabsX; /* @var $this yii\web\View */ -/* @var $model backend\models\ars\ExpressTemplate */ +/* @var $model backend\modules\shop\models\ars\ExpressTemplate */ $this->title = '创建运费模板'; $this->params['breadcrumbs'][] = ['label' => 'Express Templates', 'url' => ['index']]; diff --git a/backend/views/express-template/index.php b/backend/modules/shop/views/express-template/index.php old mode 100644 new mode 100755 similarity index 100% rename from backend/views/express-template/index.php rename to backend/modules/shop/views/express-template/index.php diff --git a/backend/views/express-template/update.php b/backend/modules/shop/views/express-template/update.php old mode 100644 new mode 100755 similarity index 96% rename from backend/views/express-template/update.php rename to backend/modules/shop/views/express-template/update.php index c8d8046..22b28bc --- a/backend/views/express-template/update.php +++ b/backend/modules/shop/views/express-template/update.php @@ -5,7 +5,7 @@ use yii\bootstrap4\ActiveForm; use kartik\tabs\TabsX; /* @var $this yii\web\View */ -/* @var $model backend\models\ars\ExpressTemplate */ +/* @var $model backend\modules\shop\models\ars\ExpressTemplate */ $this->title = '编辑运费模板: ' . $model->name; $this->params['breadcrumbs'][] = ['label' => 'Express Templates', 'url' => ['index']]; diff --git a/backend/views/express-template/view.php b/backend/modules/shop/views/express-template/view.php old mode 100644 new mode 100755 similarity index 83% rename from backend/views/express-template/view.php rename to backend/modules/shop/views/express-template/view.php index f8f544e..496f692 --- a/backend/views/express-template/view.php +++ b/backend/modules/shop/views/express-template/view.php @@ -2,10 +2,10 @@ use yii\helpers\Html; use yii\widgets\DetailView; -use backend\models\ars\ExpressTemplate; +use backend\modules\shop\models\ars\ExpressTemplate; /* @var $this yii\web\View */ -/* @var $model backend\models\ars\ExpressTemplate */ +/* @var $model backend\modules\shop\models\ars\ExpressTemplate */ $this->title = $model->name; $this->params['breadcrumbs'][] = ['label' => 'Express Templates', 'url' => ['index']]; @@ -39,7 +39,7 @@ $this->params['breadcrumbs'][] = $this->title; 'value' => function ($model) { $array = explode(',', $model->city); $cities = []; - foreach (\backend\models\ars\City::find()->andWhere(['in', 'city_id', $array])->all() as $city) { + foreach (\backend\modules\shop\models\ars\City::find()->andWhere(['in', 'city_id', $array])->all() as $city) { $cities[] = $city->name; } return implode(' // ', $cities); diff --git a/backend/views/order/_form.php b/backend/modules/shop/views/order/_form.php similarity index 100% rename from backend/views/order/_form.php rename to backend/modules/shop/views/order/_form.php diff --git a/backend/views/order/_search.php b/backend/modules/shop/views/order/_search.php similarity index 100% rename from backend/views/order/_search.php rename to backend/modules/shop/views/order/_search.php diff --git a/backend/views/order/create.php b/backend/modules/shop/views/order/create.php similarity index 100% rename from backend/views/order/create.php rename to backend/modules/shop/views/order/create.php diff --git a/backend/views/order/index.php b/backend/modules/shop/views/order/index.php similarity index 100% rename from backend/views/order/index.php rename to backend/modules/shop/views/order/index.php diff --git a/backend/views/order/update.php b/backend/modules/shop/views/order/update.php similarity index 100% rename from backend/views/order/update.php rename to backend/modules/shop/views/order/update.php diff --git a/backend/views/order/view.php b/backend/modules/shop/views/order/view.php similarity index 100% rename from backend/views/order/view.php rename to backend/modules/shop/views/order/view.php diff --git a/backend/views/taking-site/_form.php b/backend/modules/shop/views/taking-site/_form.php old mode 100644 new mode 100755 similarity index 92% rename from backend/views/taking-site/_form.php rename to backend/modules/shop/views/taking-site/_form.php index bedc12c..ff02dd4 --- a/backend/views/taking-site/_form.php +++ b/backend/modules/shop/views/taking-site/_form.php @@ -4,7 +4,7 @@ use yii\bootstrap4\Html; use yii\bootstrap4\ActiveForm; use blobt\widgets\Icheck; use kartik\depdrop\DepDrop; -use backend\models\ars\Province; +use backend\modules\shop\models\ars\Province; use yii\helpers\ArrayHelper; use yii\helpers\Url; @@ -33,7 +33,7 @@ Yii::$app->params['bsVersion'] = '4.x'; 'pluginOptions' => [ 'depends' => ['province-id'], 'placeholder' => '请选择成市', - 'url' => Url::to(['/taking-site/city']) + 'url' => Url::to(['/shop/taking-site/city']) ], 'pluginEvents' => [ "depdrop：change" => "function(event, id, value, count) { log(id); log(value); log(count); }", @@ -48,7 +48,7 @@ Yii::$app->params['bsVersion'] = '4.x'; 'pluginOptions' => [ 'depends' => ['city-id'], 'placeholder' => '请选择县区', - 'url' => Url::to(['/taking-site/area']) + 'url' => Url::to(['/shop/taking-site/area']) ] ]) ?> diff --git a/backend/views/taking-site/_search.php b/backend/modules/shop/views/taking-site/_search.php old mode 100644 new mode 100755 similarity index 100% rename from backend/views/taking-site/_search.php rename to backend/modules/shop/views/taking-site/_search.php diff --git a/backend/views/taking-site/create.php b/backend/modules/shop/views/taking-site/create.php old mode 100644 new mode 100755 similarity index 100% rename from backend/views/taking-site/create.php rename to backend/modules/shop/views/taking-site/create.php diff --git a/backend/views/taking-site/index.php b/backend/modules/shop/views/taking-site/index.php old mode 100644 new mode 100755 similarity index 100% rename from backend/views/taking-site/index.php rename to backend/modules/shop/views/taking-site/index.php diff --git a/backend/views/taking-site/update.php b/backend/modules/shop/views/taking-site/update.php old mode 100644 new mode 100755 similarity index 91% rename from backend/views/taking-site/update.php rename to backend/modules/shop/views/taking-site/update.php index 3484212..3409b7b --- a/backend/views/taking-site/update.php +++ b/backend/modules/shop/views/taking-site/update.php @@ -1,8 +1,8 @@ Date: Thu, 5 Dec 2019 13:58:31 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/config/main.php | 8 +++++++- backend/views/layouts/sidebar.php | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/backend/config/main.php b/backend/config/main.php index 62e4ad3..8e51f90 100644 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -11,7 +11,13 @@ return [ 'bootstrap' => ['log'], 'modules' => [ 'goods' => [ - 'class' => 'goods\Module', + 'class' => '\backend\modules\goods\Module', + ], + 'file' => [ + 'class' => '\backend\modules\file\Module', + ], + 'shop' => [ + 'class' => '\backend\modules\shop\Module', ], ], 'components' => [ diff --git a/backend/views/layouts/sidebar.php b/backend/views/layouts/sidebar.php index 31e09b2..a137e31 100755 --- a/backend/views/layouts/sidebar.php +++ b/backend/views/layouts/sidebar.php @@ -30,12 +30,12 @@ use iron\widgets\Menu; ] ], ['label' => '订单管理', 'url' => '#', 'icon' => 'far fa-list-alt', 'items' => [ - ['label' => '订单列表', 'url' => ['/order/index', 'tag' => 'new']], + ['label' => '订单列表', 'url' => ['/shop/order/index', 'tag' => 'new']], ], ], ['label' => '配送服务', 'url' => '#', 'icon' => 'far fa-shipping-fast', 'items' => [ - ['label' => '上门自提', 'url' => ['/taking-site/index']], - ['label' => '运费模板', 'url' => ['/express-template/index']], + ['label' => '上门自提', 'url' => ['/shop/taking-site/index']], + ['label' => '运费模板', 'url' => ['/shop/express-template/index']], ] ], From bf44c470ed59392cf0459cec17a3fcaef2cbe9d5 Mon Sep 17 00:00:00 2001 From: linyaostalker <602604991@qq.com> Date: Thu, 5 Dec 2019 14:02:13 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shop/views/taking-site/view.php | 37 ++++++++++++++++--- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/backend/modules/shop/views/taking-site/view.php b/backend/modules/shop/views/taking-site/view.php index acc33b9..378252a 100755 --- a/backend/modules/shop/views/taking-site/view.php +++ b/backend/modules/shop/views/taking-site/view.php @@ -1,5 +1,8 @@ params['breadcrumbs'][] = $this->title; 'attributes' => [ 'id', 'name', - 'province', - 'city', - 'area', + [ + 'attribute' => 'province', + 'value' => function ($model) { + $province = Province::findOne(['province_id' => $model->province]); + if ($province) { + return $province->name; + } + } + ], + [ + 'attribute' => 'city', + 'value' => function ($model) { + $city = City::findOne(['city_id' => $model->city]); + if ($city) { + return $city->name; + } + } + ], + [ + 'attribute' => 'area', + 'value' => function ($model) { + $area = Area::findOne(['area_id' => $model->area]); + if ($area) { + return $area->name; + } + } + ], 'address:ntext', - 'updated_at', - 'created_at', + 'updated_at:datetime', + 'created_at:datetime', ], ]) ?> From 198f23ddcfe91bb5c008b39c9aeb274d12bb9c99 Mon Sep 17 00:00:00 2001 From: linyaostalker <602604991@qq.com> Date: Thu, 5 Dec 2019 14:20:21 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E7=94=A8=E6=88=B7rbac=E7=AD=89=E6=95=B0=E6=8D=AE=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E6=96=87=E4=BB=B6=E4=BD=8D=E7=BD=AE=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9user=E6=A8=A1=E5=9D=97=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/config/main.php | 2 +- backend/models/LoginForm.php | 1 + {backend => common}/models/User.php | 2 +- .../migrations/m130524_201442_init.php | 0 .../migrations/m140506_102106_rbac_init.php | 0 ...2038_rbac_add_index_on_auth_assignment_user_id.php | 0 ...523_151638_rbac_updates_indexes_without_prefix.php | 0 ...00_add_verification_token_column_to_user_table.php | 0 .../migrations/m190802_072830_add_category.php | 0 console/migrations/sql/add_category.sql | 11 +++++++++++ 10 files changed, 14 insertions(+), 2 deletions(-) rename {backend => common}/models/User.php (99%) rename {backend/modules/shop => console}/migrations/m130524_201442_init.php (100%) rename {backend/modules/shop => console}/migrations/m140506_102106_rbac_init.php (100%) rename {backend/modules/shop => console}/migrations/m170907_052038_rbac_add_index_on_auth_assignment_user_id.php (100%) rename {backend/modules/shop => console}/migrations/m180523_151638_rbac_updates_indexes_without_prefix.php (100%) rename {backend/modules/shop => console}/migrations/m190124_110200_add_verification_token_column_to_user_table.php (100%) rename {backend/modules/shop => console}/migrations/m190802_072830_add_category.php (100%) create mode 100755 console/migrations/sql/add_category.sql diff --git a/backend/config/main.php b/backend/config/main.php index 8e51f90..572ea9d 100644 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -28,7 +28,7 @@ return [ 'csrfParam' => '_csrf-api', ], 'user' => [ - 'identityClass' => 'backend\models\User', + 'identityClass' => 'common\models\User', 'enableAutoLogin' => true, 'identityCookie' => ['name' => '_identity-backend', 'httpOnly' => true], ], diff --git a/backend/models/LoginForm.php b/backend/models/LoginForm.php index 9c1b03f..f1014f2 100644 --- a/backend/models/LoginForm.php +++ b/backend/models/LoginForm.php @@ -4,6 +4,7 @@ namespace backend\models; use Yii; use yii\base\Model; +use common\models\User; /** * Login form diff --git a/backend/models/User.php b/common/models/User.php similarity index 99% rename from backend/models/User.php rename to common/models/User.php index 80b3466..5df9766 100644 --- a/backend/models/User.php +++ b/common/models/User.php @@ -1,5 +1,5 @@ Date: Thu, 5 Dec 2019 14:40:42 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=B4=B9?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=9F=BA=E7=A1=80=E6=95=B0=E9=87=8F=EF=BC=8C?= =?UTF-8?q?=E7=BB=AD=E9=87=8D=E6=95=B0=E9=87=8F=E5=92=8C=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B9=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/modules/shop/Module.php | 0 .../controllers/ExpressTemplateController.php | 4 +- ...culation_in_table_ats_express_template.php | 30 ++++++++++++ .../shop/models/ars/ExpressTemplate.php | 49 +++++++------------ .../models/searchs/ExpressTemplateSearch.php | 8 +-- .../shop/views/express-template/_form.php | 40 +++++++-------- .../shop/views/express-template/view.php | 8 +-- 7 files changed, 78 insertions(+), 61 deletions(-) mode change 100644 => 100755 backend/modules/shop/Module.php create mode 100755 backend/modules/shop/migrations/m191205_062533_update_columns_basic_amount_extra_amount_calculation_in_table_ats_express_template.php mode change 100755 => 100644 backend/modules/shop/models/ars/ExpressTemplate.php diff --git a/backend/modules/shop/Module.php b/backend/modules/shop/Module.php old mode 100644 new mode 100755 diff --git a/backend/modules/shop/controllers/ExpressTemplateController.php b/backend/modules/shop/controllers/ExpressTemplateController.php index 2ff09b1..8984993 100755 --- a/backend/modules/shop/controllers/ExpressTemplateController.php +++ b/backend/modules/shop/controllers/ExpressTemplateController.php @@ -71,8 +71,8 @@ class ExpressTemplateController extends Controller public function actionCreate() { $model = new ExpressTemplate(); - $model->calculation = ExpressTemplate::CALCULATION_NUMBER; - $model->basic_amount = 1; + $model->calculation_type = ExpressTemplate::CALCULATION_TYPE_NUMBER; + $model->basic_count = 1; $model->basic_price = '0.00'; if (Yii::$app->request->isPost) { diff --git a/backend/modules/shop/migrations/m191205_062533_update_columns_basic_amount_extra_amount_calculation_in_table_ats_express_template.php b/backend/modules/shop/migrations/m191205_062533_update_columns_basic_amount_extra_amount_calculation_in_table_ats_express_template.php new file mode 100755 index 0000000..6d8a75e --- /dev/null +++ b/backend/modules/shop/migrations/m191205_062533_update_columns_basic_amount_extra_amount_calculation_in_table_ats_express_template.php @@ -0,0 +1,30 @@ +dropColumn('ats_express_template', 'basic_amount'); + $this->dropColumn('ats_express_template', 'extra_amount'); + $this->dropColumn('ats_express_template', 'calculation'); + $this->addColumn('ats_express_template', 'basic_count', $this->integer(20)->defaultValue(null)->comment('基本数量')); + $this->addColumn('ats_express_template', 'extra_count', $this->integer(20)->defaultValue(null)->comment('续重数量')); + $this->addColumn('ats_express_template', 'calculation_type', $this->tinyInteger(2)->defaultValue(0)->comment('计算方式')); + } + + public function down() + { + $this->dropColumn('ats_express_template', 'basic_amount'); + $this->dropColumn('ats_express_template', 'extra_amount'); + $this->dropColumn('ats_express_template', 'calculation'); + $this->addColumn('ats_express_template', 'basic_amount', $this->integer(20)->defaultValue(null)->comment('基本数量')); + $this->addColumn('ats_express_template', 'extra_amount', $this->integer(20)->defaultValue(null)->comment('续重数量')); + $this->addColumn('ats_express_template', 'calculation', $this->tinyInteger(2)->defaultValue(0)->comment('计算方式')); + return true; + } +} diff --git a/backend/modules/shop/models/ars/ExpressTemplate.php b/backend/modules/shop/models/ars/ExpressTemplate.php old mode 100755 new mode 100644 index 4774c6e..ba1f02a --- a/backend/modules/shop/models/ars/ExpressTemplate.php +++ b/backend/modules/shop/models/ars/ExpressTemplate.php @@ -1,6 +1,6 @@ '按重量', - self::CALCULATION_NUMBER => '按件数' + public static $calculationType = [ + self::CALCULATION_TYPE_WEIGHT => '按重量', + self::CALCULATION_TYPE_NUMBER => '按件数' ]; /** * {@inheritdoc} @@ -45,26 +45,13 @@ class ExpressTemplate extends \yii\db\ActiveRecord public function rules() { return [ - [['name', 'calculation', 'basic_price', 'basic_amount'], 'required'], - [['province', 'city', 'area', 'basic_price', 'extra_price', 'basic_amount', 'extra_amount'], 'string'], - [['calculation'], 'integer'], + [['name'], 'required'], + [['province', 'city', 'area'], 'string'], + [['extra_price', 'basic_price', 'basic_count', 'extra_count', 'calculation_type'], 'integer'], [['name'], 'string', 'max' => 255], - [['basic_amount', 'basic_price', 'extra_price', 'extra_amount'], 'checkNegative'], ]; } - /** - * @param $attribute - * @param $params - * 验证是否为负数 - */ - public function checkNegative($attribute, $params) - { - if ($this->$attribute < 0) { - $this->addError($attribute, "不得为负数"); - } - } - /** * {@inheritdoc} */ @@ -76,13 +63,13 @@ class ExpressTemplate extends \yii\db\ActiveRecord 'province' => '省份', 'city' => '城市', 'area' => '区域', - 'calculation' => '计算方式', - 'basic_price' => '基本运费', - 'basic_amount' => '基本数量', 'extra_price' => '续重运费', - 'extra_amount' => '续重数量', 'updated_at' => '更新时间', 'created_at' => '创建时间', + 'basic_price' => '基本运费', + 'basic_count' => '基本数量', + 'extra_count' => '续重数量', + 'calculation_type' => '计算方式', ]; } diff --git a/backend/modules/shop/models/searchs/ExpressTemplateSearch.php b/backend/modules/shop/models/searchs/ExpressTemplateSearch.php index 4cb0bff..8cee01c 100755 --- a/backend/modules/shop/models/searchs/ExpressTemplateSearch.php +++ b/backend/modules/shop/models/searchs/ExpressTemplateSearch.php @@ -26,7 +26,7 @@ class ExpressTemplateSearch extends ExpressTemplate public function rules() { return [ - [['id', 'calculation', 'basic_price', 'basic_amount', 'extra_price', 'extra_amount', 'updated_at', 'created_at'], 'integer'], + [['id', 'calculation_type', 'basic_price', 'basic_count', 'extra_price', 'extra_count', 'updated_at', 'created_at'], 'integer'], [['name', 'province', 'city', 'area'], 'safe'], ['created_at_range','safe'], ]; @@ -121,11 +121,11 @@ class ExpressTemplateSearch extends ExpressTemplate // grid filtering conditions $query->andFilterWhere([ 'id' => $this->id, - 'calculation' => $this->calculation, + 'calculation_type' => $this->calculation_type, 'basic_price' => $this->basic_price, - 'basic_amount' => $this->basic_amount, + 'basic_count' => $this->basic_count, 'extra_price' => $this->extra_price, - 'extra_amount' => $this->extra_amount, + 'extra_count' => $this->extra_count, 'updated_at' => $this->updated_at, 'created_at' => $this->created_at, ]); diff --git a/backend/modules/shop/views/express-template/_form.php b/backend/modules/shop/views/express-template/_form.php index 1dfe48e..8f21860 100755 --- a/backend/modules/shop/views/express-template/_form.php +++ b/backend/modules/shop/views/express-template/_form.php @@ -21,13 +21,13 @@ if ($status == 1) { field($model, 'name')->textInput(['maxlength' => true]) ?> -field($model, 'calculation')->widget(Icheck::className(), ["items" => ExpressTemplate::$calculation, 'type' => "radio"]) ?> +field($model, 'calculation_type')->widget(Icheck::className(), ["items" => ExpressTemplate::$calculationType, 'type' => "radio"]) ?> -field($model, 'basic_amount')->textInput() ?> +field($model, 'basic_count')->textInput() ?> field($model, 'basic_price')->textInput() ?> -field($model, 'extra_amount')->textInput() ?> +field($model, 'extra_count')->textInput() ?> field($model, 'extra_price')->textInput() ?> @@ -35,17 +35,17 @@ if ($status == 1) { $js=<<params['breadcrumbs'][] = $this->title; 'id', 'name', [ - 'attribute' => 'calculation', + 'attribute' => 'calculation_type', 'value' => function ($model) { - return ExpressTemplate::$calculation[$model->calculation]; + return ExpressTemplate::$calculationType[$model->calculation_type]; } ], 'basic_price', - 'basic_amount', + 'basic_count', 'extra_price', - 'extra_amount', + 'extra_count', 'updated_at:datetime', 'created_at:datetime', ['attribute' => 'city', From fd2c5c512d8b06db064a9d994cae624250ee3da6 Mon Sep 17 00:00:00 2001 From: linyaostalker <602604991@qq.com> Date: Thu, 5 Dec 2019 15:04:23 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=BF=90=E8=B4=B9?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/ExpressTemplateController.php | 15 ++++++++++ .../shop/models/ars/ExpressTemplate.php | 3 +- .../shop/views/express-template/_form.php | 28 ++++++++++++++++--- .../shop/views/express-template/create.php | 2 +- .../shop/views/express-template/update.php | 2 +- 5 files changed, 43 insertions(+), 7 deletions(-) diff --git a/backend/modules/shop/controllers/ExpressTemplateController.php b/backend/modules/shop/controllers/ExpressTemplateController.php index 8984993..460be98 100755 --- a/backend/modules/shop/controllers/ExpressTemplateController.php +++ b/backend/modules/shop/controllers/ExpressTemplateController.php @@ -90,6 +90,15 @@ class ExpressTemplateController extends Controller $cityIds = array_keys(Yii::$app->request->post('area')); $data['city'] = implode(',', $cityIds); $model->load($data, ''); + $model->basic_price *= 100; + $model->extra_price *= 100; + if ($model->calculation_type == ExpressTemplate::CALCULATION_TYPE_WEIGHT) { + $model->basic_count *= 10; + $model->extra_count *= 10; + } else { + $model->basic_count *= 1; + $model->extra_count *= 1; + } $model->save(); return $this->redirect('index'); } @@ -121,6 +130,12 @@ class ExpressTemplateController extends Controller public function actionUpdate($id) { $model = $this->findModel($id); + $model->basic_price /= 100; + $model->extra_price /= 100; + if ($model->calculation_type == ExpressTemplate::CALCULATION_TYPE_WEIGHT) { + $model->basic_count /= 10; + $model->extra_count /= 10; + } $data = Yii::$app->request->post('ExpressTemplate'); if ($data) { if (Yii::$app->request->post('area') == null) { diff --git a/backend/modules/shop/models/ars/ExpressTemplate.php b/backend/modules/shop/models/ars/ExpressTemplate.php index ba1f02a..ce4fd07 100644 --- a/backend/modules/shop/models/ars/ExpressTemplate.php +++ b/backend/modules/shop/models/ars/ExpressTemplate.php @@ -47,8 +47,9 @@ class ExpressTemplate extends \yii\db\ActiveRecord return [ [['name'], 'required'], [['province', 'city', 'area'], 'string'], - [['extra_price', 'basic_price', 'basic_count', 'extra_count', 'calculation_type'], 'integer'], + [['calculation_type'], 'integer'], [['name'], 'string', 'max' => 255], + [['extra_price', 'basic_price', 'basic_count', 'extra_count'], 'safe'] ]; } diff --git a/backend/modules/shop/views/express-template/_form.php b/backend/modules/shop/views/express-template/_form.php index 8f21860..940b46f 100755 --- a/backend/modules/shop/views/express-template/_form.php +++ b/backend/modules/shop/views/express-template/_form.php @@ -56,7 +56,7 @@ const udfVal = [//初始值 ] var calType = 1;//初始的计算方式0：计重 1:计件 -function changeCalType(type){//当切换计算方式 +function updateTypeChangeCalType(type){//当切换计算方式 $.each(formList[type],function(index,value){ //更改文字标题 $("." + index).children("label").html(value) @@ -64,8 +64,28 @@ function changeCalType(type){//当切换计算方式 $("#expresstemplate-basic_count").val(udfVal[type][0])//重置初始值 $("#expresstemplate-basic_price").val(udfVal[type][1]) - $("#expresstemplate-extra_count").val('') - $("#expresstemplate-extra_price").val('') + $("#expresstemplate-extra_count").val(0) + $("#expresstemplate-extra_price").val(udfVal[type][1]) + calType = type; +} +function changeCalType(type){//当切换计算方式 + + $.each(formList[type],function(index,value){ //更改文字标题 + $("." + index).children("label").html(value) + }); + + if(!$("#expresstemplate-basic_count").val()){ + $("#expresstemplate-basic_count").val(udfVal[type][0])//重置初始值 + } + if(!$("#expresstemplate-basic_price").val()){ + $("#expresstemplate-basic_price").val(udfVal[type][1]) + } + if(!$("#expresstemplate-extra_count").val()){ + $("#expresstemplate-extra_count").val(0) + } + if(!$("#expresstemplate-extra_price").val()){ + $("#expresstemplate-extra_price").val(udfVal[type][1]) + } calType = type; } $(document).ready(function(){ @@ -115,7 +135,7 @@ $(document).ready(function(){ }) $("input:radio[name='ExpressTemplate[calculation_type]']").on('ifChecked', function(event){ - changeCalType($(this).val()-1) + updateTypeChangeCalType($(this).val()-1) }) changeCalType(calType) }) diff --git a/backend/modules/shop/views/express-template/create.php b/backend/modules/shop/views/express-template/create.php index ad05035..fb35a2e 100755 --- a/backend/modules/shop/views/express-template/create.php +++ b/backend/modules/shop/views/express-template/create.php @@ -8,7 +8,7 @@ use kartik\tabs\TabsX; /* @var $model backend\modules\shop\models\ars\ExpressTemplate */ $this->title = '创建运费模板'; -$this->params['breadcrumbs'][] = ['label' => 'Express Templates', 'url' => ['index']]; +$this->params['breadcrumbs'][] = ['label' => '运费模板', 'url' => ['index']]; $this->params['breadcrumbs'][] = $this->title; Yii::$app->params['bsVersion'] = '4.x'; ?> diff --git a/backend/modules/shop/views/express-template/update.php b/backend/modules/shop/views/express-template/update.php index 22b28bc..13c0193 100755 --- a/backend/modules/shop/views/express-template/update.php +++ b/backend/modules/shop/views/express-template/update.php @@ -8,7 +8,7 @@ use kartik\tabs\TabsX; /* @var $model backend\modules\shop\models\ars\ExpressTemplate */ $this->title = '编辑运费模板: ' . $model->name; -$this->params['breadcrumbs'][] = ['label' => 'Express Templates', 'url' => ['index']]; +$this->params['breadcrumbs'][] = ['label' => '运费模板', 'url' => ['index']]; $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]]; $this->params['breadcrumbs'][] = 'Update '; Yii::$app->params['bsVersion'] = '4.x'; From c66a809c14a53dbd988b26f3a075c05dab08b70f Mon Sep 17 00:00:00 2001 From: linyaostalker <602604991@qq.com> Date: Thu, 5 Dec 2019 15:08:45 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86css?= =?UTF-8?q?=E5=9B=A0bootstrap4=E6=97=A0=E6=B3=95=E7=94=9F=E6=95=88?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/modules/shop/views/express-template/area.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/modules/shop/views/express-template/area.php b/backend/modules/shop/views/express-template/area.php index 006c17e..d205bfa 100755 --- a/backend/modules/shop/views/express-template/area.php +++ b/backend/modules/shop/views/express-template/area.php @@ -98,17 +98,17 @@ xj\babel\BrowserAsset::register($this); margin-right: 5px; } - .glyphicon { + .fa { padding: 5px; transition: all .2s; cursor: pointer; } - .glyphicon.glyphicon-menu-down.switch--popup { + .fa.fa-menu-down.switch--popup { position: relative; top: -1px; } - .province--list > li.active .glyphicon { + .province--list > li.active .fa { transform: rotate(180deg); } @@ -177,14 +177,14 @@ xj\babel\BrowserAsset::register($this); class="list-complete-item" >
{{province.province}} - + @@ -375,7 +375,7 @@ xj\babel\BrowserAsset::register($this); - +