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
a1ba2917f8
Fixed category seo url on category - product list page.
2023-07-18 19:35:48 +08:00
5649d40560
Code format
2023-07-18 16:52:46 +08:00
7e3ee84096
Export csv
2023-07-18 16:52:46 +08:00
2ea6cdd49b
Optimize checkout confirm.
2023-06-13 15:20:38 +08:00
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
130a4544cc
Show SPU image for product list
2023-06-07 19:23:37 +08:00
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
0c18aedbb1
revert code to redirect to cart.
2023-06-02 17:33:22 +08:00
65f8023891
Thrown cart exception.
2023-06-02 17:10:41 +08:00
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
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
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
a3470b27c0
sort order for file manager
...
wip
wip
sort order by name
2023-04-17 21:00:05 +08:00
6e1b2a4347
!83 提交两个hook
...
* 增加
2023-04-17 16:32:47 +08:00
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
19f15b54a8
Fixed page category pagenation
2023-04-07 17:22:34 +08:00
5c4ae14dbc
Code format
2023-04-07 16:53:18 +08:00
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
76edc24c77
Add hook from mundosanjose
2023-03-24 17:01:02 +08:00
9ee28acf64
fixed country list
2023-03-24 12:59:35 +08:00
88255f6e7b
Use Product::getUrlAttribute to get product url.
2023-03-14 21:13:03 +08:00
873954614a
Optimize plugin manager
2023-03-08 15:50:52 +08:00
b023ee7a1c
Fixed disabled plugin for home module.
2023-03-08 15:42:11 +08:00
8933cbbdd4
Bestseller module plugin for home page designer
...
支持首页模块插件化
bestseller
wip
wip
Optimize module view path.
wip
Fixed module content
Optimize module view path.
wip
wip
Optimize module view path.
2023-03-08 12:20:53 +08:00
a1b1f6ba15
修复库存问题: 当购物车中商品加上详情页购买商品大于库存时，可下单成功
2023-03-08 12:17:50 +08:00
3971ad5977
新增插件读取静态文件helper: plugin_asset()
2023-03-08 12:17:50 +08:00
32b35e32c1
!45 前台子分类显示等
...
* 优化前台子分类显示、优化规格批量修改、商品详情页保存开启前台验证
* 分类页显示子分类
2023-02-27 10:32:41 +00:00
43c7a5461e
修复禁用分类问题 https://guangdagit.com/projects/bk_mundosanjose/issues/8
2023-02-27 09:53:00 +08:00
d0c7b43cce
plugin code format
2023-02-15 09:44:47 +08:00
d381396062
添加支付流程 hook
2023-02-15 00:35:41 +08:00
0307831081
完善多语言, 修复后台文章列表页标题截取问题
2023-02-14 17:23:38 +08:00
7e972a8723
添加文章分类相关功能
...
优化链接配置词条
文章分类状态默认修改
wip
wip
2023-02-10 21:50:38 +08:00
1a653be8fa
修复前台支付和配送多语言
2023-02-08 10:06:19 +08:00
f0239b8f62
fixed order list resource
2023-02-07 17:53:30 +08:00
6095b5de23
hook_action 统一命名
2023-02-07 11:19:17 +08:00
393b25f34e
添加前台controller hooks
2023-02-07 10:19:30 +08:00
65c65a11fb
添加订单和产品hook
2023-02-07 09:51:01 +08:00
2743057667
删除多余的category_id
2023-02-03 12:00:35 +08:00
bf632700a0
添加面包屑library
2023-02-03 12:00:35 +08:00
9579ae8c08
修复前台选择每页数量后翻页问题
2023-02-03 12:00:35 +08:00
f3de1b098a
个人中心售后申请详情页状态显示问题
2023-01-13 16:26:34 +08:00
liqianjin
Edward Yang
pushuo
what_村长
mengwb