chenzhi
|
3bf288fa41
|
优化登陆记录区服名称为区服id
|
5 years ago |
|
chenzhi
|
5e08bda6c2
|
优化行为日志区服名称为区服id
|
5 years ago |
 ELF
|
0a0cedafd5
|
各个系统登录提示安全优化，sessionon_id变更
|
5 years ago |
|
chenzhi
|
432c84ba01
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
e39c811da8
|
修改月结月份显示错误问题
|
5 years ago |
liuweiwen
|
4addf4c281
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
liuweiwen
|
0b3ae062b1
|
优化：推广员新增与编辑的推广公司增加万盟天下科技
新增需求：推广员增加工会归属和工会关系属性
|
5 years ago |
zhengyongxing
|
10f6caddfa
|
工会统计新增内外团占比
|
5 years ago |
|
廖金灵
|
b12b133a06
|
Merge branch 'hotfix/shift-player' of wmtx/platform into release
修改玩家迁移限制
|
5 years ago |
|
elf@home
|
0bc50cbf70
|
修改限制
|
5 years ago |
chenxiaojun
|
0baf97f717
|
会长提现--更新
|
5 years ago |
yulingwei
|
25606949f5
|
修复登录统计问题
|
5 years ago |
|
chenxiaojun
|
e884214546
|
会长提现|公会分成管理--更新
|
5 years ago |
|
chenzhi
|
f594e3bb14
|
公会统计新增公司联动
|
5 years ago |
|
elf@home
|
6e354fe3b3
|
优化链接归属查询
|
5 years ago |
|
liuweiwen
|
6625eaa4f7
|
工会统计
|
5 years ago |
|
liuweiwen
|
809e9d36f1
|
工会统计
|
5 years ago |
|
liuweiwen
|
28a1efe2f4
|
工会统计列表数据与搜索修复
|
5 years ago |
|
liuweiwen
|
b3e32506cc
|
工会统计搜索公司
|
5 years ago |
|
liuweiwen
|
c44e5ee1a7
|
编辑推广员时，只允许会长修改推广公司，同时更改底下推广员的公司
|
5 years ago |
zhanglingsheng
|
7a9fe4fb45
|
超级签统计--导出
|
5 years ago |
|
yulingwei
|
9d5bfc5ef2
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
zhanglingsheng
|
e3ef73e7e3
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
zhanglingsheng
|
e709816781
|
补单记录
|
5 years ago |
|
yulingwei
|
75d3e87f89
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
yulingwei
|
899877e872
|
同步修改
|
5 years ago |
|
ELF
|
834115c213
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
ELF
|
561787a4ac
|
修改
|
5 years ago |
|
zhanglingsheng
|
8a9e0a9a8b
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
zhanglingsheng
|
ca401adbd0
|
补单记录
|
5 years ago |
|
ELF
|
a70c1aee21
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
chenzhi
|
04c560312f
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
chenzhi
|
715a1a8a2c
|
优化推广统计区服问题
|
5 years ago |
|
yulingwei
|
f4495f93a9
|
ltv修改
|
5 years ago |
|
yulingwei
|
3ec7ccc188
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
yulingwei
|
873c81605e
|
修复
|
5 years ago |
|
zhanglingsheng
|
908de1336f
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
zhanglingsheng
|
b88f395c9a
|
补单记录
|
5 years ago |
|
zhanglingsheng
|
6a28abedc0
|
补单记录
|
5 years ago |
|
chenxiaojun
|
9a0313b763
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
e66893dc7f
|
公会分成管理--更新
|
5 years ago |
|
yulingwei
|
8ccde7749a
|
Merge branch 'hotfix/ltv' into release-1.0.0
|
5 years ago |
|
yulingwei
|
3e11b4d0ad
|
更新
|
5 years ago |
|
yulingwei
|
1e3079870e
|
Merge branch 'hotfix/ltv' into release-1.0.0
|
5 years ago |
|
yulingwei
|
ee18eac375
|
修复
|
5 years ago |
|
ELF
|
ad67717292
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
yulingwei
|
e2ed862130
|
Merge branch 'hotfix/ltv' into release-1.0.0
|
5 years ago |
|
yulingwei
|
12f00ad268
|
修复
|
5 years ago |
|
chenzhi
|
a5c926b2cd
|
优化区服预告区服选择
|
5 years ago |
|
chenzhi
|
ff46ab04ca
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
chenzhi
|
f580b44289
|
优化推广员统计区服选择
|
5 years ago |
|
liuweiwen
|
2db651ae9c
|
Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
|
5 years ago |
|
liuweiwen
|
bc28933369
|
游戏订单查看-》导出通知成功数据
|
5 years ago |
|
zhengyongxing
|
e055cc27d5
|
ajax游戏区服搜索设备非必填
|
5 years ago |
|
liuweiwen
|
6dbfd09e91
|
编辑推广员时推广公司必填
|
5 years ago |
|
zhengyongxing
|
ea80b8fd44
|
游戏充值统计检索条件修正
|
5 years ago |
|
zhengyongxing
|
d59e8633c6
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
|
5 years ago |
|
zhengyongxing
|
2f25386518
|
游戏充值统计检索条件修正
|
5 years ago |
|
ELF
|
841bf0c0b9
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
ELF
|
9bf45ae0d3
|
修改
|
5 years ago |
|
zhengyongxing
|
b96e65b8fe
|
游戏充值统计检索条件修正
|
5 years ago |
|
chenzhi
|
f38e007d80
|
优化渠道的公司检索
|
5 years ago |
|
chenzhi
|
47595c81b8
|
优化公会统计公司
|
5 years ago |
|
chenzhi
|
c590b948ef
|
优化推广员充值统计导出
|
5 years ago |
|
chenzhi
|
0a006bbcc2
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
chenzhi
|
fd23b640ea
|
优化推广员充值优化代码
|
5 years ago |
|
zhengyongxing
|
13f5128dd8
|
支付渠道统计导出bug修正,游戏充值充值方式检索修正
|
5 years ago |
|
zhengyongxing
|
dd86fbaddf
|
支付渠道统计bug修正
|
5 years ago |
|
zhengyongxing
|
b5c06df195
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
|
5 years ago |
|
zhengyongxing
|
4e3206a5c1
|
支付渠道统计bug修正
|
5 years ago |
|
chenzhi
|
5e246dde2b
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
chenzhi
|
85b821081f
|
优化推广员充值统计今日本周本月不变
|
5 years ago |
|
zhanglingsheng
|
683fc44d94
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
zhanglingsheng
|
9b65fbaabb
|
超级签统计
|
5 years ago |
|
chenzhi
|
a61e0f36b5
|
优化注册统计今日本周本月不变
|
5 years ago |
|
zhanglingsheng
|
befc2ef62b
|
超级签统计
|
5 years ago |
|
zhanglingsheng
|
244e036a21
|
超级签统计
|
5 years ago |
|
ELF
|
a167c51582
|
Merge branch 'dev' into release-1.0.0
|
5 years ago |
|
yulingwei
|
e97b1ed22e
|
Merge branch 'feature/ltv' into dev
|
5 years ago |
|
yulingwei
|
65ed103d3a
|
修复beta链接格式
|
5 years ago |
|
liuweiwen
|
4c327a679a
|
Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
# Conflicts:
# Application/Admin/Controller/ExportController.class.php
# Application/Admin/Controller/PlatformController.class.php
|
5 years ago |
|
liuweiwen
|
e40b92a0d7
|
优化-【统计】-【平台统计】-【游戏注册】、【游戏充值统计】、【注册方式统计】和【充值方式统计】的今日充值、本周充值、本月充值不根据时间筛选改变
|
5 years ago |
|
zhengyongxing
|
b0899f3fc9
|
支付渠道统计bug修正，官网与推广后台充值计入平台币
|
5 years ago |
|
ELF
|
9b5697a859
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
ELF
|
1fcbe2dd65
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
zhanglingsheng
|
56da5cd85a
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
zhanglingsheng
|
59709fa295
|
游戏--添加支付方式渠道配置
|
5 years ago |
|
liuweiwen
|
1e9409ef1a
|
优化-【统计】-【平台统计】-【游戏注册】、【游戏充值统计】、【注册方式统计】和【充值方式统计】的今日充值、本周充值、本月充值不根据时间筛选改变
|
5 years ago |
|
zhanglingsheng
|
669baefe5e
|
游戏--添加支付方式渠道配置
|
5 years ago |
|
chenzhi
|
0ec79e6cb9
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
chenzhi
|
24c2ea0031
|
优化区服预告的区服选择
|
5 years ago |
|
yulingwei
|
53b4bfa0b8
|
Merge branch 'feature/ltv' into dev
|
5 years ago |
|
yulingwei
|
30922605e2
|
修复
|
5 years ago |
|
yulingwei
|
a851b31cb6
|
Merge branch 'feature/ltv' into dev
|
5 years ago |
|
yulingwei
|
6671565b5e
|
修复问题
|
5 years ago |
|
ELF
|
8a2f36b5a3
|
Merge branch 'dev' into release-1.0.0
|
5 years ago |
|
yulingwei
|
fe8a99b0ec
|
Merge branch 'feature/ltv' into dev
|
5 years ago |
|
yulingwei
|
931893640a
|
修改问题
|
5 years ago |
|
chenzhi
|
fe06fded2a
|
优化区服列表，隐藏操作，新增id
|
5 years ago |
|
zhengyongxing
|
c1e16ed8d4
|
推广员充值统计汇总为当前页面的总额，改为所有数据的总和
|
5 years ago |
|
zhengyongxing
|
79f74dfbd4
|
支付渠道游戏订单导出bug修正
|
5 years ago |
|
ELF
|
ea15b6427c
|
修改落地页
|
5 years ago |
|
ELF
|
bf5ad7aa85
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
ELF
|
7f6730a562
|
修改留存率bug
|
5 years ago |
|
zhengyongxing
|
f8092fa9e5
|
支付渠道游戏订单bug修正
|
5 years ago |
|
zhanglingsheng
|
3a7c4c9bad
|
超级签统计--合计
|
5 years ago |
|
zhanglingsheng
|
6d34f317a1
|
超级签统计--合计金额
|
5 years ago |
zhengchanglong
|
8fc5190830
|
Merge branch 'master_hotfix' into dev
|
5 years ago |
|
zhengchanglong
|
56750b3829
|
Merge branch 'master_hotfix' into release-1.0.0
|
5 years ago |
|
chenzhi
|
652b193f71
|
优化玩家列表设备号赛选
|
5 years ago |
|
zhengchanglong
|
f640531c0b
|
Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
|
5 years ago |
|
zhengchanglong
|
dc57a5e5f4
|
Merge branch 'master_hotfix' into release-1.0.0
|
5 years ago |
|
zhengyongxing
|
f8b570c20e
|
支付渠道统计bug修正
|
5 years ago |
|
chenzhi
|
3561a87d4a
|
优化玩家列表数据
|
5 years ago |
|
liuweiwen
|
ed0283aff6
|
Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
|
5 years ago |
|
liuweiwen
|
d31c2f28f3
|
游戏统计
|
5 years ago |
|
zhengyongxing
|
9b4ebd6c29
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
zhengyongxing
|
7a98ee81cb
|
支付渠道统计bug修正
|
5 years ago |
|
liuweiwen
|
93c5e311a6
|
Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
|
5 years ago |
|
liuweiwen
|
4f96c4728d
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
c58f88fe7f
|
Merge branch 'master_hotfix' into dev
|
5 years ago |
|
liuweiwen
|
765188890b
|
like 加前%导致没用索引
|
5 years ago |
|
zhengyongxing
|
444c4e61f2
|
支付渠道统计bug修正
|
5 years ago |
|
zhengyongxing
|
7ed0be2a29
|
支付渠道统计bug修正
|
5 years ago |
|
chenzhi
|
b4972959f7
|
优化公会渠道为空问题
|
5 years ago |
|
chenzhi
|
769cbb9e37
|
优化玩家列表检索方式及导出
|
5 years ago |
|
liuweiwen
|
1def746be4
|
修改excel路径
|
5 years ago |
|
chenzhi
|
2433844bf2
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
d3ccc3bb5b
|
暂存
|
5 years ago |
|
yulingwei
|
d172b0ec8b
|
Merge branch 'feature/ltv' into dev
|
5 years ago |
|
yulingwei
|
2f36d3eb1c
|
新增bata链接和开关
|
5 years ago |
|
liuweiwen
|
78e1fefbc7
|
推广员账号判断
|
5 years ago |
|
liuweiwen
|
600ac3fd9e
|
添加推广员时推广公司必填
|
5 years ago |
|
chenzhi
|
12966e83bd
|
优化玩家列表数据显示规则
|
5 years ago |
|
zhanglingsheng
|
6ffd20525d
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
zhanglingsheng
|
3a3afa739c
|
超级签统计--搜索修改
|
5 years ago |
sunke
|
ec1cb552d0
|
落地页管理检索初始化
|
5 years ago |
|
liuweiwen
|
fb4b017515
|
导出搜索时间修改
|
5 years ago |
tping
|
127be94d60
|
充值补单
|
5 years ago |
|
zhengyongxing
|
17821039ab
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
zhengyongxing
|
bd39f880fe
|
平台统计修正
|
5 years ago |
|
tping
|
964eea79e5
|
1, 平台币补单
2，repair_pay表
|
5 years ago |
|
liuweiwen
|
adaa402a14
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
1291009a02
|
游戏统计搜索时间范围
|
5 years ago |
|
zhengyongxing
|
1922e29542
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
zhengyongxing
|
2d63204546
|
支付渠道统计权限注释
|
5 years ago |
|
chenzhi
|
23306ba33b
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
4ab8977f06
|
取消财务管理数据权限
|
5 years ago |
|
zhengyongxing
|
80ebdc7f80
|
支付渠道统计添加权限
|
5 years ago |
|
chenzhi
|
5bbe0c1dcd
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
9d89be4527
|
优化公司游戏名游戏类型关系检索
|
5 years ago |
|
liuweiwen
|
491f8526bb
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
aaabd0a07f
|
游戏统计搜索时间范围
|
5 years ago |
|
zhengchanglong
|
bf6a61f41d
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
liuweiwen
|
b1e9127e9d
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
7b87c7718d
|
游戏统计搜索时间范围
|
5 years ago |
|
zhanglingsheng
|
087a935c45
|
补单记录
|
5 years ago |
|
zhanglingsheng
|
93123b3b95
|
订单记录
|
5 years ago |
|
ELF
|
de81412aef
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
ELF
|
88c1cdcd1b
|
解决冲突
|
5 years ago |
|
tping
|
5af705c2f9
|
通知到账
|
5 years ago |
|
zhengyongxing
|
e4f49e91c2
|
Merge branch 'dev_statistics' into dev
|
5 years ago |
|
zhengyongxing
|
7eb430f746
|
渠道统计bug修正
|
5 years ago |
|
zhengchanglong
|
42c508edee
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
ELF
|
67dd874ccf
|
修改
|
5 years ago |
|
chenzhi
|
5f70aa78d8
|
优化补链记录
|
5 years ago |
|
zhengchanglong
|
616c7f583f
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
27b4eaded5
|
Merge branch 'dev_statistics' into dev
|
5 years ago |
|
zhengyongxing
|
261adfa33c
|
渠道统计bug修正
|
5 years ago |
|
zhengyongxing
|
6e5cfb72b4
|
渠道统计bug修正
|
5 years ago |
|
zhengyongxing
|
4068c12480
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
zhengyongxing
|
3dbab290e6
|
Merge branch 'dev_statistics' into dev
|
5 years ago |
|
zhengyongxing
|
e506f45ed2
|
Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
|
5 years ago |
|
zhengyongxing
|
44dac56d85
|
渠道统计bug修正
|
5 years ago |
|
chenzhi
|
9dcc55d472
|
优化用户列表选择设备无响应问题
|
5 years ago |
|
liuweiwen
|
9ac0277f82
|
Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
|
5 years ago |
|
liuweiwen
|
cfd032b1fa
|
推广员统计
|
5 years ago |
|
chenzhi
|
7a82b930bf
|
优化区服选择不响应问题
|
5 years ago |
|
chenzhi
|
8b968fc9fb
|
优化区服选择无效问题
|
5 years ago |
|
chenzhi
|
c0a0f44287
|
优化推广员注册统计->区服选择不相应bug
|
5 years ago |
|
ELF
|
8d934c8d88
|
修改
|
5 years ago |
|
chenxiaojun
|
92b0bc2c87
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
ec273ab157
|
公会分成管理--更新
|
5 years ago |
|
zhengyongxing
|
66d098a81b
|
数据权限跳转提示去除，直接跳转
|
5 years ago |
|
chenzhi
|
0890e39675
|
公会统计首页新增分页
|
5 years ago |
|
chenzhi
|
85e474c299
|
公会统计首页新增分页
|
5 years ago |
|
zhengchanglong
|
ab5f7267e5
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
zhengchanglong
|
dba78c08cd
|
非管理员数据导出隐藏
|
5 years ago |
|
chenzhi
|
0ef4241570
|
合并statistcs
|
5 years ago |
|
zhengyongxing
|
5417e1751d
|
平台统计修改
|
5 years ago |
|
zhengyongxing
|
32e362ab80
|
平台统计修改
|
5 years ago |
|
zhengyongxing
|
8f1847341f
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
|
5 years ago |
|
zhengyongxing
|
6255d05472
|
平台统计修改
|
5 years ago |
|
liuweiwen
|
0d088037da
|
登录记录查询强制索引
|
5 years ago |
|
liuweiwen
|
5b1a4db378
|
登录记录
|
5 years ago |
|
liuweiwen
|
2e818c04f8
|
登录记录搜索
|
5 years ago |
|
zhengchanglong
|
484972e9f2
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
liuweiwen
|
cc1e3ccbb3
|
推广员账号已存在判断
|
5 years ago |
|
chenzhi
|
624e321b70
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
chenzhi
|
96e52b267a
|
修复没总览依旧显示问题
|
5 years ago |