Commit Graph

847 Commits

Author SHA1 Message Date
owen
c2f411607e member: 分销配置
(cherry picked from commit 5a9764c08c)
2023-09-25 12:25:23 +08:00
puhui999
c960ba1e20 完善订单详情和售后退款日志展示样式重构
(cherry picked from commit 46fd154e3a)
2023-09-25 12:24:59 +08:00
shizhong
b6e6b2c49d chore: stylelint(use pnpm lint:style) 2023-09-22 14:43:10 +08:00
shizhong
5cfe65b87a refactor: 统一 setup 格式 2023-09-22 14:25:05 +08:00
shizhong
7e5ad60d1d refactor: vue3.3 defineOptions 2023-09-22 14:00:50 +08:00
shizhong
20f483f561 refactor: vue3.3 defineOptions 2023-09-22 12:49:25 +08:00
shizhong
ee44bef034 样式 2023-09-20 17:36:08 +08:00
shizhong
ec76b555a3 解决合并出现的问题 2023-09-20 16:53:38 +08:00
xingyu
e2040244cf fix: eslint
(cherry picked from commit 5494756a66)
2023-09-20 12:42:48 +08:00
xingyu
ba6544a8c3 fix: #I7WY9N
(cherry picked from commit 56a71f64e7)
2023-09-20 12:42:42 +08:00
xingyu
0b7593fbd4 fix: avatar
(cherry picked from commit 9a6d29b295)
2023-09-20 12:42:31 +08:00
AKING
62aa0e794f update src/components/Dialog/src/Dialog.vue.
解决了弹窗默认top为0的问题

Signed-off-by: AKING <2734339436@qq.com>
(cherry picked from commit d74f96fe17)
2023-09-20 12:39:34 +08:00
owen
117577d9d1 mall:修复优惠券模板,固定日期范围保存失败
(cherry picked from commit 7887be6e92)
2023-09-20 12:39:18 +08:00
owen
6f8dc79283 promotion: 优惠券模板 productSpuIds 改成 productScopeValues
(cherry picked from commit 5f557c7be5)
2023-09-20 12:39:13 +08:00
owen
2707c5fadc mall:修复优惠券发券弹窗样式
(cherry picked from commit a68acb096f)
2023-09-20 12:39:07 +08:00
YunaiV
fd501a1f5b code review:优惠劵逻辑
(cherry picked from commit d10530c9f5)
2023-09-20 12:39:02 +08:00
YunaiV
2a280e8267 code review:优惠劵逻辑
(cherry picked from commit 4f7d6793fd)
2023-09-20 12:38:39 +08:00
owen
842c922855 mall:优惠券发送优化
(cherry picked from commit 76c4644b4b)
2023-09-20 12:38:35 +08:00
YunaiV
04a16dbb7d code review:订单列表
(cherry picked from commit 0743e4941c)
2023-09-20 12:38:27 +08:00
puhui999
d740a4d894 订单管理:完善订单详情
(cherry picked from commit f0249e94a5)
2023-09-20 12:34:53 +08:00
puhui999
d44c616ecd 售后退款:完善售后管理(列表、详情)
(cherry picked from commit 07a0530fc9)
2023-09-20 12:34:48 +08:00
puhui999
ad2c6654c1 fix: 修正合并差异
(cherry picked from commit 3e7945e437)
2023-09-20 12:34:38 +08:00
YunaiV
27bdeb9b50 code review
(cherry picked from commit 3918fab1ec)
2023-09-20 12:34:16 +08:00
puhui999
a2a343ac2e fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式
(cherry picked from commit f9780b636c)
2023-09-20 12:33:46 +08:00
puhui999
45e0f5fb6d 更新订单和售后退款详情页面路由
(cherry picked from commit 264a29e451)
2023-09-20 12:33:33 +08:00
puhui999
e777f77ba9 订单列表:添加配送方式筛选
(cherry picked from commit 688dad319e)
2023-09-20 12:33:30 +08:00
puhui999
ca94a1f274 商品列表:修复添加属性时会返回已存在属性值的问题
(cherry picked from commit 5c7796ca6f)
2023-09-20 12:33:25 +08:00
puhui999
95f0a06667 订单售后列表:完善部分 TODO
(cherry picked from commit f5a1772464)
2023-09-20 12:33:19 +08:00
AKING
7ea15cc0d7 update src/hooks/web/useCrudSchemas.ts.
解决了当使用默认的dict选项时,form中事件不能触发的问题

