2604 Commits

Author SHA1 Message Date
From-wh
c534c5923c improve: 代码生成 2023-04-15 09:18:24 +08:00
evoxwht
e86f59590a Merge branch 'v4.7.0dev' into v5.0.0dev
# Conflicts:
#	template/uni-app/pages/goods_cate/goods_cate.vue
2023-04-14 14:38:33 +08:00
evoxwht
1df5b5e7e2 修复选择按照实际金额付款请款下,订单后台改价之后还是按照之前的十几金额返佣的问题 2023-04-14 14:33:27 +08:00
liaofei
1ee97a89f4 调整crud模板 2023-04-14 12:32:04 +08:00
evoxwht
ed4091c0dc 修复从我的等级里面点击购买商品,底部菜单无法正常选中的问题。 2023-04-14 11:55:26 +08:00
From-wh
01783a2af0 improve: 分类菜单更新 2023-04-14 11:31:07 +08:00
From-wh
e70dc44aa1 improve: 表单类型新增 2023-04-14 11:30:22 +08:00
From-wh
d32a2892c9 improve: 必填字段 2023-04-14 11:12:20 +08:00
From-wh
00ed8ec7e6 improve: 代码生成默认值判断 2023-04-14 11:01:54 +08:00
From-wh
c83d7ead9e improve: 必填项判断 2023-04-14 10:22:30 +08:00
From-wh
89e287de84 feat: 代码生成权限更新 2023-04-14 10:06:38 +08:00
From-wh
753fbe3b21 feat: 权限及菜单更新 2023-04-14 09:53:53 +08:00
From-wh
ae3ded0d18 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-13 18:36:15 +08:00
From-wh
e97e94c0c4 improve: 菜单子菜单选中 2023-04-13 18:36:05 +08:00
evoxwht
163a77e746 语言地区列表接口错误修复 2023-04-13 18:16:52 +08:00
evoxwht
f77e1dc4d2 DS无法获取问题修复 2023-04-13 18:16:31 +08:00
From-wh
4a41b0965e fix: 提交报错 2023-04-13 18:02:37 +08:00
From-wh
efca509152 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-13 18:00:01 +08:00
From-wh
fcd3fa9333 improve: 优化数据 2023-04-13 17:59:54 +08:00
liaofei
69329d8dd6 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-13 17:49:31 +08:00
liaofei
18b8fb5381 修改报错 2023-04-13 17:49:15 +08:00
From-wh
073af595bf improve: 字段判断 2023-04-13 17:43:28 +08:00
From-wh
fed1e9cb08 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-13 17:37:46 +08:00
From-wh
6b16e24484 feat: 数据添加; 2023-04-13 17:37:36 +08:00
liaofei
686744fcc4 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-13 17:05:27 +08:00
liaofei
2f2a075046 增加命令 2023-04-13 17:05:11 +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
06b28d6b6a improve: 充值支付判断; 2023-04-13 16:29:20 +08:00
From-wh
fa40c56bb1 improve: 代码生成调整 2023-04-13 16:28:49 +08:00
liaofei
8b6ec93446 修改备注 2023-04-13 12:27:30 +08:00
evoxwht
2b03416743 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-13 12:07:58 +08:00
evoxwht
dca81d9edb 收银页面支付方式判断 2023-04-13 12:06:56 +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
27413c0f00 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-13 09:33:49 +08:00
From-wh
2a19b6013f improve: 跳转及样式; 2023-04-13 09:33:38 +08:00
evoxwht
3096190cc3 更新前端文件 2023-04-13 09:26:49 +08:00
liaofei
8b760a3e92 修改生成crud 2023-04-12 19:22:22 +08:00
From-wh
a5d5a8859c Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-12 18:50:56 +08:00
From-wh
b5057b5915 improve: 判断优化,数据处理; 2023-04-12 18:50:48 +08:00
evoxwht
3ae88a5b81 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-12 18:32:31 +08:00
evoxwht
dd1faf00b3 diy网络问题重新加载页面 2023-04-12 18:32:17 +08:00
From-wh
d0f7e6cbfa Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-12 18:26:31 +08:00
From-wh
624102b3be feat: 代码生成 2023-04-12 18:26:24 +08:00
evoxwht
cd71ded5cc 更新 2023-04-12 18:06:16 +08:00
evoxwht
26ed236e2e 更新忽略文件 2023-04-12 18:01:21 +08:00
evoxwht
e22fa80e7c 更新安装.env 2023-04-12 18:00:01 +08:00
evoxwht
541a3d27aa Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-12 17:38:17 +08:00
evoxwht
91ae0c4edc 优化配置缓存 2023-04-12 17:37:35 +08:00