Commit Graph

4722 Commits (8b773d5366d1f6149af270530d3d9406300e8980)

Author SHA1 Message Date
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 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 81f1fb70b9 fix: 只查询已付款的订单 2023-06-08 11:48:56 +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
TianYu 20eea0fb02 fix: 修复bug 2023-06-05 16:22:59 +08:00
TianYu ba7e34e82a feat: 新增推广员申请注册功能 2023-06-05 15:56:27 +08:00
Jruome 7c79be72d2 uniapp 推广员申请页面 2023-06-05 14:02:59 +08:00
perry 6d93d5ca16 推广员重复校验 2023-06-03 11:32:34 +08:00
tangqian 9bef9b0cc3 fix: 修改相关提成单位 2023-06-02 16:03:47 +08:00
tangqian 0e26bdbf4b Merge branch 'feature/mall_product' 2023-06-02 15:45:12 +08:00
tangqian e1aaf55a53 fix: 修改相关提成单位 2023-06-02 15:44:51 +08:00
TianYu 5adf5115eb fix: 取消支付宝支付 2023-06-02 15:27:23 +08:00
TianYu fbb6972846 fix: 修复提成设置 2023-06-02 11:44:37 +08:00
tianyu 6a0904cf64 Merge pull request 'fix: 修复提成设置' (#14) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/14
2023-06-02 11:44:14 +08:00
TianYu fd3c805655 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-06-02 11:27:05 +08:00
tianyu 6ce32ccb45 Merge pull request 'feature/mall_product' (#13) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/13
2023-06-02 11:27:01 +08:00
TianYu 38209dd485 fix: 修改轮播图权限标识 2023-06-02 11:26:49 +08:00
tangqian 0e5fc4e37e Merge branch 'feature/mall_product' 2023-06-02 11:05:44 +08:00
tangqian 413ded83a9 fix: 修改相关提成单位 2023-06-02 11:05:09 +08:00
TianYu 488f0166be fix: 权限设置问题 2023-06-02 10:47:43 +08:00
tianyu 102ea79177 Merge pull request 'feature/mall_product' (#12) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/12
2023-06-02 10:47:39 +08:00
TianYu a6fea11b09 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-06-02 10:46:05 +08:00
TianYu 0b8cf5ccab fix: 修复banner传参的问题 2023-06-02 10:45:52 +08:00
tangqian 6d3211e7b9 fix: 修改部门 2023-06-02 10:35:18 +08:00
tangqian 54cc1cde59 Merge branch 'feature/mall_product' 2023-06-02 10:34:52 +08:00
tangqian e2328d8567 fix: 修改部门 2023-06-02 10:34:38 +08:00
TianYu d5167b3e35 fix: 提成设置可以输入两位小数 2023-06-02 09:53:16 +08:00
tianyu 1aca869225 Merge pull request 'fix: 提成设置可以输入两位小数' (#11) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/11
2023-06-02 09:53:09 +08:00
tangqian a1321eaca1 fix: 修改部门 2023-06-01 19:06:27 +08:00
tangqian cf897c2b9c fix: 修改部门 2023-06-01 18:46:06 +08:00
tangqian 7f980191d1 Merge branch 'feature/mall_product' 2023-06-01 17:35:38 +08:00
tangqian ced99434c1 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-01 17:35:24 +08:00
tangqian 0512c04391 fix: 修改部门 2023-06-01 17:35:18 +08:00
TianYu 1fcfc530fb fix: 修复bug 2023-06-01 17:01:28 +08:00
tianyu 774ba45aff Merge pull request 'fix: 修复bug' (#10) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/10
2023-06-01 17:01:27 +08:00
tianyu f76bc2e3e6 Merge pull request 'feature/mall_product' (#9) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/9
2023-06-01 14:22:41 +08:00
TianYu 45779d8252 fix: 修复bug 2023-06-01 14:21:31 +08:00
Jruome 8748e0dcc9 uniapp 购买记录样式修改 2023-06-01 14:16:20 +08:00
tangqian 07d811caeb Merge branch 'feature/mall_product' 2023-06-01 14:11:37 +08:00