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
|
7e3f2be082
|
!157 Fix tab_product module
* Fix tab_product module
|
2023-07-19 01:46:46 +00: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 |
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 |
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 |
what_村长
|
ef14e65e31
|
!146 增加 hoot admin.product.sku.edit.item.after
* 增加hook admin.product.sku.edit.item.after ,方便在上面加上翻译插件按钮
* 增加hook admin.product.sku.edit.item ,方便在上面加上翻译插件按钮
* Merge branch 'dev' of https://gitee.com/what520/beikeshop into dev
* 测试
|
2023-07-18 16:52:46 +08:00 |
pushuo
|
a418db518b
|
!143 add product-page hook
* add product hook
|
2023-07-18 16:52:46 +08:00 |
pushuo
|
530e5f22fe
|
!138 Fix pagination button h5 responsive
* Fix pagination button h5 responsive ++
* Fix pagination button h5 responsive
* Optimize table UI, etc
|
2023-06-19 02:27:08 +00:00 |
tanxiaoyong
|
0e9395b98e
|
增加hook
product.detail.quantity.input
product.detail.add_to_cart
product.detail.wishlist
|
2023-06-14 11:37:07 +08:00 |
tanxiaoyong
|
e71a98e915
|
增加hook
product.detail.quantity.input
product.detail.add_to_cart
product.detail.wishlist
|
2023-06-14 11:33:17 +08:00 |
pushuo
|
b074e2a6c1
|
!125 Optimize element path
* Optimize order status modification
* Optimize element path
|
2023-06-13 09:02:47 +00:00 |
pushuo
|
56ef2dece8
|
!124 Add a view details link to the order email
* Add a view details link to the order email
|
2023-06-09 06:36:40 +00: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 |
pushuo
|
523b8a3e7c
|
!122 When entering the product details for the first time, only the SPU image will be displayed
* When entering the product details for the first time, only the SPU ima…
|
2023-06-08 07:48:00 +00:00 |
pushuo
|
2b7b0a9011
|
!119 add ms hook
* wip
* 优化
* wip
* 文件管理器
* add ms hook
|
2023-06-07 02:57:07 +00: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 |
pushuo
|
8d165eadf8
|
!117 Optimize the header drop-down menu ui
* Optimize the header drop-down menu ui
|
2023-06-06 00:43:52 +00:00 |
liqianjin
|
9694525fc7
|
v1.1.2 修改 0605
|
2023-06-05 16:22:51 +08:00 |
pushuo
|
43f6fdbb40
|
!114 Checkout request returns error message display
* Optimize checkout page error request prompt
|
2023-06-05 03:49:34 +00:00 |
pushuo
|
fb8ac8dea4
|
!111 facebook pixel
* remove account order success.
* wip
* fb-pixel
|
2023-06-02 01:18:43 +00:00 |
Edward Yang
|
8f167ac2b0
|
Add view content.
|
2023-06-01 16:07:36 +08:00 |
Edward Yang
|
39d8d85425
|
Add meta pixel hook
|
2023-05-31 18:14:37 +08:00 |
liqianjin
|
6395744c56
|
v1.2 修改完成
|
2023-05-31 11:59:54 +08:00 |
liqianjin
|
b57dcf54b0
|
v1.1 修改完成
|
2023-05-30 15:29:52 +08:00 |
liqianjin
|
d9cc12396d
|
v1 修改完成
|
2023-05-30 12:05:39 +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 |
mengwb
|
64cedc39d4
|
!105 hook
* 订单详情页增加Hook
* 添加日期选择插件
* 状态机完善
* wip
* hook for checkout
|
2023-05-30 00:34:21 +00:00 |
liqianjin
|
bb57d646db
|
修改
|
2023-05-29 19:59:31 +08:00 |
liqianjin
|
5880fbaa0a
|
init
|
2023-05-29 14:08:51 +08:00 |
pushuo
|
68f91b589f
|
!109 Add front hook
* Add front hook
|
2023-05-27 01:03:24 +00:00 |
pushuo
|
5b83f02098
|
!106 Fix the h5 navigation without links and click to jump to the home page
* Fix the h5 navigation without links and click to jump to the home page
|
2023-05-23 03:10:13 +00:00 |
pushuo
|
b5cc1ba786
|
!104 Product Added Quick Preview
* Added quick preview
|
2023-05-20 10:20:53 +00:00 |
pushuo
|
0bd592b648
|
!103 Fix that the slideshow module swiper plugin cannot be loaded for the first time
* Fix that the slideshow module swiper plugin cannot be loaded for the first time
|
2023-05-17 06:22:46 +00:00 |
pushuo
|
2fd52c1761
|
!102 Add article single file
* wip
|
2023-05-17 06:20:58 +00: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
|
fcb6c888dc
|
!99 Fix the tab_product module reporting an error when there is no data
* Fix the tab_product module reporting an error when there is no data
|
2023-05-17 03:11:48 +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 |
pushuo
|
b88d889861
|
!97 Modify an entry, name -> full name
* Modify an entry, name -> full name
|
2023-05-15 06:18:25 +00:00 |
what_村长
|
a1626dc21b
|
!95 调整订单状态显示字段
* 调整订单状态显示字段,统一使用status_format
|
2023-05-15 11:38:06 +08:00 |
pushuo
|
b595085b7e
|
!92 Optimize the checkout process
* wip
* wip
* wip
* wip
* wip
* wip
* Optimize the checkout process
|
2023-05-10 10:37:27 +00:00 |
mengwb
|
0b6609b419
|
!93 【WIP】增加hook
* hook about multiseller
|
2023-05-10 10:35:48 +00:00 |
Edward Yang
|
ab549d1cd8
|
update themes git ignore
|
2023-05-10 11:45:36 +08:00 |
pushuo
|
4ef9eeac5b
|
!90 add checkout success
* add checkout success
|
2023-05-10 01:39:22 +00:00 |
pushuo
|
77bf0bca1a
|
Change plugin purchase process
wip
wip
wip
wip
admin ui optimization
Optimize file manager
|
2023-05-09 17:53:11 +08:00 |
pushuo
|
4869e4252e
|
Optimize the plug-in purchase process
|
2023-05-09 17:53:11 +08:00 |
pushuo
|
773d1469bd
|
Add product image lazy loading
|
2023-05-04 18:26:07 +08:00 |
Edward Yang
|
10eb858ef1
|
update header and sidebar menus for admin panel.
fixed menus
wip
wip
get sub menus
wip
add current link
wip
fixed rma
fixed routes
fixed sub routes
wip
wip
fixed order and rmas
重构后台菜单
wip
fixed active
update languages.
wip
wip
add history links
code format
wip
fixed menus
fixed menus
fixed url
fixed sub routes
wip
update menus
wip
修复角色页面没有选中上一级目录
remove unnecessary code
wip
wip
fixed header common links
code format
add design
fixed plugin
wip
添加插件二次子菜单
修复获取更多
修复最近浏览记录 插件相关语言包
wip
调整文章菜单顺序
fixed common links
fixed common links
wip
wip
wip
default link icon.
修复插件编辑二级菜单选中
wip
wip
wip
wip
wip
wip
|
2023-05-04 17:48:52 +08:00 |