Commit Graph

84 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
蒲硕 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
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 8ab99143b9 Support own OpenAI API Key
Support own OpenAI API Key

fixed openai

check public cache permision when install

check public cache permision when install

Fixed user id

Fixed user id

Fixed api

wip

wip

API Key

wip

fixed openai
2023-03-13 18:59:07 +08:00
Edward Yang d84393b237 fixed plugin pagination and sidebar 2023-03-10 14:27:54 +08:00
Edward Yang 7eb8fe3477 Code format 2023-03-09 16:58:51 +08:00
pushuo af6f079b43 components input / InputLocale 2023-03-09 16:23:56 +08:00
Edward Yang 3a456ceb58 Support multiple language for column text. 2023-03-09 16:23:56 +08:00
pushuo a329f280d9 rich-text multilingual 2023-03-08 18:12:02 +08:00
songliang cd0136c892 商品管理词条 客户列表优化
修复非中文input框单独一行

补全词条

文章分类词条

后台用户编辑页样式优化

修復文章分類多語言

词条-内容管理

内容管理

去掉content

属性组词条
非中文input样式优化
2023-02-14 17:01:25 +08:00
Edward Yang 1675a07c9b 修复后台单引号 html encode 问题 2023-02-12 20:23:10 +08:00
Edward Yang 7e972a8723 添加文章分类相关功能
优化链接配置词条

文章分类状态默认修改

wip

wip
2023-02-10 21:50:38 +08:00
pushuo 9191f51176 优化后台 vip ui 等
同上

后台 form 组件value 添加 html_entity_decode

修改结账设置词条

优化获取版本更新、vip 状态逻辑

wip
2023-02-08 15:51:42 +08:00
Edward Yang c60e32b401 增加 setting hook 2023-02-07 15:07:28 +08:00
Edward Yang 9b484e03f2 RichText 命名优化 2023-02-03 12:00:35 +08:00
pushuo 5d4f0c99df 后台添加 richtext 组件,删除原 textarea 组件富文本判断
删除测试 FlatShipping 代码

删除多余参数
2023-02-03 12:00:35 +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 5982417078 优化后台商品详情页 优化分类 2022-09-08 12:43:53 +08:00
pushuo 4396b1f133 售后原因多语言 2022-08-31 14:54:39 +08:00
pushuo b88afed286 优化商品详情页验证 2022-08-30 16:19:14 +08:00
Edward Yang d9cbfe79fa 调整首页菜单 2022-08-30 15:29:45 +08:00
Edward Yang a93da78132 selected menu 2022-08-30 15:25:07 +08:00
pushuo 17cac83ada wip 2022-08-29 19:10:19 +08:00
TL c33480aac3 后台国家和省份管理 2022-08-29 18:04:26 +08:00
pushuo b964a7ea73 https://guangdagit.com/beike/beikeshop/issues/202 2022-08-29 09:40:00 +08:00
Edward Yang fc9c826b0c product 翻译从产品改为商品 2022-08-23 16:17:44 +08:00
pushuo d6eee750ec 优化错误显示 2022-08-19 18:53:24 +08:00
pushuo 2655bb8895 优化表单前端验证 2022-08-17 17:48:06 +08:00
pushuo d011cf2803 优化 2022-08-16 17:20:07 +08:00
pushuo 0a22238629 导航菜单配置等有害 2022-08-15 10:15:49 +08:00
pushuo ede0cd9fe2 优化表单配置 2022-08-12 12:00:30 +08:00
pushuo 060f10e5ac 添加一些图片配置等 2022-08-12 11:37:45 +08:00
pushuo da8854a62f 插件 2022-08-11 12:00:11 +08:00
pushuo 03b9d18071 插件 2022-08-11 11:10:52 +08:00
pushuo fc6cb5c8dc 优化插件编辑页面等 2022-08-11 10:49:42 +08:00
pushuo 68b596bbbe 优化后台表单 2022-08-11 09:20:10 +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