2584 Commits

Author SHA1 Message Date
evoxwht
476ae9b535 更新后台路由 2023-04-06 10:33:57 +08:00
evoxwht
ed53670d81 将管理端打包出来的文件放回到admin目录中 2023-04-06 10:29:43 +08:00
evoxwht
a45d46f729 Merge branch 'v4.7.0dev' into v5.0.0dev
# Conflicts:
#	crmeb/public/install/crmeb.sql
2023-04-04 18:18:00 +08:00
evoxwht
d6c7af9e8d 更新安装sql 2023-04-04 17:43:14 +08:00
liaofei
cc8385f22f 调整提取变量 2023-04-04 17:40:55 +08:00
liaofei
c26b48f928 crud增加默认存放目录 2023-04-04 17:34:19 +08:00
liaofei
127bf916dd crud相关代码增加 2023-04-04 15:24:35 +08:00
liaofei
2eabe41506 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-04 15:21:04 +08:00
liaofei
e705eff467 修改crud路由加载 2023-04-04 15:20:59 +08:00
From-wh
c94f887680 improve: 标签选择
(cherry picked from commit 0565863f99e837c16847da8d0dcf03c1045b9d38)
2023-04-04 15:01:24 +08:00
From-wh
d25d82fe97 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-04 15:00:55 +08:00
From-wh
baaeead800 improve: logo展示 2023-04-04 15:00:46 +08:00
From-wh
0565863f99 improve: 标签选择 2023-04-04 15:00:30 +08:00
evoxwht
48a5caf846 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-03 18:33:13 +08:00
evoxwht
f68ed133e0 Merge branch 'v4.7.0dev' into v5.0.0dev 2023-04-03 18:33:08 +08:00
From-wh
ceefd45641 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-03 18:24:31 +08:00
From-wh
f3b9be4adb improve: 分类选择替换 2023-04-03 18:24:20 +08:00
evoxwht
241f0636ec 修复修改了admin之后的选择表单问题 2023-04-03 18:22:34 +08:00
evoxwht
d906134361 Merge branch 'v4.7.0dev' into v5.0.0dev 2023-04-03 17:58:34 +08:00
evoxwht
0908c20589 修复客服聊天记录错误的问题 2023-04-03 17:58:22 +08:00
evoxwht
c050ef929d Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-03 17:16:35 +08:00
evoxwht
347b0c0b87 数据查询优化 2023-04-03 17:16:31 +08:00
From-wh
05542168c9 improve: 分类判断 2023-04-03 16:45:35 +08:00
From-wh
43ff27455c Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-03 16:43:48 +08:00
From-wh
8dd723caec improve: 页面缓存判断/商品/优惠券分类优化 2023-04-03 16:43:40 +08:00
From-wh
05daee15bf Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-04-03 16:42:38 +08:00
From-wh
fa18b54944 improve: 客服订单判断 2023-04-03 16:42:30 +08:00
evoxwht
50ce0161b8 优化接口 2023-04-03 16:39:15 +08:00
evoxwht
a2b331ea53 修改后台商品列表查询错误问题 2023-04-03 16:39:04 +08:00
evoxwht
092e52d9fd 修复分类显示与筛选 2023-04-03 15:58:43 +08:00
evoxwht
403bb34b81 安装sql优化 2023-04-03 15:23:21 +08:00
From-wh
ccb02a8e19 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-03 11:23:26 +08:00
From-wh
2310518099 style: 菜单判断 2023-04-03 11:23:20 +08:00
evoxwht
c3a960a00d Merge branch 'v4.7.0dev' into v5.0.0dev 2023-04-03 10:43:55 +08:00
evoxwht
3195c6d35c 客服登录状态问题处理 2023-04-03 10:43:39 +08:00
From-wh
1fbac04381 style: 渐变主题 2023-04-03 10:18:43 +08:00
From-wh
4502ffef05 style: 颜色配置 2023-04-03 10:08:23 +08:00
From-wh
49fb43e42b Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-03 09:45:25 +08:00
From-wh
e7dbd1eabb style: 颜色配置 2023-04-03 09:45:17 +08:00
evoxwht
89345c560f 优化代码 2023-04-03 09:39:52 +08:00
evoxwht
8ce38ec3ac Merge branch 'v4.7.0dev' into v5.0.0dev 2023-04-03 09:28:13 +08:00
From-wh
ec355b3be9 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-01 18:44:33 +08:00
From-wh
0cc4c5b4a7 style: 样式优化 2023-04-01 18:44:23 +08:00
From-wh
3092bccee8 Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-04-01 18:39:41 +08:00
From-wh
ea06e5bef0 improve: 分类跳转底部菜单刷新 2023-04-01 18:39:34 +08:00
evoxwht
389e3ab536 自动收货和自动评价问题处理 2023-04-01 11:06:34 +08:00
evoxwht
7b9d489092 自动收货和自动评价问题处理 2023-04-01 10:54:32 +08:00
evoxwht
9d363bd7d3 拼团砍价统计优化 2023-04-01 10:39:41 +08:00
evoxwht
8a58a1ab85 Merge branch 'v4.7.0dev' into v5.0.0dev 2023-03-31 19:11:05 +08:00
evoxwht
c17274dc89 砍价和拼团统计 2023-03-31 19:10:36 +08:00