199 Commits

Author SHA1 Message Date
From-wh
8ffb391e23 improve: modal调整 2023-03-20 18:11:11 +08:00
From-wh
fac7a2862f improve: keeplive页面获取 2023-03-20 14:53:17 +08:00
From-wh
b82ff43db1 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev
# Conflicts:
#	template/admin/src/main.js
2023-03-20 09:28:42 +08:00
From-wh
579e74cd9a feat: 后台ui调整 2023-03-20 09:27:51 +08:00
From-wh
fdab9c317c feat: 优惠券领取列表分页 2023-03-16 10:04:34 +08:00
吴昊天
621651704d Merge remote-tracking branch 'origin/v4.7.0dev' into v5.0.0dev 2023-03-15 16:31:55 +08:00
From-WH
40736ef2d0 fix: 页面title丢失 2023-03-15 16:30:14 +08:00
吴昊天
d620fc8a18 优惠券优化 2023-03-13 12:09:07 +08:00
sugar1569
3693d10fa8 删除定时任务请求接口错误 timer改为crontab 2023-03-08 16:29:21 +08:00
From-wh
1e457d6646 improve: 清除上级推广人判断 2023-03-07 10:43:02 +08:00
From-wh
337c52cebc style: tip 2023-03-07 09:50:23 +08:00
From-wh
ac7fd26917 style: 客服顶栏 2023-03-07 09:24:30 +08:00
From-wh
3edfaa7b9a improve: 首页跳转方法 2023-03-06 18:13:43 +08:00
From-wh
7e6952ed80 style: 备注文本域 2023-03-06 16:09:58 +08:00
From-wh
fb780305de improve: 用户信息编辑 2023-03-06 15:53:18 +08:00
From-wh
29d49573b5 improve: 后台用户编辑 2023-03-06 15:44:15 +08:00
From-wh
63fafe8da3 Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-06 09:31:18 +08:00
From-wh
40af13b9c9 fix: 采集跳转问题 2023-03-06 09:31:10 +08:00
sugar1569
651a87a8bf 文件管理修改密码提示 2023-03-04 14:53:01 +08:00
From-wh
b2f2bd0a43 improve: initLog 2023-03-04 12:02:25 +08:00
From-wh
fee8006ab7 Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-04 11:50:27 +08:00
From-wh
822da9f20b improve: 网址地址切换更新 2023-03-04 11:50:16 +08:00
sugar1569
6f0490c0b1 优化语言详情页面 2023-03-04 10:36:08 +08:00
From-wh
3ca6d43b61 improve: 菜单开关字段vuex 2023-03-04 10:22:20 +08:00
From-wh
9059fdc7b0 Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-03 17:31:50 +08:00
From-wh
127a165185 improve: 客服表情正则修改,支持多个表情 2023-03-03 17:31:37 +08:00
sugar1569
5663f7a1c4 用户管理页面表单搜索样式优化 2023-03-03 16:25:35 +08:00
From-wh
bb2b78317f improve: 消息关注 2023-03-03 15:41:17 +08:00
From-wh
0a9dab2152 Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-03 14:54:58 +08:00
From-wh
97a056164f fix: 分页问题处理 2023-03-03 14:54:26 +08:00
From-wh
7a9df0a8b2 style: 积分表单 2023-03-03 14:53:56 +08:00
From-wh
81743b0d8d fix: 客服订单判断 2023-03-03 14:53:34 +08:00
sugar1569
43d6593a95 无效关键词输入框样式优化 2023-03-03 14:42:21 +08:00
sugar1569
0e7e7a9037 数据配置后台幻灯片设置页面高度调整 2023-03-03 14:25:50 +08:00
sugar1569
95b416d2ee 标签页面高度调整 2023-03-03 14:19:05 +08:00
sugar1569
a6dd423aaf 发票管理优化 2023-03-02 15:55:23 +08:00
sugar1569
a0e401998c 申请提现页面优化 2023-03-02 15:37:00 +08:00
sugar1569
3cdd523e6d 话术管理和标签管理页面优化 2023-03-02 15:12:18 +08:00
sugar1569
21e0723cfd 分销时间搜索可以清空,可以自定义输入时间 2023-03-02 14:37:09 +08:00
sugar1569
0ee12b4894 配置分类列表页面样式优化 2023-03-02 14:35:26 +08:00
From-wh
2a804aea55 style: 统计样式调整; 2023-03-01 19:05:31 +08:00
From-wh
daa400ee85 Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-01 16:54:05 +08:00
From-wh
20547d3ac0 improve: 列表字段; 2023-03-01 16:53:38 +08:00
From-wh
b0ac0f29bf improve: 推广人icon 2023-03-01 16:53:19 +08:00
From-wh
b360d8ed92 style: 商品信息样式 2023-03-01 16:52:59 +08:00
liaofei
e38c012263 修改定时任务提示文字 2023-03-01 15:32:57 +08:00
From-wh
4c826273be improve: 渠道码编辑有效期展示 2023-03-01 10:22:28 +08:00
From-wh
0f872dfe10 improve: 首页title 2023-03-01 09:59:34 +08:00
From-wh
765f38ef26 style: 提示信息 2023-02-27 17:56:25 +08:00
吴昊天
9ee302d53b Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-02-27 17:19:55 +08:00