Commit Graph

2948 Commits (cc0f5a03c48f49c1e0ec4bc0c199ad13cd3e4d5f)

Author SHA1 Message Date
yulingwei 21cc6865d5 Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei 2ed2117b6d 更新
ELF ad67717292 Merge branch 'release-1.0.0' into dev
yulingwei e2ed862130 Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei 7d1808a7bf Merge branch 'hotfix/ltv' into dev
yulingwei 12f00ad268 修复
chenzhi a5c926b2cd 优化区服预告区服选择
chenzhi ff46ab04ca Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi f580b44289 优化推广员统计区服选择
liuweiwen 2db651ae9c Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen bc28933369 游戏订单查看-》导出通知成功数据
zhengyongxing e055cc27d5 ajax游戏区服搜索设备非必填
zhengyongxing e49ed7aa30 支付渠道统计计添加平台币直充金额说明
sunke dcf7efad6f 下载链接菜单显示bug
liuweiwen 6dbfd09e91 编辑推广员时推广公司必填
zhengyongxing ea80b8fd44 游戏充值统计检索条件修正
zhengyongxing d59e8633c6 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing 2f25386518 游戏充值统计检索条件修正
ELF 841bf0c0b9 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 9bf45ae0d3 修改
zhengyongxing b96e65b8fe 游戏充值统计检索条件修正
chenzhi 1d69c616d6 优化公会统计页面跳转问题
chenzhi f38e007d80 优化渠道的公司检索
chenzhi 47595c81b8 优化公会统计公司
chenzhi c590b948ef 优化推广员充值统计导出
chenzhi 0a006bbcc2 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi fd23b640ea 优化推广员充值优化代码
zhengyongxing 7c7971d48e Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing 13f5128dd8 支付渠道统计导出bug修正,游戏充值充值方式检索修正
zhanglingsheng 162e2fe19c Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng 5b81f89308 游戏编辑
ELF 460e7288a1 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 660e0063f7 修改落地页
zhengyongxing 9e99a3890e Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing dd86fbaddf 支付渠道统计bug修正
ELF 3246745e58 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF c72888181b Merge branch 'dev' into release-1.0.0
zhanglingsheng 6ab69f8b29 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhanglingsheng eabf59d3e3 超级签统计
ELF 5e0c1c0f87 修改
zhengyongxing b5c06df195 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing 4e3206a5c1 支付渠道统计bug修正
zhanglingsheng a2062684af Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng 1c2bb7e584 超级签统计
chenxiaojun 0bc657a5fc 充值玩家--更新
chenxiaojun 40da308a08 充值玩家--更新
zhanglingsheng 08e98945ed Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng ae2b498e45 超级签统计
chenxiaojun cc83e0e585 充值玩家--更新
chenxiaojun d3a4933b5c 充值玩家--更新
chenxiaojun ee6c6e62b2 充值玩家--更新
ELF 1a8d66e2d7 Merge branch 'dev' into release-1.0.0
ELF cb63520de5 修改落地页
ELF a8643d20a0 Merge branch 'dev' into release-1.0.0
ELF db46d4b079 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 600d1a27f5 修改
chenzhi 5e246dde2b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 85b821081f 优化推广员充值统计今日本周本月不变
chenxiaojun f8b29d9d12 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng 683fc44d94 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenxiaojun 5cf9ad9fd1 充值玩家--更新
zhanglingsheng 9b65fbaabb 超级签统计
chenxiaojun 31e045bdba 充值玩家--更新
chenzhi a61e0f36b5 优化注册统计今日本周本月不变
chenxiaojun a15440e299 充值玩家--更新
chenxiaojun e3742a9d8a 充值玩家--更新
zhanglingsheng befc2ef62b 超级签统计
zhanglingsheng 244e036a21 超级签统计
zhanglingsheng 153c397cf6 超级签统计
ELF a167c51582 Merge branch 'dev' into release-1.0.0
yulingwei e97b1ed22e Merge branch 'feature/ltv' into dev
yulingwei 65ed103d3a 修复beta链接格式
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
liuweiwen e40b92a0d7 优化-【统计】-【平台统计】-【游戏注册】、【游戏充值统计】、【注册方式统计】和【充值方式统计】的今日充值、本周充值、本月充值不根据时间筛选改变
ELF b1844a0082 修改落地页
zhengyongxing b0899f3fc9 支付渠道统计bug修正,官网与推广后台充值计入平台币
ELF 9b5697a859 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 1fcbe2dd65 Merge branch 'dev' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng 56da5cd85a Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhanglingsheng 59709fa295 游戏--添加支付方式渠道配置
liuweiwen 1e9409ef1a 优化-【统计】-【平台统计】-【游戏注册】、【游戏充值统计】、【注册方式统计】和【充值方式统计】的今日充值、本周充值、本月充值不根据时间筛选改变
zhanglingsheng 669baefe5e 游戏--添加支付方式渠道配置
chenzhi 0ec79e6cb9 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 24c2ea0031 优化区服预告的区服选择
yulingwei 53b4bfa0b8 Merge branch 'feature/ltv' into dev
yulingwei 30922605e2 修复
yulingwei a851b31cb6 Merge branch 'feature/ltv' into dev
yulingwei 6671565b5e 修复问题
ELF 8a2f36b5a3 Merge branch 'dev' into release-1.0.0
yulingwei fe8a99b0ec Merge branch 'feature/ltv' into dev
yulingwei 931893640a 修改问题
chenzhi fe06fded2a 优化区服列表,隐藏操作,新增id
zhengyongxing c1e16ed8d4 推广员充值统计汇总为当前页面的总额,改为所有数据的总和
ELF 31723fbc0b 修改bug
zhengyongxing e8313dd92b 支付渠道统计时间筛选历史记录去除
ELF bfd8d2d6f4 修改bug
zhengyongxing 79f74dfbd4 支付渠道游戏订单导出bug修正
ELF ea15b6427c 修改落地页
ELF bf5ad7aa85 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 7f6730a562 修改留存率bug