Commit Graph

500 Commits

Author SHA1 Message Date
wuhui_zzw cf7825d519 优化:文本内容修改 2023-08-31 11:34:22 +08:00
wuhui_zzw df8cff8869 添加:商品详情 - 物流切换列表中不显示不符合条件的物流
优化:商品详情 - 默认显示运费最低的物流。
2023-08-29 10:36:27 +08:00
wuhui_zzw f55c520015 添加:物流管理 - 商品详情页面支持切换国家和物流;并且同步刷新对应的运费 2023-08-28 15:15:44 +08:00
wuhui_zzw a318806058 优化:订单列表显示预计到达时间 2023-08-22 19:08:04 +08:00
wuhui_zzw a4bbe1c4d8 修复:运费计算错误、未登录和登录后的运费不一致 2023-08-22 18:22:10 +08:00
wuhui_zzw 399bff4def 修复:商品详情 - 购买数量可以输入小数
修复:商品购买数量为0时,依然计算了运费
添加:添加商品总数量统计
2023-08-22 17:43:16 +08:00
wuhui_zzw 18546a254c 添加:物流运费计算方式 2023-08-22 16:00:34 +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
liqianjin 02516b7825 【增加】物流及可视化 2023-08-12 18:46:10 +08:00
liqianjin fa79136adc 【增加】产品状态名称修改 2023-08-11 15:16:23 +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
Edward Yang 99f87cc9e6 修复多个模板重复加载相同hook导致的问题 2023-07-19 11:36:53 +08:00
Edward Yang a1ba2917f8 Fixed category seo url on category - product list page. 2023-07-18 19:35:48 +08:00
Edward Yang 1a3b7d134f Code format 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
Edward Yang 5649d40560 Code format 2023-07-18 16:52:46 +08:00
Edward Yang 7e3ee84096 Export csv 2023-07-18 16:52:46 +08:00
Edward Yang 2ea6cdd49b Optimize checkout confirm. 2023-06-13 15:20:38 +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
Edward Yang 130a4544cc Show SPU image for product list 2023-06-07 19:23:37 +08:00
pushuo fb1c2e4c1c !118 order detail for guest
* order ui
* fixed guest order
* add number filter
* Add order detail for guest
2023-06-07 02:03:07 +00:00
mengwb 0a5518d801 !116 结账hook
* Optimize cart list.
* 结账优化
2023-06-06 00:43:20 +00:00
Edward Yang d935eb4ff3 Optimize cart list. 2023-06-05 16:21:39 +08:00
mengwb fdbe7120c0 !113 hook优化
* hook优化
2023-06-05 03:19:49 +00:00
mengwb 25fd03c3c7 !112 service.checkout.update.after hook
* service.checkout.update.after
2023-06-02 10:08:18 +00:00
Edward Yang 0c18aedbb1 revert code to redirect to cart. 2023-06-02 17:33:22 +08:00
Edward Yang 65f8023891 Thrown cart exception. 2023-06-02 17:10:41 +08:00
Edward Yang 6a16540d1b Fixed flexshipping for 1.3.6 and 1.3.7 2023-06-02 16:18:42 +08:00
Edward Yang a29245b5d4 Fixed flex service. 2023-06-02 14:38:45 +08:00
pushuo fb8ac8dea4 !111 facebook pixel
* remove account order success.
* wip
* fb-pixel
2023-06-02 01:18:43 +00:00
liqianjin 42f66f859a v1.1.1 修改 2023-06-01 09:56:55 +08:00
liqianjin b57dcf54b0 v1.1 修改完成 2023-05-30 15:29:52 +08:00
liqianjin c86d9a8087 v1 修改完成 2023-05-30 14:19:00 +08:00
liqianjin 66d08c1654 v1 修改完成 2023-05-30 11:56:47 +08:00
mengwb 8b711fa653 !108 【WIP】代码优化和添加hook(适配多商户)
* wip
* 文件管理器优化
* 文件管理器优化
* 后台订单管理和商品管理代码优化,提供更好的扩展性,便于多商家实现
* totalService
* 添加hook
* TotalService优化
* hook
* hook
* 购物车列表hook
2023-05-30 01:56:26 +00:00
liqianjin 18a314f357 修改 2023-05-29 20:02:32 +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 1574805a5a change order total service and code format. 2023-05-18 15:31:11 +08:00
pushuo 8ea52fb8ff !101 Fix article TDK and modify article
* Fix article-related product issues
* Fix the problem that the article TDK does not display
2023-05-17 03:27:35 +00:00
pushuo 812b7655af !98 Optimize the personal center button, etc.
* wip
* Optimize the personal center button, etc.
* wip
* wip
* wip
* Modify an entry, name -> full name
2023-05-15 10:15:27 +00:00
Edward Yang 920689fbee 首页统计改为产品总数 2023-04-26 18:57:49 +08:00
Edward Yang 2a2067204a Add hook for total service. 2023-04-26 11:12:36 +08:00
Edward Yang a3470b27c0 sort order for file manager
wip

wip

sort order by name
2023-04-17 21:00:05 +08:00