Commit Graph

172 Commits

Author SHA1 Message Date
khy
41bcb2c9ea 会员余额支付 2024-10-23 21:34:18 +08:00
khy
a35f333ec2 会员回显 2024-10-23 21:10:42 +08:00
khy
a4cc10ccb9 支付订单状态变更 2024-10-23 18:11:40 +08:00
khy
e0bac9998e 创建订单 2024-10-23 14:07:18 +08:00
khy
9465085136 会员类型列表 2024-10-23 10:25:48 +08:00
khy
9d92e8c7f0 修改支付状态 2024-10-22 18:04:01 +08:00
khy
89b94e856b 会员支付(试用) 2024-10-21 19:19:44 +08:00
khy
bdbcae287c 会员支付 2024-10-21 16:01:06 +08:00
khy
caaca7b318 会员支付 2024-10-21 11:34:53 +08:00
khy
3329093c88 会员支付 2024-10-21 11:18:46 +08:00
khy
5cb71e0889 会员支付 2024-10-21 10:59:45 +08:00
khy
11dd5f7f6f 会员支付 2024-10-21 08:49:23 +08:00
khy
d2c735ac18 会员权益列表 2024-10-17 11:19:48 +08:00
2c875571ee Merge pull request '会员类型列表' (#49) from khy into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #49
2024-10-17 09:28:44 +08:00
khy
228fe0cc82 会员类型列表 2024-10-17 09:19:31 +08:00
a6a1ab163d Merge pull request 'cxw' (#48) from cxw into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #48
2024-10-16 15:06:54 +08:00
9860ff79d5 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw 2024-10-16 15:03:29 +08:00
3eead082f8 Merge pull request '修改积分商城订单提交报错,增加后台积分订单记录' (#47) from sjy-two into master
Reviewed-on: #47
2024-10-16 15:03:12 +08:00
8b801be4f3 构建脚本调整 2024-10-16 15:00:14 +08:00
df69d98073 挂载本地图片路径 2024-10-16 14:48:58 +08:00
6de437634c 修改积分商城订单提交报错,增加后台积分订单记录 2024-10-16 14:35:09 +08:00
af92c1ca00 Merge pull request '1.后台前端-隐藏优惠券折扣选项2.后台前端-优惠券有效期显示调整' (#46) from cxw into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #46
2024-10-16 13:57:33 +08:00
53128f0685 Merge pull request 'khy' (#45) from khy into master
Some checks are pending
continuous-integration/drone/push Build is running
Reviewed-on: #45
2024-10-16 13:57:22 +08:00
13eb6a75a9 1.后台前端-隐藏优惠券折扣选项
2.后台前端-优惠券有效期显示调整
2024-10-16 13:41:12 +08:00
khy
78d3175151 Merge remote-tracking branch 'origin/master' 2024-10-15 19:51:27 +08:00
b7f71f6018 Merge pull request 'Branch_csl' (#44) from Branch_csl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #44
2024-10-15 19:50:53 +08:00
khy
da363831e8 付费会员类型,权益 2024-10-15 19:49:01 +08:00
77
02cc14d9f6 替换图标与宫格导航添加一排五个的按钮 2024-10-15 09:38:32 +08:00
00551ec8fe Merge pull request '秒杀列表改回获取全部商品' (#43) from cxw into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #43
2024-10-14 18:45:01 +08:00
0da862a180 秒杀列表改回获取全部商品 2024-10-14 18:20:13 +08:00
8fc219ad38 Merge pull request '修改预约提交接口' (#42) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #42
2024-10-14 13:52:08 +08:00
6f2f58fbe9 修改预约提交接口 2024-10-14 13:19:30 +08:00
77
d13cfad70c 个人中心装修页面优化与组件图标替换 2024-10-12 15:20:19 +08:00
ad20ae2c4b Merge pull request '拼团和秒杀次数整合到get-detail接口' (#41) from cxw into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #41
2024-10-12 14:50:00 +08:00
e19200eb5b 拼团和秒杀次数整合到get-detail接口 2024-10-12 14:43:32 +08:00
d7fbe30e8e 拉镜像超时时间延长 2024-10-12 13:26:17 +08:00
9ecb0ff24a Merge pull request '秒杀活动和拼团活动接口调整' (#40) from cxw into master
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone Build is passing
Reviewed-on: #40
2024-10-12 09:38:26 +08:00
8266266387 拼团和秒杀活动获取剩余购买次数接口 2024-10-12 09:35:10 +08:00
6c1b724d93 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw 2024-10-11 15:35:47 +08:00
7581ebfa77 秒杀活动首页显示正在进行活动修改 2024-10-11 14:23:23 +08:00
9ba1fe2fdd Merge pull request '秒杀和拼团列表过滤已过期活动' (#39) from cxw into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #39
2024-10-09 18:26:33 +08:00
7954250450 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw 2024-10-09 16:56:00 +08:00
8f7452f7ac 秒杀活动指定显示个数调整 2024-10-09 16:45:06 +08:00
ec7046aab0 小程序秒杀活动接口过滤已过期的 2024-10-09 16:39:30 +08:00
2a93813e68 小程序拼团活动接口过滤已过期的 2024-10-09 16:22:45 +08:00
827563ce06 后台-是否激活卡字段补充 2024-10-09 16:21:56 +08:00
0abbd496ae Merge pull request '修改积分商城订单提交报错' (#38) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #38
2024-10-09 15:42:46 +08:00
2c4b8aa947 修改积分商城订单提交报错 2024-10-09 15:11:12 +08:00
d1c9060ee8 Merge pull request '更新自定义页面积分页面' (#37) from Branch_csl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #37
2024-10-09 14:22:11 +08:00
77
678b0ef892 优化装修默认列数 2024-10-09 14:20:26 +08:00