绮梦
|
fe6cf7ce98
|
新增用户详情下成长值页面。
|
3 years ago |
AKING
|
d74f96fe17
|
update src/components/Dialog/src/Dialog.vue.
解决了弹窗默认top为0的问题
Signed-off-by: AKING <2734339436@qq.com>
|
3 years ago |
owen
|
73f8cef3b4
|
member: 佣金记录
|
3 years ago |
|
owen
|
5a9764c08c
|
member: 分销配置
|
3 years ago |
YunaiV
|
881ec67236
|
Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
3 years ago |
|
芋道源码
|
067f89f1d4
|
!226 update src/hooks/web/useCrudSchemas.ts.
Merge pull request !226 from AKING/N/A
|
3 years ago |
puhui999
|
46fd154e3a
|
完善订单详情和售后退款日志展示样式重构
|
3 years ago |
|
owen
|
7887be6e92
|
mall：修复优惠券模板，固定日期范围保存失败
|
3 years ago |
|
owen
|
5f557c7be5
|
promotion: 优惠券模板 productSpuIds 改成 productScopeValues
|
3 years ago |
|
owen
|
a68acb096f
|
mall：修复优惠券发券弹窗样式
|
3 years ago |
|
YunaiV
|
d10530c9f5
|
code review：优惠劵逻辑
|
3 years ago |
|
芋道源码
|
9aa7ba3578
|
!230 mall：优惠券发送优化
Merge pull request !230 from 疯狂的世界/mall_coupon_send
|
3 years ago |
|
YunaiV
|
4f7d6793fd
|
code review：优惠劵逻辑
|
3 years ago |
|
owen
|
76c4644b4b
|
mall：优惠券发送优化
|
3 years ago |
|
芋道源码
|
190c6e384c
|
!225 优惠券
Merge pull request !225 from 疯狂的世界/owen_dev
|
3 years ago |
|
YunaiV
|
0743e4941c
|
code review：订单列表
|
3 years ago |
|
puhui999
|
f0249e94a5
|
订单管理：完善订单详情
|
3 years ago |
|
puhui999
|
07a0530fc9
|
售后退款：完善售后管理（列表、详情）
|
3 years ago |
|
puhui999
|
3e7945e437
|
fix: 修正合并差异
|
3 years ago |
|
puhui999
|
5035fc77e7
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
# src/views/mall/product/spu/components/index.ts
# src/views/mall/product/spu/form/BasicInfoForm.vue
|
3 years ago |
|
YunaiV
|
3918fab1ec
|
code review
|
3 years ago |
|
puhui999
|
dd3c9f8ddb
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
f9780b636c
|
fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式
|
3 years ago |
|
YunaiV
|
135c88a473
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
src/router/modules/remaining.ts
|
3 years ago |
|
puhui999
|
264a29e451
|
更新订单和售后退款详情页面路由
|
3 years ago |
|
puhui999
|
688dad319e
|
订单列表：添加配送方式筛选
|
3 years ago |
|
puhui999
|
5c7796ca6f
|
商品列表：修复添加属性时会返回已存在属性值的问题
|
3 years ago |
|
puhui999
|
f5a1772464
|
订单售后列表：完善部分 TODO
|
3 years ago |
|
AKING
|
3e67f3bc4c
|
update src/hooks/web/useCrudSchemas.ts.
解决了当使用默认的dict选项时，form中事件不能触发的问题
Signed-off-by: AKING <2734339436@qq.com>
|
3 years ago |
|
YunaiV
|
29b8d06ff2
|
code review：售后详情
|
3 years ago |
|
owen
|
27219e1833
|
mall：优惠券 商品适用范围，增加商品分类
|
3 years ago |
|
owen
|
60d2e3114b
|
mall：优惠券 商品选择组件
|
3 years ago |
|
puhui999
|
eea285b141
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
ed739aec55
|
订单售后列表：完善售后详情及相关操作
|
3 years ago |
|
YunaiV
|
8d026f0837
|
重构：商品详情界面的路由、文件路径
|
3 years ago |
xingyu
|
e6a9dd0e4c
|
fix: 个人中心头像为空时不能修改
|
3 years ago |
|
xingyu
|
54c41b4445
|
fix: router
|
3 years ago |
|
xingyu
|
547b1741fc
|
fix: router
|
3 years ago |
|
puhui999
|
8a51c9c771
|
订单售后列表：初始化售后详情
|
3 years ago |
|
puhui999
|
4f81468695
|
订单售后列表：重构列表
|
3 years ago |
|
puhui999
|
8239ca474f
|
订单列表： 修复差异
|
3 years ago |
|
YunaiV
|
9507e2b687
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
src/views/member/user/detail/UserPointList.vue
|
3 years ago |
|
芋道源码
|
df69c035e6
|
!213 update src/components/Dialog/src/Dialog.vue.
Merge pull request !213 from AKING/N/A
|
3 years ago |
|
owen
|
beef6a0a94
|
mall: 完善后台发送优惠券
|
3 years ago |
|
YunaiV
|
5cd01903e4
|
code review：商品评论
|
3 years ago |
|
芋道源码
|
d09366b9bd
|
!222 优化商品评论
Merge pull request !222 from 疯狂的世界/owen_dev
|
3 years ago |
|
YunaiV
|
2d8d323767
|
code review：会员中心
|
3 years ago |
|
绮梦
|
76e37a3ee7
|
Merge remote-tracking branch 'origin/dev' into dev-gitee
|
3 years ago |
|
绮梦
|
45a6b3bcc7
|
账户信息组件 增加等级、成长值和积分的显示。
增加一些配套的svg 图标。
增加tab 的懒加载。
|
3 years ago |
|
绮梦
|
afaf7749c2
|
调整icon的大小
|
3 years ago |
|
owen
|
3a15390090
|
商品评论：回复表单提取到单独的组件中
|
3 years ago |
|
绮梦
|
4d9ae73211
|
调整icon的对齐方式为中间居中
|
3 years ago |
|
owen
|
15971b6feb
|
商品评论：
1.移除scores，由后端自动计算
2.SPU、SKU选择组件，放到SPU组件目录下
|
3 years ago |
|
YunaiV
|
b8ca5800c6
|
code review：订单列表
|
3 years ago |
|
芋道源码
|
2605cb7de5
|
!217 完善 TODO 提到的问题，优化订单列表相关页面结构
Merge pull request !217 from puhui999/dev-to-dev
|
3 years ago |
|
YunaiV
|
84c5eb9942
|
code review：商品评论
|
3 years ago |
|
芋道源码
|
343b6bbf18
|
!220 商品：完善商品评论功能
Merge pull request !220 from 疯狂的世界/owen_dev
|
3 years ago |
|
YunaiV
|
1b6c9b2e29
|
code review：用户详情
|
3 years ago |
|
YunaiV
|
415309469c
|
Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
Conflicts:
src/views/member/user/index.vue
|
3 years ago |
|
owen
|
814b4631c9
|
商品：完善后台商品评论功能
|
3 years ago |
|
绮梦
|
28951fb31d
|
重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。
|
3 years ago |
|
puhui999
|
6b487c7e68
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
58502b1241
|
订单列表：优化订单列表页面结构
|
3 years ago |
|
puhui999
|
7db6c121bb
|
完善 code review 提到的问题
|
3 years ago |
|
AKING
|
ff8a8e7243
|
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>
|
3 years ago |
|
绮梦
|
f17bb9a7eb
|
重命名组件名称
|
3 years ago |
|
绮梦
|
d1bb736973
|
会员详情页的跳转携带参数方式改为params
|
3 years ago |
|
xingyu
|
e30d5559e6
|
fix: 路径错误
|
3 years ago |
|
绮梦
|
451458eb1e
|
会员列表页面增加详情页的跳转。
|
3 years ago |
|
owen
|
2e68a5239d
|
Merge remote-tracking branch 'origin/dev' into member_dev
# Conflicts:
# src/views/member/user/UserForm.vue
|
3 years ago |
|
owen
|
e9120f06cf
|
会员: 会员等级取消分页功能
|
3 years ago |
|
YunaiV
|
55772cbba0
|
code review：用户详情
|
3 years ago |
|
YunaiV
|
746bf864d9
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
src/views/mall/promotion/combination/record/index.vue
|
3 years ago |
|
YunaiV
|
cfbc2ed74c
|
code review：订单列表、订单详情
|
3 years ago |
|
芋道源码
|
69a66b2a06
|
!210 订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
Merge pull request !210 from puhui999/dev-to-dev
|
3 years ago |
|
YunaiV
|
bb0c1cb536
|
code review：会员等级
|
3 years ago |
|
puhui999
|
5dceda614a
|
订单列表：列表重构 添加门店、物流检索条件
|
3 years ago |
|
puhui999
|
83e780da06
|
订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
|
3 years ago |
|
puhui999
|
be143ea21b
|
订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
|
3 years ago |
|
AKING
|
cba35d698f
|
update src/components/Dialog/src/Dialog.vue.
解决了单独使用elementplus diaolog组件时，样式被篡改的问题
Signed-off-by: AKING <2734339436@qq.com>
|
3 years ago |
|
绮梦
|
c1a40e7c98
|
用户详情-积分tab 去除无用的组件。
|
3 years ago |
|
绮梦
|
10d9f11fba
|
增加用户详情页以及 签到、积分等用户详情下的子tab页。
增加 用户、签到、积分 接口的VO,方便在组件中使用。
|
3 years ago |
|
芋道源码
|
40711c0eb8
|
!209 会员：增加用户等级功能
Merge pull request !209 from 疯狂的世界/member_dev
|
3 years ago |
|
owen
|
51738f8f6e
|
会员: 修改会员等级，使用单独的表单、接口
|
3 years ago |
|
puhui999
|
ebcbe63d9b
|
订单列表：列表重构 ④ 移除测试数据
|
3 years ago |
|
owen
|
c5a703f488
|
会员：等级下拉框显示图标
|
3 years ago |
|
puhui999
|
71f9337d82
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
0d202a7a85
|
订单列表：列表重构 ③ 添加备注表单和发货表单
|
3 years ago |
|
owen
|
78917cd2be
|
会员：增加用户分组
|
3 years ago |
|
puhui999
|
345c09ee6c
|
订单列表：列表重构 ② and 完善订单详情
|
3 years ago |
|
owen
|
884bb055b0
|
会员：用户标签增加下拉框使用的 精简信息列表查询接口
|
3 years ago |
|
owen
|
7bef240926
|
会员：后台调整会员等级
|
3 years ago |
|
YunaiV
|
1db98698bd
|
优化商品属性的编辑按钮
|
3 years ago |
|
芋道源码
|
5baccbd5bc
|
!208 同步商城实现：会员列表、会员积分、会员签到、会员标签
Merge pull request !208 from 芋道源码/dev
|
3 years ago |
|
YunaiV
|
be485cc4ab
|
code review：签到记录
|
3 years ago |
|
YunaiV
|
82628ce780
|
code review：签到配置
|
3 years ago |
|
YunaiV
|
4bc3f15571
|
code review：积分记录
|
3 years ago |
|
owen
|
f1735a4010
|
会员：增加会员等级增删改查
|
3 years ago |
|
YunaiV
|
76a63e01c9
|
code review：会员签到配置
|
3 years ago |
|
芋道源码
|
cbd3d6c9a2
|
!204 会员积分和会员签到模块todo修改
Merge pull request !204 from QingX/dev
|
3 years ago |
|
芋道源码
|
12e0d6a921
|
!201 fix: 1.修复【个人中心】页面在英语环境下字段名过长被换行展示导致错位；2.修复【个人中心】页面【修改密码】校验失效。
Merge pull request !201 from baayso/master
|
3 years ago |
|
芋道源码
|
5cef0ecc3c
|
!200 打包报错 空vue 文件问题
Merge pull request !200 from 爱之小枫/fix_bug
|
3 years ago |
|
puhui999
|
161feab244
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
2eb740765e
|
订单列表：列表重构 ①
|
3 years ago |
|
owen
|
2964d55435
|
会员：
1.会员设置标签
|
3 years ago |
|
owen
|
334962fe09
|
会员：
1.增加会员标签功能
|
3 years ago |
|
芋道源码
|
b68f8be751
|
回退 'Pull Request !195 : 修复登录后通过登录页面无法再次登录的问题'
|
3 years ago |
|
YunaiV
|
cb4c78b1ac
|
会员中心：会员管理 60%
|
3 years ago |
xiaqing
|
f96882c841
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
YunaiV
|
4fd9dfd1f8
|
会员中心：会员管理 50%
|
3 years ago |
|
xiaqing
|
19444021ca
|
会员积分和会员签到模块todo修改
|
3 years ago |
baayso
|
e4592442ed
|
fix: 1.修复【个人中心】页面在英语环境下字段名过长被换行展示导致错位；2.修复【个人中心】页面【修改密码】校验失效。
|
3 years ago |
|
puhui999
|
916e93ab2e
|
fix: 解决右侧代码过长时不缩放啥也做不了的 bug
|
3 years ago |
|
puhui999
|
44be35b5ce
|
fix: 完善砍价活动管理对齐后端
|
3 years ago |
|
芋道源码
|
a3f2a01eb0
|
!198 fix: 修复支付的一些小问题
Merge pull request !198 from dhb52/master
|
3 years ago |
zws
|
c368c9b232
|
fix
https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues/I7SZNW
|
3 years ago |
dhb52
|
c7b8fdb884
|
fix: 支付/示例 queryParams 为 reactive
|
3 years ago |
|
dhb52
|
5d364e268f
|
fix: 支付/回调 修复ElDescriptions对齐问题
|
3 years ago |
|
YunaiV
|
e954ae6010
|
支付：修复支付应用的 mock 展示不正确
|
3 years ago |
|
芋道源码
|
16369c001c
|
!197 同步商城实现
Merge pull request !197 from 芋道源码/dev
|
3 years ago |
|
YunaiV
|
c3a8479eca
|
支付退款列表的 review
|
3 years ago |
|
芋道源码
|
3f90ca3a57
|
!196 fix: 支付管理/退款订单 对标 vue2
Merge pull request !196 from dhb52/master
|
3 years ago |
|
dhb52
|
10c121d62d
|
fix: 修复ElDescriptions对齐问题
|
3 years ago |
|
dhb52
|
620a2009c3
|
fix: 支付管理/退款订单 对标 vue2
|
3 years ago |
|
YunaiV
|
7bf3e41c61
|
商城：
1. 微调砍价活动的代码
|
3 years ago |
|
YunaiV
|
127e6b202e
|
商城：
1. 修复拼团活动，修改商品的拼团价格，会存在 *100 的问题
|
3 years ago |
|
YunaiV
|
ff8bde207d
|
商城：
1. 修复秒杀活动，修改商品的秒杀价格，会存在 *100 的问题
|
3 years ago |
|
xingyu
|
2ec50bab15
|
chore: remove qrcode.vue use qrcode
|
3 years ago |
|
xingyu
|
b9477463fd
|
fix: 提交后刷新列表
|
3 years ago |
|
YunaiV
|
9984de0dc7
|
商城：
1. 调整优惠劵的目录
2. 简化秒杀时间配置
|
3 years ago |
|
YunaiV
|
815897ca8b
|
商城：优惠劵的前端完善
|
3 years ago |
|
YunaiV
|
98477ef433
|
修复时间检索，value format 错误，导致无法搜索的问题
|
3 years ago |
|
YunaiV
|
90f22934da
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
YunaiV
|
19cad3b873
|
code review：补全支付文档
|
3 years ago |
|
YunaiV
|
bf66727009
|
code review：优化支付订单的实现
|
3 years ago |
|
YunaiV
|
1ab7ea0640
|
code review：优化支付通知的实现
|
3 years ago |
|
YunaiV
|
26cf4ca64a
|
code review：优化示例订单的实现
|
3 years ago |
|
YunaiV
|
7625e6757c
|
code review：优化收银台的实现，解决 TODO
|
3 years ago |
|
YunaiV
|
551ebbd41d
|
Merge branch 'master' of https://gitee.com/dhb52/yudao-ui-admin-vue3
Conflicts:
src/utils/constants.ts
|
3 years ago |
|
YunaiV
|
b0e27b2201
|
Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3
|
3 years ago |
|
芋道源码
|
6e5286f94d
|
!195 修复登录后通过登录页面无法再次登录的问题
Merge pull request !195 from lehug/master
|
3 years ago |
lehug
|
280f734f80
|
修复登录后通过登录页面无法再次登录的问题
|
3 years ago |
|
xiaqing
|
f8a4df8b77
|
会员积分针对代码格式、功能优化
1.修改积分抵扣单位，按照分显示
|
3 years ago |
|
xiaqing
|
f2e029dca6
|
会员积分针对代码格式、功能优化
1.修改积分抵扣单位，按照分显示
|
3 years ago |
|
xiaqing
|
de941ec6ba
|
会员积分针对代码格式、功能优化
1.优化todo建议
2.删除无用代码
|
3 years ago |
|
xiaqing
|
f310f65842
|
会员签到针对代码格式、功能优化
1.优化todo建议
2.删除无用代码
|
3 years ago |
账号已删除
|
ad97fcb583
|
update src/views/infra/fileConfig/FileConfigForm.vue.
FTP传输模式错误
Signed-off-by: 账号已删除 <1100014+leniy@user.noreply.gitee.com>
|
3 years ago |
|
dhb52
|
a6eab3cc9a
|
feat: 支付功能迁移（初稿）
|
3 years ago |
|
puhui999
|
79413e0ae2
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
4947716983
|
feat: 完善砍价活动管理
|
3 years ago |
|
dhb52
|
64b40e7fdf
|
feat: 添加支付图标文件
|
3 years ago |
|
YunaiV
|
0139443909
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
YunaiV
|
ef31ec7aaf
|
bugfix：分配角色菜单时，调用接口 404 问题
|
3 years ago |
|
芋道源码
|
7c87f94985
|
!187 修正合并代码后前端不能正常启动的问题
Merge pull request !187 from puhui999/dev-to-dev
|
3 years ago |
|
YunaiV
|
a2fdff47df
|
支付应用：模拟支付的添加代码优化
|
3 years ago |
|
YunaiV
|
b3b1d97447
|
支付应用：微信支付的添加代码优化
|
3 years ago |
|
YunaiV
|
86e0a375fa
|
支付应用：支付宝的添加代码优化
|
3 years ago |
|
芋道源码
|
dae9bc131c
|
!188 feat: 支付管理/应用信息
Merge pull request !188 from dhb52/master
|
3 years ago |
|
xingyu
|
003751a41c
|
fix: dialog
|
3 years ago |
|
xingyu
|
784a1be8a1
|
chore: stylelint(use pnpm lint:style)
|
3 years ago |
|
dhb52
|
36268cf834
|
typo: apiclient_key.perm => apiclient_key.pem
|
3 years ago |
|
dhb52
|
323417b0d4
|
feat: 支付管理/应用信息(alpha)
|
3 years ago |
|
puhui999
|
c327f79177
|
fix: combinationActivity 调整
|
3 years ago |
|
puhui999
|
39df9be988
|
fix: 修正合并代码后前端不能正常启动的问题
|
3 years ago |
|
puhui999
|
0b06f36aa2
|
Merge remote-tracking branch 'yudao/master' into dev-to-dev
|
3 years ago |
linr
|
0c334ff4d6
|
request支持传递axios原生参数，例如超时：request(method:'GET',url:'',timeout:1000)
|
3 years ago |
|
puhui999
|
73b918b4e9
|
fix: 修正 combinationActivity.data.ts
|
3 years ago |
|
xingyu
|
29d493e2da
|
fix: style
|
3 years ago |
|
xingyu
|
2dcb73764f
|
fix: eslint
|
3 years ago |
|
xingyu
|
9976850c46
|
chore: unocss
|
3 years ago |
|
xingyu
|
4249465b7c
|
wip: use unocss
|
3 years ago |
|
xingyu
|
8e78975521
|
fix: eslint
|
3 years ago |
|
YunaiV
|
ee802d6335
|
登录时，直接从用户信息中，获取菜单。目的：加快首页的加载速度
|
3 years ago |
|
芋道源码
|
b41d8f06ce
|
!184 同步最新商城实现
Merge pull request !184 from 芋道源码/dev
|
3 years ago |
|
YunaiV
|
a003b59e39
|
review 秒杀、拼团活动的 CRUD
|
3 years ago |
|
芋道源码
|
d7f0554f97
|
!179 完成拼团活动和秒杀活动相关表单操作和列表展示
Merge pull request !179 from puhui999/dev-to-dev
|
3 years ago |
|
芋道源码
|
f908c12963
|
!183 同步商城实现
Merge pull request !183 from 芋道源码/dev
|
3 years ago |
|
puhui999
|
dc39ad0cd1
|
fix: 完善拼团活动 CRUD
|
3 years ago |
water
|
b061c8f32b
|
update src/views/Login/components/MobileForm.vue.
我发现，这个手机号登陆时，登陆成功了但是没有自动跳转，我手动路由到/，又自动跳转到登陆页面，应该是token没存进去，我就照这loginform的逻辑修改了一下
Signed-off-by: water <2778335106@qq.com>
|
3 years ago |
蔚文纲
|
51198e12a2
|
fix: 修复src/views.infra/job/index中删除按钮因为传参错误导致删除功能报错
|
3 years ago |
|
puhui999
|
3fd9f1b43e
|
fix: mall SeckillConfig
|
3 years ago |
|
xingyu
|
44efb13c0e
|
fix: login error
|
3 years ago |
|
xingyu
|
ba1254f397
|
fix: eslint
|
3 years ago |
|
puhui999
|
b67fabcf1f
|
fix: mall SeckillActivity
|
3 years ago |
|
puhui999
|
4057130275
|
fix: mall SeckillActivity and CombinationActivity
|
3 years ago |
|
puhui999
|
ce3ca7c6ce
|
fix: mall SeckillActivity
|
3 years ago |
|
puhui999
|
36c0bce184
|
fix: mall SeckillActivity
|
3 years ago |
|
puhui999
|
b98149f1a7
|
fix: mall SeckillActivity
|
3 years ago |
|
puhui999
|
a5330958ba
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
芋道源码
|
13e0ede788
|
!155 fix: 处理 window.bpmnInstances 有时候为 undefined 问题
Merge pull request !155 from OlyLis/master
|
3 years ago |
|
YunaiV
|
4571f893ed
|
review 积分配置
|
3 years ago |
|
芋道源码
|
032d5a0a06
|
!178 会员中心(积分、签到)优化
Merge pull request !178 from QingX/dev
|
3 years ago |
|
YunaiV
|
b1ce2672e4
|
review 秒杀活动
|
3 years ago |
|
puhui999
|
2e96b1c984
|
feat: mall CombinationActivity
|
3 years ago |
|
xiaqing
|
4251dc5d61
|
会员中心代码
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
|
3 years ago |
nullcache
|
073679875b
|
修复useTable在total为0时的bug
|
3 years ago |
|
puhui999
|
341303b014
|
fix: 完善 mall seckillActivity add
|
3 years ago |
|
puhui999
|
51e79f29cc
|
fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件
|
3 years ago |
|
puhui999
|
76ccc54a35
|
fix: 修复 spu 详情查看错误，同步 mall seckill 组件 name 配置方式
|
3 years ago |
|
YunaiV
|
5d613e69b3
|
review 营销活动
|
3 years ago |
|
芋道源码
|
fa71d3e7dd
|
!175 mall seckill
Merge pull request !175 from puhui999/dev-to-dev
|
3 years ago |
|
puhui999
|
c9ae0fbdbe
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
b1e7f14963
|
fix：完善秒杀活动管理①
|
3 years ago |
|
YunaiV
|
0395b8f138
|
review 订单
|
3 years ago |
|
芋道源码
|
70a6d28edd
|
!174 订单列表和详情 页面
Merge pull request !174 from 矿泉水/dev
|
3 years ago |
|
YunaiV
|
e1b1c134d9
|
合并 master 代码的冲突
|
3 years ago |
|
YunaiV
|
b159240824
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
src/views/infra/build/index.vue
src/views/mall/product/spu/components/DescriptionForm.vue
src/views/mall/product/spu/components/OtherSettingsForm.vue
src/views/mall/product/spu/components/ProductPropertyAddForm.vue
src/views/mall/product/spu/components/SkuList.vue
|
3 years ago |
|
puhui999
|
3d47d6744e
|
feat：添加秒杀活动管理
|
3 years ago |
|
xingyu
|
c1a4edf7b1
|
refactor: 统一 setup 格式
|
3 years ago |
|
xingyu
|
82c51e0c3e
|
fix: eslint
|
3 years ago |
|
xingyu
|
d639401646
|
fix: style lint
|
3 years ago |
|
xingyu
|
f2992ce8e8
|
fix: eslint
|
3 years ago |
|
xingyu
|
922f83d99c
|
refactor: vue3.3 defineOptions
|
3 years ago |
|
puhui999
|
f3622d423a
|
fix: 使 Table 组件支持列宽和固定列配置
|
3 years ago |
|
puhui999
|
5064845d4e
|
fix: 使 Dialog 组件支持 Dialog 内部嵌套另一个 Dialog，需要使用 append-to-body 属性
|
3 years ago |
xiaobai
|
ca01b16096
|
提交订单列表和详情20230619
|
3 years ago |
|
xiaobai
|
42a7aec0b5
|
提交订单页面和详情页面 20230619
|
3 years ago |
|
puhui999
|
f7b195b226
|
feat: 完事秒杀时段管理
|
3 years ago |
|
puhui999
|
ee698fd8b2
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
a75720ec06
|
feat: 秒杀时段管理
|
3 years ago |
|
YunaiV
|
91c53e2e3f
|
code review：订单详情
|
3 years ago |
|
YunaiV
|
e3f250fff0
|
code review：订单列表
|
3 years ago |
|
芋道源码
|
867c47de61
|
!165 trade-order 列表和详情初版
Merge pull request !165 from 矿泉水/dev
|
3 years ago |
|
芋道源码
|
1e49a8eaf0
|
!170 Expiration time should not set on the refresh token
Merge pull request !170 from 呵呵大/N/A
|
3 years ago |
|
芋道源码
|
226cc03d65
|
!167 修复授权类型选项bug
Merge pull request !167 from wangzhaoqiang/dev_
|
3 years ago |
|
YunaiV
|
467256cece
|
修复 SmsChannelForm.vue 排版报错问题
|
3 years ago |
|
YunaiV
|
ae69492b53
|
code review：spu todo 去掉
|
3 years ago |
|
芋道源码
|
8ed92bcd46
|
!166 短信渠道提交失败
Merge pull request !166 from 圆梦巨人/master
|
3 years ago |
|
YunaiV
|
7908160e68
|
Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
Conflicts:
src/utils/dict.ts
|
3 years ago |
|
YunaiV
|
5eaf054646
|
code review：会员积分配置
|
3 years ago |
|
YunaiV
|
023539b0db
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
package.json
src/utils/dict.ts
|
3 years ago |
|
YunaiV
|
8666307d47
|
code review：处理字典数据的冲突
|
3 years ago |
|
xiaqing
|
1dca8476b3
|
初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
|
3 years ago |
呵呵大
|
5554d7c995
|
Expiration time should not set on the refresh token
登录接口返回的过期时间是`access token` 的过期时间，但是被错误地设置在了`refresh token` 上，这导致过了几分钟登录状态便失效要求重新登录
|
3 years ago |
wangzhaoqiang
|
119b499a92
|
修复授权类型选项bug
|
3 years ago |
|
puhui999
|
d31ade7a5f
|
fix: 完善 SPU 相关路由 review
|
3 years ago |
lwf
|
bc34a73c9e
|
短信渠道提交失败
|
3 years ago |
|
puhui999
|
20f3f72670
|
fix: 数组操作添加 ? 可选操作符，避免属性值为 null 时报错
|
3 years ago |
|
puhui999
|
b89db1af55
|
fix: review
|
3 years ago |
|
xiaobai
|
e2d795f49d
|
add trade order 20230606
|
3 years ago |
|
xiaobai
|
ec3b028d55
|
sync dev-20230606
|
3 years ago |
|
xiaobai
|
985d764f62
|
20230606 add trade-order and details
|
3 years ago |
|
puhui999
|
7fe8dee9ed
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
YunaiV
|
51e76ffd53
|
code review：优惠劵管理
|
3 years ago |
|
芋道源码
|
7c6d7e8061
|
!164 优惠券迁移vue3
Merge pull request !164 from dhb52/dev
|
3 years ago |
|
puhui999
|
a1b45f80bc
|
fix: 优化 spu 相关路由配置
|
3 years ago |
|
YunaiV
|
158585670c
|
code review：商品管理
|
3 years ago |
|
芋道源码
|
541b23c8c1
|
!159 完善商品查看详情，修改了一些问题
Merge pull request !159 from puhui999/dev-to-dev
|
3 years ago |
|
YunaiV
|
60c1604d49
|
code review：门店自提、快递运费
|
3 years ago |
|
xiaobai
|
505f5cfa0c
|
临时提交
|
3 years ago |