wuhui_zzw
5663f321dc
优化：商品编辑页面布局调整，添加贸易术语设置及相关内容
2023-09-22 15:04:12 +08:00
wuhui_zzw
9ad042da88
优化：商品编辑页面布局调整，计量单位由手动填写且支持中英文切换修改为下拉框选择且不支持中英文切换
2023-09-22 10:39:48 +08:00
wuhui_zzw
3c62e8af7d
优化：商品编辑增加按件卖（默认）/按批卖设置
2023-09-20 16:37:49 +08:00
wuhui_zzw
b679d66adb
版本合并、和客户修改后的版本合并
...
修改：商品编辑页面取消sku；起订量从规格中移除，统一设置起订量
修改：客服端显示最小起订量
2023-09-20 13:36:57 +08:00
wuhui_zzw
5a83342538
优化：国家选择器 - 添加区域分组筛选
2023-08-31 09:53:08 +08:00
wuhui_zzw
caf65fa1d8
修复：非按重量计算物流保存报错
2023-08-28 17:49:43 +08:00
wuhui_zzw
e6882598fe
添加：物流添加续重范围填写项
2023-08-28 17:45:59 +08:00
wuhui_zzw
3c96766442
添加：物流管理 - 添加前台默认展示国家
2023-08-25 14:16:09 +08:00
wuhui_zzw
4032cfaaa1
优化：国家支持图标设置
2023-08-25 11:08:31 +08:00
wuhui_zzw
f1f2a7d1bf
修改：物流列表显示内容优化
2023-08-21 18:05:03 +08:00
wuhui_zzw
afa9b0be6f
修改：物流支持多国家选择
2023-08-21 16:59:20 +08:00
liqianjin
02516b7825
【增加】物流及可视化
2023-08-12 18:46:10 +08:00
liqianjin
bfb1ea283c
【增加】物流管理
2023-08-11 18:41:28 +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
c07bdda87f
fixed product variables
2023-07-19 09:29:50 +08:00
df96ffafa5
!151 后台商品添加model和quantity 列表直接修改上下架状态
...
* cursor-pointer
* admin products-list add switch to edit status
* ProductResource add model and quantity
2023-07-18 16:52:46 +08:00
9529d68d38
Publish JD product.
2023-07-18 16:52:46 +08:00
7f585d6b51
Show product detail on panel.
2023-07-07 17:35:39 +08:00
9287e0fc47
fixed summary rule
2023-06-13 15:33:34 +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
9ecf31aecd
!120 Add sorting settings
...
* Fixed category sort order and filter by active.
* Add sorting settings
2023-06-07 07:55:43 +00:00
2b7b0a9011
!119 add ms hook
...
* wip
* 优化
* wip
* 文件管理器
* add ms hook
2023-06-07 02:57:07 +00:00
f98c93f099
Modify upload max size to 10240 for admin panel.
2023-06-01 11:06:47 +08:00
fc609a9b67
Code format
2023-05-31 18:06:14 +08:00
liqianjin
b57dcf54b0
v1.1 修改完成
2023-05-30 15:29:52 +08:00
liqianjin
66d08c1654
v1 修改完成
2023-05-30 11:56:47 +08:00
8b711fa653
!108 【WIP】代码优化和添加hook(适配多商户)
...
* wip
* 文件管理器优化
* 文件管理器优化
* 后台订单管理和商品管理代码优化，提供更好的扩展性，便于多商家实现
* totalService
* 添加hook
* TotalService优化
* hook
* hook
* 购物车列表hook
2023-05-30 01:56:26 +00:00
liqianjin
bb57d646db
修改
2023-05-29 19:59:31 +08:00
liqianjin
5e552c572e
init
2023-05-27 11:47:26 +08:00
d6f518dff6
!107 Order Payment
...
* wip
* add exceptions
* order->orderPayments ui
* add order payments
* paypal 和 stripe 保存支付数据
* add order payment.
2023-05-25 09:53:49 +00:00
619523c472
update tax rate rule
2023-05-23 10:43:21 +08:00
1574805a5a
change order total service and code format.
2023-05-18 15:31:11 +08:00
204d91e5d0
!100 Fix the error reported when there is no data in advanced filtering
...
* Fix the error reported when there is no data in advanced filtering
2023-05-17 03:28:33 +00: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
d2a68741d4
!94 Fix advanced filter save error
...
* Fix advanced filter save error
2023-05-12 02:33:05 +00:00
f26e239668
fixed position
2023-05-11 15:11:02 +08:00
8fcd26dcd7
Fixed for https://gitee.com/beikeshop/beikeshop/issues/I70XJW?from=project-issue
2023-05-10 09:59:22 +08:00
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
c1d6c48f5b
Add jwt and admin token to build API.
...
Add jwt to build API.
返回当前客户
后台添加，通过token获取后台用户信息
fixed token api
fixed order list and order detail
fixed product api
fixed categoryies API
add brands
fixed brands
add products
添加订单接口
2023-04-27 18:16:07 +08:00
67d1b85952
admin adds a token
...
wip
fixed update
fixed account update
wip
wip
wip
wip
fixed tokens
wip
admin token
2023-04-27 18:16:07 +08:00
920689fbee
首页统计改为产品总数
2023-04-26 18:57:49 +08:00
76b37ed867
!86 Optimization Advanced filters, taxes, currencies, etc.
...
* Fix region configuration province selection problem
* Optimization Advanced filters, taxes, currencies, etc.
2023-04-26 08:38:24 +00:00
a3470b27c0
sort order for file manager
...
wip
wip
sort order by name
2023-04-17 21:00:05 +08:00
98e962a6fd
!79 Fix the background brand page turning back problem, optimize the form submission interaction, etc.
...
* Fix the background brand page turning back problem, optimize the form …
2023-04-11 07:40:23 +00:00
d8027054bc
!77 Optimize setting background page properties
...
* Optimize setting background page properties
2023-04-10 06:06:35 +00:00
5c4ae14dbc
Code format
2023-04-07 16:53:18 +08:00
e1e3ee9568
!75 编辑商品时重量为空保存报错
...
* 代码规范化
* Fix the issue of saving error when editing product weight is empty.
* 高级筛选哪些属性显示在筛选栏可在后台系统设置里设置
2023-04-07 08:42:56 +00:00
wuhui_zzw
liqianjin
Edward Yang
宋良辰
pushuo
mengwb