liuweiwen
|
1c047c80a6
|
落地页样式调整测试
|
5 years ago |
sunke
|
1699c155e8
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
zhengchanglong
|
39b6e98f3b
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Controller/BehaviorLogController.class.php
# Application/Admin/Controller/ExportController.class.php
# Data/update.sql
|
5 years ago |
|
liuweiwen
|
794480bebd
|
落地页样式调整测试
|
5 years ago |
chenzhi
|
7c81377095
|
Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
|
5 years ago |
|
chenzhi
|
cb99c63223
|
公会统计6
|
5 years ago |
|
zhengchanglong
|
88fde815d4
|
非管理员数据加密显示和隐藏导出按钮
|
5 years ago |
|
liuweiwen
|
1b0256a404
|
落地页样式调整测试
|
5 years ago |
|
liuweiwen
|
1df4d24689
|
落地页样式调整测试
|
5 years ago |
chenxiaojun
|
08f862a166
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
116d1891a1
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
liuweiwen
|
b1149ab14f
|
落地页游戏截图没图片隐藏
|
5 years ago |
|
liuweiwen
|
39d2928dfd
|
落地页游戏截图没图片隐藏
|
5 years ago |
|
chenxiaojun
|
eb8306b35e
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
75faf37260
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
fbcdff3fc2
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
e9f9a421f5
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
2559aa32e9
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
6b8e277fb1
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
liuweiwen
|
d68037b99d
|
落地页游戏截图没图片隐藏
|
5 years ago |
|
sunke
|
0494d091b2
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenxiaojun
|
d6c3e9150f
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
9843b5d885
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
zhengyongxing
|
628ea84935
|
平台币收回修正
|
5 years ago |
|
zhengyongxing
|
5daf1eb565
|
支付渠道查询修改
|
5 years ago |
|
sunke
|
c24f07d6e6
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenxiaojun
|
18981c06c4
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
28efebf8d0
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
sunke
|
2f83a85690
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenxiaojun
|
bf70124c86
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
7709163e03
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
42065e2ec2
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
f132189ea4
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
liuweiwen
|
546a7029cd
|
bug修复：游戏充值-》补单没权限提示内容为空的问题
|
5 years ago |
|
liuweiwen
|
126d1ca9bc
|
管理后台-》统计-》推广员统计，增加判断当前管理员是否有官方渠道权限
|
5 years ago |
|
chenzhi
|
b743cd73e1
|
新增导出csv函数
|
5 years ago |
|
chenzhi
|
e4b6cdea85
|
公会修改6
|
5 years ago |
|
liuweiwen
|
69e3843a56
|
修改文字
|
5 years ago |
|
liuweiwen
|
b8e5d719d5
|
修复bug：推广员-》数据管理-》实时充值，解决昨日充值与今日充值筛选时间未生效的问题
|
5 years ago |
|
zhengyongxing
|
ba59b41fb9
|
数据权限官方渠道添加
|
5 years ago |
zhanglingsheng
|
2ec116a017
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
zhanglingsheng
|
a9c2207ba2
|
行为日志
|
5 years ago |
|
zhanglingsheng
|
837aec6659
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
zhanglingsheng
|
855b567a02
|
行为日志
|
5 years ago |
|
liuweiwen
|
a9959e9544
|
解决推广员列表搜索底下推广员时自动过滤掉锁定的
|
5 years ago |
|
chenzhi
|
1244156518
|
优化总览统计
|
5 years ago |
|
zhengyongxing
|
d465be8969
|
数据权限提交
|
5 years ago |
|
chenzhi
|
a877b475f5
|
优化总览脚本
|
5 years ago |
|
chenzhi
|
c6f2794a3b
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
chenzhi
|
f480cd6b7a
|
优化给推广员发放平台币时菜单问题
|
5 years ago |
|
liuweiwen
|
21e90e6cb3
|
Merge branch 'dev_permission' into release-1.0.0
|
5 years ago |
|
liuweiwen
|
fe5ae6a499
|
搜索的推广员数据权限
|
5 years ago |
|
zhengyongxing
|
153f731b55
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
|
5 years ago |
|
zhengyongxing
|
e8c3f021b6
|
角色查询导出修改
|
5 years ago |
|
chenxiaojun
|
410a3cda1b
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
liuweiwen
|
4fca3e8288
|
修改返回按钮样式
|
5 years ago |
|
chenzhi
|
b97a956cbc
|
公会统计5
|
5 years ago |
|
liuweiwen
|
511b780f72
|
返回跳转
|
5 years ago |
|
zhengyongxing
|
7779535fb6
|
数据权限
|
5 years ago |
|
liuweiwen
|
ee98ca39bb
|
推广公司
|
5 years ago |
|
liuweiwen
|
ee2fc154a4
|
推广公司
|
5 years ago |
|
sunke
|
f3d91e5a11
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
 廖金灵
