|
|
3329093c88
|
会员支付
|
2024-10-21 11:18:46 +08:00 |
|
|
|
5cb71e0889
|
会员支付
|
2024-10-21 10:59:45 +08:00 |
|
|
|
6d8c8b4b83
|
Merge pull request '后台添加客服人员，话术，留言，自动回复' (#54) from sjy-two into master
continuous-integration/drone/push Build is passing
Reviewed-on: #54
|
2024-10-21 10:35:48 +08:00 |
|
|
|
eb477862fc
|
Merge pull request 'bug修复和商品品牌信息返回' (#53) from cxw into master
continuous-integration/drone/push Build is passing
Reviewed-on: #53
|
2024-10-21 10:35:34 +08:00 |
|
|
|
85a0e9a9b1
|
后台添加客服人员，话术，留言，自动回复
|
2024-10-21 10:09:16 +08:00 |
|
|
|
11dd5f7f6f
|
会员支付
|
2024-10-21 08:49:23 +08:00 |
|
|
|
aed2d035c1
|
Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw
|
2024-10-18 14:34:38 +08:00 |
|
|
|
1316b41df7
|
支付订单中merchant_order_id重复处理
|
2024-10-18 13:42:20 +08:00 |
|
|
|
8cc065e598
|
Merge pull request '添加预约信息' (#52) from sjy-two into master
continuous-integration/drone/push Build is passing
Reviewed-on: #52
|
2024-10-18 09:33:42 +08:00 |
|
|
|
3bc97951e5
|
添加预约信息
|
2024-10-18 09:30:19 +08:00 |
|
|
|
e3d554da42
|
退款空指针处理
|
2024-10-17 16:30:07 +08:00 |
|
|
|
6ffa6d1af4
|
Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw
|
2024-10-17 15:27:30 +08:00 |
|
|
|
38ddb26051
|
商品详情接口中添加品牌信息字段
|
2024-10-17 15:17:16 +08:00 |
|
|
|
b9f0591578
|
Merge pull request '修改积分商城订单记录时间排序' (#51) from sjy-two into master
continuous-integration/drone/push Build is passing
Reviewed-on: #51
|
2024-10-17 11:24:41 +08:00 |
|
|
|
2f7ffb4032
|
Merge pull request '会员权益列表' (#50) from khy1 into master
continuous-integration/drone/push Build is passing
Reviewed-on: #50
|
2024-10-17 11:24:09 +08:00 |
|
|
|
138ddc13bb
|
修改积分商城订单记录时间排序
|
2024-10-17 11:22:54 +08:00 |
|
|
|
d2c735ac18
|
会员权益列表
|
2024-10-17 11:19:48 +08:00 |
|
|
|
2c875571ee
|
Merge pull request '会员类型列表' (#49) from khy into master
continuous-integration/drone/push Build is passing
Reviewed-on: #49
|
2024-10-17 09:28:44 +08:00 |
|
|
|
228fe0cc82
|
会员类型列表
|
2024-10-17 09:19:31 +08:00 |
|
|
|
a6a1ab163d
|
Merge pull request 'cxw' (#48) from cxw into master
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
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
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 |
|
|
|
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
continuous-integration/drone/push Build is passing
Reviewed-on: #44
|
2024-10-15 19:50:53 +08:00 |
|
|
|
da363831e8
|
付费会员类型，权益
|
2024-10-15 19:49:01 +08:00 |
|
|
|
02cc14d9f6
|
替换图标与宫格导航添加一排五个的按钮
|
2024-10-15 09:38:32 +08:00 |
|
|
|
00551ec8fe
|
Merge pull request '秒杀列表改回获取全部商品' (#43) from cxw into master
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
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 |
|
|
|
d13cfad70c
|
个人中心装修页面优化与组件图标替换
|
2024-10-12 15:20:19 +08:00 |
|
|
|
ad20ae2c4b
|
Merge pull request '拼团和秒杀次数整合到get-detail接口' (#41) from cxw into master
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
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
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 |
|
