chenzhi
|
72405e45f5
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
ea6d820408
|
优化页面显示
|
5 years ago |
chenxiaojun
|
009842c218
|
更新
|
5 years ago |
|
chenxiaojun
|
4286817dea
|
推广提现--更新
|
5 years ago |
zhengchanglong
|
9952029e6c
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
066fe46064
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
zhengchanglong
|
eb114b33b3
|
游戏分成比例设定体验优化
|
5 years ago |
|
chenzhi
|
cccbc3bfa8
|
新增cp结算单判断是否已经有交叉时间
|
5 years ago |
|
zhengchanglong
|
89d9b79930
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
zhengyongxing
|
2154899a6a
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
f87026a32c
|
结算单管理生成下游订单
|
5 years ago |
|
chenzhi
|
cda9d0c1a8
|
合并
|
5 years ago |
|
chenzhi
|
cd427a9409
|
新增添加cp上游对账单
|
5 years ago |
|
zhengchanglong
|
7e1b90fc19
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
93fe724c15
|
游戏用户锁定备注显示
|
5 years ago |
|
chenxiaojun
|
a0bcdb2c04
|
更新
|
5 years ago |
|
chenxiaojun
|
08dd26f942
|
推广提现--更新
|
5 years ago |
|
zhengchanglong
|
8144e3c50f
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
e914fde68d
|
玩家列表账号锁定添加备注
|
5 years ago |
|
chenxiaojun
|
3a9a7177fe
|
推广结算--更新
|
5 years ago |
|
chenxiaojun
|
ad80923bed
|
更新
|
5 years ago |
|
chenxiaojun
|
114cb2f7a5
|
更新
|
5 years ago |
|
chenxiaojun
|
f244b42ab7
|
推广结算--更新
|
5 years ago |
yulingwei
|
37156e0dce
|
Merge branch 'feature/pop_rules' into dev
|
5 years ago |
|
yulingwei
|
ed9ddd2d67
|
修复检索问题
|
5 years ago |
|
zhengchanglong
|
505e12beab
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
326d9e5a12
|
管理后台-游戏-游戏编辑：参数配置-新增CP游戏分成比例
|
5 years ago |
liuweiwen
|
602fb33fcc
|
新增需求：管理后台-》系统-》扩展工具-》公司信息管理
|
5 years ago |
|
yulingwei
|
249044b0de
|
Merge branch 'feature/pop_rules' into dev
|
5 years ago |
|
yulingwei
|
5542994e36
|
upt
|
5 years ago |
|
zhengyongxing
|
c6f798dc47
|
市场结算管理bug修正
|
5 years ago |
|
zhengyongxing
|
f124e4b7ff
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
7adb991d0e
|
市场结算管理上传
|
5 years ago |
|
zhengyongxing
|
ba158e6b9a
|
市场结算管理上传
|
5 years ago |
|
chenzhi
|
377bdaee72
|
合并gt
|
5 years ago |
|
chenzhi
|
ff67974413
|
修复获取推广员统计bug
|
5 years ago |
|
zhengyongxing
|
5e14eaf4c9
|
新增市场结算管理完善
|
5 years ago |
|
liuweiwen
|
50320be1d2
|
新增需求：管理后台-》推广公会归属管理，列表，新增，编辑，审批
|
5 years ago |
|
zhengyongxing
|
4fb2806656
|
新增市场结算管理
|
5 years ago |
|
chenxiaojun
|
c8fd6309a7
|
更新
|
5 years ago |
|
chenxiaojun
|
f1e8811df3
|
推广结算--更新
|
5 years ago |
|
chenzhi
|
5326ef28db
|
合并
|
5 years ago |
|
chenzhi
|
94243a5ea6
|
修改update冲突
|
5 years ago |
|
chenzhi
|
c711601fdf
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
216321f46b
|
优化换绑逻辑判断是否订单在审核中
|
5 years ago |
|
zhengyongxing
|
89883d2005
|
新增市场结算管理
|
5 years ago |
|
chenxiaojun
|
f2e0cec5aa
|
更新
|
5 years ago |
|
chenxiaojun
|
0927417ce9
|
推广结算--更新
|
5 years ago |
万盟天下
|
e6d4304d74
|
Merge branch 'hotfix/shift-player' of wmtx/platform into release
还原补链限制
|
5 years ago |
|
chenzhi
|
dfdad21d8e
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
414f326cf4
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
0039431ccb
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
zhengyongxing
|
f1a48fbdaa
|
权限分配 — 未给下级渠道分配（游戏充值）查看权限时，页面展示（游戏充值页面）修正
|
5 years ago |
|
chenzhi
|
1295857697
|
优化工会统计各级检索条件结束
|
5 years ago |
|
chenzhi
|
0561d8ff15
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
f95d23b091
|
优化公会统计各级条件展示
|
5 years ago |
|
liuweiwen
|
4892db340e
|
管理后台-》游戏-》合作方管理-》列表增加字段联系人，联系电话，邮寄地址。公司税号，收款方名称，银行账号，开户行
|
5 years ago |
|
chenzhi
|
9e2eb46904
|
公会统计游戏统计新增多重搜索
|
5 years ago |
|
chenxiaojun
|
09f2ca4ab6
|
更新
|
5 years ago |
|
chenxiaojun
|
962c284467
|
推广结算--更新
|
5 years ago |
|
liuweiwen
|
fa3adf2e0b
|
新增合作方时，新增录入内容
新增联系人，联系电话，邮寄地址。公司税号，收款方名称，
银行账号，开户行
|
5 years ago |
|
chenzhi
|
c20d507df6
|
优化订单判断
|
5 years ago |
|
chenzhi
|
9faec272e3
|
优化订单判断
|
5 years ago |
|
chenzhi
|
3e54338685
|
取消多个推广员无法补链注释
|
5 years ago |
|
chenzhi
|
3f53bc266b
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
878badef43
|
换绑新增判断渠道是否已经结算
|
5 years ago |
|
chenzhi
|
bb7e1c269c
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
876952f3b4
|
公会统计新增内外团检索
|
5 years ago |
|
chenxiaojun
|
89965bd8fb
|
导出
|
5 years ago |
|
chenxiaojun
|
a636c2dcf6
|
导出
|
5 years ago |
|
zhengchanglong
|
715abb2b3e
|
Merge branch 'hotfix/fix_get_gameist' into dev
|
5 years ago |
|
liuweiwen
|
fe0f308e54
|
财务管理下的ajax请求不判断权限
|
5 years ago |
|
chenxiaojun
|
d792e34348
|
结算管理--更新
|
5 years ago |
|
chenxiaojun
|
90eed6f5ca
|
结算管理--更新
|
5 years ago |
|
chenxiaojun
|
461e80bd30
|
结算管理--更新
|
5 years ago |
|
chenxiaojun
|
3faf5db4f7
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenxiaojun
|
c074b5fb86
|
结算管理--更新
|
5 years ago |
|
chenzhi
|
3840959f05
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
a37d0d6ec4
|
优化推广员充值统计排序问题
|
5 years ago |
|
chenzhi
|
9cef29ebeb
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
43774e9099
|
推广员充值统计新增官方渠道统计
|
5 years ago |
|
chenxiaojun
|
4721e60d32
|
推广员资质认证
|
5 years ago |
|
chenzhi
|
4ba400fa78
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
14fa967f00
|
优化推广员统计数据
|
5 years ago |
|
chenxiaojun
|
0ff9f77181
|
推广员资质认证
|
5 years ago |
|
zhengchanglong
|
7c1593e0e1
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
302ee7a2ca
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
5343ef2162
|
工会统计新增内外团
|
5 years ago |
|
chenzhi
|
0caa548525
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
836eccfa78
|
支付渠道新增支付渠道比
|
5 years ago |
|
zhengyongxing
|
acd816c766
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
cc0f5a03c4
|
工会统计新增内外团导出
|
5 years ago |
|
chenzhi
|
07f6e9919d
|
区服列表 区服名称改区服id
|
5 years ago |
 ELF
