Commit Graph

77 Commits

Author SHA1 Message Date
xingyu
899880bfe1 chore: update deps 2023-10-31 09:52:08 +08:00
xingyu
309c3f30d1 chore: remove vue-macros/volar 2023-10-25 10:43:03 +08:00
xingyu
b8403c1b90 chore: update vue v3.3.7 2023-10-25 10:34:54 +08:00
YunaiV
ef334dfc66 1.8.3 版本发布 2023-10-24 21:07:51 +08:00
puhui999
2a150cf0c0 修复合并差异 2023-10-20 21:42:50 +08:00
puhui999
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
puhui999
1e8945de63 SPU: 新增完善活动优先级拖拽排序 2023-10-20 16:36:50 +08:00
xingyu
42c8db4f34 chore: update deps 2023-10-16 15:03:55 +08:00
xingyu
de3fa7a765 chore: update deps 2023-10-16 10:24:35 +08:00
xingyu
73b2030c7f chore: update deps 2023-10-13 10:31:36 +08:00
YunaiV
99a0c7c3e7 1.8.2 版本发布 2023-09-24 23:45:10 +08:00
xingyu
57a7ed46e7 chore: add unocss eslint 2023-09-22 17:48:56 +08:00
xingyu
ce5f303272 chore: update deps 2023-09-22 17:42:31 +08:00
xingyu
4ae1722e72 fix: stylelint 2023-09-11 17:08:57 +08:00
xingyu
1fe950aea5 chore: 1.8.1-snapshot 2023-09-11 16:47:19 +08:00
xingyu
4664014fc4 chore: update deps 2023-09-11 16:22:11 +08:00
xingyu
bd2d6adafa chore: update deps 2023-08-28 17:40:07 +08:00
xingyu
0207affd02 chore: update deps 2023-08-23 10:42:35 +08:00
xingyu
2ec50bab15 chore: remove qrcode.vue use qrcode 2023-08-12 12:23:36 +08:00
xingyu
e262ab9504 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-08-12 12:06:00 +08:00
YunaiV
551ebbd41d Merge branch 'master' of https://gitee.com/dhb52/yudao-ui-admin-vue3
 Conflicts:
	src/utils/constants.ts
2023-08-10 22:21:55 +08:00
xingyu
b3513f97f7 chore: update deps 2023-08-09 19:28:25 +08:00
dhb52
a6eab3cc9a feat: 支付功能迁移(初稿) 2023-08-06 23:25:07 +08:00
芋道源码
7c87f94985
!187 修正合并代码后前端不能正常启动的问题
Merge pull request !187 from puhui999/dev-to-dev
2023-08-05 06:20:20 +00:00
xingyu
4417dc8700 chore: scripts 2023-08-04 21:44:44 +08:00
xingyu
3c4f17a1ab fix: scripts preview 2023-08-04 21:34:02 +08:00
xingyu
85f93804b5 chore: update deps 2023-08-04 21:32:28 +08:00
puhui999
39df9be988 fix: 修正合并代码后前端不能正常启动的问题 2023-08-02 23:05:45 +08:00
xingyu
4249465b7c wip: use unocss 2023-07-29 14:40:55 +08:00
xingyu
af10ccb39a chore: update deps 2023-07-29 12:55:02 +08:00
YunaiV
40a93caf89 发布 1.8.0 版本 2023-07-27 07:59:57 +08:00
芋道源码
f908c12963
!183 同步商城实现
Merge pull request !183 from 芋道源码/dev
2023-07-26 04:56:22 +00:00
xingyu
540d8496b3 chore: update deps 2023-07-08 11:13:28 +08:00
YunaiV
b159240824 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 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
2023-06-23 13:54:43 +08:00
xingyu
9ac17b3ce2 chore: build size 2023-06-21 19:27:27 +08:00
xingyu
33c460ad55 chore: remove vueSetupExtend 2023-06-21 19:24:09 +08:00
xingyu
a5c7c886ee chore: stylelint 2023-06-21 11:15:30 +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
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
puhui999
6a10a81f58 fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患 2023-05-31 15:58:35 +08:00
puhui999
820d8ab76a fix: pnpm 仓库中没有 video.js 8.0.4 这个版本,更改为 8.3.0 2023-05-30 10:00:04 +08:00
YunaiV
3e549a6862 v1.7.3 版本发布! 2023-05-29 23:04:11 +08:00
xingyu
8b3980400a chore: preview 2023-05-19 15:27:07 +08:00
xingyu
2bd750a3d6 chore: update deps 2023-05-19 15:23:41 +08:00
xingyu
462b5b55d8 chore: remove stylelint-config-prettier 2023-04-23 18:48:11 +08:00
xingyu
e31f922b82 chore: update deps 2023-04-23 18:46:40 +08:00
YunaiV
917a2441ef 版本 1.7.2 发布 2023-04-19 20:20:52 +08:00
YunaiV
9793734fdc 增加 Vue3 stage 配置,用于演示环境的部署 2023-04-16 00:02:05 +08:00
芋道源码
a5a8773972
!121 refactor: 重构MP模块
Merge pull request !121 from dhb52/dev
2023-04-14 17:16:08 +00:00