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
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
fb8ac8dea4
!111 facebook pixel
...
* remove account order success.
* wip
* fb-pixel
2023-06-02 01:18:43 +00:00
liqianjin
bb57d646db
修改
2023-05-29 19:59:31 +08:00
liqianjin
5e552c572e
init
2023-05-27 11:47:26 +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
3971ad5977
新增插件读取静态文件helper: plugin_asset()
2023-03-08 12:17:50 +08:00
7e972a8723
添加文章分类相关功能
...
优化链接配置词条
文章分类状态默认修改
wip
wip
2023-02-10 21:50:38 +08:00
434d94c01d
使用laravel/pint格式化代码
2023-01-10 14:38:26 +08:00
4cb3bfda91
游客结账登录中间件，游客登录购物车合并
2023-01-05 15:12:47 +08:00
bb640e53de
cancel order
2022-08-25 16:35:27 +08:00
0ddfde5e0c
删除 diglactic/laravel-breadcrumbs
2022-08-18 08:32:13 +08:00
b5a8e46b2b
修复我的地址面包屑
2022-08-18 00:13:59 +08:00
9984dfd3d0
code format
2022-08-17 22:45:15 +08:00
1ea67b0a35
购物车相关需要先登录, 修复购物车产品名称太长问题 https://guangdagit.com/beike/beikeshop/issues/108
2022-08-17 17:59:17 +08:00
789c2f4fa6
complete order
2022-08-16 18:05:14 +08:00
d011cf2803
优化
2022-08-16 17:20:07 +08:00
49a2a25489
添加 rma
2022-08-16 14:51:03 +08:00
9d7ff6e116
fixed search product
2022-08-12 17:32:37 +08:00
770d24f656
底部链接处理
2022-08-11 18:20:24 +08:00
bc8fb4f929
文件上传
2022-08-10 16:20:59 +08:00
32896c07c0
文件上传功能
2022-08-10 15:58:22 +08:00
850e306f2b
编辑个人信息
2022-08-10 15:00:56 +08:00
96b7481123
fixed payment
2022-08-08 16:14:16 +08:00
971db18c19
wip
2022-08-05 10:59:21 +08:00
bd531e3514
后台语言切换
2022-08-04 09:53:55 +08:00
7d67dd0d5c
收藏
2022-08-03 18:31:03 +08:00
8a6c66fb83
收藏
2022-08-03 18:24:24 +08:00
4e6bcceba3
用户修改个人信息
2022-08-03 15:10:41 +08:00
0705c31ab0
品牌自动完成
2022-07-28 20:59:58 +08:00
08fc2f8525
语言切换
2022-07-28 16:17:57 +08:00
cdbd42c464
前台品牌列表和品牌商品列表
2022-07-28 15:35:20 +08:00
8025bb9160
update bread crumb
2022-07-26 18:18:57 +08:00
891e1db59d
update bread crumb
2022-07-26 18:16:47 +08:00
9561514271
add bread creumb for product
2022-07-26 18:12:35 +08:00
eba9c802c1
收藏功能
2022-07-25 20:03:19 +08:00
408f0b3e84
收藏功能
2022-07-25 19:24:58 +08:00
08d028eeda
update zones
2022-07-22 17:08:03 +08:00
e8996fb98e
个人中心编辑信息
2022-07-22 09:50:04 +08:00
4444c4cc61
update routes
2022-07-21 11:59:51 +08:00
70df115c6e
wip
2022-07-19 11:23:10 +08:00
aa9871f1d9
商品分类自动完成
2022-07-12 21:09:54 +08:00
9929324034
fixed designer
2022-07-11 20:08:52 +08:00
4db5fe57ec
page builder
2022-07-08 11:30:51 +08:00
4b8e4f839e
个人中心修改密码接口
2022-07-07 20:35:14 +08:00
bbc6302359
stripe
2022-07-07 17:39:15 +08:00
6ee3aacc0f
顾客找回密码功能
2022-07-07 15:54:45 +08:00
6a5aebce69
bk stripe
2022-07-07 09:46:17 +08:00
ea7fc90c3a
fixed order show
2022-07-05 11:06:05 +08:00
004cbf3d76
wip
2022-07-05 11:00:05 +08:00
liqianjin
pushuo
mengwb
Edward Yang
Edward Yang
pushuo
TL