2652 Commits

Author SHA1 Message Date
evoxwht
4fe70f4f73 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-19 18:40:21 +08:00
evoxwht
cbeda6f33f 修改基础配置接口返回的微信支付错误问题
处理购物车手动修改数量的错误提示问题
处理无法正常进行拼团下单的问题
处理发票后台统计错误的问题
处理删除了砍价商品,砍价列表还显示的问题
处理支付金额为0积分抵扣也为0的时候的报错
2023-04-19 18:40:17 +08:00
From-wh
f2526ffc69 improve: 优化; 2023-04-19 18:30:22 +08:00
From-wh
40e4273e92 improve: 微信支付字段修改 2023-04-19 09:43:00 +08:00
From-wh
7dfd4efa74 improve: 客服聊天窗口 2023-04-18 15:01:08 +08:00
From-wh
0ee8db4273 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-18 14:49:16 +08:00
From-wh
e307c82085 improve: 收藏跳转 2023-04-18 14:49:00 +08:00
From-wh
9cd0f9968a improve: 优化 2023-04-18 14:48:40 +08:00
From-wh
1851c374e5 improve: 菜单配置 2023-04-18 14:48:24 +08:00
liaofei
e1bac8bbf9 删除打印 2023-04-18 14:41:43 +08:00
liaofei
3eec9060c4 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-18 14:33:07 +08:00
liaofei
60d8d26af1 调整代码生成逻辑 2023-04-18 14:32:57 +08:00
From-wh
b8737147db Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-17 16:54:14 +08:00
From-wh
ac4ef97a2a fix: title展示 2023-04-17 16:54:06 +08:00
liaofei
eec601ecff Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-17 15:56:19 +08:00
liaofei
b9a17258cc 调整路由 2023-04-17 15:56:04 +08:00
evoxwht
75b0434b89 不是付费会员的用户领取付费会员券提示 2023-04-17 15:24:30 +08:00
evoxwht
e36720f605 修改后台订单详情已经退款的订单还展示退款中字样 2023-04-17 12:29:48 +08:00
evoxwht
df8322fb83 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-17 12:06:44 +08:00
evoxwht
6d685a636c 订单统计数字错误问题处理 2023-04-17 12:06:40 +08:00
From-wh
baba33065b Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-17 12:02:21 +08:00
From-wh
63f35528bb fix: 总价显示 2023-04-17 12:02:14 +08:00
liaofei
568ebd9055 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-17 11:44:09 +08:00
liaofei
e7eee37ecc 修改路由 2023-04-17 11:44:00 +08:00
evoxwht
ef5655723a Merge branch 'v4.7.0dev' into v5.0.0dev 2023-04-17 11:33:21 +08:00
evoxwht
d4a049f8ed 更新前端划线价错误 2023-04-17 11:33:03 +08:00
liaofei
5cf2bb7868 修改下载路由 2023-04-17 10:56:53 +08:00
liaofei
a71d605445 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-17 10:14:51 +08:00
liaofei
54b55fdcce 增加多语言翻译 2023-04-17 10:14:41 +08:00
From-wh
e178fc1464 fix: 备注title问题 2023-04-17 09:57:43 +08:00
From-wh
bad4ee74d6 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-15 18:05:48 +08:00
From-wh
7a53cef79e feat: 代码生成下载 2023-04-15 18:05:41 +08:00
liaofei
d338e54375 修改批量新增BUG 2023-04-15 14:50:22 +08:00
liaofei
65ddd7a360 修复删除问题 2023-04-15 14:14:09 +08:00
liaofei
320fd99637 增加缓存过期时间 2023-04-15 12:17:07 +08:00
liaofei
5ea906090e Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-15 12:07:03 +08:00
liaofei
3ad1b8f046 增加下载文件接口 2023-04-15 12:06:45 +08:00
evoxwht
e0c250db08 Merge branch 'v4.7.0dev' into v5.0.0dev 2023-04-15 11:06:44 +08:00
evoxwht
86d1a791f1 修复分销等级页面下方推荐商品图片刷新问题 2023-04-15 11:06:25 +08:00
evoxwht
d263241445 开启队列后采集商品的图片下载问题 2023-04-15 11:05:57 +08:00
From-wh
8f0d0a6138 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev
# Conflicts:
#	template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue
2023-04-15 09:19:12 +08:00
From-wh
c534c5923c improve: 代码生成 2023-04-15 09:18:24 +08:00
liaofei
3c5de1ee73 修改报错 2023-04-14 17:25:03 +08:00
liaofei
3fc5695579 增加后台接口打包 2023-04-14 17:23:20 +08:00
liaofei
e391bcba98 更新前端文件 2023-04-14 16:35:18 +08:00
liaofei
dfae6709f7 增加默认数据 2023-04-14 16:29:16 +08:00
liaofei
4bb2ca6aae 修改crud前端图片展示 2023-04-14 16:07:05 +08:00
liaofei
698e2d0d9b Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-14 15:20:35 +08:00
liaofei
77cdf6b646 修改生成文件 2023-04-14 15:20:25 +08:00
evoxwht
e86f59590a Merge branch 'v4.7.0dev' into v5.0.0dev
# Conflicts:
#	template/uni-app/pages/goods_cate/goods_cate.vue
2023-04-14 14:38:33 +08:00