Commit Graph

Select branches

Hide Pull Requests

1129

H5

dev

feat_agree

feature/business_activity

feature/purchase_record

feature/push

feature_appversion

feature_mer_apply

feature_orderhandle

fix

fix_bug

ignore

kkk

master

master1-26

master_1

offline_pay

optimize

preview

profit_sharing

temp

#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

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#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

v1.0

Mono Color

• f17efd2ac7 Merge pull request '更新h5文字说明' (#184) from H5 into master master lihai 2024-03-18 12:01:54 +08:00
• 039170fac3 更新h5文字说明 H5 weipengfei 2024-03-18 12:01:25 +08:00
• 1ee50af9cb Merge pull request '更新h5文字说明' (#183) from H5 into master lihai 2024-03-18 11:56:28 +08:00
• e7380ca723 更新h5文字说明 weipengfei 2024-03-18 11:51:41 +08:00
• a8ffc7adfa 修改查询 dev liu 2024-03-18 10:25:10 +08:00
• 3c22ee56bb Merge pull request '恢复h5授权' (#182) from H5 into master lihai 2024-03-18 10:13:18 +08:00
• 47a17f8f37 修改下载逻辑是ios去除wgt的包 liu 2024-03-18 10:12:24 +08:00
• 1d4e4230e0 恢复h5授权 weipengfei 2024-03-18 10:10:41 +08:00
• 3da5ebcabf 更新h5, 恢复授权 weipengfei 2024-03-18 09:47:49 +08:00
• 14412376b1 Merge pull request '调整补贴余额查询' (#181) from fix_bug into master lihai 2024-03-16 16:45:27 +08:00
• 33b33288e6 调整补贴余额查询 fix_bug luofei 2024-03-16 16:43:56 +08:00
• 5944ab0832 调整补贴进度 luofei 2024-03-16 16:31:16 +08:00
• 611fe543d9 调整补贴发放 luofei 2024-03-16 16:30:00 +08:00
• 7e30f10919 调整补贴发放 luofei 2024-03-16 16:27:30 +08:00
• 6c651cd8a2 调整补贴发放 luofei 2024-03-16 16:24:39 +08:00
• 29060c709a 调整补贴发放 luofei 2024-03-16 15:31:05 +08:00
• e95efacd95 修改保证金展示的错误 luofei 2024-03-16 14:22:59 +08:00
• 67382cfdf0 Merge pull request 'dev' (#180) from dev into master lihai 2024-03-16 13:54:46 +08:00
• a548191e30 关闭补贴自动激活 luofei 2024-03-16 13:53:10 +08:00
• fd161f381d 修改商户冻结金转账时间 luofei 2024-03-16 11:45:21 +08:00
• 300cf71d3b Merge pull request '修改用户邀请记录查询' (#179) from dev into master lihai 2024-03-15 11:06:55 +08:00
• f68bc5b684 修改用户邀请记录查询 luofei 2024-03-15 11:05:47 +08:00
• 9e1af45bd7 Merge pull request 'dev' (#178) from dev into master mkm 2024-03-14 17:26:00 +08:00
• 7d2cc1e70f 更新 mkm 2024-03-14 16:41:39 +08:00
• 93a5b40cf8 更新h5-微信公众号自动授权 weipengfei 2024-03-14 11:54:19 +08:00
• 979f9c3871 更新h5-微信公众号自动授权 weipengfei 2024-03-14 11:48:39 +08:00
• 6a12146f91 上传付款凭证 liu 2024-03-13 17:19:07 +08:00
• d62ab0fa87 调整授权登录 luofei 2024-03-12 09:09:22 +08:00
• 71f4df0845 更新 mkm 2024-03-14 16:41:39 +08:00
• 8ade2ccf7a 更新h5-微信公众号自动授权 weipengfei 2024-03-14 11:54:19 +08:00
• bb7b9a78b2 更新h5-微信公众号自动授权 weipengfei 2024-03-14 11:48:39 +08:00
• ddcf367556 上传付款凭证 liu 2024-03-13 17:19:07 +08:00
• 25fc0e598a 修改用户合并 luofei 2024-03-13 10:41:39 +08:00
• 6f6d1d7eae 修改用户合并 luofei 2024-03-13 10:38:42 +08:00
• fdb7c4177a 修改用户合并 luofei 2024-03-13 10:20:42 +08:00
• 0e38d08ad3 修改用户合并 luofei 2024-03-13 09:57:58 +08:00
• e42f5716f3 h5 mkm 2024-03-13 09:43:37 +08:00
• f8530d9a28 修改用户合并 luofei 2024-03-13 09:54:05 +08:00
• 67e0e7b455 修改邀请记录 luofei 2024-03-12 18:04:59 +08:00
• cbea0aa270 调整邀请注册 luofei 2024-03-12 15:41:17 +08:00
• 30242b1e96 调整订单数量查询，处理商户销售金额的错误 luofei 2024-03-12 14:06:54 +08:00
• 828e228ab6 调整退款的错误 luofei 2024-03-12 11:38:05 +08:00
• 222416cb08 调整订单推广人查询 luofei 2024-03-12 10:10:56 +08:00
• d826c9777a 商品导出excel liu 2024-03-12 09:50:33 +08:00
• 358906854c 调整确认收货 luofei 2024-03-12 09:56:20 +08:00
• c044855072 添加路由 luofei 2024-03-12 09:08:58 +08:00
• 89d988cc60 更新 mkm 2024-03-11 16:46:40 +08:00
• cf98018c6c 修改商户订单列表查询 luofei 2024-03-11 15:29:49 +08:00
• 16e01495e4 超管后台排序修改 liu 2024-03-11 11:56:34 +08:00
• 671230708f 订单退款，减少商户销售金额和采购金额 luofei 2024-03-11 14:33:47 +08:00
• 0964e3306c 修改用户合并 luofei 2024-03-13 10:41:39 +08:00
• 98a9ec10a9 修改用户合并 luofei 2024-03-13 10:38:42 +08:00
• 63504b1d2f 修改用户合并 luofei 2024-03-13 10:20:42 +08:00
• 8b1691d624 修改用户合并 luofei 2024-03-13 09:57:58 +08:00
• af5e6e9a4f Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev luofei 2024-03-13 09:54:11 +08:00
• 24e532f980 修改用户合并 luofei 2024-03-13 09:54:05 +08:00
• 249a3611b6 h5 mkm 2024-03-13 09:43:37 +08:00
• eebb013e4e 修改邀请记录 luofei 2024-03-12 18:04:59 +08:00
• d36254a34a 调整邀请注册 luofei 2024-03-12 15:41:17 +08:00
• d5fdcd2262 调整订单数量查询，处理商户销售金额的错误 luofei 2024-03-12 14:06:54 +08:00
• be1b95d6d6 调整退款的错误 luofei 2024-03-12 11:38:05 +08:00
• 5f7648ccdc 调整订单推广人查询 luofei 2024-03-12 10:10:56 +08:00
• c13dbd0145 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev luofei 2024-03-12 09:56:32 +08:00
• a0bf3b3432 调整确认收货 luofei 2024-03-12 09:56:20 +08:00
• 53f2fbf9ae 商品导出excel liu 2024-03-12 09:50:33 +08:00
• d7189ebf85 Merge pull request '修改微信授权登录' (#175) from fix_bug into master lihai 2024-03-12 09:16:37 +08:00
• 9e79bcab01 修改微信授权登录 luofei 2024-03-12 09:12:59 +08:00
• 104872a239 调整授权登录 luofei 2024-03-12 09:09:22 +08:00
• 62bde50dfb 添加路由 luofei 2024-03-12 09:08:58 +08:00
• 208e8e8525 更新 mkm 2024-03-11 16:46:40 +08:00
• 047e174a2f 修改商户订单列表查询 luofei 2024-03-11 15:29:49 +08:00
• cc8d29f821 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev luofei 2024-03-11 14:33:53 +08:00
• 9abcf8d92a 订单退款，减少商户销售金额和采购金额 luofei 2024-03-11 14:33:47 +08:00
• 0308cfc9ec 超管后台排序修改 liu 2024-03-11 11:56:34 +08:00
• 5e1642fb2e 修改用户信息返回 luofei 2024-03-11 11:48:22 +08:00
• 8bc29a1dfa Merge pull request '修改用户信息返回' (#174) from dev into master mkm 2024-03-11 11:38:28 +08:00
• 3971af747a 修改用户信息返回 luofei 2024-03-11 11:37:37 +08:00
• 0b8010872f Merge pull request 'dev' (#173) from dev into master mkm 2024-03-11 11:03:20 +08:00
• 99f136d5b1 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev luofei 2024-03-11 10:58:44 +08:00
• fa03d63243 修改商户端订单实付金额展示 luofei 2024-03-11 10:58:27 +08:00
• 4a5caa8af3 Merge remote-tracking branch 'origin/dev' into dev liu 2024-03-11 10:57:02 +08:00
• f7f1d7c388 修复后台excel导出问题 liu 2024-03-11 10:56:35 +08:00
• 9b066cdfb3 修改商户端订单实付金额展示 luofei 2024-03-11 10:55:40 +08:00
• db8e9eb6b3 修改用户信息返回 luofei 2024-03-11 10:45:28 +08:00
• 2c06abadf4 添加红包使用记录 luofei 2024-03-11 10:32:38 +08:00
• 68fac0d248 Merge pull request 'dev' (#172) from dev into master mkm 2024-03-11 10:24:17 +08:00
• 528635aeb7 商户余额支付，冻结订单金额 luofei 2024-03-11 10:09:36 +08:00
• 16fead435b 修改查询条件 liu 2024-03-11 09:19:39 +08:00
• d614cfc42a 修改优化查询 liu 2024-03-09 18:31:13 +08:00
• a007894fa6 优化查询 liu 2024-03-09 18:28:50 +08:00
• f8a4f0f71e 优化查询 liu 2024-03-09 18:21:27 +08:00
• 8e59dc334c Merge pull request 'dev' (#171) from dev into master lihai 2024-03-09 18:00:52 +08:00
• 1bb6aff8b0 Merge remote-tracking branch 'origin/dev' into dev liu 2024-03-09 17:53:11 +08:00
• 657849f2cf 添加更新时间 liu 2024-03-09 17:52:56 +08:00
• dd5bfd7f11 修改商户冻结金额解冻时间 luofei 2024-03-09 17:51:51 +08:00
• ca00b1ab27 调整商户押金记录 luofei 2024-03-09 16:50:09 +08:00
• fc78d3af34 调试微信授权登录 luofei 2024-03-09 16:47:06 +08:00
• 2b56e360df Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev luofei 2024-03-09 16:39:49 +08:00
• 879e56c3a5 调试微信授权登录 luofei 2024-03-09 16:39:38 +08:00
• 2cc737cd20 Merge remote-tracking branch 'origin/dev' into dev liu 2024-03-09 16:34:27 +08:00