wyyl/themes/default
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
..
account !125 Optimize element path 2023-06-13 09:02:47 +00:00
brand init 2023-05-29 14:08:51 +08:00
cart !155 Add hooks for cart and checkout page submit buttons 2023-07-18 16:52:46 +08:00
checkout !118 order detail for guest 2023-06-07 02:03:07 +00:00
components init 2023-05-29 14:08:51 +08:00
design !157 Fix tab_product module 2023-07-19 01:46:46 +00:00
errors init 2023-05-29 14:08:51 +08:00
layout Merge branch 'github-master' into master-github-histories 2023-08-10 13:45:22 +08:00
mails !124 Add a view details link to the order email 2023-06-09 06:36:40 +00:00
page_categories init 2023-05-29 14:08:51 +08:00
pages init 2023-05-29 14:08:51 +08:00
product Merge branch 'github-master' into master-github-histories 2023-08-10 13:45:22 +08:00
shared Merge branch 'github-master' into master-github-histories 2023-08-10 13:45:22 +08:00
category.blade.php init 2023-05-29 14:08:51 +08:00
checkout.blade.php !155 Add hooks for cart and checkout page submit buttons 2023-07-18 16:52:46 +08:00
home.blade.php Add view content. 2023-06-01 16:07:36 +08:00
order_info.blade.php !118 order detail for guest 2023-06-07 02:03:07 +00:00
search.blade.php init 2023-05-29 14:08:51 +08:00