 liqianjin
|
f344d2deab
|
Merge branch 'github-master' into master-github-histories
# Conflicts:
# beike/Admin/View/Components/Header.php
# beike/Admin/View/Components/Sidebar.php
# beike/Helpers.php
# beike/Models/Product.php
# beike/Repositories/OrderRepo.php
# beike/Repositories/PageCategoryRepo.php
# beike/Shop/Services/CartService.php
# composer.lock
# resources/beike/admin/views/components/header.blade.php
# resources/beike/admin/views/pages/design/builder/index.blade.php
# resources/beike/admin/views/pages/marketing/show.blade.php
# resources/beike/admin/views/pages/products/form/form.blade.php
# resources/lang/en/admin/marketing.php
# resources/lang/zh_cn/admin/common.php
# resources/lang/zh_cn/admin/marketing.php
# resources/lang/zh_cn/admin/product.php
# themes/default/cart/mini.blade.php
# themes/default/layout/footer.blade.php
# themes/default/layout/master.blade.php
# themes/default/product/product.blade.php
|
2023-08-10 13:45:22 +08:00 |
what_村长
|
ef14e65e31
|
!146 增加 hoot admin.product.sku.edit.item.after
* 增加hook admin.product.sku.edit.item.after ,方便在上面加上翻译插件按钮
* 增加hook admin.product.sku.edit.item ,方便在上面加上翻译插件按钮
* Merge branch 'dev' of https://gitee.com/what520/beikeshop into dev
* 测试
|
2023-07-18 16:52:46 +08:00 |
pushuo
|
a418db518b
|
!143 add product-page hook
* add product hook
|
2023-07-18 16:52:46 +08:00 |
tanxiaoyong
|
0e9395b98e
|
增加hook
product.detail.quantity.input
product.detail.add_to_cart
product.detail.wishlist
|
2023-06-14 11:37:07 +08:00 |
|
tanxiaoyong
|
e71a98e915
|
增加hook
product.detail.quantity.input
product.detail.add_to_cart
product.detail.wishlist
|
2023-06-14 11:33:17 +08:00 |
|
pushuo
|
e7019a9722
|
!123 Add video function
* Optimize shopping cart entries
* File manager selection type judgment
* video function
* Support video for file manager
* Optimize file manager
|
2023-06-09 05:58:33 +00:00 |