xingyu
|
5006717803
|
chore: eslint
(cherry picked from commit 37c41aeecc509903518f9fa1d8db14239968ea8b)
|
2023-07-27 19:19:31 +08:00 |
|
xingyu
|
eb649bc023
|
chore: eslint
(cherry picked from commit 3d39b42e96be3b467a2b40a4b86335500cf659d4)
|
2023-07-27 19:19:27 +08:00 |
|
xingyu
|
1c0be5e1b3
|
chore: vscode setting use pnpm
(cherry picked from commit 2df15acb260b399b29627378f5b73ffa4d065c76)
|
2023-07-27 19:18:17 +08:00 |
|
xingyu
|
1a136e469b
|
docs: readme
(cherry picked from commit 458bb2216338574cb20787aff165e1531d833450)
|
2023-07-27 19:18:12 +08:00 |
|
xingyu
|
15fc4bc37a
|
chore: packageManager use pnpm
(cherry picked from commit ca8238a84b64e281dd2e704e3edb6f0d8919b347)
|
2023-07-27 19:18:02 +08:00 |
|
xingyu
|
bb53885da3
|
chore: update deps
(cherry picked from commit 91a015828dfd113478d32c03542853c9d5c838c8)
|
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 42a7aec0b51c4c9f0d2588972a3fddfd3bd2f981)
|
2023-07-27 19:15:56 +08:00 |
|
puhui999
|
0f9629707f
|
feat: 完事秒杀时段管理
(cherry picked from commit f7b195b226308e4f016817a1bba5ca1a52921906)
|
2023-07-27 19:14:57 +08:00 |
|
puhui999
|
a233d16dbb
|
feat: 秒杀时段管理
(cherry picked from commit a75720ec0646f4fe5bdf21126bd5c3cf719170e9)
|
2023-07-27 19:14:47 +08:00 |
|
YunaiV
|
b6dff5f976
|
code review：订单详情
(cherry picked from commit 91c53e2e3f846f6c090be56a093c449cfaf94adc)
|
2023-07-27 19:14:39 +08:00 |
|
YunaiV
|
8bf1f04044
|
code review：订单列表
(cherry picked from commit e3f250fff07ee496c54050d1ed28041c9786d0fd)
|
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 ae69492b53ceeb006c72c1ef70d1b0b15685dee2)
|
2023-07-27 19:09:57 +08:00 |
|
YunaiV
|
d4902558e6
|
code review：会员积分配置
(cherry picked from commit 5eaf054646d4eb701f1ce54d566cce16549dde98)
|
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 8666307d472cd1b335b0102af9a8fede76823919)
|
2023-07-27 19:07:23 +08:00 |
|
xiaqing
|
98c977a732
|
初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
(cherry picked from commit 1dca8476b35962c278124075acc731319fca60cb)
|
2023-07-27 19:06:34 +08:00 |
|
puhui999
|
6976c26c37
|
fix: 完善 SPU 相关路由 review
(cherry picked from commit d31ade7a5fccc98db7e90e41a31564205b393056)
|
2023-07-27 19:04:38 +08:00 |
|
puhui999
|
9d8e0d507b
|
fix: 数组操作添加 ? 可选操作符，避免属性值为 null 时报错
(cherry picked from commit 20f3f7267023b21fc28541ed7a0f35f3a0d3e832)
|
2023-07-27 19:02:29 +08:00 |
|
puhui999
|
2d88367e61
|
fix: review
(cherry picked from commit b89db1af55127fef5b558e2fdcd6f8401ccdc7df)
|
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 985d764f623e24402b1ba91562d2994b28d1aeec)
|
2023-07-27 18:54:36 +08:00 |
|
YunaiV
|
f641785df9
|
code review：优惠劵管理
(cherry picked from commit 51e76ffd53aa1cc76f85cfb4389ac257f2804f8a)
|
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 a1b45f80bc72c57b1fd7cfef6b4f314629ed637d)
|
2023-07-27 18:50:14 +08:00 |
|
YunaiV
|
79a4aa5189
|
code review：商品管理
(cherry picked from commit 158585670ccab231b7a0902f62b9d134af747d50)
|
2023-07-27 18:50:01 +08:00 |
|
YunaiV
|
16c518e18a
|
code review：门店自提、快递运费
(cherry picked from commit 60c1604d4947df8f2eaaa748780af9db9f75831f)
|
2023-07-27 18:46:14 +08:00 |
|
xiaobai
|
a29421dd41
|
临时提交
(cherry picked from commit 505f5cfa0c543f779abe43d6d77f260991486fdf)
|
2023-07-27 18:44:50 +08:00 |
|
dhb52
|
e2faf6a2a4
|
style: 添加VO
(cherry picked from commit c5a7d05821d4eae7197cbd0dba66f544ee214ecc)
|
2023-07-27 18:42:44 +08:00 |
|
puhui999
|
b28bfc4081
|
fix: 修复善品测试发现的问题
(cherry picked from commit 7fb6258bed0ad06943000d9884a3757539d68519)
|
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 2ddb6050763cb395dbe4c1d475a127e6e8da58ca)
|
2023-07-27 13:11:05 +08:00 |
|
puhui999
|
d35ac547ac
|
fix: 完善 SPU 查看详情
(cherry picked from commit 39c92cb944e2b41007d1870d411f5255c9da1d70)
|
2023-07-27 13:10:58 +08:00 |
|
jason
|
9e7fe34ae8
|
新增门店自提管理
(cherry picked from commit 000aa950129d42aa141816f939c64639e89ff7c6)
|
2023-07-27 13:10:46 +08:00 |
|
puhui999
|
cf7f4ff89e
|
fix: 修改 review 提到的问题，完善分类选择层级校验、完整层级展示
(cherry picked from commit e555977757f76516638ce2c8fb90eb6a186bc25b)
|
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 |
|
周建
|
73cd6e303d
|
登录接口返回的过期时间是access token 的过期时间，但是被错误地设置在了refresh token 上，这导致过了几分钟登录状态便失效要求重新登录
|
2023-06-19 13:08:56 +08:00 |
|
芋道源码
|
ec4a5ec961
|
!173 合并master上1.7.2和1.7.3的修改到master-vxe
Merge pull request !173 from clockdotnet/master-vxe
|
2023-06-17 10:37:49 +00:00 |
|
周建
|
4cf5954eaa
|
应用管理页面新增编辑报错
支付订单新增时时间选择问题
|
2023-06-17 09:41:10 +08:00 |
|
shizhong
|
28507236a7
|
BUG和多余的文件
|
2023-06-16 19:31:12 +08:00 |
|
shizhong
|
2489cf00d7
|
将 highlight 代码高亮的全局引入，改成局部引入
|
2023-06-16 19:29:36 +08:00 |
|