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	!111 facebook pixel	2023-06-02 01:18:43 +00:00
BrandController.php	init	2023-05-27 11:47:26 +08:00
CartController.php	v1.1.2 合并至github项目	2023-08-10 11:34:43 +08:00
CategoryController.php	init	2023-05-27 11:47:26 +08:00
CheckoutController.php	Optimize checkout confirm.	2023-06-13 15:20:38 +08:00
Controller.php	Code format	2023-07-18 16:52:46 +08:00
CurrencyController.php	init	2023-05-27 11:47:26 +08:00
FileController.php	init	2023-05-27 11:47:26 +08:00
HomeController.php	init	2023-05-27 11:47:26 +08:00
InquiryController.php	修改	2023-05-29 20:02:32 +08:00
LanguageController.php	init	2023-05-27 11:47:26 +08:00
OrderController.php	!123 Add video function	2023-06-09 05:58:33 +00:00
PageCategoryController.php	init	2023-05-27 11:47:26 +08:00
PageController.php	init	2023-05-27 11:47:26 +08:00
PluginController.php	init	2023-05-27 11:47:26 +08:00
ProductController.php	!123 Add video function	2023-06-09 05:58:33 +00:00
ZoneController.php	init	2023-05-27 11:47:26 +08:00