3367 Commits

Author SHA1 Message Date
From-wh
29d2336a7d Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev 2023-06-19 15:14:35 +08:00
From-wh
3e0edbd248 improve: 商家寄件金额判断 2023-06-19 15:14:18 +08:00
evoxwht
784450e629 Merge remote-tracking branch 'origin/v5.1.0dev' into v5.1.0dev 2023-06-19 15:06:46 +08:00
evoxwht
6ccf18c708 后台提现页面优化数据 2023-06-19 15:06:20 +08:00
From-wh
5bfa8e8c56 Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev 2023-06-19 15:00:33 +08:00
evoxwht
75a8e75e65 订单查询优化 2023-06-19 15:00:25 +08:00
From-wh
d94858a89b Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev
# Conflicts:
#	template/admin/src/pages/order/orderList/handle/orderSend.vue
2023-06-19 15:00:15 +08:00
evoxwht
23a96541ff 提现列表显示问题优化 2023-06-19 15:00:11 +08:00
evoxwht
b201d34ee3 退款页面总数优化 2023-06-19 14:59:50 +08:00
From-wh
8d76fc1ac5 improve: 客服发货类型判断 2023-06-19 14:59:28 +08:00
evoxwht
049ceb4fbc 拼团问题优化 2023-06-19 14:59:26 +08:00
From-wh
2fa86e3b53 feat: 售后信息展示 2023-06-19 14:59:09 +08:00
From-wh
7fa4faa6f8 feat: oss 视频云存储 2023-06-19 12:23:35 +08:00
evoxwht
927d993419 天翼云和华为云视频上传问题修复 2023-06-19 12:19:50 +08:00
evoxwht
f4960cd5a2 Merge remote-tracking branch 'origin/v5.1.0dev' into v5.1.0dev 2023-06-19 11:56:00 +08:00
evoxwht
ea3f786905 京东云视频上传问题修复 2023-06-19 11:55:55 +08:00
liaofei
8e6503cf09 Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev 2023-06-19 11:22:36 +08:00
liaofei
5409048ff8 调整订单发货 2023-06-19 11:22:27 +08:00
evoxwht
3343051c8a Merge remote-tracking branch 'origin/v5.1.0dev' into v5.1.0dev 2023-06-19 11:04:38 +08:00
evoxwht
525be22b79 订单导出增加自定义表单内容 2023-06-19 11:04:15 +08:00
liaofei
e2ae540c31 修改 2023-06-19 10:21:29 +08:00
liaofei
652a0e92cc 商家寄件调整 2023-06-19 10:07:36 +08:00
liaofei
cb93a01172 修改寄件 2023-06-19 10:04:18 +08:00
liaofei
b64f3c43c9 调整获取金额 2023-06-19 10:02:31 +08:00
From-wh
f7ca371ff6 Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev 2023-06-19 09:21:40 +08:00
From-wh
e5952180e2 improve: 寄件金额计算 2023-06-19 09:21:36 +08:00
liaofei
0ffea0976b Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev 2023-06-16 17:26:13 +08:00
liaofei
2839c115f9 修改寄件 2023-06-16 17:26:00 +08:00
evoxwht
b99f4ae2a4 提现列表显示方式问题处理了 2023-06-16 17:19:10 +08:00
evoxwht
e462132501 只有退款单显示退款信息内容 2023-06-16 17:18:40 +08:00
evoxwht
d10c74c406 收藏列表已下架商品点击报错 2023-06-16 17:17:07 +08:00
From-wh
4faba1a1b9 Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev 2023-06-16 16:53:09 +08:00
From-wh
ed9fd107f5 feat: 虚拟评论规格 2023-06-16 16:53:05 +08:00
From-wh
affacc1998 improve: 开票信息 2023-06-16 16:52:39 +08:00
From-wh
8834e96877 improve: 客服库存 2023-06-16 16:51:41 +08:00
From-wh
6a5b7ba28f feat: 消息跳转 2023-06-16 16:51:25 +08:00
From-wh
b39a8d7527 improve: 商品标题及部分优化 2023-06-16 16:51:07 +08:00
liaofei
fb4622cd53 增加接口 2023-06-16 15:36:46 +08:00
evoxwht
84eaead334 商品列表返回规格数据优化 2023-06-16 14:26:55 +08:00
evoxwht
d8529501a0 商品列表返回规格数据优化 2023-06-16 14:25:21 +08:00
evoxwht
3d2cdf2cf9 商品列表返回规格数据优化 2023-06-16 14:12:34 +08:00
evoxwht
cddfecb072 商品采集报错处理 2023-06-16 11:26:07 +08:00
evoxwht
cf5759f60f Merge remote-tracking branch 'origin/v5.1.0dev' into v5.1.0dev 2023-06-16 11:25:51 +08:00
evoxwht
00431da3d4 提现和佣金记录列表报错问题处理 2023-06-16 11:25:42 +08:00
Gosowong
57267ac20d fix: 修改小程序支付管理回调和获取微信物流公司编码bug 2023-06-15 17:40:54 +08:00
From-wh
152aae1a64 style: 缩略图样式 2023-06-15 17:10:13 +08:00
From-wh
b3539cf16c Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev 2023-06-15 17:05:29 +08:00
From-wh
f5f09df348 feat: 图片压缩 2023-06-15 17:05:25 +08:00
evoxwht
f48f919d39 修复用户累计消费数据错误的问题。 2023-06-15 16:18:47 +08:00
From-wh
fac9b3fa85 improve: 移动端上传 2023-06-15 15:51:50 +08:00