Commit Graph

220 Commits

Author SHA1 Message Date
khy
e650bab63b 会员支付 2024-10-25 11:26:32 +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
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
f67342d318 Merge pull request '预约模块修改' (#69) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #69
2024-10-24 09:49:48 +08:00
044668a7c7 Merge pull request '会员记录(后台)' (#70) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #70
2024-10-24 09:43:12 +08:00
khy
e90d9dd5ca 会员记录(后台) 2024-10-24 09:33:51 +08:00
1603d9d525 预约模块修改 2024-10-23 23:13:47 +08:00
314cc090ee Merge pull request '会员余额支付' (#68) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #68
2024-10-23 21:35:12 +08:00
khy
41bcb2c9ea 会员余额支付 2024-10-23 21:34:18 +08:00
c613b2e3c1 Merge pull request '会员回显' (#67) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #67
2024-10-23 21:12:23 +08:00
khy
a35f333ec2 会员回显 2024-10-23 21:10:42 +08:00
dbf38c1aa4 Merge pull request '支付订单状态变更' (#66) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #66
2024-10-23 18:16:17 +08:00
khy
a4cc10ccb9 支付订单状态变更 2024-10-23 18:11:40 +08:00
9fcf547417 Merge pull request '创建订单' (#65) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #65
2024-10-23 14:09:53 +08:00
28ce473568 Merge pull request '客服-最近浏览-字段缺失补充' (#64) from cxw into master
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #64
2024-10-23 14:09:44 +08:00
khy
e0bac9998e 创建订单 2024-10-23 14:07:18 +08:00
8f6e7e168a 客服-最近浏览-字段缺失补充 2024-10-23 12:53:21 +08:00
505aa43c36 Merge pull request '支付方式接口调整' (#63) from cxw into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #63
2024-10-23 11:01:58 +08:00
2f62a01f02 支付方式接口调整 2024-10-23 10:53:38 +08:00
1b70fdd086 Merge pull request '会员类型列表' (#62) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #62
2024-10-23 10:27:40 +08:00
khy
9465085136 会员类型列表 2024-10-23 10:25:48 +08:00
6f5f3dd8b2 Merge pull request '重复充值余额处理' (#61) from cxw into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #61
2024-10-23 10:06:38 +08:00
1d50394776 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw 2024-10-22 22:56:13 +08:00
e9609ce7d5 余额充值微信未支付时,重复增加余额处理 2024-10-22 22:55:57 +08:00
5177793676 Merge pull request '修改支付状态' (#60) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #60
2024-10-22 18:25:50 +08:00
khy
9d92e8c7f0 修改支付状态 2024-10-22 18:04:01 +08:00
334c3efbc0 Merge pull request '会员支付(试用)' (#59) from khy1 into master
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #59
2024-10-21 19:23:19 +08:00
khy
89b94e856b 会员支付(试用) 2024-10-21 19:19:44 +08:00
0beaed16ba Merge pull request '会员支付' (#58) from khy1 into master
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #58
2024-10-21 16:03:45 +08:00
khy
bdbcae287c 会员支付 2024-10-21 16:01:06 +08:00
9d57571165 Merge pull request '预约模块添加预约项目管理' (#57) from sjy-two into master
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #57
2024-10-21 15:52:50 +08:00
208d0a6e97 预约模块添加预约项目管理 2024-10-21 15:51:14 +08:00
8ecd53d92a Merge pull request '提交客服话术图片' (#56) from sjy-two into master
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #56
2024-10-21 15:19:58 +08:00
f94a161b2f 提交客服话术图片 2024-10-21 15:12:15 +08:00
a194b00ee8 Merge pull request 'khy1' (#55) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #55
2024-10-21 11:38:03 +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
6d8c8b4b83 Merge pull request '后台添加客服人员,话术,留言,自动回复' (#54) from sjy-two into master
All checks were successful
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
All checks were successful
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
khy
11dd5f7f6f 会员支付 2024-10-21 08:49:23 +08:00