Commit Graph

19 Commits

Author SHA1 Message Date
liqianjin 4f1beb97d9 【增加】视频播放装修
【增加】复制商品
【增加】商品长宽高参数
【增加】合并到第三方主版本分支,更新到最新版本
2023-08-11 13:55:00 +08:00
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 c07bdda87f fixed product variables 2023-07-19 09:29:50 +08:00
Edward Yang 9529d68d38 Publish JD product. 2023-07-18 16:52:46 +08:00
liqianjin b57dcf54b0 v1.1 修改完成 2023-05-30 15:29:52 +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 f26e239668 fixed position 2023-05-11 15:11:02 +08:00
Edward Yang 5c4ae14dbc Code format 2023-04-07 16:53:18 +08:00
mengwb e1e3ee9568 !75 编辑商品时重量为空保存报错
* 代码规范化
* Fix the issue of saving error when editing product weight is empty.
* 高级筛选哪些属性显示在筛选栏可在后台系统设置里设置
2023-04-07 08:42:56 +00:00
mengwb d074c123d9 !68 商品重量和多个bug修复
* Optimizing Blog ui
* Optimize breadcrumb position, optimize webpack.mix.js
* Modify request vip status update logic
* 后台商品列表默认按修改时间倒序,商品编辑保存无修改时更新商品修改时间
* wip
* wip
* 高级筛选属性多选问题处理
* 修复游客结账问题
* Add payment success page
* After repairing the data loss problem after dragging the order of specifications
* wip
* Fix the problem that the image of the deleted product in the backgroun…
* wip
* wip
* 占位图
* 更改地址重新加载运费,和重新计算order total运费功能
* wip
* wip
* wip
2023-03-31 02:56:57 +00: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 122af22e6f 修复删除描述 2022-08-26 11:02:49 +08:00
Edward Yang 614757ecaf fixed product create 2022-08-24 18:50:26 +08:00
TL 70b820e011 商品管理 2022-07-20 15:04:29 +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