Commit Graph

4807 Commits (4aff4b3d03a9cad901c8d2599c74b81faf357c34)

Author SHA1 Message Date
tangqian 5cf0b9a8b4 Merge branch 'feature/mall_product' 2023-06-09 14:56:14 +08:00
tangqian eca405b763 fix: 修改 2023-06-09 14:55:56 +08:00
tangqian 5964eabb05 Merge branch 'feature/mall_product' 2023-06-09 14:32:52 +08:00
tangqian 89041b470f Merge branch 'feature/mall_product' into test 2023-06-09 14:32:38 +08:00
tangqian cf9be203b1 fix: 修改 2023-06-09 14:32:23 +08:00
tangqian 0d0623276b fix: 修改 2023-06-09 13:52:54 +08:00
Jruome ec67c47c66 uniapp 字数限制 2023-06-09 11:04:48 +08:00
Jruome 5536be8e23 Merge remote-tracking branch 'origin/master' 2023-06-09 10:23:43 +08:00
Jruome fd79239465 管理端推广员修改 2023-06-09 10:20:18 +08:00
TianYu 724c591d9f fix: 环境变量修改 2023-06-09 09:55:42 +08:00
TianYu e8386788ce fix: 环境变量修改 2023-06-09 09:54:52 +08:00
tianyu 9a9b6dbe39 Merge pull request 'merge_ty' (#16) from merge_ty into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/16
2023-06-08 18:04:20 +08:00
TianYu 98673dc012 Merge branch 'test' into merge_ty 2023-06-08 18:04:05 +08:00
TianYu d67b6bd8a1 fix: 修复bug 2023-06-08 17:29:04 +08:00
TianYu da123b99f5 Merge branch 'test' of http://117.33.142.185:3000/zenghuapei/cyywl_server into test 2023-06-08 16:45:08 +08:00
TianYu e760a69ff9 fix: 修复bug 2023-06-08 16:44:43 +08:00
tangqian 956f0cc445 Merge remote-tracking branch 'origin/test' into test 2023-06-08 16:44:27 +08:00
tangqian 424df4b278 Merge branch 'feature/mall_product' into test 2023-06-08 16:44:19 +08:00
tangqian c231870cad fix: 修改 2023-06-08 16:43:51 +08:00
TianYu 14d89110a4 Merge branch 'test' of http://117.33.142.185:3000/zenghuapei/cyywl_server into test 2023-06-08 16:42:32 +08:00
TianYu ff0c287110 fix: 修复bug 2023-06-08 16:42:20 +08:00
Jruome 46230f3bcb Merge remote-tracking branch 'origin/test' 2023-06-08 16:00:37 +08:00
Jruome c3b0862735 管理端推广员新增注册来源筛选 2023-06-08 16:00:06 +08:00
tangqian cedb9985ad Merge branch 'feature/mall_product' into test 2023-06-08 15:59:13 +08:00
tangqian acbce105f1 fix: 修改推广员 新增一个注册来源 2023-06-08 15:58:57 +08:00
tangqian 4529afd72c Merge remote-tracking branch 'origin/test' into test 2023-06-08 15:54:41 +08:00
tangqian a0028953bd Merge branch 'feature/mall_product' into test 2023-06-08 15:52:20 +08:00
tangqian 0ff7ebece8 fix: 修改推广员 新增一个注册来源 2023-06-08 15:51:57 +08:00
TianYu 1692521b77 fix: 修复无法跳转到注册推广员页面问题 2023-06-08 15:45:38 +08:00
TianYu c60367ffc0 Merge branch 'test' of http://117.33.142.185:3000/zenghuapei/cyywl_server into test 2023-06-08 15:27:39 +08:00
TianYu dac91acc10 fix: 微信公众号APPID区分运行环境 2023-06-08 15:26:48 +08:00
perry 8b773d5366 查询链接地址 2023-06-08 15:26:43 +08:00
perry ef6684b366 Merge remote-tracking branch 'origin/test' into test 2023-06-08 15:21:44 +08:00
perry 34ef8b1ed8 修改支付回调 2023-06-08 15:21:35 +08:00
TianYu 903d23b2f6 Merge branch 'test' of http://117.33.142.185:3000/zenghuapei/cyywl_server into test 2023-06-08 15:16:27 +08:00
TianYu 9b0f586317 feat: 新增推广员注册功能 2023-06-08 15:15:08 +08:00
axzsd 0b32343112 配置文件 2023-06-08 14:19:58 +08:00
TianYu 29347ab0ad fix: 修复测试环境变量 2023-06-08 12:40:51 +08:00
TianYu a9284a9842 fix: 修复测试环境变量 2023-06-08 12:35:05 +08:00
TianYu 1c9287d2da Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-06-08 12:26:51 +08:00
TianYu 346e4036fd feat: 运行环境区分 2023-06-08 12:26:38 +08:00
tangqian 77dd2e37a8 Merge remote-tracking branch 'origin/master' 2023-06-08 11:49:59 +08:00
tangqian 81f1fb70b9 fix: 只查询已付款的订单 2023-06-08 11:48:56 +08:00
axzsd a5eb88e029 Merge remote-tracking branch 'origin/master' 2023-06-08 11:05:05 +08:00
axzsd 135c183e76 配置文件 2023-06-08 11:04:51 +08:00
tangqian d471605d9b fix: 新增推广员注册来源 2023-06-07 14:48:47 +08:00
tangqian d82c357910 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-07 09:45:08 +08:00
tangqian d357ce42ea fix: 新增推广员注册来源 2023-06-07 09:45:02 +08:00
TianYu bc1ff1422e fix: 下架推广员注册功能 2023-06-07 09:17:13 +08:00
TianYu 793e2a4a5e fix: 话费返回时间前端不做处理 2023-06-06 14:21:06 +08:00