292 Commits

Author SHA1 Message Date
From-wh
fcd3fa9333 improve: 优化数据 2023-04-13 17:59:54 +08:00
From-wh
073af595bf improve: 字段判断 2023-04-13 17:43:28 +08:00
From-wh
6b16e24484 feat: 数据添加; 2023-04-13 17:37:36 +08:00
From-wh
8f5055159b style: button文字 2023-04-13 17:04:13 +08:00
From-wh
3bd299206b style: 规则样式 2023-04-13 16:29:51 +08:00
From-wh
fa40c56bb1 improve: 代码生成调整 2023-04-13 16:28:49 +08:00
liaofei
8b6ec93446 修改备注 2023-04-13 12:27:30 +08:00
liaofei
df270e50b4 增加备注说明 2023-04-13 11:57:23 +08:00
From-wh
6280ddc723 faet: 备注 2023-04-13 10:43:03 +08:00
From-wh
2a19b6013f improve: 跳转及样式; 2023-04-13 09:33:38 +08:00
From-wh
b5057b5915 improve: 判断优化,数据处理; 2023-04-12 18:50:48 +08:00
From-wh
624102b3be feat: 代码生成 2023-04-12 18:26:24 +08:00
From-wh
c0b9643aef feat: 数据备份备注修改 2023-04-12 09:38:21 +08:00
From-wh
1091fd4590 improve: 参数修改; 2023-04-11 18:30:49 +08:00
From-wh
877d5bc55d Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-11 18:26:04 +08:00
From-wh
8d65925deb improve: 代码生成 2023-04-11 18:25:56 +08:00
liaofei
6368b5db0e Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-11 17:46:46 +08:00
liaofei
9e4268e746 修改数据库类型字段获取 2023-04-11 17:46:37 +08:00
evoxwht
a9f39e7b08 pc显示移动端页面优化 2023-04-11 17:27:30 +08:00
From-wh
020ba9c589 improve: 接口权限/调试 2023-04-11 16:54:14 +08:00
From-wh
63ecfbdd92 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-10 18:41:23 +08:00
From-wh
69b6b9cb7d feat: 代码生成/路由权限/接口调试 2023-04-10 18:40:07 +08:00
From-wh
186188a00a improve: 城市文件 2023-04-10 18:39:25 +08:00
evoxwht
7d03e8dca7 文件管理备注 2023-04-10 10:27:00 +08:00
From-wh
f3b9be4adb improve: 分类选择替换 2023-04-03 18:24:20 +08:00
From-wh
8dd723caec improve: 页面缓存判断/商品/优惠券分类优化 2023-04-03 16:43:40 +08:00
evoxwht
8ce38ec3ac Merge branch 'v4.7.0dev' into v5.0.0dev 2023-04-03 09:28:13 +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
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
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
17057a67c5 improve: 优化 2023-03-31 10:23:50 +08:00
From-wh
ae5c23279d style: 分类3图片 2023-03-31 10:23:10 +08:00
evoxwht
d69a58899d Merge branch 'v4.7.0dev' into v5.0.0dev 2023-03-31 08:55:26 +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
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
2fb2cae76f 提示文字修复 2023-03-29 17:36: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
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
ab5d4b3eec Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-29 15:59:12 +08:00
From-wh
d676bb1e21 improve: 优化体验 2023-03-29 15:58:10 +08:00