Signed-off-by: AKING <2734339436@qq.com>
(cherry picked from commit 3e67f3bc4c)
2023-09-20 12:33:10 +08:00
YunaiV
8364e52477 code review:售后详情
(cherry picked from commit 29b8d06ff2)
2023-09-20 12:32:48 +08:00
owen
c999b72692 mall:优惠券 商品适用范围,增加商品分类
(cherry picked from commit 27219e1833)
2023-09-20 12:30:42 +08:00
owen
404bb00dbf mall:优惠券 商品选择组件
(cherry picked from commit 60d2e3114b)
2023-09-20 12:30:37 +08:00
puhui999
c738fd417a 订单售后列表:完善售后详情及相关操作
(cherry picked from commit ed739aec55)
2023-09-20 12:30:14 +08:00
YunaiV
ed41a9bed6 重构:商品详情界面的路由、文件路径
(cherry picked from commit 8d026f0837)
2023-09-20 12:30:02 +08:00
xingyu
c3ccd02f9e fix: router
(cherry picked from commit 54c41b4445)
2023-09-20 12:28:23 +08:00
xingyu
21ac6e0c3e fix: router
(cherry picked from commit 547b1741fc)
2023-09-20 12:27:24 +08:00
puhui999
52776c97da 订单售后列表:初始化售后详情
(cherry picked from commit 8a51c9c771)
2023-09-20 12:25:56 +08:00
puhui999
875211e24f 订单售后列表:重构列表
(cherry picked from commit 4f81468695)
2023-09-20 12:25:50 +08:00
puhui999
109e18dba6 订单列表: 修复差异
(cherry picked from commit 8239ca474f)
2023-09-20 12:25:45 +08:00
owen
529ac7d347 mall: 完善后台发送优惠券
(cherry picked from commit beef6a0a94)
2023-09-20 12:25:36 +08:00
YunaiV
b9c0d4ffa5 code review:商品评论
(cherry picked from commit 5cd01903e4)
2023-09-20 12:24:24 +08:00
YunaiV
4ffc150701 code review:会员中心
(cherry picked from commit 2d8d323767)
2023-09-20 12:23:45 +08:00
绮梦
48a230aac4 账户信息组件 增加等级、成长值和积分的显示。
增加一些配套的svg 图标。
增加tab 的懒加载。

(cherry picked from commit 45a6b3bcc7)
2023-09-20 12:23:26 +08:00
绮梦
a5046fd527 调整icon的大小
(cherry picked from commit afaf7749c2)
2023-09-20 12:23:17 +08:00
owen
ae0982ee44 商品评论:回复表单提取到单独的组件中
(cherry picked from commit 3a15390090)
2023-09-20 12:23:12 +08:00
绮梦
8c1772c64c 调整icon的对齐方式为中间居中
(cherry picked from commit 4d9ae73211)
2023-09-20 12:23:08 +08:00
owen
9f4751b1d7 商品评论:
1.移除scores,由后端自动计算
2.SPU、SKU选择组件,放到SPU组件目录下

(cherry picked from commit 15971b6feb)
2023-09-20 12:23:04 +08:00
YunaiV
b55b9966d6 code review:订单列表
(cherry picked from commit b8ca5800c6)
2023-09-20 12:22:48 +08:00
YunaiV
0e36aea9ff code review:商品评论
(cherry picked from commit 84c5eb9942)
2023-09-20 12:22:22 +08:00
YunaiV
e97a62fe06 code review:用户详情
(cherry picked from commit 1b6c9b2e29)
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 814b4631c9)
2023-09-20 12:19:40 +08:00
绮梦
72e494c532 重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。
(cherry picked from commit 28951fb31d)
2023-09-20 12:19:00 +08:00
puhui999
41be920135 订单列表:优化订单列表页面结构
(cherry picked from commit 58502b1241)
2023-09-20 12:18:24 +08:00
puhui999
9d9ccaa1b8 完善 code review 提到的问题
(cherry picked from commit 7db6c121bb)
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 ff8a8e7243)
2023-09-20 12:18:03 +08:00
绮梦
3ee076d0d9 重命名组件名称
(cherry picked from commit f17bb9a7eb)
2023-09-20 12:17:22 +08:00
绮梦
2804d199c0 会员详情页的跳转携带参数方式改为params
(cherry picked from commit d1bb736973)
2023-09-20 12:17:11 +08:00
xingyu
d327d28755 fix: 路径错误
(cherry picked from commit e30d5559e6)
2023-09-20 12:16:52 +08:00
绮梦
6b2064d979 会员列表页面增加详情页的跳转。
(cherry picked from commit 451458eb1e)
2023-09-20 12:16:36 +08:00
owen
4de2049956 会员: 会员等级取消分页功能
(cherry picked from commit e9120f06cf)
2023-09-20 12:14:25 +08:00
YunaiV
92423dc00b code review:用户详情
(cherry picked from commit 55772cbba0)
2023-09-20 12:14:21 +08:00
YunaiV
46ab58ddf0 code review:订单列表、订单详情
(cherry picked from commit cfbc2ed74c)
2023-09-20 12:14:05 +08:00
YunaiV
6556feed21 code review:会员等级
(cherry picked from commit bb0c1cb536)
2023-09-20 12:13:05 +08:00
puhui999
edb88f8548 订单列表:列表重构 添加门店、物流检索条件
(cherry picked from commit 5dceda614a)
2023-09-20 12:12:58 +08:00
puhui999
300cfe694b 订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注
(cherry picked from commit 83e780da06)
2023-09-20 12:12:55 +08:00
puhui999
99ef6f83ba 订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注
(cherry picked from commit be143ea21b)
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 cba35d698f)
2023-09-20 12:12:35 +08:00
绮梦
943516c502 用户详情-积分tab 去除无用的组件。
(cherry picked from commit c1a40e7c98)
2023-09-20 12:12:20 +08:00
绮梦
612cc026b3 增加用户详情页以及 签到、积分等用户详情下的子tab页。
增加 用户、签到、积分 接口的VO,方便在组件中使用。

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

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

