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

928 Commits

Author SHA1 Message Date
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
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
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
puhui999
7da1b04ae2 feat：添加秒杀活动管理 
(cherry picked from commit 3d47d6744e)
 2023-07-27 19:27:44 +08:00
xingyu
3d36bc4f56 fix: eslint 
(cherry picked from commit 82c51e0c3e)
 2023-07-27 19:26:41 +08:00
xingyu
1745a61d04 fix: style lint 
(cherry picked from commit d639401646)
 2023-07-27 19:26:28 +08:00
xingyu
cf75e6801c fix: eslint 
(cherry picked from commit f2992ce8e8)
 2023-07-27 19:25:38 +08:00
puhui999
1c01266d62 fix: 使 Table 组件支持列宽和固定列配置 
(cherry picked from commit f3622d423a)
 2023-07-27 19:20:21 +08:00
puhui999
1e0b6e9efc fix: 使 Dialog 组件支持 Dialog 内部嵌套另一个 Dialog，需要使用 append-to-body 属性 
(cherry picked from commit 5064845d4e)
 2023-07-27 19:19:56 +08:00
shizhong
a35fd3ec62 提交订单列表和详情20230619 2023-07-27 19:17:22 +08:00
xiaobai
1b5c983d1d 提交订单页面和详情页面 20230619 
(cherry picked from commit 42a7aec0b5)
 2023-07-27 19:15:56 +08:00
puhui999
0f9629707f feat: 完事秒杀时段管理 
(cherry picked from commit f7b195b226)
 2023-07-27 19:14:57 +08:00
puhui999
a233d16dbb feat: 秒杀时段管理 
(cherry picked from commit a75720ec06)
 2023-07-27 19:14:47 +08:00
YunaiV
b6dff5f976 code review：订单详情 
(cherry picked from commit 91c53e2e3f)
 2023-07-27 19:14:39 +08:00
YunaiV
8bf1f04044 code review：订单列表 
(cherry picked from commit e3f250fff0)
 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
YunaiV
1fad4f626c code review：spu todo 去掉 
(cherry picked from commit ae69492b53)
 2023-07-27 19:09:57 +08:00
YunaiV
d4902558e6 code review：会员积分配置 
(cherry picked from commit 5eaf054646)
 2023-07-27 19:09:38 +08:00
shizhong
7a35f7fe6e Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-07-27 19:08:57 +08:00
YunaiV
24a4ed134a code review：处理字典数据的冲突 
(cherry picked from commit 8666307d47)
 2023-07-27 19:07:23 +08:00
xiaqing
98c977a732 初始化积分模块 
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理

(cherry picked from commit 1dca8476b3)
 2023-07-27 19:06:34 +08:00
puhui999
6976c26c37 fix: 完善 SPU 相关路由 review 
(cherry picked from commit d31ade7a5f)
 2023-07-27 19:04:38 +08:00
puhui999
9d8e0d507b fix: 数组操作添加 ? 可选操作符，避免属性值为 null 时报错 
(cherry picked from commit 20f3f72670)
 2023-07-27 19:02:29 +08:00
puhui999
2d88367e61 fix: review 
(cherry picked from commit b89db1af55)
 2023-07-27 19:02:19 +08:00
shizhong
274d85010f add trade order 20230606 2023-07-27 19:01:41 +08:00
shizhong
45bf152dd2 sync dev-20230606 2023-07-27 19:00:31 +08:00
xiaobai
b9ba1d36c2 20230606 add trade-order and details 
(cherry picked from commit 985d764f62)
 2023-07-27 18:54:36 +08:00
YunaiV
f641785df9 code review：优惠劵管理 
(cherry picked from commit 51e76ffd53)
 2023-07-27 18:53:49 +08:00
shizhong
0d0b2265c6 !164 优惠券迁移vue3 Merge pull request !164 from dhb52/dev 2023-07-27 18:53:17 +08:00
puhui999
ce62362982 fix: 优化 spu 相关路由配置 
(cherry picked from commit a1b45f80bc)
 2023-07-27 18:50:14 +08:00
YunaiV
79a4aa5189 code review：商品管理 
(cherry picked from commit 158585670c)
 2023-07-27 18:50:01 +08:00
YunaiV
16c518e18a code review：门店自提、快递运费 
(cherry picked from commit 60c1604d49)
 2023-07-27 18:46:14 +08:00
xiaobai
a29421dd41 临时提交 
(cherry picked from commit 505f5cfa0c)
 2023-07-27 18:44:50 +08:00
dhb52
e2faf6a2a4 style: 添加VO 
(cherry picked from commit c5a7d05821)
 2023-07-27 18:42:44 +08:00
