Commit Graph

2416 Commits

Author SHA1 Message Date
wuhui_zzw f1f2a7d1bf 修改:物流列表显示内容优化 2023-08-21 18:05:03 +08:00
wuhui_zzw afa9b0be6f 修改:物流支持多国家选择 2023-08-21 16:59:20 +08:00
wuhui_zzw 3a7aacb474 优化:首页装修页面视频播放器优化 - 显示相关控件 2023-08-18 17:57:03 +08:00
wuhui_zzw 7f31190de9 优化:订单列表没有显示物流信息 2023-08-18 17:07:43 +08:00
wuhui_zzw 64d4c6c860 修复:购物车没有商品时 在商品详情加减购买数量时会一直报购物车为空的错误 2023-08-18 16:32:59 +08:00
wuhui_zzw 8ab026f52e 优化:非直接购买商品禁止下单(但是可以加入购物车和收藏) 2023-08-18 15:41:22 +08:00
wuhui_zzw b7a2839ee4 优化:购物车页面订单金额统计优化 和支付页面一致 2023-08-18 14:01:04 +08:00
wuhui_zzw be017fdb7e 优化:商品详情页面订单金额统计优化 和支付页面一致 2023-08-18 11:19:22 +08:00
wuhui_zzw 8d7c37509f 优化:商品详情页面下单优化,支持多规格下单 2023-08-17 15:47:05 +08:00
wuhui_zzw d1c5514682 update cache 2023-08-16 14:04:20 +08:00
wuhui_zzw 67c3c7ab61 文件补齐 2023-08-16 14:01:36 +08:00
wuhui_zzw 39c5134312 update cache 2023-08-16 14:00:10 +08:00
wuhui_zzw 70c2160aca 文件补齐 2023-08-16 13:40:41 +08:00
liqianjin 02516b7825 【增加】物流及可视化 2023-08-12 18:46:10 +08:00
liqianjin bfb1ea283c 【增加】物流管理 2023-08-11 18:41:28 +08:00
liqianjin fa79136adc 【增加】产品状态名称修改 2023-08-11 15:16:23 +08:00
liqianjin 1713d0712c 【增加】视频播放装修
【增加】复制商品
【增加】商品长宽高参数
【增加】合并到第三方主版本分支,更新到最新版本
2023-08-11 13:56:05 +08:00
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
liqianjin 8674f1125c v1.1.2 合并至github项目 2023-08-10 11:34:43 +08:00
pushuo bb7a6aad0d !161 Fix page summary input error prompt
* Fix installation error and no information display problem
* Fix page summary input error prompt
2023-07-20 06:22:35 +00:00
pushuo 2b12969d3a !160 Fix the front-end error reporting problem when the page is deleted
* wip
* Fix the front-end error reporting problem when the page is deleted
2023-07-20 10:16:36 +08:00
Edward Yang a3d35f6f09 code format 2023-07-20 10:13:07 +08:00
pushuo 47a6ea5297 !158 The admin tab is activated according to the parameters
* Background tab is automatically activated
2023-07-19 18:47:01 +08:00
Edward Yang d8b9be889c upgrade to v1.3.8(20230719) 2023-07-19 18:38:18 +08:00
Edward Yang 7ec745c52c !159 Stripe 升级优化
* wip
* fixed stripe charge
* wip
* wip
* code format
* wip
* wip
* 优化 stripe
* Background tab is automatically activated
2023-07-19 18:34:53 +08:00
Edward Yang 746b0382d9 fixed stripe 2023-07-19 15:24:58 +08:00
Edward Yang 99f87cc9e6 修复多个模板重复加载相同hook导致的问题 2023-07-19 11:36:53 +08:00
pushuo 7e3f2be082 !157 Fix tab_product module
* Fix tab_product module
2023-07-19 01:46:46 +00:00
Edward Yang b23a926dd5 修复切换不同模板产生模板缓存导致DIY问题 2023-07-19 09:45:32 +08:00
Edward Yang c07bdda87f fixed product variables 2023-07-19 09:29:50 +08:00
Edward Yang a1ba2917f8 Fixed category seo url on category - product list page. 2023-07-18 19:35:48 +08:00
pushuo a78d61e96e !156 Fix multiple tab_product module switching errors
* Fix multiple tab_product module switching errors
2023-07-18 10:54:00 +00:00
Edward Yang def439de4d release v1.3.8 - 20230718 2023-07-18 16:53:50 +08:00
pushuo 8750c828f7 !155 Add hooks for cart and checkout page submit buttons
* fixed license
* add setting license_code
* Add hooks for cart and checkout page submit buttons
2023-07-18 16:52:46 +08:00
Edward Yang 41ba00a3b3 code format 2023-07-18 16:52:46 +08:00
pushuo e4e6601f21 !154 Fix the error that the background product list image exceeds the display error
* Fix the error that the background product list image exceeds the display error
2023-07-18 16:52:46 +08:00
mengwb 3063e764f9 !153 所有model统一继承BASE
* model统一继承BASE
2023-07-18 16:52:46 +08:00
pushuo b3e70910ff !152 Fix ThemeSeeder data error
* wip
* Fix ThemeSeeder data error
2023-07-18 16:52:46 +08:00
宋良辰 df96ffafa5 !151 后台商品添加model和quantity 列表直接修改上下架状态
* cursor-pointer
* admin products-list add switch to edit status
* ProductResource add model and quantity
2023-07-18 16:52:46 +08:00
Edward Yang 1a3b7d134f Code format 2023-07-18 16:52:46 +08:00
Edward Yang 2d28ca8e68 add product repo builder 2023-07-18 16:52:46 +08:00
mengwb d0c4bc77e7 !150 安装环境检测
* installer detect the php extension
2023-07-18 16:52:46 +08:00
pushuo 69e9a051c1 !149 Fix configuration link status disabled and display problems
* wip
* wip
* Fix configuration link status disabled and display problems -> https:/…
2023-07-18 16:52:46 +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
pushuo 2e7d2b7cb2 !148 Fix the problem of switching preview when editing tab-product module
* wip
* Fix the problem of switching preview when editing tab-product module
2023-07-18 16:52:46 +08:00
Edward Yang 2430791a25 update order payment schema 2023-07-18 16:52:46 +08:00
Edward Yang 33784ebbdb 支持 blade hook 循环体传值 2023-07-18 16:52:46 +08:00
Edward Yang e1a4d1b3cc 修复 blade hook 优先级被覆盖导致插件失效 2023-07-18 16:52:46 +08:00
Edward Yang 9529d68d38 Publish JD product. 2023-07-18 16:52:46 +08:00