(cherry picked from commit 334962fe09)
2023-09-19 20:59:58 +08:00
芋道源码
f798ec0567 回退 'Pull Request !195 : 修复登录后通过登录页面无法再次登录的问题'
(cherry picked from commit b68f8be751)
2023-09-19 20:59:50 +08:00
YunaiV
9f0b1a64c5 会员中心:会员管理 60%
(cherry picked from commit cb4c78b1ac)
2023-09-19 20:57:42 +08:00
YunaiV
779c6c760c 会员中心:会员管理 50%
(cherry picked from commit 4fd9dfd1f8)
2023-09-19 20:57:35 +08:00
xiaqing
a7f0c8d3a2 会员积分和会员签到模块todo修改
(cherry picked from commit 19444021ca)
2023-09-19 20:57:26 +08:00
baayso
664a86e71c fix: 1.修复【个人中心】页面在英语环境下字段名过长被换行展示导致错位;2.修复【个人中心】页面【修改密码】校验失效。
(cherry picked from commit e4592442ed)
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 44be35b5ce)
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 c368c9b232)
2023-09-19 20:52:42 +08:00
dhb52
d7c3f8f870 fix: 支付/示例 queryParams 为 reactive
(cherry picked from commit c7b8fdb884)
2023-09-19 20:52:38 +08:00
dhb52
f87beb4da7 fix: 支付/回调 修复ElDescriptions对齐问题
(cherry picked from commit 5d364e268f)
2023-09-19 20:52:33 +08:00
YunaiV
dddc6a2e0d 支付:修复支付应用的 mock 展示不正确
(cherry picked from commit e954ae6010)
2023-09-19 20:52:26 +08:00
YunaiV
e4a6e3f94b 支付退款列表的 review
(cherry picked from commit c3a8479eca)
2023-09-19 20:52:21 +08:00
dhb52
4cdbdae8c4 fix: 修复ElDescriptions对齐问题
(cherry picked from commit 10c121d62d)
2023-09-19 20:51:39 +08:00
dhb52
149a463a6b fix: 支付管理/退款订单 对标 vue2
(cherry picked from commit 620a2009c3)
2023-09-19 20:51:33 +08:00
YunaiV
cfef155ee2 商城:
1. 微调砍价活动的代码

(cherry picked from commit 7bf3e41c61)
2023-09-19 20:50:54 +08:00
YunaiV
81d8e36ccc 商城:
1. 修复拼团活动,修改商品的拼团价格,会存在 *100 的问题

(cherry picked from commit 127e6b202e)
2023-09-19 20:50:49 +08:00
YunaiV
ffc797ae31 商城:
1. 修复秒杀活动,修改商品的秒杀价格,会存在 *100 的问题

(cherry picked from commit ff8bde207d)
2023-09-19 20:50:41 +08:00
xingyu
3b21e610af chore: remove qrcode.vue use qrcode
(cherry picked from commit 2ec50bab15)
2023-09-19 20:50:27 +08:00
xingyu
e1b27dec11 fix: 提交后刷新列表
(cherry picked from commit b9477463fd)
2023-09-19 20:50:21 +08:00
YunaiV
0fd07c0cbc 商城:
1. 调整优惠劵的目录
2. 简化秒杀时间配置

