Commit Graph

1277 Commits

Author SHA1 Message Date
4cdab6fb3e feat: 调整客户表的字段 2023-10-28 19:50:42 +08:00
32b3c874f5 !294 feat: 客户表的 crud
Merge pull request !294 from wanwan/master
2023-10-27 14:41:47 +00:00
309c3f30d1 chore: remove vue-macros/volar 2023-10-25 10:43:03 +08:00
238537df83 fix: ElLoading need import 2023-10-25 10:36:06 +08:00
bf2c59c6e0 chore: stylelint config 2023-10-25 10:35:30 +08:00
50f1ae9524 chore: eslint config 2023-10-25 10:35:20 +08:00
96db6ab538 chore: vscode setting 2023-10-25 10:35:10 +08:00
b8403c1b90 chore: update vue v3.3.7 2023-10-25 10:34:54 +08:00
044754cdb4 feat: 客户表的 crud 2023-10-25 00:24:20 +08:00
ef334dfc66 1.8.3 版本发布 2023-10-24 21:07:51 +08:00
539352f598 修复 banner 返回字段不对 2023-10-24 20:29:23 +08:00
6644a4d4a6 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-10-24 20:12:39 +08:00
e5d6a9dae1 code review:banner 逻辑 2023-10-24 20:07:48 +08:00
ed0f3a3043 !293 完善 banner 管理。商品 spu 剔除优惠卷相关逻辑
Merge pull request !293 from puhui999/dev-to-dev
2023-10-24 12:00:48 +00:00
95d7d1eb42 优惠卷模版样式调整 2023-10-24 17:39:02 +08:00
75135e1e4f 商品 spu 脱离优惠卷模块 2023-10-24 16:57:20 +08:00
a7439ee08b 完善 banner 管理 2023-10-24 16:10:55 +08:00
54cce467ab !286 feat: crm 线索表完善 review 提到的问题
Merge pull request !286 from wanwan/master
2023-10-21 13:58:13 +00:00
6c6c2cb058 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-10-21 21:56:41 +08:00
af79d4a653 !285 【新增】回款管理 功能
Merge pull request !285 from souvc/master
2023-10-21 13:56:12 +00:00
73578ce8b2 !290 【工作流】--加签减签review修改接口地址
Merge pull request !290 from Youkehai/feature/addSignAndSubSign
2023-10-21 13:06:19 +00:00
2dbfa77bee code review:banner 逻辑 2023-10-21 19:59:41 +08:00
4709c18a6e !284 完善 SPU,订单列表:完善表头宽度自适应
Merge pull request !284 from puhui999/dev-to-dev
2023-10-21 11:08:44 +00:00
bb73a6edfd !287 reward
Merge pull request !287 from Bluemark/dev
2023-10-21 11:08:16 +00:00
929fa9a208 !289 满减页面布局
Merge pull request !289 from 落日晚风/master
2023-10-21 11:05:51 +00:00
423ea319e0 code review:限时折扣 2023-10-21 18:18:40 +08:00
5cfb67d047 fix: 【工作流】--加签减签review修改接口地址 2023-10-21 18:16:39 +08:00
bb5945958b 钱包 - 优化
支付应用 - 证书模式增加应用私钥
2023-10-21 15:33:31 +08:00
e187c55408 !283 mall模块
Merge pull request !283 from zxiaoxiu/discount
2023-10-21 06:23:04 +00:00
491b3a5018 新增 banner 管理 2023-10-21 02:40:20 +08:00
fb90a85e43 feat: crm 线索表完善 review 提到的问题 2023-10-21 00:53:32 +08:00
26780c3525 【新增】回款计划 功能 2023-10-20 23:48:39 +08:00
7ad1457f79 【新增】回款管理 功能 2023-10-20 22:17:05 +08:00
0730e215d8 完善文章管理 review 提到的问题 2023-10-20 22:16:18 +08:00
2a150cf0c0 修复合并差异 2023-10-20 21:42:50 +08:00
9f77514c17 限时折扣 2023-10-20 20:51:18 +08:00
d62bbcdd92 Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
#	package.json
#	src/views/member/user/detail/UserOrderList.vue
2023-10-20 16:40:19 +08:00
1e8945de63 SPU: 新增完善活动优先级拖拽排序 2023-10-20 16:36:50 +08:00
01d78429cc SPU: 完善优惠卷选择 2023-10-20 15:35:01 +08:00
18df708b49 SPU: 完善优惠卷选择 2023-10-20 11:48:59 +08:00
2457665b55 code review:门店自提 2023-10-20 09:46:15 +08:00
826199dc22 !281 fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx
Merge pull request !281 from 陈晨成/master
2023-10-19 16:25:00 +00:00
83501f9b09 !279 交易:核销订单
Merge pull request !279 from 疯狂的世界/dev
2023-10-19 16:06:33 +00:00
6dc7315e17 !280 feat: CRM 线索表 crud
Merge pull request !280 from wanwan/master
2023-10-19 15:16:34 +00:00
3074adb1df fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx 2023-10-19 18:43:02 +08:00
3464bb9c74 SPU: 新增优惠卷选择 2023-10-19 17:33:42 +08:00
5b3bcecef2 OrderTableColumn: 商品信息列样式调整2 2023-10-19 15:54:23 +08:00
094f8e16db OrderTableColumn: 商品信息列样式调整 2023-10-19 11:10:33 +08:00
70778fd9e6 UserOrderList 重构完善 2023-10-19 10:54:10 +08:00
5270c83876 订单列表:完善表头宽度自适应 2023-10-19 10:36:52 +08:00