puhui999
b28bfc4081 fix: 修复善品测试发现的问题 
(cherry picked from commit 7fb6258bed)
 2023-07-27 18:36:45 +08:00
shizhong
c2168466f3 fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患 2023-07-27 18:36:06 +08:00
puhui999
144be6ef44 fix: 完善 SPU 选择快递模版的功能 
(cherry picked from commit 2ddb605076)
 2023-07-27 13:11:05 +08:00
puhui999
d35ac547ac fix: 完善 SPU 查看详情 
(cherry picked from commit 39c92cb944)
 2023-07-27 13:10:58 +08:00
jason
9e7fe34ae8 新增门店自提管理 
(cherry picked from commit 000aa95012)
 2023-07-27 13:10:46 +08:00
puhui999
cf7f4ff89e fix: 修改 review 提到的问题，完善分类选择层级校验、完整层级展示 
(cherry picked from commit e555977757)
 2023-07-27 13:09:36 +08:00
shizhong
9af3734b78 逻辑问题 2023-07-11 12:46:39 +08:00
shizhong
c6a9c0c5fb 所有菜单的 name 都加上模块的前缀，避免冲突 2023-07-10 19:11:15 +08:00
周建
3b2d308ccc 补充 2023-06-25 14:06:14 +08:00
周建
7ca76a5304 修复一些命名和拼写错误问题，修复一些BUG 2023-06-25 13:34:27 +08:00
周建
9456a6f31c 命名问题 2023-06-21 13:36:59 +08:00
周建
b07cc98619 接口命名统一 2023-06-21 13:22:47 +08:00
周建
c545c3008f 工作流bug 2023-06-20 15:51:45 +08:00
周建
73cd6e303d 登录接口返回的过期时间是access token 的过期时间，但是被错误地设置在了refresh token 上，这导致过了几分钟登录状态便失效要求重新登录 2023-06-19 13:08:56 +08:00
周建
4cf5954eaa 应用管理页面新增编辑报错 
支付订单新增时时间选择问题
 2023-06-17 09:41:10 +08:00
shizhong
28507236a7 BUG和多余的文件 2023-06-16 19:31:12 +08:00
shizhong
2489cf00d7 将 highlight 代码高亮的全局引入，改成局部引入 2023-06-16 19:29:36 +08:00
周建
330a44fc98 下面列表 2023-06-16 18:25:58 +08:00
周建
0e15d393a6 代码格式化问题 2023-06-16 16:31:53 +08:00
周建
6ff7a3c9a9 支付订单问题 2023-06-14 14:24:29 +08:00
周建
38ea9cbcda 部分样式bug 2023-06-14 13:58:48 +08:00
shizhong
e60c33e4b4 BUG 2023-06-13 21:53:35 +08:00
shizhong
99774fc622 将 highlight 代码高亮的全局引入，改成局部引入 2023-06-13 21:42:32 +08:00
shizhong
6f266fb967 给所有组件添加name属性预防未知bug!!! 2023-06-13 21:05:25 +08:00
shizhong
1e52823524 BUG 2023-06-13 15:35:13 +08:00
wangding
ea81cbd520 add router search 
(cherry picked from commit 43f3c67434)
 2023-06-13 14:16:02 +08:00
wangding
1e096a47c0 新增路由搜索功能 
(cherry picked from commit 6768cdea05)
 2023-06-13 14:15:49 +08:00
jason
88439669c0 运费模板区域改成多选 
(cherry picked from commit 70c5082776)
 2023-06-13 14:15:44 +08:00
YunaiV
6e7ee28079 review + mall：快递公司管理 
(cherry picked from commit b12aefe46e)
 2023-06-13 14:15:31 +08:00
YunaiV
dfc3da744f review + mall：商品管理 
(cherry picked from commit 349a39e72f)
 2023-06-13 14:15:28 +08:00
shizhong
61396246a5 Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev 2023-06-13 14:14:42 +08:00
YunaiV
4cd4327bc8 review + mall：商品管理 
(cherry picked from commit 0fba3fd503)
 2023-06-13 14:13:55 +08:00
puhui999
4eacb6dd8c fix: 完善善品导出 
(cherry picked from commit d877bfd26e)
 2023-06-13 14:12:49 +08:00
jason
4850c05614 运费模板表格样式调整 
(cherry picked from commit c296c9e53d)
 2023-06-13 14:12:45 +08:00
jason
bbe9e667c4 运费模板性能优化。区域选择使用懒加载 
(cherry picked from commit af2fb4bf5f)
 2023-06-13 14:12:41 +08:00
jason
90ccc11006 mall: 订单中心->运费模板(第一版 性能有问题) 
(cherry picked from commit 4e69f15128)
 2023-06-13 14:10:52 +08:00
