wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,398 Commits 5 Branches 0 Tags 49 MiB
Commit Graph

98 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 b57dcf54b0 v1.1 修改完成 2023-05-30 15:29:52 +08:00
liqianjin 66d08c1654 v1 修改完成 2023-05-30 11:56:47 +08:00
liqianjin bb57d646db 修改 2023-05-29 19:59:31 +08:00
liqianjin 5e552c572e init 2023-05-27 11:47:26 +08:00
pushuo 8ea52fb8ff !101 Fix article TDK and modify article 
* Fix article-related product issues
* Fix the problem that the article TDK does not display
 2023-05-17 03:27:35 +00: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
Edward Yang 920689fbee 首页统计改为产品总数 2023-04-26 18:57:49 +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
蒲硕 d8027054bc !77 Optimize setting background page properties 
* Optimize setting background page properties
 2023-04-10 06:06:35 +00:00
mengwb 86b3d33d6d !66 默认属性组不可删除 
* 默认数据增加id为1的默认属性组，并且默认属性组后台不能删除
* migrations/2023_03_20_091423_product_weight.php
* 商品重量
* add weight blade
* bugfix
* 商品重量，用于计算flex shipping运费；地址变化后配送方式变化，需要重新显示新的配送方式
* Placeholder Image Backend Settings
* 商品重量，用于计算flex shipping运费；地址变化后配送方式变化，需要重新显示新的配送方式
* 增加hook
 2023-03-24 10:23:55 +00:00
Edward Yang 726c6e2528 fixed plugin permission 2023-03-08 12:17:50 +08:00
pushuo 571eba695d 权限管理 添加插件权限 2023-03-08 12:17:50 +08:00
Edward Yang a11607c6c3 完善插件权限 2023-03-08 12:17:49 +08:00
nilsir 80c6135711 代码错误修复 2023-02-16 14:17:17 +08:00
Edward Yang 13e46886a8 完善多語言 
多语言优化

词条优化
 2023-02-15 14:22:49 +08:00
TL d8039cead5 属性和属性组权限添加 2023-02-14 11:24:32 +08:00
Edward Yang 07a9417343 完善文章分类权限 2023-02-14 10:23:29 +08:00
Edward Yang 26d8f562ee 修复文章作者 2023-02-12 01:02:47 +08:00
Edward Yang f2d7f76ab9 修复文章查看数为空保存报错 2023-02-11 20:37:07 +08:00
Edward Yang 7e972a8723 添加文章分类相关功能 
优化链接配置词条

文章分类状态默认修改

wip

wip
 2023-02-10 21:50:38 +08:00
Edward Yang 459bb3db51 完善mailgun, sendmail 邮件发送 2023-01-13 14:28:24 +08:00
TL d0aeeb522b 删除属性时检查是否有商品使用 
删除商品时删除商品分、商品相关、商品sku、商品属性、商品描述
 2023-01-13 03:27:08 +00:00
TL 216bf84a2c 删除属性组时同时删除描述 
删除属性组时检查是否有属性在使用
删除属性时同时删除描述
 2023-01-13 03:27:08 +00:00
Edward Yang 434d94c01d 使用laravel/pint格式化代码 2023-01-10 14:38:26 +08:00
TL de7df33788 编辑属性组 2023-01-06 14:42:33 +08:00
TL 1613adc3fa 商品属性功能后端代码 2023-01-06 11:41:38 +08:00
Edward Yang fe16241f26 后台配置每页显示数量 2022-12-21 14:23:33 +08:00
Edward Yang 8f22790abd 修改注释版权 2022-09-13 23:07:51 +08:00
Edward Yang 7a2b89fb29 修复删除用户报错 https://guangdagit.com/beike/beikeshop/issues/236 2022-09-09 16:29:37 +08:00
TL c5f6c22f33 后台后端语言包 2022-08-30 11:20:27 +08:00
TL c33480aac3 后台国家和省份管理 2022-08-29 18:04:26 +08:00
TL f24b298307 安装引导 2022-08-26 16:44:51 +08:00
Edward Yang 2503012cd8 优化税类 2022-08-26 10:26:27 +08:00
Edward Yang e548fa845a export orders 2022-08-24 10:09:34 +08:00
Edward Yang fc9c826b0c product 翻译从产品改为商品 2022-08-23 16:17:44 +08:00
Edward Yang 2eda2bc745 优化单页错误信息 2022-08-19 19:16:51 +08:00
Edward Yang ac0f1ac48e fixed page error 2022-08-19 16:56:05 +08:00
Edward Yang a610c9231f 修复税费计算逻辑 2022-08-19 16:19:26 +08:00
Edward Yang da28dcdcc8 fixed order report for https://guangdagit.com/beike/beikeshop/issues/135 2022-08-19 14:02:16 +08:00
Edward Yang 473868fd09 格式化时间 https://guangdagit.com/beike/beikeshop/issues/121 2022-08-18 14:57:42 +08:00
Edward Yang 0d6dcf1d98 fixed common. 2022-08-16 18:03:55 +08:00
TL e19735f5a7 添加后台权限 2022-08-16 16:18:02 +08:00
TL 630c4e193e 添加权限 2022-08-16 13:57:36 +08:00
Edward Yang 06b6967285 修复创建用户报错 https://guangdagit.com/beike/beikeshop/issues/45 2022-08-15 19:10:08 +08:00
pushuo 0a22238629 导航菜单配置等有害 2022-08-15 10:15:49 +08:00
Edward Yang 7aa0a2047e fixed pages 2022-08-12 18:14:54 +08:00
Edward Yang ebc81a3363 修复角色权限相关 https://guangdagit.com/beike/beikeshop/issues/81 2022-08-12 17:57:30 +08:00
Edward Yang 6e6321a1a0 优化后台用户 2022-08-12 16:04:18 +08:00
Edward Yang 9fba918f72 fixed for https://guangdagit.com/beike/beikeshop/issues/49 2022-08-12 15:52:20 +08:00