Commit Graph

158 Commits

Author SHA1 Message Date
Leufolium 86be2a9a84 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-22 22:31:20 +08:00
Leufolium cd07846804 by Robin at 20240222; fix 2024-02-22 21:50:34 +08:00
Leufolium 7e967887d9 by Robin at 20240222; add mobile phone get 2024-02-22 15:20:26 +08:00
lwl0608 98ea808079 add wechat auth code 2024-02-20 23:13:17 +08:00
lwl0608 201e1f4c5c wx jsapi 2024-02-20 23:05:24 +08:00
Leufolium cffaa2c880 by Robin at 20240207; fix error 2024-02-07 14:39:18 +08:00
Leufolium a1bb6f4a01 by Robin at 20240207 2024-02-07 14:06:05 +08:00
Leufolium 5079d25bb3 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-07 13:51:00 +08:00
Leufolium 12870ef2fd by Robin at 20240207; add aligned 2024-02-07 12:07:28 +08:00
lwl0608 ccf4417659 Merge branch 'dev-lwl/wechat' 2024-02-05 23:25:47 +08:00
lwl0608 2793229b6c fix 2024-02-05 22:06:28 +08:00
Leufolium eeccbf6315 Merge branch 'feat-IRONFANS-53-20240205-Robin' into feat-20240117-001-Robin 2024-02-05 21:26:22 +08:00
lwl0608 2261c021fa add config 2024-02-05 21:16:49 +08:00
chenhao 4346b953d6 Merge pull request 'feat-IRONFANS-46-20240201-Robin' (#92) from feat-IRONFANS-46-20240201-Robin into main
Reviewed-on: #92
2024-02-04 17:01:34 +08:00
lwl0608 332bcc87fc wx 2024-02-03 17:58:40 +08:00
lwl0608 d4011adb92 deal_one_order 2024-02-03 17:23:08 +08:00
Leufolium b3809eddf5 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-01 20:10:02 +08:00
Leufolium 2a60148d49 by Robin at 20240201; 2024-02-01 11:07:38 +08:00
Leufolium 52279af4a9 by Robin at 20240201; 2024-02-01 10:19:44 +08:00
Leufolium c71c996afd by Robin at 20240201; 2024-02-01 09:52:45 +08:00
Leufolium e20f3c338c Merge branch 'feat-20240121-001-Robin' into conflict-feat-20240112-001-main 2024-01-23 18:01:39 +08:00
chenhao f724fed644 Merge pull request 'feat-20230112-001-Robin' (#67) from feat-20230112-001-Robin into main
Reviewed-on: #67
2024-01-23 17:56:14 +08:00
Leufolium 9c42b763d8 by Robin at 20240122 2024-01-22 17:15:59 +08:00
Leufolium 851e62264f by Robin at 20240122; fix 2024-01-22 14:21:13 +08:00
lwl0608 e3abdff08c opt 2024-01-21 12:27:34 +08:00
Leufolium 04b65a72d2 by Robin at 20240119; fix 2024-01-19 17:31:38 +08:00
Leufolium 876ec6513f By Robin at 20240119; fix 2024-01-19 00:31:03 +08:00
lwl0608 c6085f42d6 op order_list 2024-01-17 21:57:45 +08:00
Leufolium c5f5eb661c by Robin at 20240117; fix 2024-01-17 19:18:23 +08:00
Leufolium 26c55749a0 by Robin at 20240113; moment 2024-01-13 00:32:19 +08:00
Leufolium 1f6a083f93 by Robin at 20240110; login add inviter field 2024-01-10 23:19:34 +08:00
lwl0608 537ed90d65 withdraw apply 2024-01-08 11:49:16 +08:00
lwl0608 4c6125177b add 2024-01-07 23:02:25 +08:00
lwl0608 9f2b80566e add 2024-01-07 22:37:06 +08:00
lwl0608 ac91201240 add 2024-01-04 18:10:26 +08:00
chenhao bb8a2acd6a Merge pull request 'feat-20230102-001-Robin' (#41) from feat-20230102-001-Robin into main
Reviewed-on: #41
2024-01-04 13:09:50 +08:00
Leufolium 3cc042ba66 by Robin at 20230103; add daily statement 2024-01-03 16:16:41 +08:00
chenhao b1b4fed922 Merge pull request 'feat-20231228-001-Robin' (#36) from feat-20231228-001-Robin into main
Reviewed-on: #36
2024-01-02 22:41:44 +08:00
Leufolium db6670572e by Robin at 20230102; account count 2024-01-02 19:34:05 +08:00
Leufolium 073ebfe814 by Robin at 20240102 2024-01-02 17:49:41 +08:00
Leufolium c11180094e by Robin at 20231231;fix single query 2023-12-31 13:41:46 +08:00
Leufolium ed3bc2294c by Robin at 20231230; add status 2023-12-30 17:32:41 +08:00
lwl0608 6d4c1eb05a 优化 1 2023-12-30 13:49:05 +08:00
Leufolium 2e638c4f04 by Robin at 20231229; media fill 2023-12-29 22:22:25 +08:00
lwl0608 1277bbafc9 fix 2023-12-29 20:47:34 +08:00
chenhao 64f506cab4 Merge pull request 'by Robin at 20231229; fix' (#17) from feat-20231228-004-Robin into main
Reviewed-on: #17
2023-12-29 14:47:30 +08:00
Leufolium 881316a60a by Robin at 20231229; fix 2023-12-29 14:22:26 +08:00
lwl0608 7d5758d999 alipay callback 2023-12-29 14:16:37 +08:00
Leufolium ac3b6c54b1 by Robin at 20231228; fix 2023-12-28 18:20:53 +08:00
Leufolium 8e32e5ac4a by Robin at 20231227; fix 2023-12-27 18:29:49 +08:00
Leufolium 4faacbd342 by Robin at 20231224; userId 2023-12-24 13:34:25 +08:00
Leufolium 338ace4d30 by Robin at 20231223; op list by session 2023-12-23 22:45:59 +08:00
Leufolium dc71ebc274 by Robin at 20231223; list 2023-12-23 22:19:16 +08:00
Leufolium 4d560e5637 Merge branch 'main' of http://121.196.202.62:3000/wishpal_ironfan/service 2023-12-23 22:03:57 +08:00
Leufolium 7ea7b36776 by Robin at 20231223; contact session 2023-12-23 22:03:53 +08:00
lwl0608 157eed2d28 tmp 2023-12-23 19:34:02 +08:00
lwl0608 9f62b24fff fix gold_num 2023-12-23 17:09:07 +08:00
lwl0608 9a00286db6 service 2023-12-21 22:17:40 +08:00