|
7c5b3bb5e7
|
Merge branch 'feature/account_safe' into dev
|
5 years ago |
|
chenzhi
|
0f7134c838
|
游戏充值 区服名称改区服id
|
5 years ago |
|
ELF
|
4fb2c35495
|
Merge branch 'hotfix/link_info' into dev
|
5 years ago |
|
chenzhi
|
3bf288fa41
|
优化登陆记录区服名称为区服id
|
5 years ago |
|
chenzhi
|
5e08bda6c2
|
优化行为日志区服名称为区服id
|
5 years ago |
|
ELF
|
0a0cedafd5
|
各个系统登录提示安全优化，sessionon_id变更
|
5 years ago |
|
zhengchanglong
|
10c0b3a18a
|
Merge branch 'feature/group_type' into dev
# Conflicts:
# Application/Admin/Controller/PromoteController.class.php
# Data/update.sql
|
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 |
|
ELF
|
8ab02a5e0b
|
还原补链限制
|
5 years ago |
|
廖金灵
|
b12b133a06
|
Merge branch 'hotfix/shift-player' of wmtx/platform into release
修改玩家迁移限制
|
5 years ago |
|
elf@home
|
0bc50cbf70
|
修改限制
|
5 years ago |
|
zhengyongxing
|
d842a5c468
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
zhengyongxing
|
e9ffc0af79
|
平台币充值添加推广员充值搜索修改，玩家列表时间检索非必填
|
5 years ago |
|
chenxiaojun
|
6054b5f6c0
|
更新
|
5 years ago |
|
chenxiaojun
|
0baf97f717
|
会长提现--更新
|
5 years ago |
|
zhengyongxing
|
0068a0d1c4
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
zhengyongxing
|
346bbaa117
|
平台币充值添加推广员充值搜索修改，玩家列表时间检索非必填
|
5 years ago |
|
yulingwei
|
c5f737cb0b
|
Merge branch 'hotfix/login_crontab' into dev
|
5 years ago |
|
yulingwei
|
25606949f5
|
修复登录统计问题
|
5 years ago |
|
chenxiaojun
|
e884214546
|
会长提现|公会分成管理--更新
|
5 years ago |
|
zhengyongxing
|
8652c19f5c
|
平台币充值添加推广员充值搜索
|
5 years ago |
|
chenxiaojun
|
c329ec09f4
|
更新
|
5 years ago |
|
chenxiaojun
|
0758062837
|
会长提现--更新
|
5 years ago |
|
chenxiaojun
|
73537c120e
|
更新
|
5 years ago |
|
chenxiaojun
|
35ea788ed0
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
936240d06a
|
推广结算--更新
|
5 years ago |
|
chenxiaojun
|
15174f8547
|
推广结算--更新
|
5 years ago |
|
chenxiaojun
|
311aeffbb7
|
推广结算--更新
|
5 years ago |
|
chenxiaojun
|
cda8e4c1c0
|
推广结算--更新
|
5 years ago |
|
zhengchanglong
|
0e5be6e4a3
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
chenxiaojun
|
5a0769eb3b
|
更新
|
5 years ago |
|
chenxiaojun
|
e447159971
|
公会分成管理--更新
|
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 |
|
liuweiwen
|
2096c22826
|
注释
|
5 years ago |
|
liuweiwen
|
ec4c820057
|
Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
|
5 years ago |
|
liuweiwen
|
86dd4a2952
|
【用户】-【玩家组】-【登录记录】-选择会长只显示这个会长的登录记录
改为展示这个会长及其所属推广员的登录记录
|
5 years ago |
|
zhengchanglong
|
1ca183b547
|
非管理员数据加密显示
|
5 years ago |
|
zhengchanglong
|
4d06b52b9d
|
Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
|
5 years ago |
|
zhengchanglong
|
c6b8f99b6e
|
非管理员数据加密显示
|
5 years ago |
|
chenzhi
|
b3e09ad5db
|
放行ajax,首页无权限判断
|
5 years ago |
|
zhengchanglong
|
9a2a7df2e6
|
非管理员数据加密显示
|
5 years ago |
|
chenzhi
|
700114cb4c
|
Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
|
5 years ago |
|
chenzhi
|
ae3e5d4048
|
公会导出结束
|
5 years ago |
|
zhengchanglong
|
cc6d095a1c
|
非管理员数据加密显示
|
5 years ago |
|
chenzhi
|
2651a94408
|
公会导出2
|
5 years ago |
|
zhengyongxing
|
10aa8cf81c
|
月结统计导出添加
|
5 years ago |
|
zhengchanglong
|
4968ace29d
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Common/function.php
# Application/Home/Controller/DownloadController.class.php
|
5 years ago |
|
zhengchanglong
|
dbaf93b630
|
非管理员数据加密显示
|
5 years ago |
|
ELF
|
b36e1f1bc9
|
解决冲突
|
5 years ago |
|
zhengyongxing
|
d1a5b63be2
|
Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
|
5 years ago |
|
zhengyongxing
|
71df0ab08b
|
菜单修正
|
5 years ago |
|
chenzhi
|
ba6947987b
|
Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
|
5 years ago |
|
chenzhi
|
e414013f8b
|
优化导出2
|
5 years ago |
|
zhengyongxing
|
b8d736c337
|
Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
|
5 years ago |
|
zhengyongxing
|
00f33befa2
|
平台币收回修正
|
5 years ago |
|
chenxiaojun
|
206c2ed251
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
c5dc3b4f22
|
优化会长统计导出1
|
5 years ago |
|
chenxiaojun
|
1f19360d72
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
81fb39c004
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
liuweiwen
|
3b23c0c5cf
|
后台管理-》统计-》推广员统计，增加判断是否有官方渠道权限
|
5 years ago |
|
sunke
|
5b7a0ad8b2
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
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 |
|
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 |
|
chenxiaojun
|
2559aa32e9
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
6b8e277fb1
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
zhengyongxing
|
628ea84935
|
平台币收回修正
|
5 years ago |
|
zhengyongxing
|
5daf1eb565
|
支付渠道查询修改
|
5 years ago |
|
sunke
|
2f83a85690
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
liuweiwen
|
126d1ca9bc
|
管理后台-》统计-》推广员统计，增加判断当前管理员是否有官方渠道权限
|
5 years ago |
|
chenzhi
|
e4b6cdea85
|
公会修改6
|
5 years ago |
|
liuweiwen
|
b8e5d719d5
|
修复bug：推广员-》数据管理-》实时充值，解决昨日充值与今日充值筛选时间未生效的问题
|
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 |
|
zhengyongxing
|
e8c3f021b6
|
角色查询导出修改
|
5 years ago |
|
chenxiaojun
|
410a3cda1b
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
chenzhi
|
b97a956cbc
|
公会统计5
|
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 |
|
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 |
|
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 |
|
chenxiaojun
|
aa5e404188
|
管理后台>推广员管理>公会分成管理--更新
|
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 |
|
zhengchanglong
|
e08a2eb3ce
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Controller/access_data_foldline.txt
# Data/update.sql
|
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 |
|
zhengchanglong
|
8075ac22f8
|
添加管理员生日字段默认当天
|
5 years ago |
|
zhengchanglong
|
e99e96dfb1
|
添加管理员生日字段默认今天
|
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
|
375bbac885
|
行为日志
|
5 years ago |
|
chenxiaojun
|
3e439715c1
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |