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

2358 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
815d99ae93 优化代码 2023-03-30 12:22:22 +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
036e87e5e3 Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-29 17:36:31 +08:00
evoxwht
2fb2cae76f 提示文字修复 2023-03-29 17:36:27 +08:00
From-wh
341added5f Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-29 17:26:32 +08:00
From-wh
7451a0118b fix: 拼团选购 2023-03-29 17:25: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
397ec0c48f 优化代码 2023-03-29 17:24:17 +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
bb6e74b2aa improve: title样式 2023-03-29 16:00:18 +08:00
From-wh
a60e4af4de Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-29 15:59: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
evoxwht
5b8378f85e 赠送购买商品优惠券，仅普通商品订单才会赠送 2023-03-29 15:59:08 +08:00
From-wh
8e50bffe0b style: 华为手机文字展示 2023-03-29 15:59:06 +08:00
From-wh
d676bb1e21 improve: 优化体验 2023-03-29 15:58:10 +08:00
evoxwht
63d1a60be5 直播商品价格显示问题 2023-03-29 13:58:47 +08:00
evoxwht
497dda22a8 修复选择线下支付不包邮时还扣除邮费 2023-03-29 12:28:53 +08:00
evoxwht
2f19e49100 商品分类注释更新 2023-03-29 12:17:44 +08:00
From-wh
b0b4243d61 Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-29 12:16:24 +08:00
From-wh
82b88e7d6c improve: 分类切换更新缓存 2023-03-29 12:16:14 +08:00
From-wh
e02a03a220 improve: 秒杀判断 2023-03-29 12:15:45 +08:00
evoxwht
f3b3f38e13 提现显示问题处理 2023-03-29 10:57:59 +08:00
evoxwht
f6de7c1f64 修复秒杀统计 2023-03-29 10:57:44 +08:00
evoxwht
16a680f88f 优化注释 2023-03-28 18:40:07 +08:00
evoxwht
68bdfd76c1 Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-28 18:14:21 +08:00
evoxwht
129f026638 秒杀导出，统计修复 2023-03-28 18:13:28 +08:00
From-wh
d990f35db0 Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-28 18:11:32 +08:00
From-wh
d35a07311b improve: 移动端优化 2023-03-28 18:11:17 +08:00
From-wh
3d7e487a5a improve: 优化 2023-03-28 18:05:54 +08:00
evoxwht
1b6ce633ec 删除无用代码 2023-03-28 18:05:05 +08:00
evoxwht
4961dca45f 秒杀相关问题修复 2023-03-28 18:04:53 +08:00
evoxwht
ffe93cd369 开启消息队列之后，企业微信机器人消息无法发送的问题处理 2023-03-28 16:40:03 +08:00
evoxwht
df9a6802ba 用户详情报错修复 2023-03-28 14:46:49 +08:00
From-wh
88ad2d324d Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-28 14:13:22 +08:00
From-wh
9be3c34872 improve: 样式及方法优化 2023-03-28 14:13:07 +08:00
From-wh
26dcff4ae5 improve: 后台优化 2023-03-28 14:12:47 +08:00
evoxwht
525498b6e5 下单页面使用优惠券的限时使用时间段显示有误 2023-03-28 12:30:33 +08:00
evoxwht
1afa4b504d 添加时要校验用户领取的数量不能大于优惠券发放的限量 2023-03-28 12:08:08 +08:00
evoxwht
8cb9a50b22 优惠券添加时候，后台赠送和新用户自动发放的优惠券不填写领取时间 2023-03-28 12:04:27 +08:00
evoxwht
99253b7972 添加的文章回显问题修复 2023-03-28 11:58:44 +08:00
evoxwht
72653993c3 列表开始使用时间字段数据显示有误修复 2023-03-28 11:47:31 +08:00
evoxwht
0b74118dd8 赠送的优惠券修改发送类型 2023-03-28 11:42:08 +08:00
From-wh
6db6028ee0 improve: 分组设置刷新 2023-03-28 09:27:57 +08:00
evoxwht
c9295aa4ec 修改直播间商品展示 2023-03-28 09:06:14 +08:00