Commit Graph

706 Commits

Author SHA1 Message Date
xingyu
05c3245ea5 chore: unocss
(cherry picked from commit 9976850c46)
2023-09-19 20:09:09 +08:00
xingyu
b6bf2f0d91 chore: unocss
(cherry picked from commit b19d31ce4e)
2023-09-19 20:09:06 +08:00
xingyu
e9b60d166a chore: unocss
(cherry picked from commit 5d9e713981)
2023-09-19 20:09:01 +08:00
xingyu
a7c1a98df1 docs: unocss
(cherry picked from commit e37fe5f4fe)
2023-09-19 20:08:55 +08:00
xingyu
fa4ac7420f chore: vscode config
(cherry picked from commit 34817269a4)
2023-09-19 20:08:52 +08:00
xingyu
4f81427aa0 wip: use unocss
(cherry picked from commit 4249465b7c)
2023-09-19 20:08:38 +08:00
xingyu
c7d6d35642 fix: eslint
(cherry picked from commit 8e78975521)
2023-09-19 20:02:03 +08:00
xingyu
9dd40c360a docs: preview
(cherry picked from commit 3f36b57363)
2023-09-19 20:00:08 +08:00
xingyu
4eccb44c88 docs: update deps
(cherry picked from commit 5037aa593e)
2023-09-19 19:59:39 +08:00
xingyu
a13e2f48ec chore: update deps
(cherry picked from commit af10ccb39a)
2023-09-19 19:59:31 +08:00
YunaiV
4cef3e3e5f 登录时,直接从用户信息中,获取菜单。目的:加快首页的加载速度
(cherry picked from commit ee802d6335)
2023-09-19 19:59:19 +08:00
芋道源码
9fd5a9d7f4
!242 fix: 个人中心头像为空时不能修改
Merge pull request !242 from clockdotnet/master-vxe
2023-09-11 12:19:21 +00:00
shizhong
6704805af4 fix: 个人中心头像为空时不能修改 2023-09-11 16:35:04 +08:00
xingyu
bdaeb75ccc fix: 个人中心头像为空时不能修改
(cherry picked from commit e6a9dd0e4c)
2023-09-11 16:10:27 +08:00
芋道源码
a15d777afb
!214 增加部门和菜单的详情,解决个人中心无法上传图片的问题
Merge pull request !214 from clockdotnet/master-vxe
2023-08-23 16:58:45 +00:00
周建
4d798c82df 密码提示问题 2023-08-23 13:51:04 +08:00
shizhong
b376e8e2a8 增加部门和菜单的详情,解决个人中心无法上传图片的问题 2023-08-22 17:33:04 +08:00
周建
7eced09de0 个人中心重置及校验问题,部分表单增加校验 2023-08-16 17:31:28 +08:00
芋道源码
fd46445147
!185 master-vxe分支合并master分支1.8.0版本的修改
Merge pull request !185 from clockdotnet/master-vxe
2023-07-28 00:48:31 +00:00
shizhong
5620a9da6a 发布 1.8.0 版本 2023-07-27 23:33:28 +08:00
shizhong
7b3b89fc9a 发布 1.8.0 版本 2023-07-27 22:11:53 +08:00
shizhong
206ede95cf 发布 1.8.0 版本 2023-07-27 21:10:28 +08:00
shizhong
74aac991bc 发布 1.8.0 版本 2023-07-27 20:53:52 +08:00
YunaiV
2104de6a71 review 秒杀、拼团活动的 CRUD
(cherry picked from commit a003b59e39)
2023-07-27 19:51:42 +08:00
shizhong
8641221274 !183 同步商城实现 Merge pull request !183 from 芋道源码/dev 2023-07-27 19:50:13 +08:00
puhui999
84d538ad69 fix: 完善拼团活动 CRUD
(cherry picked from commit dc39ad0cd1)
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 b061c8f32b)
2023-07-27 19:44:36 +08:00
puhui999
85cc7cdb46 fix: mall SeckillConfig
(cherry picked from commit 3fd9f1b43e)
2023-07-27 19:43:51 +08:00
xingyu
5e0d09769d fix: login error
(cherry picked from commit 44efb13c0e)
2023-07-27 19:43:43 +08:00
xingyu
a7fe002abd fix: eslint
(cherry picked from commit ba1254f397)
2023-07-27 19:43:38 +08:00
xingyu
469e81c963 chore: update deps
(cherry picked from commit 540d8496b3)
2023-07-27 19:43:22 +08:00
puhui999
a507f26664 fix: mall SeckillActivity
(cherry picked from commit b67fabcf1f)
2023-07-27 19:41:28 +08:00
puhui999
0394f81dab fix: mall SeckillActivity and CombinationActivity
(cherry picked from commit 4057130275)
2023-07-27 19:41:21 +08:00
puhui999
d1cc7d134b fix: mall SeckillActivity
(cherry picked from commit ce3ca7c6ce)
2023-07-27 19:41:03 +08:00
puhui999
de53abb249 fix: mall SeckillActivity
(cherry picked from commit 36c0bce184)
2023-07-27 19:40:57 +08:00
puhui999
1ab348f8df fix: mall SeckillActivity
(cherry picked from commit b98149f1a7)
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 4571f893ed)
2023-07-27 19:37:26 +08:00
YunaiV
401112f668 review 秒杀活动
(cherry picked from commit b1ce2672e4)
2023-07-27 19:37:02 +08:00
puhui999
22f869db89 feat: mall CombinationActivity
(cherry picked from commit 2e96b1c984)
2023-07-27 19:36:45 +08:00
xiaqing
195ae79bfc 会员中心代码
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码

(cherry picked from commit 4251dc5d61)
2023-07-27 19:36:28 +08:00
nullcache
341dcaf665 修复useTable在total为0时的bug
(cherry picked from commit 69c4995b52)
2023-07-27 19:35:39 +08:00
puhui999
bc35b0c80f fix: 完善 mall seckillActivity add
(cherry picked from commit 341303b014)
2023-07-27 19:35:21 +08:00
puhui999
1d0d9d24ad fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件
(cherry picked from commit 51e79f29cc)
2023-07-27 19:35:12 +08:00
puhui999
670ebb8ba5 fix: 修复 spu 详情查看错误,同步 mall seckill 组件 name 配置方式
(cherry picked from commit 76ccc54a35)
2023-07-27 19:35:01 +08:00
YunaiV
a22eea8e90 review 营销活动
(cherry picked from commit 5d613e69b3)
2023-07-27 19:34:54 +08:00
puhui999
70c2fe409c fix:完善秒杀活动管理①
(cherry picked from commit b1e7f14963)
2023-07-27 19:33:06 +08:00
YunaiV
2fdcdf983a review 订单
(cherry picked from commit 0395b8f138)
2023-07-27 19:32:55 +08:00
YunaiV
d32d3fb2ed 合并 master 代码的冲突
(cherry picked from commit e1b1c134d9)
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