Commit Graph

  • 6c6c2cb058 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev YunaiV 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 逻辑 YunaiV 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:限时折扣 YunaiV 2023-10-21 18:18:40 +08:00
  • 5cfb67d047 fix: 【工作流】--加签减签review修改接口地址 kehaiyou 2023-10-21 18:16:39 +08:00
  • bb5945958b 钱包 - 优化 支付应用 - 证书模式增加应用私钥 jason 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 管理 puhui999 2023-10-21 02:40:20 +08:00
  • fb90a85e43 feat: crm 线索表完善 review 提到的问题 913752709@qq.com 2023-10-21 00:53:32 +08:00
  • 26780c3525 【新增】回款计划 功能 liuhongfeng 2023-10-20 23:48:39 +08:00
  • 7ad1457f79 【新增】回款管理 功能 liuhongfeng 2023-10-20 22:17:05 +08:00
  • 0730e215d8 完善文章管理 review 提到的问题 puhui999 2023-10-20 22:16:18 +08:00
  • 2a150cf0c0 修复合并差异 puhui999 2023-10-20 21:42:50 +08:00
  • 9f77514c17 限时折扣 zhangshuai 2023-10-20 20:51:18 +08:00
  • d62bbcdd92 Merge remote-tracking branch 'yudao/dev' into dev-to-dev puhui999 2023-10-20 16:40:19 +08:00
  • 1e8945de63 SPU: 新增完善活动优先级拖拽排序 puhui999 2023-10-20 16:36:50 +08:00
  • 01d78429cc SPU: 完善优惠卷选择 puhui999 2023-10-20 15:35:01 +08:00
  • 18df708b49 SPU: 完善优惠卷选择 puhui999 2023-10-20 11:48:59 +08:00
  • 2457665b55 code review:门店自提 YunaiV 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 1351515658@qq.com 2023-10-19 18:43:02 +08:00
  • 3464bb9c74 SPU: 新增优惠卷选择 puhui999 2023-10-19 17:33:42 +08:00
  • 5b3bcecef2 OrderTableColumn: 商品信息列样式调整2 puhui999 2023-10-19 15:54:23 +08:00
  • 094f8e16db OrderTableColumn: 商品信息列样式调整 puhui999 2023-10-19 11:10:33 +08:00
  • 70778fd9e6 UserOrderList 重构完善 puhui999 2023-10-19 10:54:10 +08:00
  • 5270c83876 订单列表:完善表头宽度自适应 puhui999 2023-10-19 10:36:52 +08:00
  • 7af2a3bcc3 feat: CRM 线索表 crud 913752709@qq.com 2023-10-18 20:02:59 +08:00
  • 04d88ce1a6 订单列表:自定义列抽离封装为组件 puhui999 2023-10-18 17:20:13 +08:00
  • d1a3fe5d5a 营销文章:新增表单属性移除浏览量 puhui999 2023-10-18 11:33:42 +08:00
  • ff01effd45 Merge remote-tracking branch 'origin/dev' into dev owen 2023-10-17 23:26:08 +08:00
  • 431fff28ce 统计卡片修改为全局组件 owen 2023-10-17 23:25:49 +08:00
  • 61b3bdfd4c 交易:核销订单 owen 2023-10-17 23:18:07 +08:00
  • d6b0305d78 !277 修复前端支付渠道配置权限 Merge pull request !277 from 小玩家/master 芋道源码 2023-10-17 14:55:14 +00:00
  • 8832eafaae code review:crm 合同流程 YunaiV 2023-10-17 22:52:24 +08:00
  • 533b4e5006 支付渠道配置--修复权限 1163996518@qq.com 2023-10-17 21:27:13 +08:00
  • d5328918ab 支付渠道配置--修复权限 1163996518@qq.com 2023-10-17 20:58:28 +08:00
  • 40ec1b08ae !275 Review代码修改 Merge pull request !275 from 疯狂的世界/dev 芋道源码 2023-10-17 12:52:28 +00:00
  • 0089d59d36 !274 CRM/合同管理 CRUD初稿 Merge pull request !274 from dhb52/master 芋道源码 2023-10-17 12:01:51 +00:00
  • c27685285a code review:修复工作流的审批界面报错问题 YunaiV 2023-10-17 19:50:09 +08:00
  • 63fd52828c Merge remote-tracking branch 'origin/dev' into dev YunaiV 2023-10-17 19:03:02 +08:00
  • aa99c53729 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev YunaiV 2023-10-17 19:02:37 +08:00
  • 0242c84196 !267 【工作流】加签和减签 Merge pull request !267 from Youkehai/feature/addSignAndSubSign 芋道源码 2023-10-17 11:01:18 +00:00
  • 57f6367596 Merge remote-tracking branch 'origin/dev' into dev owen 2023-10-17 16:09:55 +08:00
  • 6fc232b758 交易:订单核销 owen 2023-10-17 16:09:36 +08:00
  • dced551698 feat: CRM/合同 crud dhb52 2023-10-16 23:56:34 +08:00
  • c3f06f5fbe 钱包 - 钱包余额流水 jason 2023-10-16 22:45:32 +08:00
  • 8626bccc4c 钱包 - 钱包余额流水 jason 2023-10-16 22:32:10 +08:00
  • ae2c3f2ad5 Merge remote-tracking branch 'origin/dev' into dev jason 2023-10-16 22:27:39 +08:00
  • e3a0cfe5e9 统计:修复错误 owen 2023-10-16 22:18:51 +08:00
  • 6204ce6c1b 统计:trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】 owen 2023-10-16 22:09:20 +08:00
  • cd4b4cd322 统计:Review修改 owen 2023-10-16 22:03:36 +08:00
  • 66ec610801 code review:文章管理 YunaiV 2023-10-16 21:55:11 +08:00
  • 7b9ea62e6b !273 商城首页 Merge pull request !273 from 疯狂的世界/dev 芋道源码 2023-10-16 12:11:23 +00:00
  • 8c18ad941e perf: is utils xingyu 2023-10-16 15:09:47 +08:00
  • 5da9b660bd perf: propTypes xingyu 2023-10-16 15:09:13 +08:00
  • 1a1b70a350 style: stylelint xingyu 2023-10-16 15:04:05 +08:00
  • 42c8db4f34 chore: update deps xingyu 2023-10-16 15:03:55 +08:00
  • edfd03903f 统计:会员终端统计,处理未知终端情况 owen 2023-10-16 14:26:04 +08:00
  • 2bfc9c3b13 统计:处理会员性别统计,存在未知的情况 owen 2023-10-16 13:25:15 +08:00
  • 661e72bcfd 统计:修复错误 owen 2023-10-16 13:15:17 +08:00
  • 8dec8edc6a Merge remote-tracking branch 'origin/dev' into dev owen 2023-10-16 13:01:02 +08:00
  • e1a72779d4 统计:Review修改 owen 2023-10-16 13:00:13 +08:00
  • a2ded16718 docs: element plus 2.4.0 xingyu 2023-10-16 10:25:24 +08:00
  • de3fa7a765 chore: update deps xingyu 2023-10-16 10:24:35 +08:00
  • 99172ea088 code review:文章管理 YunaiV 2023-10-16 09:57:46 +08:00
  • 195309dbb6 Merge remote-tracking branch 'origin/dev' into dev owen 2023-10-16 09:52:35 +08:00
  • 3802fee661 商城:增加商城首页 owen 2023-10-16 09:51:19 +08:00
  • cbb0cfefdb !272 营销活动:新增文章管理,文章分类管理 Merge pull request !272 from puhui999/dev-to-dev 芋道源码 2023-10-15 14:04:48 +00:00
  • e2a08ddbac 恢复 SSO 界面的路由 YunaiV 2023-10-15 21:58:19 +08:00
  • 04e83e268a !271 添加社交登录页面,修复登录多次重定向问题 Merge pull request !271 from dhb52/master 芋道源码 2023-10-15 13:37:55 +00:00
  • 90d6f4da9f 钱包- 钱包余额查询 jason 2023-10-15 17:47:36 +08:00
  • 50e43e4028 Merge remote-tracking branch 'yudao/dev' into dev-to-dev puhui999 2023-10-15 16:14:32 +08:00
  • befffb3f7d 营销活动:新增文章管理。 puhui999 2023-10-15 16:14:09 +08:00
  • 89417ac393 fix: 删除SSOLogin.vue组建,解决登录界面不停重定向问题 dhb52 2023-10-15 14:58:13 +08:00
  • 3587d1ef97 fix: 路由缺少name字段,ts不高兴 dhb52 2023-10-15 14:29:16 +08:00
  • 4d77d7e136 feat: 社交平台登录 dhb52 2023-10-15 14:26:20 +08:00
  • 36bb90fbb8 营销活动:新增文章分类管理 puhui999 2023-10-15 00:54:28 +08:00
  • 889334bc37 !266 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C Merge pull request !266 from 风狗/N/A 芋道源码 2023-10-14 10:19:37 +00:00
  • b57b45c96f !255 站内信测试增加 Member 用户类型支持 Merge pull request !255 from 风狗/dev 芋道源码 2023-10-14 10:18:54 +00:00
  • fa71f85221 !265 修复,刷新菜单缓存失效问题 Merge pull request !265 from 天痕/N/A 芋道源码 2023-10-14 10:15:13 +00:00
  • 8b6ca3028a Merge remote-tracking branch 'origin/dev' into dev jason 2023-10-14 11:33:15 +08:00
  • f9d0c1aa1c 钱包-充值套餐 jason 2023-10-14 11:32:54 +08:00
  • 529a821cdb Merge remote-tracking branch 'origin/master' YunaiV 2023-10-13 18:44:27 +08:00
  • 470fb23ae1 同步最新 README.md 功能列表 YunaiV 2023-10-13 18:35:44 +08:00
  • 9b09304c50 docs: update deps xingyu 2023-10-13 10:41:10 +08:00
  • e04ca7aac7 fix: unocss eslint xingyu 2023-10-13 10:34:01 +08:00
  • 73b2030c7f chore: update deps xingyu 2023-10-13 10:31:36 +08:00
  • 6ed7b3a69e !270 合并商城最新代码 Merge pull request !270 from 芋道源码/dev 芋道源码 2023-10-12 13:53:25 +00:00
  • 532b237712 !268 统计:会员统计 Merge pull request !268 from 疯狂的世界/dev 芋道源码 2023-10-11 04:34:07 +00:00
  • 855b37c1ab code review:拼团记录列表 YunaiV 2023-10-11 11:04:03 +08:00
  • 19c19d78dd !269 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 Merge pull request !269 from puhui999/dev-to-dev 芋道源码 2023-10-11 02:40:01 +00:00
  • b08e0e5ab2 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 puhui999 2023-10-10 16:55:53 +08:00
  • 3500a20630 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 puhui999 2023-10-10 16:53:22 +08:00
  • 62a953815d fix: 减签按钮显示和api地址修改 youkehai 2023-10-10 10:40:30 +08:00