Commit Graph

987 Commits

Author SHA1 Message Date
wuhui_zzw cf7825d519 优化:文本内容修改 2023-08-31 11:34:22 +08:00
wuhui_zzw 64fea5c8b3 优化:物流编辑 - 续重范围取消添加按钮,仅使用一个。续重范围使用最小值同步首重禁止修改。物流列表单位调整和物流实际物流一致。 2023-08-31 11:16:11 +08:00
wuhui_zzw e6882598fe 添加:物流添加续重范围填写项 2023-08-28 17:45:59 +08:00
wuhui_zzw 8e34333803 优化:注释后台的版权与服务,插件市场 2023-08-28 16:12:18 +08:00
wuhui_zzw f55c520015 添加:物流管理 - 商品详情页面支持切换国家和物流;并且同步刷新对应的运费 2023-08-28 15:15:44 +08:00
wuhui_zzw 3c96766442 添加:物流管理 - 添加前台默认展示国家 2023-08-25 14:16:09 +08:00
wuhui_zzw 4032cfaaa1 优化:国家支持图标设置 2023-08-25 11:08:31 +08:00
wuhui_zzw 1dd22c3e02 文字替换:Add buy sku 修改为Quantity;Product Total 修改为 Quantity total 2023-08-25 09:48:53 +08:00
wuhui_zzw a318806058 优化:订单列表显示预计到达时间 2023-08-22 19:08:04 +08:00
wuhui_zzw 270623a9ad 优化:物流信息添加默认单位 2023-08-22 16:19:58 +08:00
wuhui_zzw 18546a254c 添加:物流运费计算方式 2023-08-22 16:00:34 +08:00
wuhui_zzw f1f2a7d1bf 修改:物流列表显示内容优化 2023-08-21 18:05:03 +08:00
wuhui_zzw afa9b0be6f 修改:物流支持多国家选择 2023-08-21 16:59:20 +08:00
wuhui_zzw 8d7c37509f 优化:商品详情页面下单优化,支持多规格下单 2023-08-17 15:47:05 +08:00
wuhui_zzw 70c2160aca 文件补齐 2023-08-16 13:40:41 +08:00
liqianjin 02516b7825 【增加】物流及可视化 2023-08-12 18:46:10 +08:00
liqianjin bfb1ea283c 【增加】物流管理 2023-08-11 18:41:28 +08:00
liqianjin fa79136adc 【增加】产品状态名称修改 2023-08-11 15:16:23 +08:00
liqianjin 4f1beb97d9 【增加】视频播放装修
【增加】复制商品
【增加】商品长宽高参数
【增加】合并到第三方主版本分支,更新到最新版本
2023-08-11 13:55:00 +08:00
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