Commit Graph

340 Commits

Author SHA1 Message Date
wuhui_zzw 5663f321dc 优化:商品编辑页面布局调整,添加贸易术语设置及相关内容 2023-09-22 15:04:12 +08:00
wuhui_zzw 9ad042da88 优化:商品编辑页面布局调整,计量单位由手动填写且支持中英文切换修改为下拉框选择且不支持中英文切换 2023-09-22 10:39:48 +08:00
wuhui_zzw bfc31e06c4 优化:商品详情加入购物车、立即购买、购物车页面下单 - 添加批量售卖商品下单及加入购物车处理。不符合条件禁止下单或者加入购物车 2023-09-21 16:46:55 +08:00
wuhui_zzw 525a6c1740 优化:商品详情购买处理按批购买 2023-09-21 13:38:08 +08:00
wuhui_zzw 19df41c8d4 优化:增加计量单位并且在商品组件和商品详情中显示。支持多语言 2023-09-20 14:49:44 +08:00
wuhui_zzw 2e36e35e17 优化:客服端 - 商品详情页面显示当前商品的最小起订量、并且如果购买数量低于最小起购量时禁止下单和添加购物车 2023-09-20 14:05:36 +08:00
wuhui_zzw b679d66adb 版本合并、和客户修改后的版本合并
修改:商品编辑页面取消sku;起订量从规格中移除,统一设置起订量
修改:客服端显示最小起订量
2023-09-20 13:36:57 +08:00
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 18546a254c 添加:物流运费计算方式 2023-08-22 16:00:34 +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 a1ba2917f8 Fixed category seo url on category - product list page. 2023-07-18 19:35:48 +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
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
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
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
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 a3470b27c0 sort order for file manager
wip

wip

sort order by name
2023-04-17 21:00:05 +08:00
what_村长 6e1b2a4347 !83 提交两个hook
* 增加
2023-04-17 16:32:47 +08:00
what_村长 d4b8c148a1 !78 增加几处hook,用于实现其他登录方式及登录后的数据展示控制
* Merge branch 'dev' of https://gitee.com/what520/beikeshop into dev
* 增加 @hookwrapper('account.sidebar.email')
* 增加 hook_filter('account.edit.index', $data);拦截展示数据
* @hookwrapper('account.edit.email')
* 增加@stack('login.vue.data'),@stack('login.vue.method')
* 图片翻译插件增加hook
* 增加2个hook  admin.product.name.after   admin.product.content.after 用于实现翻译插件按钮
* 1.增加 @hook('file_manager.content.head.btns.after')
* 1.增加 @hook('file_manager.content.head.btns.after')
* 在文件管理器上加入@hook('file_manager.content.head.btns.after')
2023-04-11 06:23:12 +00:00
Edward Yang 19f15b54a8 Fixed page category pagenation 2023-04-07 17:22:34 +08:00
Edward Yang 5c4ae14dbc Code format 2023-04-07 16:53:18 +08: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 76edc24c77 Add hook from mundosanjose 2023-03-24 17:01:02 +08:00
Edward Yang 9ee28acf64 fixed country list 2023-03-24 12:59:35 +08:00
Edward Yang 88255f6e7b Use Product::getUrlAttribute to get product url. 2023-03-14 21:13:03 +08:00
Edward Yang 873954614a Optimize plugin manager 2023-03-08 15:50:52 +08:00
Edward Yang b023ee7a1c Fixed disabled plugin for home module. 2023-03-08 15:42:11 +08:00