Commit Graph

1049 Commits

Author SHA1 Message Date
puhui999
1c01266d62 fix: 使 Table 组件支持列宽和固定列配置
(cherry picked from commit f3622d423a)
2023-07-27 19:20:21 +08:00
puhui999
1e0b6e9efc fix: 使 Dialog 组件支持 Dialog 内部嵌套另一个 Dialog,需要使用 append-to-body 属性
(cherry picked from commit 5064845d4e)
2023-07-27 19:19:56 +08:00
xingyu
9c7d23a251 chore: stylelint
(cherry picked from commit a5c7c886ee)
2023-07-27 19:19:45 +08:00
xingyu
bc6bd1d8ab fix: locales
(cherry picked from commit c05fbd7fdc)
2023-07-27 19:19:39 +08:00
xingyu
05db3f4579 chore: vscode setting
(cherry picked from commit 952f7b6268)
2023-07-27 19:19:35 +08:00
xingyu
5006717803 chore: eslint
(cherry picked from commit 37c41aeecc)
2023-07-27 19:19:31 +08:00
xingyu
eb649bc023 chore: eslint
(cherry picked from commit 3d39b42e96)
2023-07-27 19:19:27 +08:00
xingyu
1c0be5e1b3 chore: vscode setting use pnpm
(cherry picked from commit 2df15acb26)
2023-07-27 19:18:17 +08:00
xingyu
1a136e469b docs: readme
(cherry picked from commit 458bb22163)
2023-07-27 19:18:12 +08:00
xingyu
15fc4bc37a chore: packageManager use pnpm
(cherry picked from commit ca8238a84b)
2023-07-27 19:18:02 +08:00
xingyu
bb53885da3 chore: update deps
(cherry picked from commit 91a015828d)
2023-07-27 19:17:49 +08:00
shizhong
a35fd3ec62 提交订单列表和详情20230619 2023-07-27 19:17:22 +08:00
xiaobai
1b5c983d1d 提交订单页面和详情页面 20230619
(cherry picked from commit 42a7aec0b5)
2023-07-27 19:15:56 +08:00
puhui999
0f9629707f feat: 完事秒杀时段管理
(cherry picked from commit f7b195b226)
2023-07-27 19:14:57 +08:00
puhui999
a233d16dbb feat: 秒杀时段管理
(cherry picked from commit a75720ec06)
2023-07-27 19:14:47 +08:00
YunaiV
b6dff5f976 code review:订单详情
(cherry picked from commit 91c53e2e3f)
2023-07-27 19:14:39 +08:00
YunaiV
8bf1f04044 code review:订单列表
(cherry picked from commit e3f250fff0)
2023-07-27 19:11:50 +08:00
shizhong
1e8b1c8a1d !165 trade-order 列表和详情初版 Merge pull request !165 from 矿泉水/dev 2023-07-27 19:11:40 +08:00
YunaiV
1fad4f626c code review:spu todo 去掉
(cherry picked from commit ae69492b53)
2023-07-27 19:09:57 +08:00
YunaiV
d4902558e6 code review:会员积分配置
(cherry picked from commit 5eaf054646)
2023-07-27 19:09:38 +08:00
shizhong
7a35f7fe6e Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-07-27 19:08:57 +08:00
YunaiV
24a4ed134a code review:处理字典数据的冲突
(cherry picked from commit 8666307d47)
2023-07-27 19:07:23 +08:00
xiaqing
98c977a732 初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理

(cherry picked from commit 1dca8476b3)
2023-07-27 19:06:34 +08:00
puhui999
6976c26c37 fix: 完善 SPU 相关路由 review
(cherry picked from commit d31ade7a5f)
2023-07-27 19:04:38 +08:00
puhui999
9d8e0d507b fix: 数组操作添加 ? 可选操作符,避免属性值为 null 时报错
(cherry picked from commit 20f3f72670)
2023-07-27 19:02:29 +08:00
puhui999
2d88367e61 fix: review
(cherry picked from commit b89db1af55)
2023-07-27 19:02:19 +08:00
shizhong
274d85010f add trade order 20230606 2023-07-27 19:01:41 +08:00
shizhong
45bf152dd2 sync dev-20230606 2023-07-27 19:00:31 +08:00
xiaobai
b9ba1d36c2 20230606 add trade-order and details
(cherry picked from commit 985d764f62)
2023-07-27 18:54:36 +08:00
YunaiV
f641785df9 code review:优惠劵管理
(cherry picked from commit 51e76ffd53)
2023-07-27 18:53:49 +08:00
shizhong
0d0b2265c6 !164 优惠券迁移vue3 Merge pull request !164 from dhb52/dev 2023-07-27 18:53:17 +08:00
puhui999
ce62362982 fix: 优化 spu 相关路由配置
(cherry picked from commit a1b45f80bc)
2023-07-27 18:50:14 +08:00
YunaiV
79a4aa5189 code review:商品管理
(cherry picked from commit 158585670c)
2023-07-27 18:50:01 +08:00
YunaiV
16c518e18a code review:门店自提、快递运费
(cherry picked from commit 60c1604d49)
2023-07-27 18:46:14 +08:00
xiaobai
a29421dd41 临时提交
(cherry picked from commit 505f5cfa0c)
2023-07-27 18:44:50 +08:00
dhb52
e2faf6a2a4 style: 添加VO
(cherry picked from commit c5a7d05821)
2023-07-27 18:42:44 +08:00
puhui999
b28bfc4081 fix: 修复善品测试发现的问题
(cherry picked from commit 7fb6258bed)
2023-07-27 18:36:45 +08:00
shizhong
c2168466f3 fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患 2023-07-27 18:36:06 +08:00
puhui999
144be6ef44 fix: 完善 SPU 选择快递模版的功能
(cherry picked from commit 2ddb605076)
2023-07-27 13:11:05 +08:00
puhui999
d35ac547ac fix: 完善 SPU 查看详情
(cherry picked from commit 39c92cb944)
2023-07-27 13:10:58 +08:00
jason
9e7fe34ae8 新增门店自提管理
(cherry picked from commit 000aa95012)
2023-07-27 13:10:46 +08:00
puhui999
cf7f4ff89e fix: 修改 review 提到的问题,完善分类选择层级校验、完整层级展示
(cherry picked from commit e555977757)
2023-07-27 13:09:36 +08:00
芋道源码
e4d6b4301b
!181 所有菜单的 name 都加上模块的前缀,避免冲突,并且和菜单数据能对上
Merge pull request !181 from clockdotnet/master-vxe
2023-07-26 04:53:33 +00:00
shizhong
9af3734b78 逻辑问题 2023-07-11 12:46:39 +08:00
shizhong
c6a9c0c5fb 所有菜单的 name 都加上模块的前缀,避免冲突 2023-07-10 19:11:15 +08:00
周建
3b2d308ccc 补充 2023-06-25 14:06:14 +08:00
周建
7ca76a5304 修复一些命名和拼写错误问题,修复一些BUG 2023-06-25 13:34:27 +08:00
周建
9456a6f31c 命名问题 2023-06-21 13:36:59 +08:00
周建
b07cc98619 接口命名统一 2023-06-21 13:22:47 +08:00
周建
c545c3008f 工作流bug 2023-06-20 15:51:45 +08:00