 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
|
bb57d646db
|
修改
|
2023-05-29 19:59:31 +08:00 |
|
liqianjin
|
5e552c572e
|
init
|
2023-05-27 11:47:26 +08:00 |
mengwb
|
86b3d33d6d
|
!66 默认属性组不可删除
* 默认数据增加id为1的默认属性组，并且默认属性组后台不能删除
* migrations/2023_03_20_091423_product_weight.php
* 商品重量
* add weight blade
* bugfix
* 商品重量，用于计算flex shipping运费；地址变化后配送方式变化，需要重新显示新的配送方式
* Placeholder Image Backend Settings
* 商品重量，用于计算flex shipping运费；地址变化后配送方式变化，需要重新显示新的配送方式
* 增加hook
|
2023-03-24 10:23:55 +00:00 |
Edward Yang
|
88255f6e7b
|
Use Product::getUrlAttribute to get product url.
|
2023-03-14 21:13:03 +08:00 |
|
Edward Yang
|
100333d56f
|
优化 masterSku 命名
|
2023-01-12 15:46:53 +08:00 |
|
Edward Yang
|
434d94c01d
|
使用laravel/pint格式化代码
|
2023-01-10 14:38:26 +08:00 |
|
TL
|
6e8d7f295f
|
相关商品功能
|
2023-01-06 15:51:30 +08:00 |
|
TL
|
1613adc3fa
|
商品属性功能后端代码
|
2023-01-06 11:41:38 +08:00 |
Edward Yang
|
106471ea2e
|
fixed customer guard https://guangdagit.com/beike/beikeshop/issues/195
|
2022-08-25 16:51:21 +08:00 |
|
Edward Yang
|
ceb0aa0686
|
修复后台商品列表商品价格 https://guangdagit.com/beike/beikeshop/issues/76
|
2022-08-15 18:42:45 +08:00 |
|
Edward Yang
|
8ca50a622d
|
fixed wishlist https://guangdagit.com/beike/beikeshop/issues/87
|
2022-08-15 17:53:26 +08:00 |
TL
|
a6801ef182
|
收藏
|
2022-08-12 17:02:47 +08:00 |
|
Edward Yang
|
4d0e0b2b86
|
duplicate product
|
2022-08-11 17:11:03 +08:00 |
pushuo
|
70283cade3
|
优化商品详情等
|
2022-08-03 18:16:54 +08:00 |
|
TL
|
3cddcd8ce8
|
品牌由manufacturer改为brand
|
2022-07-28 15:01:54 +08:00 |
|
pushuo
|
e31d582754
|
wip
|
2022-07-26 17:14:42 +08:00 |
|
TL
|
cfc6af6536
|
商品图片功能
|
2022-07-26 16:16:51 +08:00 |
|
TL
|
78302f4591
|
商品图片（只是spu图片和sku图片）
|
2022-07-26 16:08:58 +08:00 |
|
Edward Yang
|
e1949b330f
|
fixed images
|
2022-07-26 16:01:28 +08:00 |
|
Edward Yang
|
faf3d09084
|
继承 base model
|
2022-07-21 18:36:52 +08:00 |
|
pushuo
|
24b29207ca
|
wip
|
2022-07-20 14:19:36 +08:00 |
|
TL
|
46d38c0cce
|
商品详情
|
2022-07-20 11:13:16 +08:00 |
|
Edward Yang
|
447eb80968
|
fixed urk
|
2022-06-27 20:46:51 +08:00 |
|
Edward Yang
|
464b2e5d77
|
fixed product sku
|
2022-06-27 20:19:04 +08:00 |
Sam Chen
|
56c5aea7e6
|
admin ui (#4)
* admin product list
* chore
* 优化 后台商品列表 ui
* test file upload
* admin/resources -> resources
* element-ui
* 恢复 bootstrap input
* 样式
* product category relation
* chore
Co-authored-by: pushuo <229102104@qq.com>
|
2022-05-23 15:43:11 +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 |