|
|
53d0cc6767
|
commission--yt-commit
|
2025-06-25 15:45:25 +08:00 |
|
|
|
1a8bcbec9f
|
commission--yt-commit
|
2025-06-25 15:44:12 +08:00 |
|
|
|
0e20be0425
|
commission--yt-commit
|
2025-06-23 10:03:08 +08:00 |
|
|
|
2350346d95
|
commission--yt-commit
|
2025-06-19 14:13:59 +08:00 |
|
|
|
b360697a37
|
Merge branch 'feture-yt' into dev
# Conflicts:
# pages/loginModule/register/register.js
|
2025-06-17 19:27:36 +08:00 |
|
|
|
9241e3bce3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-17 19:26:09 +08:00 |
|
|
|
8c0a108e8f
|
commission--yt-commit
|
2025-06-17 19:25:58 +08:00 |
|
|
|
ade53fa60f
|
Merge pull request '测试分支合并请求333' (#11) from feature-xxx into dev
Reviewed-on: http://154.8.193.216:3030/admin1/qingcheng-xiaochengxu/pulls/11
|
2025-06-17 11:13:11 +00:00 |
|
|
|
9b8b40d2ed
|
测试分支合并请求333
|
2025-06-17 19:10:59 +08:00 |
|
|
|
5093eb3058
|
Merge branch 'feature-xxx' into dev
# Conflicts:
# app.js
|
2025-06-17 18:59:05 +08:00 |
|
|
|
3ce43e880d
|
测试分支合并请求2222
|
2025-06-17 18:43:08 +08:00 |
|
|
|
1e2593fd3b
|
测试分支合并请求
|
2025-06-17 18:17:05 +08:00 |
|
|
|
a5da14642b
|
Merge branch 'dev' into feature-xxx
|
2025-06-17 01:10:09 +00:00 |
|
|
|
0de7e859c2
|
测试分支合并请求
|
2025-06-17 09:04:01 +08:00 |
|
|
|
152b4995ca
|
Merge pull request 'feature-xxx' (#7) from feature-xxx into dev
|
2025-06-17 00:42:07 +00:00 |
|
|
|
a797150e3e
|
测试分支合并请求
|
2025-06-17 08:39:16 +08:00 |
|
|
|
3d1e60edc5
|
测试分支合并请求
|
2025-06-17 08:38:14 +08:00 |
|
|
|
c93b471625
|
测试分支合并请求
|
2025-06-17 08:26:41 +08:00 |
|
|
|
e608c02f8b
|
Merge remote-tracking branch 'origin/feature-xxx' into feature-xxx
|
2025-06-16 23:33:12 +08:00 |
|
|
|
2399168f8e
|
Merge pull request 'Merge pull request '测试分支合并请求' (#4) from feature-xxx into dev' (#5) from dev into feature-xxx
Reviewed-on: http://154.8.193.216:3030/admin1/qingcheng-xiaochengxu/pulls/5
|
2025-06-16 15:31:59 +00:00 |
|
|
|
949d39b1b9
|
测试分支合并请求
|
2025-06-16 23:30:02 +08:00 |
|
|
|
1ef99032ec
|
Merge pull request '测试分支合并请求' (#4) from feature-xxx into dev
Reviewed-on: http://154.8.193.216:3030/admin1/qingcheng-xiaochengxu/pulls/4
|
2025-06-16 15:24:38 +00:00 |
|
|
|
d6761b460c
|
Merge branch 'dev' into feature-xxx
|
2025-06-16 15:23:58 +00:00 |
|
|
|
d6bfd2d262
|
测试分支合并请求
|
2025-06-16 23:21:21 +08:00 |
|
|
|
bd98398c4e
|
Merge branch 'feture-yt' into dev
# Conflicts:
# app.json
|
2025-06-16 16:18:29 +08:00 |
|
|
|
ea403c8ed9
|
Merge branch 'feature-xxx' into dev
|
2025-06-16 16:17:23 +08:00 |
|
|
|
a8d326cc5f
|
commission--yt-commit
|
2025-06-16 16:17:00 +08:00 |
|
|
|
a48fa01050
|
修改了查询推广码下的结算记录
|
2025-06-16 16:16:50 +08:00 |
|
|
|
8ea2d7a89e
|
------
|
2025-06-16 13:18:08 +08:00 |
|
|
|
fc957770ce
|
补充了注册页面的小程序用户协议和隐私政策
|
2025-06-16 10:59:20 +08:00 |
|
|
|
6f06dfd826
|
补充了小程序用户协议和隐私政策
|
2025-06-15 22:28:50 +08:00 |
|
|
|
7603d8c96c
|
完成了小程序联系上级的功能（点击手机号跳转拨号页面）
|
2025-06-15 21:51:05 +08:00 |
|
|
|
0739bdcbb8
|
完成了小程序项目列表页，项目明细抽佣表，下级用户项目明细抽佣表的下拉刷新
|
2025-06-15 21:06:58 +08:00 |
|
|
|
dc3837dbff
|
修改了部分样式
|
2025-06-11 14:16:38 +08:00 |
|
|
|
a51f9bdea8
|
修复功能（用户申请提现）
|
2025-06-11 11:32:02 +08:00 |
|
|
|
ae9886635d
|
修复功能（用户申请提现）
|
2025-06-11 09:16:56 +08:00 |
|
|
|
a20fbe81e3
|
添加功能（用户申请提现）
|
2025-06-10 12:18:44 +08:00 |
|
|
|
4d40d86061
|
退出登录的修改密码添加响应式弹窗
|
2025-06-10 10:03:55 +08:00 |
|
|
|
7d63133f54
|
团队管理和下级用户抽佣明细的输入框搜索功能
|
2025-06-10 09:14:39 +08:00 |
|
|
|
8d95fb089d
|
Merge branch 'feture-yt' into dev
# Conflicts:
# pages/projectModule/projectDetail/projectDetail.js
# pages/projectModule/projectDetail/projectDetail.wxml
# pages/projectModule/projectList/projectList.js
# pages/projectModule/projectList/projectList.wxml
# pages/projectModule/userProject/userProject.js
|
2025-06-09 19:37:04 +08:00 |
|
|
|
179f70b65d
|
commission--yt-commit
|
2025-06-09 19:33:21 +08:00 |
|
|
|
c0c6b5b61a
|
添加的功能：查看推广码对应的结算记录
|
2025-06-09 19:08:32 +08:00 |
|
|
|
38ba528f76
|
修改环境
|
2025-06-06 13:20:22 +08:00 |
|
|
|
01af5c52d4
|
Merge branch 'feture-yt' into dev
# Conflicts:
# request.js
|
2025-06-06 13:17:16 +08:00 |
|
|
|
a576bacae2
|
commission--yt-commit
|
2025-06-06 13:16:22 +08:00 |
|
|
|
017cb7b0e9
|
commission--yt-commit
|
2025-06-06 13:16:14 +08:00 |
|
|
|
dfd14fe576
|
修复了功能（对项目明细设置抽佣比例）
|
2025-06-06 13:08:04 +08:00 |
|
|
|
b00256ba06
|
Merge branch 'dev' into feture-yt
|
2025-06-06 08:35:20 +08:00 |
|
|
|
7014dfda1d
|
commission--yt-commit
|
2025-06-06 08:34:19 +08:00 |
|
|
|
6df2f37187
|
Merge branch 'featrure-commission' into dev
|
2025-06-06 08:33:04 +08:00 |
|
