sfmind
|
d5c1c29795
|
订单列表和订单详情页初步完善
|
2022-12-14 00:58:25 +08:00 |
|
YunaiV
|
5474ae876d
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
|
2022-12-13 20:20:04 +08:00 |
|
YunaiV
|
40ce481e2e
|
ip：AreaUtils、IPUtils 优化
|
2022-12-13 20:19:54 +08:00 |
|
qs
|
ec1a933d30
|
修改支付模块>支付过期时间格式化异常（yyyy-MM-ddTHH:mm:ssXXX）
|
2022-12-13 15:41:30 +08:00 |
|
qs
|
24ed7be5c5
|
修改支付模块>解析订单通知V3>属性设置错误
|
2022-12-13 15:21:55 +08:00 |
|
gaibu
|
453603b6ad
|
fix: SQL 条件表达式缺少括号问题
|
2022-12-13 10:37:41 +08:00 |
|
芋道源码
|
f9b4874ee9
|
!320 秒杀活动相关
Merge pull request !320 from halfninety/feature/1.8.0-uniapp
|
2022-12-13 02:04:54 +00:00 |
|
YunaiV
|
4a2cb33cd7
|
product：优化商品属性值的代码
|
2022-12-12 23:40:23 +08:00 |
|
YunaiV
|
98ca807d4b
|
product：优化商品属性项的代码
|
2022-12-12 22:25:31 +08:00 |
|
芋道源码
|
05a6c60690
|
!325 修改pay模块>提交退款申请>重复设置属性
Merge pull request !325 from 骑士梦/cherry-pick-1670817624
|
2022-12-12 14:17:00 +00:00 |
|
芋道源码
|
988314fb74
|
!324 修改pay模块>创建支付单>存在时返回订单Id
Merge pull request !324 from 骑士梦/master
|
2022-12-12 14:16:40 +00:00 |
|
Ikko Ashimine
|
5f8ce75df4
|
fix typo in uni-swiper-dot.vue
defualt -> default
Signed-off-by: Ikko Ashimine <eltociear@gmail.com>
|
2022-12-12 05:29:43 +00:00 |
|
qs
|
fb663a984c
|
fixed 86ef58d from https://gitee.com/qshome/ruoyi-vue-pro/pulls/324
修改`pay模块>创建支付单>存在时返回订单Id`
|
2022-12-12 04:00:24 +00:00 |
|
qs
|
c93eb07cc8
|
fixed c2f0f9e from https://gitee.com/qshome/ruoyi-vue-pro/pulls/324
修改`pay模块>提交退款申请>重复设置属性`
|
2022-12-12 04:00:24 +00:00 |
|
qs
|
c2f0f9edaa
|
修改pay模块>提交退款申请>重复设置属性
|
2022-12-12 11:55:35 +08:00 |
|
qs
|
86ef58d70b
|
修改pay模块>创建支付单>存在时返回订单Id
|
2022-12-12 09:46:12 +08:00 |
|
dark
|
0b5aa560b3
|
ip库引入，查询工具类
|
2022-12-11 22:20:43 +08:00 |
|
芋道源码
|
99338182b2
|
!323 fix: 逻辑删除唯一索引冲突的问题
Merge pull request !323 from 与或非/issues/I61D4E
|
2022-12-11 09:47:30 +00:00 |
|
YunaiV
|
7f131a3853
|
trade：增加用户 App 的订单分页和详情接口
|
2022-12-10 23:06:53 +08:00 |
|
YunaiV
|
b7d78a24a4
|
trade：完成管理后台的订单详情的简单对接
|
2022-12-10 21:02:32 +08:00 |
|
YunaiV
|
c5408965eb
|
trade：增加管理后台的订单详情接口
|
2022-12-10 17:53:44 +08:00 |
|
YunaiV
|
fc48ab4928
|
trade：前端订单管理，联调接口
|
2022-12-10 17:06:34 +08:00 |
|
gaibu
|
a5ec334e53
|
fix: 逻辑删除唯一索引冲突的问题
|
2022-12-10 12:02:49 +08:00 |
|
gaibu
|
9e3ed75772
|
fix: 逻辑删除唯一索引冲突的问题
|
2022-12-10 11:59:21 +08:00 |
|
YunaiV
|
fc49f000ce
|
trade：前端订单管理，联调接口
|
2022-12-10 11:52:11 +08:00 |
|
gaibu
|
67435648b2
|
fix: 逻辑删除唯一索引冲突的问题
|
2022-12-10 11:32:46 +08:00 |
|
芋道源码
|
1b3051da58
|
!322 修复 vue3 代码生成 优化标签栏
Merge pull request !322 from xingyu/dev
|
2022-12-09 16:18:47 +00:00 |
|
YunaiV
|
bddbedd781
|
增加城市库
|
2022-12-10 00:17:08 +08:00 |
|
xingyu
|
3937004d5b
|
fix: mysql warn
|
2022-12-09 18:34:34 +08:00 |
|
YunaiV
|
fe1ae23b71
|
trade：增加管理后台的订单分页接口
|
2022-12-09 00:20:38 +08:00 |
|
xingyu
|
02174383a7
|
style: tagview 左右对称
|
2022-12-08 23:19:24 +08:00 |
|
xingyu
|
0c909aa1bb
|
fix: vxe-table scrollbar
|
2022-12-08 23:05:06 +08:00 |
|
xingyu
|
f936122f85
|
docs: update deps
|
2022-12-08 23:04:00 +08:00 |
|
xingyu
|
862d300ec8
|
chore: update deps
|
2022-12-08 23:02:55 +08:00 |
|
xingyu
|
1fca6b460a
|
fix: codegen 边框
|
2022-12-08 23:02:47 +08:00 |
|
xingyu
|
705cdb47cf
|
style: 移除vxe-grid 右侧按钮外框
|
2022-12-08 22:59:58 +08:00 |
|
xingyu
|
c48a9217be
|
style: 标签栏 圆角
|
2022-12-08 22:04:15 +08:00 |
|
YunaiV
|
fac3e7c726
|
product：商品规格，调整成商品属性，避免和 sku 概念冲突
|
2022-12-08 21:12:35 +08:00 |
|
xingyu
|
eee5e62843
|
fix: 路径错误
|
2022-12-08 19:57:05 +08:00 |
|
xingyu4j
|
19c193cc1a
|
fix: vue3 代码生成
|
2022-12-08 17:26:06 +08:00 |
|
xingyu4j
|
0a805483a9
|
代码生成 localDateTime 处理
|
2022-12-08 17:07:04 +08:00 |
|
xingyu4j
|
623f7124c6
|
fix: vue3 代码生成类型
|
2022-12-08 17:03:58 +08:00 |
|
xingyu4j
|
aa3b4bf1fa
|
增加精简版地址
|
2022-12-08 14:26:28 +08:00 |
|
xingyu4j
|
262ff34160
|
保证统一的版本号
|
2022-12-08 13:58:48 +08:00 |
|
xingyu4j
|
232c325608
|
升级版本，保证统一的版本号
|
2022-12-08 13:52:01 +08:00 |
|
xingyu4j
|
9ca7a080c3
|
Merge remote-tracking branch 'origin/master' into dev
|
2022-12-08 12:40:41 +08:00 |
|
xingyu4j
|
21d8ded00b
|
chore: node >= 16
|
2022-12-08 12:39:35 +08:00 |
|
xingyu4j
|
e25d9a8981
|
feat: add search slots
|
2022-12-08 12:39:23 +08:00 |
|
xingyu4j
|
9315ac0bec
|
Revert "feat: add search slots"
This reverts commit 078249677b.
|
2022-12-08 12:37:16 +08:00 |
|
xingyu4j
|
078249677b
|
feat: add search slots
|
2022-12-08 12:36:40 +08:00 |
|