Commit Graph

261 Commits

Author SHA1 Message Date
khy
dd143f237e 种草社区(动态管理) 2024-10-30 18:44:55 +08:00
khy
566cf302c4 会员支付优化(现金支付) 2024-10-29 18:29:55 +08:00
232976d532 Merge pull request '提交遗漏文件' (#92) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #92
2024-10-29 13:16:08 +08:00
547448fc44 提交遗漏文件 2024-10-29 13:13:55 +08:00
f2297720fc Merge pull request '会员支付优化' (#91) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #91
2024-10-29 11:53:15 +08:00
khy
e406f885d9 会员支付优化 2024-10-29 11:50:33 +08:00
f7f702673b Merge pull request '客服话术和素材图片添加分类' (#90) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #90
2024-10-29 11:30:45 +08:00
1a0cfaac2b 优化客服话术和图片素材界面 2024-10-29 11:29:11 +08:00
c6c4dd7693 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into sjy-two 2024-10-29 11:01:31 +08:00
1ca6b87037 客服话术和素材图片添加分类 2024-10-29 10:59:39 +08:00
e68b6ed573 Merge pull request '添加客服话术分类,图片素材分类' (#88) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #88
2024-10-28 11:34:10 +08:00
eadb727812 Merge pull request '会员记录支付状态' (#89) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #89
2024-10-28 11:14:16 +08:00
khy
cbdbf6fa01 会员记录支付状态 2024-10-28 11:09:09 +08:00
ccbdf82114 添加客服话术分类,图片素材分类 2024-10-28 10:36:25 +08:00
5235fae53c Merge pull request 'khy1' (#87) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #87
2024-10-28 10:29:06 +08:00
khy
6c29031b3b Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into khy1 2024-10-28 10:22:58 +08:00
khy
b6b82502e0 会员协议 2024-10-28 10:22:38 +08:00
0eabf4fc3c Merge pull request 'khy1' (#86) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #86
2024-10-25 17:48:40 +08:00
khy
0621b9823b 交易订单 2024-10-25 17:46:26 +08:00
12dd84bb4c Merge pull request '交易' (#85) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #85
2024-10-25 16:44:40 +08:00
khy
35cea73266 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into khy1 2024-10-25 16:42:50 +08:00
b24c6d3157 Merge pull request 'sjy-two' (#84) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #84
2024-10-25 16:39:13 +08:00
khy
36b7469e1e Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into khy1 2024-10-25 16:38:55 +08:00
khy
a163a6490f 交易 2024-10-25 16:38:16 +08:00
67459fe554 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into sjy-two 2024-10-25 16:23:44 +08:00
a521d1c674 Merge pull request '交易订单' (#83) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #83
2024-10-25 16:20:39 +08:00
khy
783ab383ec 交易订单 2024-10-25 16:19:29 +08:00
21a0e43cc1 Merge pull request '新增交易订单' (#82) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #82
2024-10-25 16:16:52 +08:00
khy
f8de72bc6a 新增交易订单 2024-10-25 16:14:01 +08:00
c58893d335 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into sjy-two 2024-10-25 16:05:47 +08:00
aa3d6de962 调整积分商城,我的积分数据显示,兑换记录详情 2024-10-25 15:51:43 +08:00
45b6bf142e Merge pull request '支付bug' (#79) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #79
2024-10-25 14:48:48 +08:00
khy
6beabe3478 支付bug 2024-10-25 14:38:59 +08:00
94d29f3cad Merge pull request '后台-客服页面调整和客服转接功能(前端刷新功能未实现)' (#78) from cxw into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #78
2024-10-25 13:59:19 +08:00
69201dd39f 注释 2024-10-25 11:53:27 +08:00
ade1a54439 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw 2024-10-25 11:28:29 +08:00
eac7fc313d Merge pull request 'khy1' (#75) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #75
2024-10-25 11:27:44 +08:00
khy
e650bab63b 会员支付 2024-10-25 11:26:32 +08:00
0e37da8584 后台-客服页面调整和客服转接功能 2024-10-25 11:23:22 +08:00
khy
32a1f6b109 会员支付 2024-10-25 11:23:03 +08:00
6b5ba72b0a Merge pull request '修改预约模块添加预约时间段bug' (#74) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #74
2024-10-25 09:58:23 +08:00
f6b2ffb401 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into sjy-two 2024-10-25 09:18:11 +08:00
01b75abc2d 修改预约模块添加预约时间段bug 2024-10-25 09:13:27 +08:00
a7135b440a Merge pull request '微信支付(日志)' (#73) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #73
2024-10-24 19:03:19 +08:00
khy
dcff7fc4a5 微信支付(日志) 2024-10-24 18:57:03 +08:00
3e7ba69963 Merge pull request '会员(微信支付)' (#72) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #72
2024-10-24 18:39:35 +08:00
khy
734af91921 会员(微信支付) 2024-10-24 18:35:52 +08:00
e0b7148121 Merge pull request '付费会员配置' (#71) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #71
2024-10-24 16:43:31 +08:00
khy
1bf166aa0f 会员支付bug 2024-10-24 16:30:24 +08:00
khy
017aea38da 付费会员配置 2024-10-24 13:59:45 +08:00