Commit Graph

49 Commits

Author SHA1 Message Date
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 66d08c1654 v1 修改完成 2023-05-30 11:56:47 +08:00
liqianjin 5e552c572e init 2023-05-27 11:47:26 +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
pushuo 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
蒲硕 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
pushuo 9fe36070c1 add new theme fashion
wip

wip

wip

wip

admin form add hook

Code format

优化插件市场返回上一页

Update openai migration

optimize brands

Optimize page and category hook

模版优化

delete black

wip

Plublish theme files.

Ignore themes except default

删除demo-2

wip

Get enabled themes.

Theme seeder.

Run theme seeder.

update theme

wip

wip

Switch theme and run db seeder

code format

wip

wip
2023-03-16 15:25:45 +08:00
Edward Yang 7e972a8723 添加文章分类相关功能
优化链接配置词条

文章分类状态默认修改

wip

wip
2023-02-10 21:50:38 +08:00
Edward Yang c60e32b401 增加 setting hook 2023-02-07 15:07:28 +08:00
Edward Yang 35e3655ae6 添加二级菜单路由前缀以便让插件修改 2023-01-16 11:34:46 +08:00
Edward Yang 434d94c01d 使用laravel/pint格式化代码 2023-01-10 14:38:26 +08:00
TL 1613adc3fa 商品属性功能后端代码 2023-01-06 11:41:38 +08:00
pushuo dbae784622 客户管理回收站 2022-12-28 16:21:38 +08:00
songliang fa7a31ec9c 后台h5响应式 2022-12-07 17:21:13 +08:00
Edward Yang 1085238859 plugin marketing 2022-10-14 17:21:43 +08:00
pushuo 24145203f9 https://guangdagit.com/beike/beikeshop/issues/229 2022-09-08 15:14:25 +08:00
pushuo 4396b1f133 售后原因多语言 2022-08-31 14:54:39 +08:00
Edward Yang d9cbfe79fa 调整首页菜单 2022-08-30 15:29:45 +08:00
pushuo 17cac83ada wip 2022-08-29 19:10:19 +08:00
TL c33480aac3 后台国家和省份管理 2022-08-29 18:04:26 +08:00
Edward Yang fc9c826b0c product 翻译从产品改为商品 2022-08-23 16:17:44 +08:00
pushuo 0a22238629 导航菜单配置等有害 2022-08-15 10:15:49 +08:00
pushuo fce7f41f5d page 页面 2022-08-08 17:13:14 +08:00
Edward Yang a6e2f430e4 add pages 2022-08-08 15:28:34 +08:00
pushuo d7691c3970 wip 2022-08-08 14:56:25 +08:00
Edward Yang 8a2d39d6c9 fixed languages 2022-08-05 19:11:03 +08:00
pushuo 14d13e0ce1 wip 2022-08-05 09:25:59 +08:00
Edward Yang b7bd77ba76 插件修改后台子菜单 2022-08-04 18:23:49 +08:00
Edward Yang 5372de0b6a fixed languages 2022-08-04 12:16:21 +08:00
Edward Yang c40f743d69 use helper to access user and customer 2022-08-04 10:20:27 +08:00
Edward Yang d434f50abc 调整权限 2022-08-03 16:18:53 +08:00
pushuo 217bdbadc3 后台售后用户角色等 2022-08-03 16:18:45 +08:00
Edward Yang 19e5ecc29a update roles 2022-08-02 10:55:06 +08:00
pushuo af5dceb6c0 wip 2022-08-01 20:46:50 +08:00
Edward Yang 95ac80ee36 update roles 2022-08-01 15:56:32 +08:00
Edward Yang 13f952d25d fixed admin roles 2022-08-01 14:35:03 +08:00
Edward Yang ad31828c5f add spatie permission 2022-08-01 11:51:18 +08:00
pushuo c6779e7bc3 wip 2022-08-01 08:47:30 +08:00
pushuo d36e991ab0 后台首页图表 2022-07-29 17:19:22 +08:00
pushuo 316085e4e2 wip 2022-07-28 16:48:33 +08:00
Edward Yang 565c1d78d1 fixed tax rate 2022-07-27 11:24:19 +08:00
Edward Yang 8aa7ec697f add tax and regions 2022-07-26 20:13:42 +08:00
Edward Yang ed8a5fa1f1 整理后台菜单 2022-07-25 21:23:25 +08:00
pushuo e9b66f64e4 wip 2022-07-25 20:50:19 +08:00
pushuo d2a135f275 wip 2022-07-06 16:36:25 +08:00
pushuo 70d01b7fa2 后台订单详情 2022-07-06 16:29:50 +08:00
pushuo c1c9f1ec5b 后台订单列表 2022-07-06 15:04:32 +08:00
pushuo 76a4713960 用户组 2022-07-05 20:24:10 +08:00
Sam Chen 22b7783312
分拆 beike namespace (#2)
* 分拆 beike namespace

Co-authored-by: Sam Chen <samchen945@gmail.com>
2022-05-17 15:37:27 +08:00