root/ludu-admin-vue3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
681 Commits 8 Branches 11 Tags
Commit Graph

681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
puhui999
84d538ad69 fix: 完善拼团活动 CRUD 
(cherry picked from commit dc39ad0cd1b5bc4a12983b971449ca1a6792d4b9)
 2023-07-27 19:45:36 +08:00
water
e7e0c7a6b7 update src/views/Login/components/MobileForm.vue. 
我发现，这个手机号登陆时，登陆成功了但是没有自动跳转，我手动路由到/，又自动跳转到登陆页面，应该是token没存进去，我就照这loginform的逻辑修改了一下

Signed-off-by: water <2778335106@qq.com>
(cherry picked from commit b061c8f32b06acc60b8003bbe08d240bad4a6b49)
 2023-07-27 19:44:36 +08:00
puhui999
85cc7cdb46 fix: mall SeckillConfig 
(cherry picked from commit 3fd9f1b43e42a10feb6fd04b2d9dbc2ab5f6edd6)
 2023-07-27 19:43:51 +08:00
xingyu
5e0d09769d fix: login error 
(cherry picked from commit 44efb13c0eb08d0b42c1bc62a6895538e05c582f)
 2023-07-27 19:43:43 +08:00
xingyu
a7fe002abd fix: eslint 
(cherry picked from commit ba1254f397ca322e4a21d972d33a11b1f98496b4)
 2023-07-27 19:43:38 +08:00
xingyu
469e81c963 chore: update deps 
(cherry picked from commit 540d8496b384b313a48c947793d190cb0ca44873)
 2023-07-27 19:43:22 +08:00
puhui999
a507f26664 fix: mall SeckillActivity 
(cherry picked from commit b67fabcf1f774b8d2a1117e05a3c29c4b7d5119d)
 2023-07-27 19:41:28 +08:00
puhui999
0394f81dab fix: mall SeckillActivity and CombinationActivity 
(cherry picked from commit 40571302753292182bb8a7052aae1fb6f3117503)
 2023-07-27 19:41:21 +08:00
puhui999
d1cc7d134b fix: mall SeckillActivity 
(cherry picked from commit ce3ca7c6cef7dbe18b224f831be4fae75d9407b2)
 2023-07-27 19:41:03 +08:00
puhui999
de53abb249 fix: mall SeckillActivity 
(cherry picked from commit 36c0bce1845b288ec1ea2f5f1528c07247502c21)
 2023-07-27 19:40:57 +08:00
puhui999
1ab348f8df fix: mall SeckillActivity 
(cherry picked from commit b98149f1a75058edc9e85914772a1ae4cacf479d)
 2023-07-27 19:40:48 +08:00
shizhong
e8088415d9 !155 fix: 处理 window.bpmnInstances 有时候为 undefined 问题 Merge pull request !155 from OlyLis/master 2023-07-27 19:40:20 +08:00
YunaiV
23fa3fe14c review 积分配置 
(cherry picked from commit 4571f893ed93d3a012635a22137ecaff0ae34949)
 2023-07-27 19:37:26 +08:00
YunaiV
401112f668 review 秒杀活动 
(cherry picked from commit b1ce2672e418cc9a970992787d5ba405c92d5070)
 2023-07-27 19:37:02 +08:00
puhui999
22f869db89 feat: mall CombinationActivity 
(cherry picked from commit 2e96b1c9840b7adfbc8110eb3a36bd2b406dc392)
 2023-07-27 19:36:45 +08:00
xiaqing
195ae79bfc 会员中心代码 
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码

(cherry picked from commit 4251dc5d6167db0befecfacf2402511314eda6ec)
 2023-07-27 19:36:28 +08:00
nullcache
341dcaf665 修复useTable在total为0时的bug 
(cherry picked from commit 69c4995b52e86d2a6ba57519e4deb0e8f71f21c3)
 2023-07-27 19:35:39 +08:00
puhui999
bc35b0c80f fix: 完善 mall seckillActivity add 
(cherry picked from commit 341303b014f1d24baf132575763d20a4a08c4b1c)
 2023-07-27 19:35:21 +08:00
