 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 |
Edward Yang
|
f72b61a4a3
|
Fixed checkout for null sku https://gitee.com/beikeshop/beikeshop/issues/I7D59N?from=project-issue
|
2023-07-18 16:52:46 +08:00 |
|
liqianjin
|
b57dcf54b0
|
v1.1 修改完成
|
2023-05-30 15:29:52 +08:00 |
|
liqianjin
|
5e552c572e
|
init
|
2023-05-27 11:47:26 +08:00 |
|
Edward Yang
|
434d94c01d
|
使用laravel/pint格式化代码
|
2023-01-10 14:38:26 +08:00 |
pushuo
|
315c31b5bd
|
后台订单筛选，前台购物车显示SKU 规格名称
|
2022-11-04 14:07:16 +08:00 |
Edward Yang
|
95ad14093a
|
fixed checkout service
|
2022-08-12 14:51:01 +08:00 |
TL
|
78302f4591
|
商品图片（只是spu图片和sku图片）
|
2022-07-26 16:08:58 +08:00 |
|
Edward Yang
|
faf3d09084
|
继承 base model
|
2022-07-21 18:36:52 +08:00 |
Sam Chen
|
22b7783312
|
分拆 beike namespace (#2)
* 分拆 beike namespace
Co-authored-by: Sam Chen <samchen945@gmail.com>
|
2022-05-17 15:37:27 +08:00 |