allLikeMall

root/allLikeMall

Fork 0

Commit Graph

Select branches

Hide Pull Requests

Branch_chensl

Branch_csl

cxw

khy-two

khy1

lu

master

sjy

sjy-one

sjy-three

sjy-two

zzw-one

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

f8de72bc6a 新增交易订单 khy 2024-10-25 16:14:01 +0800
c58893d335 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into sjy-two sonjinyon 2024-10-25 16:05:47 +0800
aa3d6de962 调整积分商城，我的积分数据显示，兑换记录详情 sonjinyon 2024-10-25 15:51:43 +0800
45b6bf142e Merge pull request '支付bug' (#79) from khy1 into master root 2024-10-25 14:48:48 +0800
6beabe3478 支付bug khy 2024-10-25 14:38:59 +0800
94d29f3cad Merge pull request '后台-客服页面调整和客服转接功能（前端刷新功能未实现）' (#78) from cxw into master root 2024-10-25 13:59:19 +0800
69201dd39f 注释 XinWei 2024-10-25 11:53:27 +0800
ade1a54439 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw XinWei 2024-10-25 11:28:29 +0800
eac7fc313d Merge pull request 'khy1' (#75) from khy1 into master root 2024-10-25 11:27:44 +0800
e650bab63b 会员支付 khy 2024-10-25 11:26:32 +0800
0e37da8584 后台-客服页面调整和客服转接功能 XinWei 2024-10-25 11:23:22 +0800
32a1f6b109 会员支付 khy 2024-10-25 11:23:03 +0800
6b5ba72b0a Merge pull request '修改预约模块添加预约时间段bug' (#74) from sjy-two into master root 2024-10-25 09:58:23 +0800
f6b2ffb401 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into sjy-two sonjinyon 2024-10-25 09:18:11 +0800
01b75abc2d 修改预约模块添加预约时间段bug sonjinyon 2024-10-25 09:13:27 +0800
a7135b440a Merge pull request '微信支付（日志）' (#73) from khy1 into master root 2024-10-24 19:03:19 +0800
dcff7fc4a5 微信支付（日志） khy 2024-10-24 18:57:03 +0800
3e7ba69963 Merge pull request '会员（微信支付）' (#72) from khy1 into master root 2024-10-24 18:39:35 +0800
734af91921 会员（微信支付） khy 2024-10-24 18:35:52 +0800
e0b7148121 Merge pull request '付费会员配置' (#71) from khy1 into master root 2024-10-24 16:43:31 +0800
1bf166aa0f 会员支付bug khy 2024-10-24 16:30:24 +0800
017aea38da 付费会员配置 khy 2024-10-24 13:59:45 +0800
8ab64a909a Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw XinWei 2024-10-24 10:50:46 +0800
81be16bd6c 后台-客服跳转 XinWei 2024-10-24 10:50:29 +0800
f67342d318 Merge pull request '预约模块修改' (#69) from sjy-two into master root 2024-10-24 09:49:48 +0800
044668a7c7 Merge pull request '会员记录（后台）' (#70) from khy1 into master root 2024-10-24 09:43:12 +0800
e90d9dd5ca 会员记录（后台） khy 2024-10-24 09:33:51 +0800
1603d9d525 预约模块修改 sonjinyon 2024-10-23 23:13:47 +0800
314cc090ee Merge pull request '会员余额支付' (#68) from khy1 into master root 2024-10-23 21:35:12 +0800
41bcb2c9ea 会员余额支付 khy 2024-10-23 21:34:18 +0800
c613b2e3c1 Merge pull request '会员回显' (#67) from khy1 into master root 2024-10-23 21:12:23 +0800
a35f333ec2 会员回显 khy 2024-10-23 21:10:42 +0800
dbf38c1aa4 Merge pull request '支付订单状态变更' (#66) from khy1 into master root 2024-10-23 18:16:17 +0800
a4cc10ccb9 支付订单状态变更 khy 2024-10-23 18:11:40 +0800
9fcf547417 Merge pull request '创建订单' (#65) from khy1 into master root 2024-10-23 14:09:53 +0800
28ce473568 Merge pull request '客服-最近浏览-字段缺失补充' (#64) from cxw into master root 2024-10-23 14:09:44 +0800
e0bac9998e 创建订单 khy 2024-10-23 14:07:18 +0800
8f6e7e168a 客服-最近浏览-字段缺失补充 XinWei 2024-10-23 12:53:21 +0800
505aa43c36 Merge pull request '支付方式接口调整' (#63) from cxw into master root 2024-10-23 11:01:58 +0800
2f62a01f02 支付方式接口调整 XinWei 2024-10-23 10:53:38 +0800
1b70fdd086 Merge pull request '会员类型列表' (#62) from khy1 into master root 2024-10-23 10:27:40 +0800
9465085136 会员类型列表 khy 2024-10-23 10:25:48 +0800
6f5f3dd8b2 Merge pull request '重复充值余额处理' (#61) from cxw into master root 2024-10-23 10:06:38 +0800
1d50394776 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw XinWei 2024-10-22 22:56:13 +0800
e9609ce7d5 余额充值微信未支付时，重复增加余额处理 XinWei 2024-10-22 22:55:57 +0800
5177793676 Merge pull request '修改支付状态' (#60) from khy1 into master root 2024-10-22 18:25:50 +0800
9d92e8c7f0 修改支付状态 khy 2024-10-22 18:04:01 +0800
334c3efbc0 Merge pull request '会员支付(试用)' (#59) from khy1 into master root 2024-10-21 19:23:19 +0800
89b94e856b 会员支付(试用) khy 2024-10-21 19:19:44 +0800
0beaed16ba Merge pull request '会员支付' (#58) from khy1 into master root 2024-10-21 16:03:45 +0800
bdbcae287c 会员支付 khy 2024-10-21 16:01:06 +0800
9d57571165 Merge pull request '预约模块添加预约项目管理' (#57) from sjy-two into master root 2024-10-21 15:52:50 +0800
208d0a6e97 预约模块添加预约项目管理 sonjinyon 2024-10-21 15:51:14 +0800
8ecd53d92a Merge pull request '提交客服话术图片' (#56) from sjy-two into master root 2024-10-21 15:19:58 +0800
f94a161b2f 提交客服话术图片 sonjinyon 2024-10-21 15:12:15 +0800
a194b00ee8 Merge pull request 'khy1' (#55) from khy1 into master root 2024-10-21 11:38:03 +0800
caaca7b318 会员支付 khy 2024-10-21 11:34:53 +0800
3329093c88 会员支付 khy 2024-10-21 11:18:46 +0800
5cb71e0889 会员支付 khy 2024-10-21 10:59:45 +0800
6d8c8b4b83 Merge pull request '后台添加客服人员，话术，留言，自动回复' (#54) from sjy-two into master root 2024-10-21 10:35:48 +0800
eb477862fc Merge pull request 'bug修复和商品品牌信息返回' (#53) from cxw into master root 2024-10-21 10:35:34 +0800
85a0e9a9b1 后台添加客服人员，话术，留言，自动回复 sonjinyon 2024-10-21 10:09:16 +0800
11dd5f7f6f 会员支付 khy 2024-10-21 08:49:23 +0800
aed2d035c1 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw XinWei 2024-10-18 14:34:38 +0800
1316b41df7 支付订单中merchant_order_id重复处理 XinWei 2024-10-18 13:42:20 +0800
8cc065e598 Merge pull request '添加预约信息' (#52) from sjy-two into master root 2024-10-18 09:33:42 +0800
3bc97951e5 添加预约信息 sonjinyon 2024-10-18 09:30:19 +0800
e3d554da42 退款空指针处理 XinWei 2024-10-17 16:30:07 +0800
6ffa6d1af4 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw XinWei 2024-10-17 15:27:30 +0800
38ddb26051 商品详情接口中添加品牌信息字段 XinWei 2024-10-17 15:17:16 +0800
b9f0591578 Merge pull request '修改积分商城订单记录时间排序' (#51) from sjy-two into master root 2024-10-17 11:24:41 +0800
2f7ffb4032 Merge pull request '会员权益列表' (#50) from khy1 into master root 2024-10-17 11:24:09 +0800
138ddc13bb 修改积分商城订单记录时间排序 sonjinyon 2024-10-17 11:22:54 +0800
d2c735ac18 会员权益列表 khy 2024-10-17 11:19:48 +0800
2c875571ee Merge pull request '会员类型列表' (#49) from khy into master root 2024-10-17 09:28:44 +0800
228fe0cc82 会员类型列表 khy 2024-10-17 09:19:31 +0800
a6a1ab163d Merge pull request 'cxw' (#48) from cxw into master root 2024-10-16 15:06:54 +0800
9860ff79d5 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw XinWei 2024-10-16 15:03:29 +0800
3eead082f8 Merge pull request '修改积分商城订单提交报错,增加后台积分订单记录' (#47) from sjy-two into master root 2024-10-16 15:03:12 +0800
8b801be4f3 构建脚本调整 XinWei 2024-10-16 15:00:14 +0800
df69d98073 挂载本地图片路径 XinWei 2024-10-16 14:48:58 +0800
6de437634c 修改积分商城订单提交报错,增加后台积分订单记录 sonjinyon 2024-10-16 14:35:09 +0800
af92c1ca00 Merge pull request '1.后台前端-隐藏优惠券折扣选项2.后台前端-优惠券有效期显示调整' (#46) from cxw into master root 2024-10-16 13:57:33 +0800
53128f0685 Merge pull request 'khy' (#45) from khy into master root 2024-10-16 13:57:22 +0800
13eb6a75a9 1.后台前端-隐藏优惠券折扣选项 2.后台前端-优惠券有效期显示调整 XinWei 2024-10-16 13:41:12 +0800
78d3175151 Merge remote-tracking branch 'origin/master' khy 2024-10-15 19:51:27 +0800
b7f71f6018 Merge pull request 'Branch_csl' (#44) from Branch_csl into master root 2024-10-15 19:50:53 +0800
da363831e8 付费会员类型，权益 khy 2024-10-15 19:49:01 +0800
02cc14d9f6 替换图标与宫格导航添加一排五个的按钮 Branch_csl 77 2024-10-15 09:38:32 +0800
00551ec8fe Merge pull request '秒杀列表改回获取全部商品' (#43) from cxw into master root 2024-10-14 18:45:01 +0800
ec177140c5 付费会员月卡管理 lu Your Name 2024-10-14 18:42:17 +0800
0da862a180 秒杀列表改回获取全部商品 XinWei 2024-10-14 18:20:13 +0800
8fc219ad38 Merge pull request '修改预约提交接口' (#42) from sjy-two into master root 2024-10-14 13:52:08 +0800
6f2f58fbe9 修改预约提交接口 sonjinyon 2024-10-14 13:19:30 +0800
d13cfad70c 个人中心装修页面优化与组件图标替换 77 2024-10-12 15:20:19 +0800
ad20ae2c4b Merge pull request '拼团和秒杀次数整合到get-detail接口' (#41) from cxw into master root 2024-10-12 14:50:00 +0800
e19200eb5b 拼团和秒杀次数整合到get-detail接口 XinWei 2024-10-12 14:43:32 +0800
d7fbe30e8e 拉镜像超时时间延长 XinWei 2024-10-12 13:26:17 +0800
9ecb0ff24a Merge pull request '秒杀活动和拼团活动接口调整' (#40) from cxw into master root 2024-10-12 09:38:26 +0800
8266266387 拼团和秒杀活动获取剩余购买次数接口 XinWei 2024-10-12 09:35:10 +0800