574 Commits

Author SHA1 Message Date
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
From-wh
3092bccee8 Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-04-01 18:39:41 +08:00
From-wh
ea06e5bef0 improve: 分类跳转底部菜单刷新 2023-04-01 18:39:34 +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
8456a5f935 查看物流页面金额显示问题修复 2023-03-31 17:08:24 +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
4ee92f8403 improve: 保底值 2023-03-31 15:56:38 +08:00
From-wh
5aa8fcdf8c improve: 保底值 2023-03-31 15:20:42 +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
e4663fc9a4 style: 已售展示 2023-03-31 10:24:10 +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
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
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
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