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 |
|
dhb52
|
f87beb4da7
|
fix: 支付/回调 修复ElDescriptions对齐问题
(cherry picked from commit 5d364e268f1d2eec20a5bb04beb297d8ca27eb5d)
|
2023-09-19 20:52:33 +08:00 |
|
YunaiV
|
dddc6a2e0d
|
支付：修复支付应用的 mock 展示不正确
(cherry picked from commit e954ae6010ad9a4a1d4bc30f09267beb30180d39)
|
2023-09-19 20:52:26 +08:00 |
|
YunaiV
|
e4a6e3f94b
|
支付退款列表的 review
(cherry picked from commit c3a8479eca28e6179681ec9514937b22c3c33226)
|
2023-09-19 20:52:21 +08:00 |
|
dhb52
|
4cdbdae8c4
|
fix: 修复ElDescriptions对齐问题
(cherry picked from commit 10c121d62d622b3b3d46af3210170a1e1b103c99)
|
2023-09-19 20:51:39 +08:00 |
|
dhb52
|
149a463a6b
|
fix: 支付管理/退款订单 对标 vue2
(cherry picked from commit 620a2009c3bd146ebda815bc7805fe369474cbb7)
|
2023-09-19 20:51:33 +08:00 |
|
YunaiV
|
cfef155ee2
|
商城：
1. 微调砍价活动的代码
(cherry picked from commit 7bf3e41c6189776b129670d44c9b40ecce2f86d5)
|
2023-09-19 20:50:54 +08:00 |
|
YunaiV
|
81d8e36ccc
|
商城：
1. 修复拼团活动，修改商品的拼团价格，会存在 *100 的问题
(cherry picked from commit 127e6b202edce8b41cdcd3e726eb4fde45b12441)
|
2023-09-19 20:50:49 +08:00 |
|
YunaiV
|
ffc797ae31
|
商城：
1. 修复秒杀活动，修改商品的秒杀价格，会存在 *100 的问题
(cherry picked from commit ff8bde207ddb0d46cc2bba1cbc03250242f7251e)
|
2023-09-19 20:50:41 +08:00 |
|
xingyu
|
3b21e610af
|
chore: remove qrcode.vue use qrcode
(cherry picked from commit 2ec50bab155e29bdfc47dc7d4f3597f13e101e9a)
|
2023-09-19 20:50:27 +08:00 |
|
xingyu
|
e1b27dec11
|
fix: 提交后刷新列表
(cherry picked from commit b9477463fdd2945caabb0ef8d36a953272121f06)
|
2023-09-19 20:50:21 +08:00 |
|
YunaiV
|
0fd07c0cbc
|
商城：
1. 调整优惠劵的目录
2. 简化秒杀时间配置
(cherry picked from commit 9984de0dc7251779434a5bf95c3aa9aab3c4cd65)
|
2023-09-19 20:50:06 +08:00 |
|