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

853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YunaiV
0e36aea9ff code review：商品评论 
(cherry picked from commit 84c5eb9942f7823980096aca80e556c4696e853c)
 2023-09-20 12:22:22 +08:00
YunaiV
e97a62fe06 code review：用户详情 
(cherry picked from commit 1b6c9b2e2939a853e59843d5b9f321652bb38da8)
 2023-09-20 12:22:09 +08:00
shizhong
19e96f1d0d Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev 2023-09-20 12:21:52 +08:00
owen
1a49567613 商品：完善后台商品评论功能 
(cherry picked from commit 814b4631c944a4657128210378bda40294628b3f)
 2023-09-20 12:19:40 +08:00
绮梦
72e494c532 重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。 
(cherry picked from commit 28951fb31d05de22ff264d1734852fa6013d0aa5)
 2023-09-20 12:19:00 +08:00
puhui999
41be920135 订单列表：优化订单列表页面结构 
(cherry picked from commit 58502b12410844a054b638f39149f211c5d88e49)
 2023-09-20 12:18:24 +08:00
puhui999
9d9ccaa1b8 完善 code review 提到的问题 
(cherry picked from commit 7db6c121bb6e788bf4b05a0772a510cdcb3d9ed1)
 2023-09-20 12:18:16 +08:00
AKING
295d04e1f3 update src/components/Pagination/index.vue. 
解决了当全局size为small的时候分页组件样式太大的问题，当组件为small时，则会显示小的分页组件，具体请参照ep官网：https://element-plus.org/zh-CN/component/pagination.html#%E9%99%84%E5%8A%A0%E5%8A%9F%E8%83%BD

Signed-off-by: AKING <2734339436@qq.com>

(cherry picked from commit ff8a8e7243402f8f8946deee56aae9b5e45496f4)
 2023-09-20 12:18:03 +08:00
绮梦
3ee076d0d9 重命名组件名称 
(cherry picked from commit f17bb9a7eb6cd8e000d05038488f7034b244a3bc)
 2023-09-20 12:17:22 +08:00
绮梦
2804d199c0 会员详情页的跳转携带参数方式改为params 
(cherry picked from commit d1bb736973b98b16d73ccecc3b7c285f72e41cef)
 2023-09-20 12:17:11 +08:00
xingyu
a845a420b5 docs: update deps 
(cherry picked from commit 65f9e3ee6c13a76f38768b698cfb1d0ef85a9d3b)
 2023-09-20 12:17:00 +08:00
xingyu
7540b4c8ae chore: update deps 
(cherry picked from commit 0207affd02899ac8f1a9617b2f43ff9a3615983d)
 2023-09-20 12:16:57 +08:00
xingyu
d327d28755 fix: 路径错误 
(cherry picked from commit e30d5559e6b930185ec25ab70a3a2a843abde6cf)
 2023-09-20 12:16:52 +08:00
绮梦
6b2064d979 会员列表页面增加详情页的跳转。 
(cherry picked from commit 451458eb1e98aa42f8b6bcf7b2e1f7fbb974c0d1)
 2023-09-20 12:16:36 +08:00
owen
4de2049956 会员: 会员等级取消分页功能 
(cherry picked from commit e9120f06cf20e5c8708a42809050497278cec679)
 2023-09-20 12:14:25 +08:00
YunaiV
92423dc00b code review：用户详情 
(cherry picked from commit 55772cbba0d0729fd864f9cf338baabcba1e41d0)
 2023-09-20 12:14:21 +08:00
YunaiV
46ab58ddf0 code review：订单列表、订单详情 
(cherry picked from commit cfbc2ed74cd2854266746c88545affb85fb79551)
 2023-09-20 12:14:05 +08:00
YunaiV
6556feed21 code review：会员等级 
(cherry picked from commit bb0c1cb536494f87b61e15323826cb2bbecb2099)
 2023-09-20 12:13:05 +08:00
puhui999
edb88f8548 订单列表：列表重构 添加门店、物流检索条件 
(cherry picked from commit 5dceda614ab3804196f0ad7ad103ac347bc6fe9a)
 2023-09-20 12:12:58 +08:00
puhui999
300cfe694b 订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注 
(cherry picked from commit 83e780da06daf38da658c1745bc963e90b9b7209)
 2023-09-20 12:12:55 +08:00
puhui999
99ef6f83ba 订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注 
(cherry picked from commit be143ea21b70f2281c3f302fbacfd7dc07ab3ed4)
 2023-09-20 12:12:52 +08:00
AKING
70b1161ec1 update src/components/Dialog/src/Dialog.vue. 
解决了单独使用elementplus diaolog组件时，样式被篡改的问题


Signed-off-by: AKING <2734339436@qq.com>
(cherry picked from commit cba35d698f2f4b1be0b2d7d271f5411fe9d7284c)
 2023-09-20 12:12:35 +08:00
绮梦
943516c502 用户详情-积分tab 去除无用的组件。 
(cherry picked from commit c1a40e7c9825f8bdd2f3b6ac0eb028da16b5dbf3)
 2023-09-20 12:12:20 +08:00
绮梦
612cc026b3 增加用户详情页以及 签到、积分等用户详情下的子tab页。 
增加 用户、签到、积分 接口的VO,方便在组件中使用。

(cherry picked from commit 10d9f11fbaef14685b3860ed6fa1669b36637d9d)
 2023-09-20 12:12:11 +08:00
owen
2b67180f80 会员: 修改会员等级，使用单独的表单、接口 
(cherry picked from commit 51738f8f6e60b59666c3c9ace97d251a051bcb14)
 2023-09-20 12:12:02 +08:00
