Commit Graph

29 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 18a314f357 修改 2023-05-29 20:02:32 +08:00
liqianjin bb57d646db 修改 2023-05-29 19:59:31 +08:00
liqianjin 5e552c572e init 2023-05-27 11:47:26 +08:00
pushuo 812b7655af !98 Optimize the personal center button, etc.
* wip
* Optimize the personal center button, etc.
* wip
* wip
* wip
* Modify an entry, name -> full name
2023-05-15 10:15:27 +00:00
Edward Yang 434d94c01d 使用laravel/pint格式化代码 2023-01-10 14:38:26 +08:00
Edward Yang a65caab2f9 添加mail后台配置
邮件

邮件设置

no message

set smtp setting

fixed mail template

wip

fixed mail

fixed mail

fixed mail config

wip

wip

add others email template

fixed mail

添加  horizon 面板,采用队列发送邮件

重构邮件发送

是否使用队列后台配置

使用队列发送邮件

customer new order

重构邮件发送

update code

code optimize

wip

wip

wip

是否提醒多语言

优化邮件

wip

wip

订单是否提醒状态更新修改

wkip

wip

fixed email locale

wip

找回密码邮件

wip

修改类名

后台找回密码和验证码邮件

wip

前后台找回密码验证email

后台找回密码
2022-12-26 16:40:34 +08:00
Edward Yang 786dfccbfd fixed email validation 2022-09-19 14:41:46 +08:00
Edward Yang 8f22790abd 修改注释版权 2022-09-13 23:07:51 +08:00
Edward Yang 2e6fa3479f fixed cart 2022-08-26 15:35:33 +08:00
Edward Yang 3503560202 库存不足 2022-08-26 15:29:27 +08:00
Edward Yang 7866d0adc0 fixed rma languages 2022-08-22 19:29:19 +08:00
Edward Yang 8f5261d660 fixed edit account 2022-08-22 19:14:09 +08:00
Edward Yang c6512f3189 修复多语言问题 2022-08-22 18:31:10 +08:00
Edward Yang f861261b3c fixed address error 2022-08-22 18:23:17 +08:00
pushuo 026f5008e5 wip 2022-08-16 19:38:16 +08:00
TL 55ea7eb031 编辑个人信息 2022-08-11 09:38:53 +08:00
pushuo 944b50969b 优化修改个人信息和页尾配置 2022-08-10 20:30:06 +08:00
TL fb398b2663 编辑个人信息 2022-08-10 19:42:28 +08:00
TL dc9d9c43a4 文件上传 2022-08-10 19:27:09 +08:00
TL bc8fb4f929 文件上传 2022-08-10 16:20:59 +08:00
TL 01f1822c27 售后服务申请(退换货)功能 2022-08-03 16:49:01 +08:00
TL e8996fb98e 个人中心编辑信息 2022-07-22 09:50:04 +08:00
TL 6ee3aacc0f 顾客找回密码功能 2022-07-07 15:54:45 +08:00
TL 0f8ae94e22 地址管理 2022-07-04 19:54:25 +08:00
pushuo 25cbf7f8ef wip 2022-07-04 16:58:38 +08:00
TL 44757d45a0 注册登录功能 2022-06-28 10:51:31 +08:00
TL 7498bcdb11 注册登录 2022-06-27 20:49:55 +08:00
TL dd15a65acd 注册登录退出 2022-06-24 09:57:51 +08:00