Commit Graph

38 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
pushuo b074e2a6c1 !125 Optimize element path
* Optimize order status modification
* Optimize element path
2023-06-13 09:02:47 +00:00
liqianjin 5e552c572e init 2023-05-27 11:47:26 +08: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
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
蒲硕 d8027054bc !77 Optimize setting background page properties
* Optimize setting background page properties
2023-04-10 06:06:35 +00:00
pushuo b8889cb9c5 Add plugin uninstall reminder
wip

Fix navigation responsiveness issues

brand ui

Fix delete attribute call error api

Optimize plugin when uninstall and check plugin is available for current version.

wip

Fix the loading error of the element language file in the homepage editor

Fix menu page category name getting error

Fix menu page category name getting error ++
2023-03-24 11:38:12 +08: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 c3ce7bdcc1 Fixed plugin description 2023-03-08 17:27:53 +08:00
Edward Yang 46172e4fa8 添加我要发布插件按钮 2023-02-13 23:17:02 +08:00
pushuo d3624990e8 优化后台使用 element ui 翻页,显示总条数 2023-01-12 18:22:19 +08:00
pushuo fb02010079 修复插件市场 列表页插件 url 问题 2022-12-28 16:21:38 +08:00
pushuo 9a09a42f81 优化 插件详情h5 2022-12-07 17:21:13 +08:00
Edward Yang 9f67ec43f0 后台下单购买插件
购买插件

wip

wip

购买插件微信支付

wip

优化插件购买

wip

修复插件购买

添加插件接口

返回json

wip

优化插件详情页购买ui交互

添加弹出层插件

wip

wip

wip

插件市场设置 token 优化
2022-12-07 17:21:13 +08:00
pushuo 874cf8f84b 后台插件市场列表设置 token 添加 获取 Token 按钮 2022-11-11 14:50:03 +08:00
pushuo 5916ea0b31 修复插件市场列表筛选 name 2022-11-04 16:49:53 +08:00
pushuo 73ee668c8b wip 2022-11-04 16:48:36 +08:00
pushuo de1c40121b 插件市场详情添加 获取 token 链接 2022-11-04 16:48:12 +08:00
pushuo dbc403550c wip 2022-10-14 17:38:52 +08:00
pushuo aeb6312f4c wip 2022-10-14 17:38:52 +08:00
pushuo 3993a229f7 wip 2022-10-14 17:38:52 +08:00
pushuo cc322ca23b wip 2022-10-14 17:38:52 +08:00
pushuo 61fc6ab82a wip 2022-10-14 17:38:52 +08:00
pushuo 5bd60354a3 设置 token 2022-10-14 17:38:52 +08:00
pushuo 77951b54ee social 后台编辑
wip

wip

wip

修改插件图标

add social controller.

add social controller.

add shop base url

wip

wip

save social setting

优化购物车加载

后台第三方登录插件

完善第三方登录按钮

fixed social setting

wip

wip

wip

wip

完善第三方登录

fixed social redirect

优化后台

修复google 登录

fixed window opener

Add 第三方登录类型

wip

wip

完善多语言

修复第三方登录前台多语言
2022-10-14 17:21:44 +08:00
pushuo 75aca94d09 优化插件市场ui 2022-10-14 17:21:43 +08:00
Edward Yang bfa4088b7b 修复插件不可用 2022-10-14 17:21:43 +08:00
Edward Yang 34c959b222 fixed download 2022-10-14 17:21:43 +08:00
pushuo acc85159bd 后台插件市场无数据 2022-10-14 17:21:43 +08:00
Edward Yang f4ac449ffc fixed download 2022-10-14 17:21:43 +08:00
pushuo 458357dba5 wip 2022-10-14 17:21:43 +08:00
pushuo cac7d30e0a wip 2022-10-14 17:21:43 +08:00
pushuo 7029befc57 wip 2022-10-14 17:21:43 +08:00
pushuo 6074f08c6f no message 2022-10-14 17:21:43 +08:00
Edward Yang 5671f2d2bf add plugin show page 2022-10-14 17:21:43 +08:00
pushuo 77f28a598e 优化后台插件中心 2022-10-14 17:21:43 +08:00
Edward Yang f3a664f8ca add marketing list 2022-10-14 17:21:43 +08:00