Commit Graph

192 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 530e5f22fe !138 Fix pagination button h5 responsive
* Fix pagination button h5 responsive ++
* Fix pagination button h5 responsive
* Optimize table UI, etc
2023-06-19 02:27:08 +00:00
pushuo 5af461e617 !133 Optimize background ui
* Optimize background ui
2023-06-14 07:03:47 +00:00
pushuo cb3a9951b3 !131 Fix card background color
* Fix card background color
2023-06-14 06:22:37 +00:00
pushuo 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
pushuo 8d165eadf8 !117 Optimize the header drop-down menu ui
* Optimize the header drop-down menu ui
2023-06-06 00:43:52 +00:00
liqianjin 42f66f859a v1.1.1 修改 2023-06-01 09:56:55 +08:00
liqianjin bb57d646db 修改 2023-05-29 19:59:31 +08:00
liqianjin 5e552c572e init 2023-05-27 11:47:26 +08:00
pushuo 5b83f02098 !106 Fix the h5 navigation without links and click to jump to the home page
* Fix the h5 navigation without links and click to jump to the home page
2023-05-23 03:10:13 +00:00
pushuo b5cc1ba786 !104 Product Added Quick Preview
* Added quick preview
2023-05-20 10:20:53 +00:00
pushuo 0bd592b648 !103 Fix that the slideshow module swiper plugin cannot be loaded for the first time
* Fix that the slideshow module swiper plugin cannot be loaded for the first time
2023-05-17 06:22:46 +00: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
pushuo 77bf0bca1a Change plugin purchase process
wip

wip

wip

wip

admin ui optimization

Optimize file manager
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
蒲硕 3e2a27d2b8 !87 Front desk mobile terminal navigation optimization
* Front desk mobile terminal navigation optimization
2023-05-04 02:12:17 +00:00
mengwb d074c123d9 !68 商品重量和多个bug修复
* Optimizing Blog ui
* Optimize breadcrumb position, optimize webpack.mix.js
* Modify request vip status update logic
* 后台商品列表默认按修改时间倒序,商品编辑保存无修改时更新商品修改时间
* wip
* wip
* 高级筛选属性多选问题处理
* 修复游客结账问题
* Add payment success page
* After repairing the data loss problem after dragging the order of specifications
* wip
* Fix the problem that the image of the deleted product in the backgroun…
* wip
* wip
* 占位图
* 更改地址重新加载运费,和重新计算order total运费功能
* wip
* wip
* wip
2023-03-31 02:56:57 +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
蒲硕 37cb7d30a8 !58 Open the vip pop-up window and add token
* Open the vip pop-up window and add token
2023-03-16 10:17:35 +00:00
pushuo 265eb68f22 Fix the error in the function of deleting products in the tab-product module
Plug-in optimization

wip

wip

wip
2023-03-09 09:52:27 +00:00
pushuo 4ab15cc605 子分类显示优化 2023-03-08 12:17:49 +08:00
蒲硕 32b35e32c1 !45 前台子分类显示等
* 优化前台子分类显示、优化规格批量修改、商品详情页保存开启前台验证
* 分类页显示子分类
2023-02-27 10:32:41 +00:00
pushuo fdac7066ed 修复博客内容图片宽度超限问题 2023-02-20 14:09:09 +08:00
pushuo 417da1899e 修复第三方登录弹窗失效 2023-02-13 06:55:18 +00:00
Edward Yang 7e972a8723 添加文章分类相关功能
优化链接配置词条

文章分类状态默认修改

wip

wip
2023-02-10 21:50:38 +08:00
pushuo c022e1f75b 修复购物车页面ui 2023-02-03 18:42:18 +08:00
pushuo ee833b9eaa 优化后台 订单管理、商品管理、客户管理 列表筛选等 2023-02-03 10:22:43 +00:00
pushuo 59f47ec84c 首页模块添加 商品模块 和 图标链接模块 2023-02-03 12:00:35 +08:00
pushuo 8451c0b819 后台商品详情多规格批量设置等 2023-02-03 12:00:35 +08:00
pushuo d35952fe5c 优化品牌列表 ui 2023-02-03 12:00:35 +08:00
pushuo fcee9191ad 优化页尾编辑 版权信息,被删除图片后不应该显示默认图 2023-02-03 12:00:35 +08:00
pushuo f643c76632 修复 一行四图pro 模块建议尺寸错误等 2023-02-03 12:00:35 +08:00
pushuo 470d5cf21c 优化分类筛选 ui等 2023-01-13 11:31:57 +08:00
pushuo 0c74f77fcc 优化商品属性显示等 2023-01-12 16:19:00 +08:00
pushuo 181faeb4a1 优化商品筛选和相关商品等ui 2023-01-12 10:22:36 +08:00
pushuo 2f66a6b945 优化分类筛选等 2023-01-12 09:24:27 +08:00
pushuo 5919f0d971 优化筛选 ui 2023-01-11 19:30:32 +08:00
pushuo fe66b21e9c 分类筛选前端 2023-01-11 17:46:45 +08:00
pushuo af58eb52f1 优化词条、前台 ui、修复后台详情页商品ID显示错误等 2023-01-10 19:38:07 +08:00
pushuo 89725cb383 完善 商品、分类 TDK等 2023-01-06 19:02:43 +08:00
pushuo c1db80eaaa 相关后台商品配置和 前台ui 2023-01-06 17:22:24 +08:00
pushuo c05b21efc7 属性配置前端 2023-01-06 14:46:34 +08:00
pushuo a91477bf25 修复未登录时点击收藏按钮,走登录逻辑 2023-01-06 11:39:44 +08:00
pushuo 7d48a7e140 游客结账登录 2023-01-05 15:12:47 +08:00
pushuo 99c32242cb 游客结账添加后台配置、优化词条等 2023-01-05 15:12:47 +08:00
pushuo 70b2d83682 添加 前后台订单详情页和结账页插件 html 代码插入点、优化地址管理弹窗 2022-12-30 15:20:20 +08:00
pushuo 3c6442d698 优化导航菜单项没配置文字不应显示、优化404页面、优化商品详情 分类 品牌 title 显示对应名称、优化后台头部 添加 admin_locale 等 2022-12-29 17:44:29 +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
pushuo 06604a3d19 修复手机端,sku 图片切换问题 -> https://gitee.com/beikeshop/beikeshop/issues/I66R0Z?from=project-issue 2022-12-23 11:06:38 +08:00
pushuo 4696b75bf3 修复导航菜单防止小屏幕下(非手机端),配置列数过多 显示错误 -> https://gitee.com/beikeshop/beikeshop/issues/I66KP9?from=project-issue 2022-12-21 14:23:33 +08:00