Commit Graph

318 Commits

Author SHA1 Message Date
wuhui_zzw cf7825d519 优化:文本内容修改 2023-08-31 11:34:22 +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 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
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
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
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 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
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
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 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
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 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 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 b595085b7e !92 Optimize the checkout process
* wip
* wip
* wip
* wip
* wip
* wip
* Optimize the checkout process
2023-05-10 10:37:27 +00:00
Edward Yang 89adc4d8d1 Code format 2023-05-10 11:52:19 +08:00
licy@guangda.work 6636986904 admin test 2023-05-10 10:53:55 +08:00
Edward Yang 8fcd26dcd7 Fixed for https://gitee.com/beikeshop/beikeshop/issues/I70XJW?from=project-issue 2023-05-10 09:59:22 +08: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
Edward Yang c1d6c48f5b Add jwt and admin token to build API.
Add jwt to build API.

返回当前客户

后台添加,通过token获取后台用户信息

fixed token api

fixed order list and order detail

fixed product api

fixed categoryies API

add brands

fixed brands

add products

添加订单接口
2023-04-27 18:16:07 +08: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
Edward Yang 2956a536ff fixed Indonesia 2023-04-26 14:31:53 +08:00
pushuo 4e5fe381b4 add lang id 2023-04-26 14:19:24 +08:00
Edward Yang a3470b27c0 sort order for file manager
wip

wip

sort order by name
2023-04-17 21:00:05 +08:00
蒲硕 d8027054bc !77 Optimize setting background page properties
* Optimize setting background page properties
2023-04-10 06:06:35 +00:00
Edward Yang 5c4ae14dbc Code format 2023-04-07 16:53:18 +08:00
mengwb e1e3ee9568 !75 编辑商品时重量为空保存报错
* 代码规范化
* Fix the issue of saving error when editing product weight is empty.
* 高级筛选哪些属性显示在筛选栏可在后台系统设置里设置
2023-04-07 08:42:56 +00:00