(cherry picked from commit 9984de0dc7)
2023-09-19 20:50:06 +08:00
YunaiV
00829471be 商城:优惠劵的前端完善
(cherry picked from commit 815897ca8b)
2023-09-19 20:49:56 +08:00
shizhong
49e28e7b02 修复时间检索,value format 错误,导致无法搜索的问题 2023-09-19 20:49:04 +08:00
YunaiV
4fb9e8ba4d code review:补全支付文档
(cherry picked from commit 19cad3b873)
2023-09-19 20:45:32 +08:00
YunaiV
00c319ba41 code review:优化支付订单的实现
(cherry picked from commit bf66727009)
2023-09-19 20:45:25 +08:00
YunaiV
a7610dbab3 code review:优化支付通知的实现
(cherry picked from commit 1ab7ea0640)
2023-09-19 20:45:22 +08:00
YunaiV
3af92d076e code review:优化示例订单的实现
(cherry picked from commit 26cf4ca64a)
2023-09-19 20:45:02 +08:00
YunaiV
db1e2beaf0 code review:优化收银台的实现,解决 TODO
(cherry picked from commit 7625e6757c)
2023-09-19 20:44:38 +08:00
lehug
caff8e4966 修复登录后通过登录页面无法再次登录的问题
(cherry picked from commit 280f734f80)
2023-09-19 20:41:44 +08:00
xiaqing
bc8702c1dd 会员积分针对代码格式、功能优化
1.修改积分抵扣单位,按照分显示

(cherry picked from commit f8a4df8b77)
2023-09-19 20:41:21 +08:00
xiaqing
9ab9344521 会员积分针对代码格式、功能优化
1.修改积分抵扣单位,按照分显示

(cherry picked from commit f2e029dca6)
2023-09-19 20:41:16 +08:00
xiaqing
817548c825 会员积分针对代码格式、功能优化
1.优化todo建议
2.删除无用代码

(cherry picked from commit de941ec6ba)
2023-09-19 20:41:09 +08:00
xiaqing
0991528c17 会员签到针对代码格式、功能优化
1.优化todo建议
 2.删除无用代码

(cherry picked from commit f310f65842)
2023-09-19 20:40:40 +08:00
dhb52
191d149959 feat: 支付功能迁移(初稿)
(cherry picked from commit a6eab3cc9a)
2023-09-19 20:39:21 +08:00
puhui999
541fc97796 feat: 完善砍价活动管理
(cherry picked from commit 4947716983)
2023-09-19 20:36:04 +08:00
dhb52
fd42c410b0 feat: 添加支付图标文件
(cherry picked from commit 64b40e7fdf)
2023-09-19 20:35:57 +08:00
YunaiV
f9be77efd4 bugfix:分配角色菜单时,调用接口 404 问题
(cherry picked from commit ef31ec7aaf)
2023-09-19 20:35:42 +08:00
YunaiV
544adb9811 支付应用:模拟支付的添加代码优化
(cherry picked from commit a2fdff47df)
2023-09-19 20:32:24 +08:00
YunaiV
b613a69e5c 支付应用:微信支付的添加代码优化
(cherry picked from commit b3b1d97447)
2023-09-19 20:32:20 +08:00
YunaiV
77a5734a07 支付应用:支付宝的添加代码优化
(cherry picked from commit 86e0a375fa)
2023-09-19 20:32:16 +08:00
xingyu
c4fd56dbcd fix: dialog
(cherry picked from commit 003751a41c)
2023-09-19 20:31:53 +08:00
dhb52
73cd024a5c typo: apiclient_key.perm => apiclient_key.pem
(cherry picked from commit 36268cf834)
2023-09-19 20:25:33 +08:00
dhb52
3f479ecffc feat: 支付管理/应用信息(alpha)
(cherry picked from commit 323417b0d4)
2023-09-19 20:25:26 +08:00
puhui999
da5ad39251 fix: combinationActivity 调整
(cherry picked from commit c327f79177)
2023-09-19 20:24:40 +08:00
puhui999
cace3d1743 fix: 修正合并代码后前端不能正常启动的问题
(cherry picked from commit 39df9be988)
2023-09-19 20:24:31 +08:00
linr
e3e2111324 request支持传递axios原生参数,例如超时:request(method:'GET',url:'',timeout:1000)
(cherry picked from commit 0c334ff4d6)
2023-09-19 20:24:21 +08:00
puhui999
67baf1e0a5 fix: 修正 combinationActivity.data.ts
(cherry picked from commit 73b918b4e9)
2023-09-19 20:24:15 +08:00
xingyu
9ae54036fa fix: style
(cherry picked from commit 29d493e2da)
2023-09-19 20:14:31 +08:00
xingyu
c50051d930 fix: eslint
(cherry picked from commit 2dcb73764f)
2023-09-19 20:14:25 +08:00
xingyu
05c3245ea5 chore: unocss
(cherry picked from commit 9976850c46)
2023-09-19 20:09:09 +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
YunaiV
4cef3e3e5f 登录时,直接从用户信息中,获取菜单。目的:加快首页的加载速度
(cherry picked from commit ee802d6335)
2023-09-19 19:59:19 +08: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
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
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