Commit Graph

25 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
pushuo e7019a9722 !123 Add video function
* Optimize shopping cart entries
* File manager selection type judgment
* video function
* Support video for file manager
* Optimize file manager
2023-06-09 05:58:33 +00:00
liqianjin 66d08c1654 v1 修改完成 2023-05-30 11:56:47 +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 920689fbee 首页统计改为产品总数 2023-04-26 18:57:49 +08:00
蒲硕 76b37ed867 !86 Optimization Advanced filters, taxes, currencies, etc.
* Fix region configuration province selection problem
* Optimization Advanced filters, taxes, currencies, etc.
2023-04-26 08:38:24 +00: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 434d94c01d 使用laravel/pint格式化代码 2023-01-10 14:38:26 +08:00
pushuo c1db80eaaa 相关后台商品配置和 前台ui 2023-01-06 17:22:24 +08:00
pushuo 71237ca31d 添加 多规格编辑辅助说明文字 -> https://gitee.com/beikeshop/beikeshop/issues/I60WOC?from=project-issue 2022-11-14 16:04:49 +08:00
Edward Yang 8f22790abd 修改注释版权 2022-09-13 23:07:51 +08:00
pushuo 26983bcf8c 优化后台分类 品牌 商品 多语言 2022-08-31 09:02:26 +08:00
pushuo 6f731804c6 商品详情页多语言词条灯 2022-08-29 21:21:33 +08:00
pushuo 234ac1032a 清空回收站 2022-08-29 20:20:16 +08:00
Edward Yang 711c62d9b7 产品列表页英文 2022-08-26 17:25:35 +08:00
TL ca0320253d 后台商品编辑 2022-08-23 16:46:34 +08:00
Edward Yang fc9c826b0c product 翻译从产品改为商品 2022-08-23 16:17:44 +08:00
TL 5bfc4b84a2 后台商品创建 2022-08-23 15:17:29 +08:00
TL 7354b0c6e5 权限语言包 2022-08-16 17:27:56 +08:00
Edward Yang ba53d3f844 fixed languages 2022-08-05 19:09:14 +08:00
Edward Yang e36f3b6b7a update languages 2022-08-04 16:07:33 +08:00
Edward Yang 8f5dc98f7e 权限多语言 2022-08-04 11:23:22 +08:00
Edward Yang c63af2b89b fixed languages 2022-08-04 11:06:26 +08:00