puhui999
1d0d9d24ad fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件 
(cherry picked from commit 51e79f29cc70ad1670b93829bab3d5d23751c263)
 2023-07-27 19:35:12 +08:00
puhui999
670ebb8ba5 fix: 修复 spu 详情查看错误，同步 mall seckill 组件 name 配置方式 
(cherry picked from commit 76ccc54a350a6183b6aa89599d3e010b467263b6)
 2023-07-27 19:35:01 +08:00
YunaiV
a22eea8e90 review 营销活动 
(cherry picked from commit 5d613e69b3d651806f7710eebb2b14e5c7034097)
 2023-07-27 19:34:54 +08:00
puhui999
70c2fe409c fix：完善秒杀活动管理① 
(cherry picked from commit b1e7f149638243885ae97f6c31f5df24d9b6ffa2)
 2023-07-27 19:33:06 +08:00
YunaiV
2fdcdf983a review 订单 
(cherry picked from commit 0395b8f13887bbd6c04f7b5b6b7c1871b64b44ab)
 2023-07-27 19:32:55 +08:00
YunaiV
d32d3fb2ed 合并 master 代码的冲突 
(cherry picked from commit e1b1c134d9014ba0b1612e85468d145e124a7278)
 2023-07-27 19:32:36 +08:00
shizhong
419a572e80 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-07-27 19:32:27 +08:00
puhui999
7da1b04ae2 feat：添加秒杀活动管理 
(cherry picked from commit 3d47d6744e0dd78d4df350c5eb6421dba889f8af)
 2023-07-27 19:27:44 +08:00
xingyu
e66f43c2b0 chore: build size 
(cherry picked from commit 9ac17b3ce2ab5ef185f23685d961d887ec25f260)
 2023-07-27 19:26:54 +08:00
xingyu
3d36bc4f56 fix: eslint 
(cherry picked from commit 82c51e0c3e073d9acad975ba2490f648edfb5f96)
 2023-07-27 19:26:41 +08:00
xingyu
1745a61d04 fix: style lint 
(cherry picked from commit d639401646718357ba40b3be8a3fab7db9d0097d)
 2023-07-27 19:26:28 +08:00
xingyu
9d525601bb docs: version 
(cherry picked from commit 64dbcdabe015eca5a6f1ade286bd50ced11c03ef)
 2023-07-27 19:26:03 +08:00
xingyu
2f5eb8d69c chore: remove vueSetupExtend 
(cherry picked from commit 33c460ad555d295c0a08a43f67059d2f7d1198f7)
 2023-07-27 19:25:56 +08:00
xingyu
cf75e6801c fix: eslint 
(cherry picked from commit f2992ce8e88a0461c31e3460ba3a0a85d1f7fd66)
 2023-07-27 19:25:38 +08:00
puhui999
1c01266d62 fix: 使 Table 组件支持列宽和固定列配置 
(cherry picked from commit f3622d423a29d3c4a1f831ed89864c85d94074d1)
 2023-07-27 19:20:21 +08:00
puhui999
1e0b6e9efc fix: 使 Dialog 组件支持 Dialog 内部嵌套另一个 Dialog，需要使用 append-to-body 属性 
(cherry picked from commit 5064845d4e7ad807b5dfeabee4ffb8de0eb123ff)
 2023-07-27 19:19:56 +08:00
xingyu
9c7d23a251 chore: stylelint 
(cherry picked from commit a5c7c886ee9f662aaa0a7d89663639e3372dd7d3)
 2023-07-27 19:19:45 +08:00
xingyu
bc6bd1d8ab fix: locales 
(cherry picked from commit c05fbd7fdc6cda94b768b01758126fe20222a356)
 2023-07-27 19:19:39 +08:00
xingyu
05db3f4579 chore: vscode setting 
(cherry picked from commit 952f7b62686f3c327c1ac4152ac92bb66debfa64)
 2023-07-27 19:19:35 +08:00
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