 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 |
|
liqianjin
|
42f66f859a
|
v1.1.1 修改
|
2023-06-01 09:56:55 +08:00 |
|
liqianjin
|
bb57d646db
|
修改
|
2023-05-29 19:59:31 +08:00 |
|
liqianjin
|
5e552c572e
|
init
|
2023-05-27 11:47:26 +08:00 |
Edward Yang
|
76edc24c77
|
Add hook from mundosanjose
|
2023-03-24 17:01:02 +08:00 |
|
Edward Yang
|
434d94c01d
|
使用laravel/pint格式化代码
|
2023-01-10 14:38:26 +08:00 |
So
|
d766dfbe36
|
购物车商品模型增加独立字段attr作为规格
修正安装完成时写入配置文件的域名
修正安装完成时写入配置文件的域名
购物车商品模型增加独立字段attr作为规格
|
2022-11-11 14:50:03 +08:00 |
pushuo
|
315c31b5bd
|
后台订单筛选，前台购物车显示SKU 规格名称
|
2022-11-04 14:07:16 +08:00 |
Edward Yang
|
a0bf115f56
|
修复订单SKU https://guangdagit.com/beike/beikeshop/issues/240
|
2022-09-09 16:41:36 +08:00 |
|
Edward Yang
|
226e5a7e99
|
修复下单商品名称被截取
|
2022-08-22 10:03:30 +08:00 |
|
Edward Yang
|
1ea67b0a35
|
购物车相关需要先登录, 修复购物车产品名称太长问题 https://guangdagit.com/beike/beikeshop/issues/108
|
2022-08-17 17:59:17 +08:00 |
|
Edward Yang
|
2790fe648f
|
fixed cart image
|
2022-08-16 18:21:54 +08:00 |
|
Edward Yang
|
95ad14093a
|
fixed checkout service
|
2022-08-12 14:51:01 +08:00 |
|
Edward Yang
|
e247632af2
|
change cart and category resource
|
2022-08-11 19:07:57 +08:00 |