puhui999
8a7b6e2be1 订单列表：列表重构 ④ 移除测试数据 
(cherry picked from commit ebcbe63d9b0ae095e6cb6002c6564f6603b30536)
 2023-09-20 12:11:53 +08:00
owen
c01a8f9e99 会员：等级下拉框显示图标 
(cherry picked from commit c5a703f488c6034a0f31c7b93f0feb1b3b1b2cc4)
 2023-09-20 12:11:43 +08:00
puhui999
9efe122318 订单列表：列表重构 ③ 添加备注表单和发货表单 
(cherry picked from commit 0d202a7a85782b97c03827fa26b9716ad9727d4f)
 2023-09-20 12:11:09 +08:00
owen
b74d4df4f8 会员：增加用户分组 
(cherry picked from commit 78917cd2be0d34dbbf4baab040f0cb83cec910ee)
 2023-09-20 12:11:04 +08:00
puhui999
c89d08e22a 订单列表：列表重构 ② and 完善订单详情 
(cherry picked from commit 345c09ee6ce5a3c8893bef56c8334573fb0d9bf8)
 2023-09-20 12:10:57 +08:00
owen
788cba3bc5 会员：用户标签增加下拉框使用的 精简信息列表查询接口 
(cherry picked from commit 884bb055b054408a019c9c1ef7992e3d2c446390)
 2023-09-20 12:09:04 +08:00
owen
9b15c04efc 会员：后台调整会员等级 
(cherry picked from commit 7bef2409262a4075b51b5dbc14d275b5cc3f0a0e)
 2023-09-20 12:08:53 +08:00
YunaiV
5fd150ad84 优化商品属性的编辑按钮 
(cherry picked from commit 1db98698bd680ceeb72faf316c31a5e30d98205f)
 2023-09-20 12:08:44 +08:00
YunaiV
e27733aed8 code review：签到记录 
(cherry picked from commit be485cc4aba71df1127557eaa5187a2099a55692)
 2023-09-19 21:04:40 +08:00
YunaiV
57df63dc35 code review：签到配置 
(cherry picked from commit 82628ce78083d04edc7c9521f61bdb4d7abfbfbe)
 2023-09-19 21:04:29 +08:00
YunaiV
f48c55a0b6 code review：积分记录 
(cherry picked from commit 4bc3f15571d7d5d5646e510744a444964ea767b5)
 2023-09-19 21:04:10 +08:00
owen
8006325621 会员：增加会员等级增删改查 
(cherry picked from commit f1735a4010ee1e873c4b07c1e0d222e4180fa27c)
 2023-09-19 21:04:04 +08:00
YunaiV
5a0579e087 code review：会员签到配置 
(cherry picked from commit 76a63e01c99a537d3e459e3e09a721bfb0784bc7)
 2023-09-19 21:03:59 +08:00
puhui999
21643274cb 订单列表：列表重构 ① 
(cherry picked from commit 2eb740765e76e7ea4e4559de5441e2c3e7c9993e)
 2023-09-19 21:03:26 +08:00
owen
81b94d4a8c 会员： 
1.会员设置标签

(cherry picked from commit 2964d55435e3a1cced7ee1444e3531ae9c3c4167)
 2023-09-19 21:00:04 +08:00
owen
bcb0ed847e 会员： 
1.增加会员标签功能

(cherry picked from commit 334962fe09b409bb4742989100a58db0efdfcc29)
 2023-09-19 20:59:58 +08:00
芋道源码
f798ec0567 回退 'Pull Request !195 : 修复登录后通过登录页面无法再次登录的问题' 
(cherry picked from commit b68f8be7519dcf447a74ab9fa7578cae8fbc55ed)
 2023-09-19 20:59:50 +08:00
YunaiV
9f0b1a64c5 会员中心：会员管理 60% 
(cherry picked from commit cb4c78b1ac26f41732fb9764475ef63ead44cd60)
 2023-09-19 20:57:42 +08:00
YunaiV
779c6c760c 会员中心：会员管理 50% 
(cherry picked from commit 4fd9dfd1f842f145485eeefa8581b771caf68a5f)
 2023-09-19 20:57:35 +08:00
xiaqing
a7f0c8d3a2 会员积分和会员签到模块todo修改 
(cherry picked from commit 19444021ca65db5d9a766d0f19fbdd8c3214cc79)
 2023-09-19 20:57:26 +08:00
baayso
664a86e71c fix: 1.修复【个人中心】页面在英语环境下字段名过长被换行展示导致错位；2.修复【个人中心】页面【修改密码】校验失效。 
(cherry picked from commit e4592442ed4abeb115e04c3e8826c684cbbd76b2)
 2023-09-19 20:57:17 +08:00
shizhong
6e5552c02e fix: 解决右侧代码过长时不缩放啥也做不了的 bug 2023-09-19 20:55:35 +08:00
puhui999
1854e891cb fix: 完善砍价活动管理对齐后端 
(cherry picked from commit 44be35b5ce3159b525d17ab7abbd931c114867e8)
 2023-09-19 20:53:01 +08:00
zws
beb13d65d8 fix 
https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues/I7SZNW

(cherry picked from commit c368c9b232f8770171fbdd7a13905aa2c88e6619)
 2023-09-19 20:52:42 +08:00
dhb52
d7c3f8f870 fix: 支付/示例 queryParams 为 reactive 
(cherry picked from commit c7b8fdb88483e274e3eee0536e4c0ca311479eca)
 2023-09-19 20:52:38 +08:00