|
|
b24c6d3157
|
Merge pull request 'sjy-two' (#84) from sjy-two into master
continuous-integration/drone/push Build is passing
Reviewed-on: #84
|
2024-10-25 16:39:13 +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
continuous-integration/drone/push Build is passing
Reviewed-on: #83
|
2024-10-25 16:20:39 +08:00 |
|
|
|
783ab383ec
|
交易订单
|
2024-10-25 16:19:29 +08:00 |
|
|
|
21a0e43cc1
|
Merge pull request '新增交易订单' (#82) from khy1 into master
continuous-integration/drone/push Build is passing
Reviewed-on: #82
|
2024-10-25 16:16:52 +08:00 |
|
|
|
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
continuous-integration/drone/push Build is passing
Reviewed-on: #79
|
2024-10-25 14:48:48 +08:00 |
|
|
|
6beabe3478
|
支付bug
|
2024-10-25 14:38:59 +08:00 |
|
|
|
94d29f3cad
|
Merge pull request '后台-客服页面调整和客服转接功能（前端刷新功能未实现）' (#78) from cxw into master
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
continuous-integration/drone/push Build is passing
Reviewed-on: #75
|
2024-10-25 11:27:44 +08:00 |
|
|
|
e650bab63b
|
会员支付
|
2024-10-25 11:26:32 +08:00 |
|
|
|
0e37da8584
|
后台-客服页面调整和客服转接功能
|
2024-10-25 11:23:22 +08:00 |
|
|
|
32a1f6b109
|
会员支付
|
2024-10-25 11:23:03 +08:00 |
|
|
|
6b5ba72b0a
|
Merge pull request '修改预约模块添加预约时间段bug' (#74) from sjy-two into master
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
continuous-integration/drone/push Build is passing
Reviewed-on: #73
|
2024-10-24 19:03:19 +08:00 |
|
|
|
dcff7fc4a5
|
微信支付（日志）
|
2024-10-24 18:57:03 +08:00 |
|
|
|
3e7ba69963
|
Merge pull request '会员（微信支付）' (#72) from khy1 into master
continuous-integration/drone/push Build is passing
Reviewed-on: #72
|
2024-10-24 18:39:35 +08:00 |
|
|
|
734af91921
|
会员（微信支付）
|
2024-10-24 18:35:52 +08:00 |
|
|
|
e0b7148121
|
Merge pull request '付费会员配置' (#71) from khy1 into master
continuous-integration/drone/push Build is passing
Reviewed-on: #71
|
2024-10-24 16:43:31 +08:00 |
|
|
|
1bf166aa0f
|
会员支付bug
|
2024-10-24 16:30:24 +08:00 |
|
|
|
017aea38da
|
付费会员配置
|
2024-10-24 13:59:45 +08:00 |
|
|
|
8ab64a909a
|
Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw
|
2024-10-24 10:50:46 +08:00 |
|
|
|
81be16bd6c
|
后台-客服跳转
|
2024-10-24 10:50:29 +08:00 |
|
|
|
f67342d318
|
Merge pull request '预约模块修改' (#69) from sjy-two into master
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
continuous-integration/drone/push Build is passing
Reviewed-on: #70
|
2024-10-24 09:43:12 +08:00 |
|
|
|
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
continuous-integration/drone/push Build is passing
Reviewed-on: #68
|
2024-10-23 21:35:12 +08:00 |
|
|
|
41bcb2c9ea
|
会员余额支付
|
2024-10-23 21:34:18 +08:00 |
|
|
|
c613b2e3c1
|
Merge pull request '会员回显' (#67) from khy1 into master
continuous-integration/drone/push Build is passing
Reviewed-on: #67
|
2024-10-23 21:12:23 +08:00 |
|
|
|
a35f333ec2
|
会员回显
|
2024-10-23 21:10:42 +08:00 |
|
|
|
dbf38c1aa4
|
Merge pull request '支付订单状态变更' (#66) from khy1 into master
continuous-integration/drone/push Build is passing
Reviewed-on: #66
|
2024-10-23 18:16:17 +08:00 |
|
|
|
a4cc10ccb9
|
支付订单状态变更
|
2024-10-23 18:11:40 +08:00 |
|
|
|
9fcf547417
|
Merge pull request '创建订单' (#65) from khy1 into master
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
continuous-integration/drone/push Build is failing
Reviewed-on: #64
|
2024-10-23 14:09:44 +08:00 |
|
|
|
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
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
continuous-integration/drone/push Build is passing
Reviewed-on: #62
|
2024-10-23 10:27:40 +08:00 |
|
|
|
9465085136
|
会员类型列表
|
2024-10-23 10:25:48 +08:00 |
|
|
|
6f5f3dd8b2
|
Merge pull request '重复充值余额处理' (#61) from cxw into master
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 |
|
