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

968 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 8674f1125c v1.1.2 合并至github项目 2023-08-10 11:34:43 +08:00
pushuo bb7a6aad0d !161 Fix page summary input error prompt 
* Fix installation error and no information display problem
* Fix page summary input error prompt
 2023-07-20 06:22:35 +00:00
Edward Yang 7ec745c52c !159 Stripe 升级优化 
* wip
* fixed stripe charge
* wip
* wip
* code format
* wip
* wip
* 优化 stripe
* Background tab is automatically activated
 2023-07-19 18:34:53 +08:00
pushuo 8750c828f7 !155 Add hooks for cart and checkout page submit buttons 
* fixed license
* add setting license_code
* Add hooks for cart and checkout page submit buttons
 2023-07-18 16:52:46 +08:00
pushuo e4e6601f21 !154 Fix the error that the background product list image exceeds the display error 
* Fix the error that the background product list image exceeds the display error
 2023-07-18 16:52:46 +08:00
宋良辰 df96ffafa5 !151 后台商品添加model和quantity 列表直接修改上下架状态 
* cursor-pointer
* admin products-list add switch to edit status
* ProductResource add model and quantity
 2023-07-18 16:52:46 +08:00
pushuo 2e7d2b7cb2 !148 Fix the problem of switching preview when editing tab-product module 
* wip
* Fix the problem of switching preview when editing tab-product module
 2023-07-18 16:52:46 +08:00
what_村长 ef14e65e31 !146 增加 hoot admin.product.sku.edit.item.after 
* 增加hook admin.product.sku.edit.item.after ,方便在上面加上翻译插件按钮
* 增加hook admin.product.sku.edit.item ,方便在上面加上翻译插件按钮
* Merge branch 'dev' of https://gitee.com/what520/beikeshop into dev
* 测试
 2023-07-18 16:52:46 +08:00
pushuo a531cc0173 !144 Fix single multi-specification delete problem 
* Fix single multi-specification delete problem
 2023-07-18 16:52:46 +08:00
pushuo 35543ed409 !142 Fix the problem of duplicate data when designing the home page 
* wip
* wip
* Fix the problem of duplicate data when designing the home page
 2023-06-21 14:12:57 +08:00
Edward Yang 5b262df391 Fixed openai and added plugin version. 2023-06-19 19:07:43 +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 9eb9a43fce !137 Fix the problem of saving multi-standard products 
* wip
* Fix the problem of saving multi-standard products
 2023-06-14 11:06:14 +00:00
pushuo d61c0a5e12 !135 Repair tax rate setting error 
* Repair tax rate setting error
 2023-06-14 08:55:10 +00:00
pushuo e9aa555609 !134 Fix backend product saving error 
* Fix backend product saving error
 2023-06-14 07:59:38 +00:00
pushuo 5af461e617 !133 Optimize background ui 
* Optimize background ui
 2023-06-14 07:03:47 +00:00
pushuo 391f28ede7 !132 Delete the background vip button and change it to License & Services 
* Delete the background vip button and change it to License & Services
 2023-06-14 06:46:23 +00:00
pushuo b4ddf33810 !130 Fix front-end form validation 
* Fix front-end form validation + 1
 2023-06-14 06:23:09 +00:00
pushuo cb3a9951b3 !131 Fix card background color 
* Fix card background color
 2023-06-14 06:22:37 +00:00
pushuo d89dd1b7c6 !129 Fix the problem of sku data confusion caused by deleting commodity specifications in the background 
* Fix the problem of sku data confusion caused by deleting commodity spe…
* fix product variant
 2023-06-14 05:57:35 +00:00
pushuo b2811aafce !128 Fix front-end form validation 
* fix product variant
 2023-06-14 03:57:45 +00:00
pushuo 975cfa1d69 !126 Optimize background rma ui and form submission validation logic 
* Optimize background rma ui and form submission validation logic
 2023-06-13 10:06:09 +00:00
pushuo b074e2a6c1 !125 Optimize element path 
* Optimize order status modification
* Optimize element path
 2023-06-13 09:02:47 +00:00
Edward Yang 1cbf9af4a4 optimize fail status 2023-06-13 15:26:07 +08: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 9ecf31aecd !120 Add sorting settings 
* Fixed category sort order and filter by active.
* Add sorting settings
 2023-06-07 07:55:43 +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 9694525fc7 v1.1.2 修改 0605 2023-06-05 16:22:51 +08:00
pushuo fb8ac8dea4 !111 facebook pixel 
* remove account order success.
* wip
* fb-pixel
 2023-06-02 01:18:43 +00:00
pushuo b320aab6b6 !110 Fix background vip request error and cause other problems 
* Fix background vip request error and cause other problems
 2023-06-01 02:14:06 +00:00
liqianjin 42f66f859a v1.1.1 修改 2023-06-01 09:56:55 +08:00
Edward Yang fc609a9b67 Code format 2023-05-31 18:06:14 +08:00
liqianjin 6395744c56 v1.2 修改完成 2023-05-31 11:59:54 +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
mengwb 8b711fa653 !108 【WIP】代码优化和添加hook(适配多商户) 
* wip
* 文件管理器优化
* 文件管理器优化
* 后台订单管理和商品管理代码优化，提供更好的扩展性，便于多商家实现
* totalService
* 添加hook
* TotalService优化
* hook
* hook
* 购物车列表hook
 2023-05-30 01:56:26 +00:00
liqianjin bb57d646db 修改 2023-05-29 19:59:31 +08:00
liqianjin 5e552c572e init 2023-05-27 11:47:26 +08:00
Edward Yang d6f518dff6 !107 Order Payment 
* wip
* add exceptions
* order->orderPayments ui
* add order payments
* paypal 和 stripe 保存支付数据
* add order payment.
 2023-05-25 09:53:49 +00: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
Edward Yang 1574805a5a change order total service and code format. 2023-05-18 15:31:11 +08: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 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 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 b88d889861 !97 Modify an entry, name -> full name 
* Modify an entry, name -> full name
 2023-05-15 06:18:25 +00:00
Teemo 9d020adaee !96 韩语支持 
* 删除文件 resources/lang/ko/.keep
* 韩语4
* 韩语3
* 新建 admin
* 韩语2
* 韩语
* 新建 ko
 2023-05-14 12:32:44 +00:00
pushuo d2a68741d4 !94 Fix advanced filter save error 
* Fix advanced filter save error
 2023-05-12 02:33:05 +00:00
pushuo b595085b7e !92 Optimize the checkout process 
* wip
* wip
* wip
* wip
* wip
* wip
* Optimize the checkout process
 2023-05-10 10:37:27 +00:00