2458 Commits

Author SHA1 Message Date
evoxwht
24cb5ae428 语言关系报错修复 2023-04-10 10:33:00 +08:00
evoxwht
467bf0c6d2 移动端首页显示划线价错误问题修复 2023-04-10 10:27:37 +08:00
evoxwht
4de56866dc Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-10 10:27:05 +08:00
evoxwht
7d03e8dca7 文件管理备注 2023-04-10 10:27:00 +08:00
liaofei
c47a3a1960 修改路由 2023-04-10 10:25:25 +08:00
liaofei
e682459ac3 修改路由 2023-04-10 10:23:23 +08:00
liaofei
53a95dbc0c 修改路由 2023-04-10 10:09:32 +08:00
liaofei
948343e294 修改同步路由 2023-04-10 09:39:18 +08:00
liaofei
9de2754961 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-07 18:28:06 +08:00
liaofei
52f588a00e 增加生成crud代码 2023-04-07 18:27:57 +08:00
evoxwht
37b983619a 优化注释 2023-04-07 10:58:30 +08:00
evoxwht
c7e8182166 更新移动端 2023-04-07 10:51:21 +08:00
evoxwht
7233a402ed Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-07 10:36:37 +08:00
evoxwht
442ee5df3f 更新管理端页面编译 2023-04-07 10:36:34 +08:00
liaofei
7c2cc12b79 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-07 10:18:23 +08:00
liaofei
9d6c3b6768 增加路由接口 2023-04-07 10:18:14 +08:00
evoxwht
1f86627969 修改中间件的Request为$request 2023-04-07 10:05:26 +08:00
liaofei
43953bd56e Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-06 18:49:38 +08:00
liaofei
de14acb007 增加crud控制器代码和路由权限接口表分类逻辑 2023-04-06 18:49:30 +08:00
evoxwht
4a4a522218 Merge branch 'v4.7.0dev' into v5.0.0dev
# Conflicts:
#	crmeb/route/route.php
2023-04-06 17:58:03 +08:00
evoxwht
858a8fdd0b Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev
# Conflicts:
#	template/admin/vue.config.js
2023-04-06 14:31:04 +08:00
evoxwht
3f5a76dcd5 更新admin路径 2023-04-06 14:30:36 +08:00
From-wh
c984bc54ef Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-04-06 14:21:00 +08:00
From-wh
587848ef1b improve: 修改打包后html文件 2023-04-06 14:20:38 +08:00
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