liyang
|
5cd8ca2857
|
角色查询、额外额外、测试资源权限修改
|
4 years ago |
|
liyang
|
a457750390
|
角色查询、额外额度、测试资源权限修改
|
4 years ago |
|
liyang
|
8617ad3e91
|
Merge branch 'release' of http://8.136.139.249:3000/wmtx/platform into feature/LY0309
|
4 years ago |
|
liyang
|
f8b93616ce
|
菜单封装中
|
4 years ago |
 ELF
|
1ab1db12ab
|
修复苹果落地页无法滚动bug
|
4 years ago |
|
廖金灵
|
36becfb8d6
|
Merge pull request '1' (#166) from feature/0207zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/166
|
4 years ago |
|
liyang
|
65ca417a2e
|
推广后台资源申请页面
|
4 years ago |
tping
|
fb3bcdd107
|
1
|
4 years ago |
张谷成
|
76f6c77160
|
Merge pull request '1' (#148) from hotfix/0203 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/148
|
4 years ago |
|
tping
|
f3efd97a19
|
1
|
4 years ago |
|
tping
|
792508bd64
|
1
|
4 years ago |
|
tping
|
e5b6af3771
|
1
|
4 years ago |
|
tping
|
d14cb334af
|
Merge branch 'release' into feature/0207zgc
|
4 years ago |
|
tping
|
fbf0b27ca3
|
推广后台充值导出
|
4 years ago |
|
ELF
|
2ecaa742d5
|
优化
|
4 years ago |
|
ELF
|
91996da3a2
|
优化
|
4 years ago |
|
ELF
|
a3d3b5722c
|
优化
|
4 years ago |
|
ELF
|
4f3c21263d
|
优化
|
4 years ago |
|
ELF
|
531b94bae8
|
版本
|
4 years ago |
|
ELF
|
3dfc92ecc3
|
修改下载超时
|
4 years ago |
chenzhi
|
343ecc8587
|
优化登陆
|
4 years ago |
|
tping
|
e4ef55531a
|
特殊公司评级管理权限
|
4 years ago |
|
tping
|
e495105ed0
|
会长可以看
|
4 years ago |
|
tping
|
15c841e883
|
Merge branch 'release' into feature/1211
|
4 years ago |
|
tping
|
553ce102df
|
特殊公司
|
4 years ago |
|
廖金灵
|
342b592976
|
Merge pull request 'feature/testing_resource_verify_admin' (#11) from feature/testing_resource_verify_admin into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
|
4 years ago |
|
tping
|
cf88d4c1db
|
Merge branch 'release' into feature/1211
# Conflicts:
# Application/Home/Controller/BaseController.class.php
|
4 years ago |
|
tping
|
5cf8f2ea10
|
特殊公司
|
4 years ago |
|
tping
|
33ef14e1af
|
特殊外团
|
4 years ago |
|
ELF
|
f58e565fe7
|
修改
|
4 years ago |
|
ELF
|
e5a0117912
|
修改
|
4 years ago |
|
tping
|
31ce7b071c
|
1211
|
4 years ago |
|
ELF
|
1b74318619
|
修改
|
4 years ago |
|
ELF
|
88402dfac0
|
修改
|
4 years ago |
|
廖金灵
|
1b3a365409
|
Merge branch 'hotfix/promote_group_view_recharge' of wmtx/platform into release
雷雨等导量公会组长可以看到充值信息
|
4 years ago |
|
ELF
|
d43d0c2628
|
雷雨等导量公会组长可以看到充值信息
|
4 years ago |
|
ELF
|
1bb1b284e6
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
|
4 years ago |
万盟天下
|
82cf73ede5
|
Merge branch 'feature/elf_version_1117' of wmtx/platform into release
游戏统计/后台登录时间修改
|
4 years ago |
|
ELF
|
f95125892a
|
优化推广员后台汇总查询
|
4 years ago |
|
ELF
|
7468057834
|
推广员结算订单归属
|
4 years ago |
|
ELF
|
289783eecd
|
修改
|
4 years ago |
|
elf@home
|
dd66846e68
|
根据推广公司配置推广后台
|
4 years ago |
|
ELF
|
773068b57c
|
优化代码
|
4 years ago |
|
ELF
|
c550846454
|
修改
|
4 years ago |
|
ELF
|
47ca2f2b9e
|
修改
|
4 years ago |
|
ELF
|
dd71ccdf83
|
修改
|
4 years ago |
|
ELF
|
f490f10ee5
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/testing_resource_admin
|
4 years ago |
张谷诚
|
f23f456ddc
|
Merge branch 'hotfix/orderquery' of wmtx/platform into release
增加清除时间
|
4 years ago |
|
tping
|
5a57d87ff7
|
增加清空时间
|
4 years ago |
|
廖金灵
|
a3ce776d16
|
Merge branch 'feature/version_1028' of wmtx/platform into release
优化代码
|
4 years ago |
|
ELF
|
2dc69ac892
|
修改
|
4 years ago |
|
廖金灵
|
710573f511
|
Merge branch 'feature/version_1028' of wmtx/platform into release
修改数据汇总bug
|
4 years ago |
|
ELF
|
75754a8957
|
修改
|
4 years ago |
|
张谷诚
|
fc666fa7b1
|
Merge branch 'hotfix/orderquery' of wmtx/platform into release
导出支付显示问题
|
4 years ago |
|
tping
|
1c6a17d50f
|
支付方式显示
|
4 years ago |
|
张谷诚
|
f25bc96071
|
Merge branch 'hotfix/orderquery' of wmtx/platform into release
到账时间导出
|
4 years ago |
|
tping
|
adb011ca5a
|
到账时间
|
4 years ago |
|
张谷诚
|
0c9033e700
|
Merge branch 'hotfix/orderquery' of wmtx/platform into release
到账时间导出
|
4 years ago |
|
tping
|
e86f4c4762
|
到账时间
|
4 years ago |
|
张谷诚
|
b642f671c7
|
Merge branch 'hotfix/orderquery' of wmtx/platform into release
|
4 years ago |
|
tping
|
e6ae117fd7
|
1,隐藏删除按钮（后台->推广->游戏分包）
2,推广后台增加下单时间查询
|
4 years ago |
|
廖金灵
|
9c6f1b6789
|
Merge branch 'feature/version_1028' of wmtx/platform into release
修改bug
|
4 years ago |
|
ELF
|
be9075fc63
|
修改bug
|
4 years ago |
|
廖金灵
|
001b390afc
|
Merge branch 'feature/version_1028' of wmtx/platform into release
修改评级等功能
|
4 years ago |
|
ELF
|
34586b228e
|
修改
|
4 years ago |
|
ELF
|
8c8d01a446
|
修改评级
|
4 years ago |
|
ELF
|
092683425d
|
修改
|
4 years ago |
|
ELF
|
3c11826a1c
|
修改
|
4 years ago |
|
elf@home
|
f13f3f7744
|
修改
|
4 years ago |
|
ELF
|
3f92608468
|
推广后台功能开发
|
4 years ago |
|
ELF
|
b44a5118cf
|
修改
|
4 years ago |
|
万盟天下
|
f7bd731ead
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into master
测试资源功能提交
|
4 years ago |
|
万盟天下
|
b2098410a1
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
测试资源发放
|
4 years ago |
|
ELF
|
18c3e95f30
|
修改
|
4 years ago |
|
ELF
|
c5fe80639f
|
修改
|
4 years ago |
|
ELF
|
06bd640c79
|
修改
|
4 years ago |
|
ELF
|
263e35c097
|
初步提交
|
4 years ago |
|
ELF
|
f0d79c83a2
|
修改
|
4 years ago |
|
ELF
|
dec6c4b222
|
修改权限
|
4 years ago |
|
ELF
|
8d1a58d583
|
修改
|
4 years ago |
|
ELF
|
d33bb3f3f8
|
修改
|
4 years ago |
|
ELF
|
2ae89b9edb
|
解决冲突
|
4 years ago |
|
ELF
|
95248d3582
|
修改
|
4 years ago |
|
ELF
|
0169d8a2db
|
修改
|
4 years ago |
|
ELF
|
c42a123ad7
|
修改
|
4 years ago |
|
ELF
|
28fbbff699
|
修改
|
4 years ago |
|
ELF
|
8d2e61153b
|
修改
|
4 years ago |
|
elf@home
|
c4eb04428e
|
修改
|
4 years ago |
|
ELF
|
afad195062
|
修改
|
4 years ago |
|
ELF
|
2f4868553a
|
修改
|
4 years ago |
|
ELF
|
ce1d061ee6
|
修改
|
4 years ago |
|
廖金灵
|
d2c5ff923b
|
Merge branch 'hotfix/download_domain_fix' of wmtx/platform into master
落地页域名后台切换
|
4 years ago |
|
廖金灵
|
04866ef988
|
Merge branch 'hotfix/promote_role_list' of wmtx/platform into release
推广后台角色列表优化
|
4 years ago |
|
ELF
|
02c4b00bfe
|
优化
|
4 years ago |
|
ELF
|
919791c0c7
|
推广后台优化
|
4 years ago |
|
ELF
|
df933cc6b1
|
修改
|
4 years ago |
|
ELF
|
16122d5d9f
|
修改
|
4 years ago |
|
ELF
|
5a184bbee1
|
功能优化
|
4 years ago |
|
ELF
|
9f0c56d753
|
修改bug
|
4 years ago |
|
ELF
|
f37f6c51dd
|
修改功能
|
4 years ago |
|
ELF
|
ae294252ee
|
修改
|
4 years ago |
|
ELF
|
32bc839dcd
|
合并
|
4 years ago |
|
ELF
|
9d041f7c8a
|
修改
|
4 years ago |
|
ELF
|
2867a05bb3
|
修改
|
4 years ago |
|
ELF
|
3890410bec
|
优化
|
4 years ago |
|
廖金灵
|
90bb38cd56
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
修改BUG
|
4 years ago |
|
ELF
|
b1f4ec2d9a
|
修改
|
4 years ago |
|
廖金灵
|
747dc7394c
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
修改bug
|
4 years ago |
|
ELF
|
404da03cd0
|
修改
|
4 years ago |
|
廖金灵
|
8ae08a6784
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
测试资源权限
|
4 years ago |
|
ELF
|
2a52df9ebb
|
测试资源权限
|
4 years ago |
|
廖金灵
|
79af51d27b
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
测试资源发放
|
4 years ago |
|
ELF
|
e249596014
|
修改
|
4 years ago |
|
ELF
|
550da5cb37
|
测试
|
4 years ago |
|
ELF
|
c2da9641f0
|
优化
|
4 years ago |
|
ELF
|
06c4d5f1f1
|
优化测试资源
|
4 years ago |
|
ELF
|
247c4e9aae
|
ss
|
4 years ago |
|
ELF
|
66bffbff99
|
吸怪
|
4 years ago |
|
ELF
|
fa90dc0bc8
|
修改
|
4 years ago |
|
ELF
|
367345ea8d
|
修改
|
4 years ago |
|
elf@home
|
461f347b1a
|
修改
|
4 years ago |
|
ELF
|
ecf460e7c9
|
修改
|
4 years ago |
|
ELF
|
9c59ba06e2
|
修改
|
4 years ago |
|
ELF
|
3383b3d2d9
|
修改
|
4 years ago |
|
ELF
|
c0fe59864c
|
修改
|
4 years ago |
|
ELF
|
49751b8760
|
测试资源修改
|
4 years ago |
yulingwei
|
ba91c60d5d
|
upt
|
4 years ago |
|
yulingwei
|
8d1415258f
|
upt
|
4 years ago |
|
yulingwei
|
08c4d82b00
|
upt
|
4 years ago |
郑永星
|
fe4a029ce4
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
|
4 years ago |
zhengyongxing
|
7aa031bbb4
|
市场结算管理优化
|
4 years ago |
|
zhengyongxing
|
f9503182da
|
市场结算管理优化
|
4 years ago |
|
yulingwei
|
deaa20c5bf
|
upt
|
4 years ago |
|
yulingwei
|
c308bbbd6c
|
upt
|
4 years ago |
|
yulingwei
|
19c3aeec50
|
Merge branch 'feature/promote_base_info' of 47.111.118.107:wmtx/platform into feature/promote_base_info
|
4 years ago |
|
yulingwei
|
a88b182641
|
upt
|
4 years ago |
|
ELF
|
49ea782f7c
|
解决冲突
|
4 years ago |
|
ELF
|
62d7f15fdc
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign
|
4 years ago |
|
yulingwei
|
6ffd3de128
|
upt
|
4 years ago |
|
yulingwei
|
781f63146f
|
upt
|
4 years ago |
|
yulingwei
|
90e0f00579
|
upt
|
4 years ago |
|
yulingwei
|
9641aecde0
|
upt
|
4 years ago |
|
yulingwei
|
151346d69f
|
upt
|
4 years ago |
|
yulingwei
|
1bd33daa54
|
upt
|
4 years ago |
|
ELF
|
aeade79e67
|
修改
|
4 years ago |
|
ELF
|
80cb58cdc9
|
推广员业绩查询时间范围限制为31天
|
4 years ago |
|
ELF
|
451b2b3105
|
修改
|
4 years ago |
|
ELF
|
15d0b454a4
|
修改
|
4 years ago |
|
yulingwei
|
2680f92079
|
1
|
4 years ago |
|
yulingwei
|
4058eb3963
|
1
|
4 years ago |