puhui999
c254222b5f fix: 优化相关逻辑，修复遗留bug 
(cherry picked from commit 38545e89c6)
 2023-06-13 14:07:33 +08:00
puhui999
4410bdd93c fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 
(cherry picked from commit 0c42b76a52)
 2023-06-13 14:07:22 +08:00
xingyu
f26c72ced9 fix: echart color 
(cherry picked from commit 9f0065f89f)
 2023-06-13 14:07:09 +08:00
xingyu
484cd403fc fix: echart 
(cherry picked from commit 45ee4116b7)
 2023-06-13 14:06:53 +08:00
jason
4ec3d3fe72 新增快递公司菜单 
(cherry picked from commit b0984c9013)
 2023-06-13 14:06:19 +08:00
puhui999
ea4e2a0bcc fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 
(cherry picked from commit 4ddba9d454)
 2023-06-13 14:06:16 +08:00
puhui999
d73a32106a fix: 修复 OtherSettingsForm TODO 优化相关算法,解决上一版本遗留的bug 
(cherry picked from commit 3c4a39df01)
 2023-06-13 14:06:02 +08:00
puhui999
085dbd6220 fix: 修复 SkuList TODO 优化相关算法 
(cherry picked from commit 9c06832d7e)
 2023-06-13 14:05:57 +08:00
puhui999
73b2809654 fix: 添加商品属性去掉备注 
(cherry picked from commit 6ac8c78d57)
 2023-06-13 14:05:53 +08:00
puhui999
74d926172c fix: 进一步完善商品列表，修复TODO 
(cherry picked from commit 52bfc4dac0)
 2023-06-13 14:05:48 +08:00
puhui999
478f02fa7c fix: 整合spu，移动相关类型到spu删除对应文件和文件夹 
(cherry picked from commit 50b181318b)
 2023-06-13 14:05:43 +08:00
puhui999
cafd74193f fix: 移动copyValueToTarget方法到utils/index中 
(cherry picked from commit 43e541f944)
 2023-06-13 14:05:38 +08:00
shizhong
82f02cd9f3 !148 【重构】Vue3 管理后台：[基础管理 -> Redis监控] 使用Echart组件实现 2023-06-13 14:05:17 +08:00
shizhong
e81f8c51cb 修复后台”在线用户强退“功能 2023-06-13 14:03:52 +08:00
Chika
2989372c5c Redis监控用Echart组件整改 
(cherry picked from commit fbac522149)
 2023-06-13 14:00:09 +08:00
Chika
80f1c08951 Redis监控图标使用Echart组件整合 
(cherry picked from commit bf629a9554)
 2023-06-13 13:59:08 +08:00
YunaiV
7a5993c584 code review 商品管理的实现 
(cherry picked from commit e92361ed40)
 2023-06-13 13:56:48 +08:00
dhb52
fc4b46de2e refactor: mp/autoReply 拆分ReplyForm组件 
(cherry picked from commit be49c381f6)
 2023-06-13 13:56:27 +08:00
dhb52
3553b300d4 refactor: mp/wx-msg拆分Msg组件 
(cherry picked from commit 2b84489969)
 2023-06-13 13:56:12 +08:00
YunaiV
cc62e8ec79 code review 微信的实现 
(cherry picked from commit 1c77ba8e04)
 2023-06-13 13:56:08 +08:00
puhui999
b9fd7b7753 商品管理: 打通所有接口（第一版） 
(cherry picked from commit 0c6e3a39c9)
 2023-06-13 13:56:04 +08:00
puhui999
263ca68ff1 商品管理: 调整相关组件优化逻辑,完成表单保存和数据回显 
(cherry picked from commit 9ee35fc165)
 2023-06-13 13:55:51 +08:00
puhui999
2152573c5e 商品管理: 调整相关组件优化逻辑 
(cherry picked from commit 1116fb278b)
 2023-06-13 13:55:48 +08:00
puhui999
72fd0b8ed5 商品管理: 调整相关组件优化逻辑 
(cherry picked from commit 6478d295df)
 2023-06-13 13:55:44 +08:00
puhui999
cb45ea0753 商品管理: 完成商品属性批量添加 
(cherry picked from commit 64f6f67ddd)
 2023-06-13 13:55:20 +08:00
puhui999
d37540de1d 商品管理: 完成商品属性排列组合算法生成对应表数据 
(cherry picked from commit ab1120b0ff)
 2023-06-13 13:55:17 +08:00
puhui999
84ed1f7df3 商品管理: 保存属性值到数据库 
(cherry picked from commit 35c3545e7c)
 2023-06-13 13:55:13 +08:00
puhui999
4bb39f2578 商品管理: fix:根据商品属性动态生成表格值 
(cherry picked from commit 538d1e0b6c)
 2023-06-13 13:54:58 +08:00