|
9ca02441be
|
Merge branch 'hotfix/log1.1' of wmtx/platform into master
行为日志显示bug
|
5 years ago |
sunke
|
d98cbc2f50
|
Merge branch 'hotfix/changeplayerslog' of wmtx/platform into master
平台内充值订单增加extend是否为空判断显示
|
5 years ago |
|
sunke
|
25ae12a72c
|
增加extend判断
|
5 years ago |
|
chenzhi
|
904b707cf4
|
公会统计5
|
5 years ago |
|
zhanglingsheng
|
f3a80b73b8
|
行为日志显示bug
|
5 years ago |
|
chenzhi
|
86db958ca7
|
将txt文件全部移入runtime
|
5 years ago |
|
zhanglingsheng
|
043de55e0b
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
zhanglingsheng
|
c6a89f5fe1
|
行为日志BUG
|
5 years ago |
|
廖金灵
|
9977e4ef2e
|
Merge branch 'hotfix/behaviorlog' of wmtx/platform into master
行为日志BUG
|
5 years ago |
|
chenxiaojun
|
5034cb863b
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
zhanglingsheng
|
eaa5066324
|
行为日志bug
|
5 years ago |
|
chenxiaojun
|
788a2415e3
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
zhengyongxing
|
5f3e71e8a8
|
数据权限bug修正
|
5 years ago |
|
zhengyongxing
|
e7b2f57a93
|
数据权限bug修正
|
5 years ago |
|
zhengyongxing
|
54b28f991b
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
|
5 years ago |
|
zhengyongxing
|
ce0e9f943d
|
数据权限bug修正
|
5 years ago |
|
sunke
|
8ccb78e7af
|
线上行为日志bug
|
5 years ago |
|
chenxiaojun
|
aa5e404188
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
sunke
|
b2ab2c9df0
|
隐藏信息
|
5 years ago |
|
sunke
|
1cd4e94840
|
平台币充值区服隐藏
|
5 years ago |
|
chenzhi
|
9104c0865c
|
公会统计5
|
5 years ago |
|
zhengyongxing
|
3151e8b456
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
|
5 years ago |
|
zhengyongxing
|
ce58d63aa5
|
充值汇总bug修正
|
5 years ago |
|
zhanglingsheng
|
7f9ec687cb
|
行为日志显示bug
|
5 years ago |
|
zhengyongxing
|
69ad354ff7
|
数据权限bug修正
|
5 years ago |
|
zhengchanglong
|
e08a2eb3ce
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Controller/access_data_foldline.txt
# Data/update.sql
|
5 years ago |
|
sunke
|
74d1deb9a0
|
cp订单号
|
5 years ago |
|
zhengchanglong
|
7c7ec4fc1d
|
Merge branch 'dev_permission' into release-1.0.0
# Conflicts:
# Application/Admin/Common/function.php
# Application/Admin/Controller/BehaviorLogController.class.php
# Application/Admin/Controller/ExportController.class.php
|
5 years ago |
|
chenzhi
|
1450d05677
|
公会统计5
|
5 years ago |
|
liuweiwen
|
0695a22472
|
导出数据权限
|
5 years ago |
|
liuweiwen
|
96bf040f98
|
导出数据权限
|
5 years ago |
|
sunke
|
0f997da819
|
订单号
|
5 years ago |
|
zhengchanglong
|
8075ac22f8
|
添加管理员生日字段默认当天
|
5 years ago |
|
zhengchanglong
|
e99e96dfb1
|
添加管理员生日字段默认今天
|
5 years ago |
|
liuweiwen
|
62f5098df7
|
处理数据权限筛选时，不覆盖原有的搜索字段promote_id
|
5 years ago |
|
liuweiwen
|
a9a6b49148
|
空格
|
5 years ago |
|
chenxiaojun
|
14d4c71a7f
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
sunke
|
4e737c3e6a
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
zhanglingsheng
|
b4f6c58e42
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
zhanglingsheng
|
df4f7fc511
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
zhanglingsheng
|
375bbac885
|
行为日志
|
5 years ago |
|
chenxiaojun
|
3e439715c1
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
chenzhi
|
c05698e991
|
公会统计4
|
5 years ago |
|
liuweiwen
|
4bf6352f9d
|
导出添加数据权限
|
5 years ago |
|
chenzhi
|
6e97bd3bbe
|
Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics
|
5 years ago |
|
chenzhi
|
b94fb8d794
|
公会统计4
|
5 years ago |
|
sunke
|
5f24c670b8
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
liuweiwen
|
31790a7e51
|
Merge remote-tracking branch 'origin/dev_permission' into dev_permission
|
5 years ago |
|
liuweiwen
|
0b2eb4a45b
|
管理后台-》推广员统计-》推广员注册统计列表数据权限与导出权限
管理后台-》推广员统计-》推广员充值统计列表数据权限与导出权限
|
5 years ago |
|
zhengyongxing
|
48437d25c2
|
数据权限导出修改
|
5 years ago |
|
zhanglingsheng
|
883dd449e0
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
46c7c85b68
|
超级签详情样式
|
5 years ago |
yulingwei
|
4dfdd653da
|
Merge branch 'hotfix/ltv' into dev
|
5 years ago |
|
yulingwei
|
63d945b4df
|
修改样式
|
5 years ago |
|
liuweiwen
|
47f53a4941
|
管理后台-》平台统计-》游戏注册统计列表数据权限与导出权限
管理后台-》平台统计-》游戏充值统计列表数据权限与导出权限
管理后台-》平台统计-》注册方式统计列表数据权限与导出权限
管理后台-》平台统计-》充值方式统计列表数据权限与导出权限
|
5 years ago |
|
yulingwei
|
f33ec364c3
|
修复 in 问题
|
5 years ago |
|
yulingwei
|
007b8bbccd
|
Merge branch 'hotfix/ltv' into dev
|
5 years ago |
|
yulingwei
|
bc7c6b493c
|
修复问题
|
5 years ago |
|
liuweiwen
|
4ed57dcda1
|
增加注释
|
5 years ago |
|
liuweiwen
|
7f57b53646
|
渠道统计列表
|
5 years ago |
|
liuweiwen
|
af541bface
|
平台统计列表
|
5 years ago |
|
ELF
|
910e1db638
|
Merge branch 'release-1.0.0'
|
5 years ago |
|
yulingwei
|
70d6919d18
|
Merge branch 'hotfix/ltv' into dev
|
5 years ago |
|
yulingwei
|
36b295919a
|
修复问题
|
5 years ago |
|
chenxiaojun
|
ef4443cd4c
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenxiaojun
|
3d3b96abc1
|
安卓落地页视频样式修复
|
5 years ago |
|
chenxiaojun
|
cf8f6d007f
|
Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev_cxj
|
5 years ago |
|
chenxiaojun
|
ef24feff13
|
安卓落地页视频样式修复
|
5 years ago |
|
chenxiaojun
|
6c46cd711f
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
chenzhi
|
36f8c5ed43
|
Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics
|
5 years ago |
|
ELF
|
481db0cacc
|
Merge branch 'release-1.0.0'
|
5 years ago |
|
liuweiwen
|
95f286fd3e
|
官网地图
|
5 years ago |
|
ELF
|
56d261288d
|
Merge branch 'release-1.0.0'
|
5 years ago |
|
zhanglingsheng
|
83ce328062
|
超级订单搜索导出
|
5 years ago |
|
sunke
|
ec2bbab76f
|
sever
|
5 years ago |
|
liuweiwen
|
279e6d4d81
|
Merge remote-tracking branch 'origin/dev_statistics' into dev_statistics
|
5 years ago |
|
zhanglingsheng
|
c112391dea
|
超级订单搜索导出
|
5 years ago |
|
liuweiwen
|
cdbf059ee4
|
平台币直充明细列表，搜索，导出
内充支出明细列表，搜索，导出
|
5 years ago |
|
sunke
|
0d1e68e449
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenxiaojun
|
48614da52d
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
zhanglingsheng
|
cbbbf6350c
|
超级签统计--导出
|
5 years ago |
|
chenzhi
|
28e13f4c76
|
公会聚合3
|
5 years ago |
|
chenzhi
|
7f86924778
|
公会优化3
|
5 years ago |
|
chenxiaojun
|
94b66e3edd
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
4c04b68a32
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
bc166771e4
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
ELF
|
b861c7fb3e
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
ELF
|
22be3a5d95
|
Merge branch 'release-1.0.0'
|
5 years ago |
|
chenxiaojun
|
a76214ee22
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
1989915767
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
bb17441528
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
ad0b88553b
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
yulingwei
|
d1bc94e438
|
修改问题
|
5 years ago |
|
zhanglingsheng
|
b3a98a5f29
|
超级签统计
|
5 years ago |
|
zhanglingsheng
|
3b444155d8
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
09ba38fc79
|
超级签统计
|
5 years ago |
|
chenzhi
|
06742203f7
|
公会统计3
|
5 years ago |
|
chenxiaojun
|
dae994d416
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
e9f8e40e48
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
yulingwei
|
cd34df0bda
|
修改时间统计
|
5 years ago |
|
zhengchanglong
|
ff1981ba59
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
chenxiaojun
|
7415853c7d
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
zhengchanglong
|
25a4138842
|
扶持管理字眼改成资源管理
|
5 years ago |
|
chenxiaojun
|
62c54cda7f
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
yulingwei
|
ebf64a7137
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
21bbc0eb40
|
Merge branch 'hotfix/ltv' into dev
|
5 years ago |
|
zhengchanglong
|
0459b99da0
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Home/Controller/QueryController.class.php
|
5 years ago |
|
yulingwei
|
9f156f7be4
|
ltv优化
|
5 years ago |
|
zhengchanglong
|
b13255167d
|
Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
|
5 years ago |
|
zhengchanglong
|
2cb7d9bdfd
|
扶持资源改成测试资源
|
5 years ago |
|
chenxiaojun
|
0da7f8e7df
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
60fff33fca
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenzhi
|
929d5500c0
|
Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics
|
5 years ago |
|
chenzhi
|
33bf8c1ea7
|
公会统计2
|
5 years ago |
|
chenxiaojun
|
8fd8ae006a
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
sunke
|
bafd5cf8d2
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/codemanage
|
5 years ago |
|
chenxiaojun
|
1b8fb8cad5
|
推广平台>数据管理>每日概况--更新
|
5 years ago |
|
chenxiaojun
|
3e5588ff3d
|
推广平台>数据管理>每日概况--更新
|
5 years ago |
|
chenxiaojun
|
894f174390
|
管理后台>推广员管理>公会分成管理--新增
|
5 years ago |
|
chenxiaojun
|
a19a7b530e
|
推广平台>数据管理>每日概况--更新
|
5 years ago |
|
chenxiaojun
|
f2fc739db2
|
管理后台>推广员管理>公会分成管理--新增
|
5 years ago |
|
chenxiaojun
|
bd8c4331bd
|
管理后台>推广员管理>公会分成管理--新增
|
5 years ago |
|
liuweiwen
|
53a235379a
|
游戏订单查看-导出excell
|
5 years ago |
|
sunke
|
fc2596a7cc
|
充值玩家当天时间包办
|
5 years ago |
|
liuweiwen
|
750572bc21
|
游戏订单查看增加开始时间与结束时间搜索
|
5 years ago |
|
liuweiwen
|
39e3350dd9
|
游戏订单查看
|
5 years ago |
|
chenxiaojun
|
3e0e2d29fc
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
0f3038ea18
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
7d644de6e3
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
4d070462ac
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
sunke
|
60f2c62fe6
|
下载链接管理后台
|
5 years ago |
|
chenxiaojun
|
55c70afb40
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
f854ca6bbb
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
8261512ba3
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
f032257838
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
3ecf939c5b
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
0679e5709b
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
yulingwei
|
838ef64dfe
|
Merge branch 'hotfix/search' into release-1.0.0
|
5 years ago |