602 Commits

Author SHA1 Message Date
liaofei
6368b5db0e Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-11 17:46:46 +08:00
liaofei
9e4268e746 修改数据库类型字段获取 2023-04-11 17:46:37 +08:00
evoxwht
a9f39e7b08 pc显示移动端页面优化 2023-04-11 17:27:30 +08:00
evoxwht
5a1cedfaa0 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-11 16:57:03 +08:00
evoxwht
92fdd2df8e 优化pc端打开h5页面 2023-04-11 16:57:00 +08:00
From-wh
020ba9c589 improve: 接口权限/调试 2023-04-11 16:54:14 +08:00
evoxwht
9e6ec8c5a0 更新默认数据 2023-04-11 11:17:07 +08:00
evoxwht
eb2bbfe0b4 更新默认数据 2023-04-11 11:11:51 +08:00
liaofei
7f79b225d8 更新thinkphp扩展 2023-04-11 10:52:33 +08:00
From-wh
63ecfbdd92 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-10 18:41:23 +08:00
From-wh
b13734503b improve; 支付配置 2023-04-10 18:41:08 +08:00
From-wh
69b6b9cb7d feat: 代码生成/路由权限/接口调试 2023-04-10 18:40:07 +08:00
From-wh
186188a00a improve: 城市文件 2023-04-10 18:39:25 +08:00
From-wh
a92cc3a872 improve: 打包插件 2023-04-10 18:38:44 +08:00
evoxwht
467bf0c6d2 移动端首页显示划线价错误问题修复 2023-04-10 10:27:37 +08:00
evoxwht
7d03e8dca7 文件管理备注 2023-04-10 10:27:00 +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
3f5a76dcd5 更新admin路径 2023-04-06 14:30:36 +08:00
evoxwht
ed53670d81 将管理端打包出来的文件放回到admin目录中 2023-04-06 10:29:43 +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
baaeead800 improve: logo展示 2023-04-04 15:00:46 +08:00
From-wh
0565863f99 improve: 标签选择 2023-04-04 15:00:30 +08:00
From-wh
f3b9be4adb improve: 分类选择替换 2023-04-03 18:24:20 +08:00
From-wh
05542168c9 improve: 分类判断 2023-04-03 16:45:35 +08:00
From-wh
8dd723caec improve: 页面缓存判断/商品/优惠券分类优化 2023-04-03 16:43:40 +08:00
From-wh
fa18b54944 improve: 客服订单判断 2023-04-03 16:42:30 +08:00
From-wh
2310518099 style: 菜单判断 2023-04-03 11:23:20 +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
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
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
evoxwht
8456a5f935 查看物流页面金额显示问题修复 2023-03-31 17:08:24 +08:00
evoxwht
9d6f9dd6a4 Merge branch 'v4.7.0dev' into v5.0.0dev
# Conflicts:
#	template/uni-app/pages/goods/order_confirm/index.vue
2023-03-31 16:13:09 +08:00
From-wh
4ee92f8403 improve: 保底值 2023-03-31 15:56:38 +08:00
From-wh
5aa8fcdf8c improve: 保底值 2023-03-31 15:20:42 +08:00
From-wh
7822b48fcb improve: 优化菜单 2023-03-31 11:59:15 +08:00
From-wh
9231a23935 style: 分类图片更新 2023-03-31 10:25:02 +08:00
From-wh
50f9d3c47b Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-31 10:24:20 +08:00
From-wh
e4663fc9a4 style: 已售展示 2023-03-31 10:24:10 +08:00
From-wh
17057a67c5 improve: 优化 2023-03-31 10:23:50 +08:00