github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-11-03 16:30:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,464 Commits 19 Branches 21 Tags
Commit Graph

395 Commits

Author SHA1 Message Date
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
8dd723caec improve: 页面缓存判断/商品/优惠券分类优化 2023-04-03 16:43:40 +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
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
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
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
17057a67c5 improve: 优化 2023-03-31 10:23:50 +08:00
From-wh
ae5c23279d style: 分类3图片 2023-03-31 10:23:10 +08:00
From-wh
127697bf6d Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-03-31 09:17:09 +08:00
From-wh
ab8ac0faf6 improve: 开关风格 2023-03-31 09:17:01 +08:00
evoxwht
d69a58899d Merge branch 'v4.7.0dev' into v5.0.0dev 2023-03-31 08:55:26 +08:00
evoxwht
5a02c4864d 添加直播间时候的分享图必填 2023-03-30 20:49:42 +08:00
evoxwht
0b55d74696 直播善品删除的时候同步修改表格和顶部 2023-03-30 20:49:18 +08:00
evoxwht
a32b1b42ab 客服页面底部版本剧中 2023-03-30 20:47:32 +08:00
From-wh
c26015d032 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-03-30 18:27:32 +08:00
From-wh
2b85e04a58 improve; 主题添加 2023-03-30 18:27:25 +08:00
evoxwht
9b20b37749 导出用户优化 2023-03-30 17:46:36 +08:00
evoxwht
92721fca42 代理商后台添加问题修复 2023-03-30 12:16:11 +08:00
evoxwht
0129d6222d Merge branch 'v4.7.0dev' into v5.0.0dev 2023-03-30 10:01:47 +08:00
evoxwht
56efb28b32 拼团问题修复 2023-03-30 10:01:07 +08:00
evoxwht
5585c699a8 Merge branch 'v4.7.0dev' into v5.0.0dev 2023-03-29 20:10:28 +08:00
evoxwht
2fb2cae76f 提示文字修复 2023-03-29 17:36:27 +08:00
evoxwht
8d1e4fb677 Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-29 17:24:21 +08:00
evoxwht
e1b6d608fe 后台拼团拼团订单详情金额展示错误 2023-03-29 17:23:46 +08:00
From-wh
91b0c98929 Merge branch 'v4.7.0dev' into v5.0.0dev 
# Conflicts:
#	crmeb/app/api/controller/v1/order/StoreOrderController.php
#	crmeb/app/listener/notice/NoticeListener.php
#	template/admin/src/styles/style.css
#	template/admin/src/utils/modalForm.js
#	template/uni-app/pages/goods/order_confirm/index.vue
#	template/uni-app/pages/users/user_info/index.vue
 2023-03-29 16:05:29 +08:00
From-wh
ab5d4b3eec Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-29 15:59:12 +08:00
From-wh
d676bb1e21 improve: 优化体验 2023-03-29 15:58:10 +08:00
evoxwht
63d1a60be5 直播商品价格显示问题 2023-03-29 13:58:47 +08:00
From-wh
e02a03a220 improve: 秒杀判断 2023-03-29 12:15:45 +08:00
From-wh
3d7e487a5a improve: 优化 2023-03-28 18:05:54 +08:00