2371 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
evoxwht	d69a58899d	Merge branch 'v4.7.0dev' into v5.0.0dev	2023-03-31 08:55:26 +08:00
evoxwht	4ea776ba30	发票详情优化金额	2023-03-30 20:52:26 +08:00
evoxwht	6aad9a21b6	中奖记录页面填写收货信息之后刷新页面	2023-03-30 20:51:58 +08:00
evoxwht	db296826c6	核销查看订单页面优化	2023-03-30 20:50:58 +08:00
evoxwht	9717ddeb14	优化移动端订单发货	2023-03-30 20:50:38 +08:00
evoxwht	45ed8cdd87	砍价商品返回按钮在小程序上不显示	2023-03-30 20:50:22 +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
evoxwht	830a52a617	订单退款之后，修改订单的refund_type为6	2023-03-30 20:47:15 +08:00
evoxwht	aa2b20c66e	前端订单管理修复比例	2023-03-30 20:46:52 +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	08e41ae0a8	评价商品显示金额问题处理	2023-03-30 17:46:50 +08:00
evoxwht	9b20b37749	导出用户优化	2023-03-30 17:46:36 +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