Commits · c9ae0fbdbee8e479f04c1f45ce1742e9f645e1cb · phsl / admin · GitLab

23 Jun, 2023 4 commits
- Merge remote-tracking branch 'yudao/dev' into dev-to-dev · c9ae0fbd
  puhui999 committed Jun 24, 2023
  
  c9ae0fbd Browse Files
- fix：完善秒杀活动管理① · b1e7f149
  puhui999 committed Jun 24, 2023
  
  b1e7f149 Browse Files
- 合并 master 代码的冲突 · e1b1c134
  YunaiV committed Jun 23, 2023
  
  e1b1c134 Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · b1592408
```
 Conflicts:
	src/views/infra/build/index.vue
	src/views/mall/product/spu/components/DescriptionForm.vue
	src/views/mall/product/spu/components/OtherSettingsForm.vue
	src/views/mall/product/spu/components/ProductPropertyAddForm.vue
	src/views/mall/product/spu/components/SkuList.vue
```
  YunaiV committed Jun 23, 2023
  b1592408 Browse Files
22 Jun, 2023 1 commit
- feat：添加秒杀活动管理 · 3d47d674
  puhui999 committed Jun 22, 2023
  
  3d47d674 Browse Files
21 Jun, 2023 19 commits
- refactor: 统一 setup 格式 · c1a4edf7
  xingyu committed Jun 21, 2023
  
  c1a4edf7 Browse Files
- chore: build size · 9ac17b3c
  xingyu committed Jun 21, 2023
  
  9ac17b3c Browse Files
- fix: eslint · 82c51e0c
  xingyu committed Jun 21, 2023
  
  82c51e0c Browse Files
- fix: style lint · d6394016
  xingyu committed Jun 21, 2023
  
  d6394016 Browse Files
- docs: version · 64dbcdab
  xingyu committed Jun 21, 2023
  
  64dbcdab Browse Files
- chore: remove vueSetupExtend · 33c460ad
  xingyu committed Jun 21, 2023
  
  33c460ad Browse Files
- fix: eslint · f2992ce8
  xingyu committed Jun 21, 2023
  
  f2992ce8 Browse Files
- refactor: vue3.3 defineOptions · 922f83d9
  xingyu committed Jun 21, 2023
  
  922f83d9 Browse Files
- fix: 使 Table 组件支持列宽和固定列配置 · f3622d42
  puhui999 committed Jun 21, 2023
  
  f3622d42 Browse Files
- fix: 使 Dialog 组件支持 Dialog 内部嵌套另一个 Dialog，需要使用 append-to-body 属性 · 5064845d
  puhui999 committed Jun 21, 2023
  
  5064845d Browse Files
- chore: stylelint · a5c7c886
  xingyu committed Jun 21, 2023
  
  a5c7c886 Browse Files
- fix: locales · c05fbd7f
  xingyu committed Jun 21, 2023
  
  c05fbd7f Browse Files
- chore: vscode setting · 952f7b62
  xingyu committed Jun 21, 2023
  
  952f7b62 Browse Files
- chore: eslint · 37c41aee
  xingyu committed Jun 21, 2023
  
  37c41aee Browse Files
- chore: eslint · 3d39b42e
  xingyu committed Jun 21, 2023
  
  3d39b42e Browse Files
- chore: vscode setting use pnpm · 2df15acb
  xingyu committed Jun 21, 2023
  
  2df15acb Browse Files
- docs: readme · 458bb221
  xingyu committed Jun 21, 2023
  
  458bb221 Browse Files
- chore: packageManager use pnpm · ca8238a8
  xingyu committed Jun 21, 2023
  
  ca8238a8 Browse Files
- chore: update deps · 91a01582
  xingyu committed Jun 21, 2023
  
  91a01582 Browse Files
19 Jun, 2023 1 commit
- feat: 完事秒杀时段管理 · f7b195b2
  puhui999 committed Jun 19, 2023
  
  f7b195b2 Browse Files
17 Jun, 2023 15 commits
- Merge remote-tracking branch 'yudao/dev' into dev-to-dev · ee698fd8
  puhui999 committed Jun 17, 2023
  
  ee698fd8 Browse Files
- feat: 秒杀时段管理 · a75720ec
  puhui999 committed Jun 17, 2023
  
  a75720ec Browse Files
- code review：订单详情 · 91c53e2e
  YunaiV committed Jun 17, 2023
  
  91c53e2e Browse Files
- code review：订单列表 · e3f250ff
  YunaiV committed Jun 17, 2023
  
  e3f250ff Browse Files
- !165 trade-order 列表和详情初版 · 867c47de
```
Merge pull request !165 from 矿泉水/dev
```
  芋道源码 committed Jun 17, 2023
  867c47de Browse Files
- !170 Expiration time should not set on the refresh token · 1e49a8ea
```
Merge pull request !170 from 呵呵大/N/A
```
  芋道源码 committed Jun 17, 2023
  1e49a8ea Browse Files
- !167 修复授权类型选项bug · 226cc03d
```
Merge pull request !167 from wangzhaoqiang/dev_
```
  芋道源码 committed Jun 17, 2023
  226cc03d Browse Files
- 修复 SmsChannelForm.vue 排版报错问题 · 467256ce
  YunaiV committed Jun 17, 2023
  
  467256ce Browse Files
- code review：spu todo 去掉 · ae69492b
  YunaiV committed Jun 17, 2023
  
  ae69492b Browse Files
- !166 短信渠道提交失败 · 8ed92bcd
```
Merge pull request !166 from 圆梦巨人/master
```
  芋道源码 committed Jun 17, 2023
  8ed92bcd Browse Files
- Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev · 7908160e
```
 Conflicts:
	src/utils/dict.ts
```
  YunaiV committed Jun 17, 2023
  7908160e Browse Files
- code review：会员积分配置 · 5eaf0546
  YunaiV committed Jun 17, 2023
  
  5eaf0546 Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · 023539b0
```
 Conflicts:
	package.json
	src/utils/dict.ts
```
  YunaiV committed Jun 17, 2023
  023539b0 Browse Files
- code review：处理字典数据的冲突 · 8666307d
  YunaiV committed Jun 17, 2023
  
  8666307d Browse Files
- !171 积分模块 · b809945c
```
Merge pull request !171 from QingX/master
```
  芋道源码 committed Jun 17, 2023
  b809945c Browse Files