Commit Graph

809 Commits (3f36b57363868def201865bf04f2c6da35320e68)

Author SHA1 Message Date
xingyu 82c51e0c3e fix: eslint 2023-06-21 19:27:16 +08:00
xingyu d639401646 fix: style lint 2023-06-21 19:26:14 +08:00
xingyu 64dbcdabe0 docs: version 2023-06-21 19:24:14 +08:00
xingyu 33c460ad55 chore: remove vueSetupExtend 2023-06-21 19:24:09 +08:00
xingyu f2992ce8e8 fix: eslint 2023-06-21 19:18:05 +08:00
xingyu 922f83d99c refactor: vue3.3 defineOptions 2023-06-21 19:14:34 +08:00
puhui999 f3622d423a fix: 使 Table 组件支持列宽和固定列配置 2023-06-21 15:27:35 +08:00
puhui999 5064845d4e fix: 使 Dialog 组件支持 Dialog 内部嵌套另一个 Dialog,需要使用 append-to-body 属性 2023-06-21 15:26:43 +08:00
xingyu a5c7c886ee chore: stylelint 2023-06-21 11:15:30 +08:00
xingyu c05fbd7fdc fix: locales 2023-06-21 11:10:15 +08:00
xingyu 952f7b6268 chore: vscode setting 2023-06-21 11:07:46 +08:00
xingyu 37c41aeecc chore: eslint 2023-06-21 11:07:33 +08:00
xingyu 3d39b42e96 chore: eslint 2023-06-21 10:55:37 +08:00
xingyu 2df15acb26 chore: vscode setting use pnpm 2023-06-21 10:50:03 +08:00
xingyu 458bb22163 docs: readme 2023-06-21 10:48:18 +08:00
xingyu ca8238a84b chore: packageManager use pnpm 2023-06-21 10:45:35 +08:00
xingyu 91a015828d chore: update deps 2023-06-21 10:44:39 +08:00
xiaobai ca01b16096 提交订单列表和详情20230619 2023-06-19 15:57:20 +08:00
xiaobai 42a7aec0b5 提交订单页面和详情页面 20230619 2023-06-19 12:42:43 +08:00
puhui999 f7b195b226 feat: 完事秒杀时段管理 2023-06-19 10:20:43 +08:00
puhui999 ee698fd8b2 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-06-17 21:21:33 +08:00
puhui999 a75720ec06 feat: 秒杀时段管理 2023-06-17 21:20:28 +08:00
YunaiV 91c53e2e3f code review:订单详情 2023-06-17 21:12:20 +08:00
YunaiV e3f250fff0 code review:订单列表 2023-06-17 21:02:29 +08:00
芋道源码 867c47de61
!165 trade-order 列表和详情初版
Merge pull request !165 from 矿泉水/dev
2023-06-17 11:04:12 +00:00
芋道源码 1e49a8eaf0
!170 Expiration time should not set on the refresh token
Merge pull request !170 from 呵呵大/N/A
2023-06-17 11:02:27 +00:00
芋道源码 226cc03d65
!167 修复授权类型选项bug
Merge pull request !167 from wangzhaoqiang/dev_
2023-06-17 10:57:00 +00:00
YunaiV 467256cece 修复 SmsChannelForm.vue 排版报错问题 2023-06-17 18:54:57 +08:00
YunaiV ae69492b53 code review:spu todo 去掉 2023-06-17 18:48:49 +08:00
芋道源码 8ed92bcd46
!166 短信渠道提交失败
Merge pull request !166 from 圆梦巨人/master
2023-06-17 10:48:26 +00:00
YunaiV 7908160e68 Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/utils/dict.ts
2023-06-17 18:45:05 +08:00
YunaiV 5eaf054646 code review:会员积分配置 2023-06-17 18:33:07 +08:00
YunaiV 023539b0db Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	package.json
	src/utils/dict.ts
2023-06-17 17:40:29 +08:00
YunaiV 8666307d47 code review:处理字典数据的冲突 2023-06-17 17:38:20 +08:00
芋道源码 b809945c19
!171 积分模块
Merge pull request !171 from QingX/master
2023-06-17 09:37:15 +00:00
xiaqing 1dca8476b3 初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
2023-06-10 20:57:16 +08:00
呵呵大 5554d7c995
Expiration time should not set on the refresh token
登录接口返回的过期时间是`access token` 的过期时间,但是被错误地设置在了`refresh token` 上,这导致过了几分钟登录状态便失效要求重新登录
2023-06-10 03:19:03 +00:00
wangzhaoqiang 119b499a92 修复授权类型选项bug 2023-06-08 16:25:32 +08:00
puhui999 d31ade7a5f fix: 完善 SPU 相关路由 review 2023-06-07 18:31:28 +08:00
lwf bc34a73c9e 短信渠道提交失败 2023-06-07 13:45:33 +08:00
puhui999 20f3f72670 fix: 数组操作添加 ? 可选操作符,避免属性值为 null 时报错 2023-06-07 08:59:03 +08:00
puhui999 b89db1af55 fix: review 2023-06-06 16:22:58 +08:00
xiaobai e2d795f49d add trade order 20230606 2023-06-06 01:36:22 +08:00
xiaobai ec3b028d55 sync dev-20230606 2023-06-06 01:25:22 +08:00
xiaobai 985d764f62 20230606 add trade-order and details 2023-06-06 01:08:38 +08:00
puhui999 7fe8dee9ed Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-06-05 08:35:39 +08:00
YunaiV 51e76ffd53 code review:优惠劵管理 2023-06-03 23:15:11 +08:00
芋道源码 7c6d7e8061
!164 优惠券迁移vue3
Merge pull request !164 from dhb52/dev
2023-06-03 15:02:05 +00:00
puhui999 a1b45f80bc fix: 优化 spu 相关路由配置 2023-06-03 21:21:43 +08:00
YunaiV 158585670c code review:商品管理 2023-06-03 20:50:07 +08:00