3056 Commits (f2e0cec5aa698bd72c0c4304a1f8326c923df539)

Author SHA1 Message Date
chenxiaojun c329ec09f4 更新 5 years ago
chenxiaojun 731e4d29f7 会长提现--更新 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 053417f7f8 推广结算--更新 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
万盟天下 23defe8174 Merge branch 'master_hotfix_20191228' of wmtx/platform into master
修改工会统计bug
5 years ago
chenzhi 4d0606d6fc 新增渠道查看公司联动 5 years ago
chenzhi f594e3bb14 公会统计新增公司联动 5 years ago
ELF 88c8bef83e Merge branch 'hotfix/promote-status' into release-1.0.0 5 years ago
ELF 87fb1f526e 修改推广员添加时初始默认状态 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
zhanglingsheng 34020fd725 超级签统计--样式 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
ELF 0a86f3a33c 修改样式 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
ELF 6297ff7011 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
ELF 67caddeef0 修改落地页样式 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
ELF 8cdf259fdf Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
ELF c054595a94 修改微信分享bug 5 years ago
chenxiaojun 905769f922 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
chenxiaojun 9a0313b763 公会分成管理--更新 5 years ago
sunke 453c0c3682 链接归属名词修改 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
yulingwei b868b14273 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
yulingwei 21cc6865d5 Merge branch 'hotfix/ltv' into release-1.0.0 5 years ago
yulingwei 2ed2117b6d 更新 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 7d1808a7bf Merge branch 'hotfix/ltv' into dev 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
zhengyongxing e49ed7aa30 支付渠道统计计添加平台币直充金额说明 5 years ago
sunke dcf7efad6f 下载链接菜单显示bug 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 1d69c616d6 优化公会统计页面跳转问题 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 7c7971d48e Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx 5 years ago
zhengyongxing 13f5128dd8 支付渠道统计导出bug修正,游戏充值充值方式检索修正 5 years ago
zhanglingsheng 162e2fe19c Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
zhanglingsheng 5b81f89308 游戏编辑 5 years ago
ELF 460e7288a1 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
ELF 660e0063f7 修改落地页 5 years ago
zhengyongxing 9e99a3890e Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx 5 years ago
zhengyongxing dd86fbaddf 支付渠道统计bug修正 5 years ago
ELF 3246745e58 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
ELF c72888181b Merge branch 'dev' into release-1.0.0 5 years ago
zhanglingsheng 6ab69f8b29 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
zhanglingsheng eabf59d3e3 超级签统计 5 years ago
ELF 5e0c1c0f87 修改 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
zhanglingsheng a2062684af Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
zhanglingsheng 1c2bb7e584 超级签统计 5 years ago
chenxiaojun 0bc657a5fc 充值玩家--更新 5 years ago
chenxiaojun 40da308a08 充值玩家--更新 5 years ago
zhanglingsheng 08e98945ed Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
zhanglingsheng ae2b498e45 超级签统计 5 years ago
chenxiaojun cc83e0e585 充值玩家--更新 5 years ago
chenxiaojun d3a4933b5c 充值玩家--更新 5 years ago
chenxiaojun ee6c6e62b2 充值玩家--更新 5 years ago
ELF 1a8d66e2d7 Merge branch 'dev' into release-1.0.0 5 years ago
ELF cb63520de5 修改落地页 5 years ago
ELF a8643d20a0 Merge branch 'dev' into release-1.0.0 5 years ago
ELF db46d4b079 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
ELF 600d1a27f5 修改 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
chenxiaojun f8b29d9d12 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 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
chenxiaojun 5cf9ad9fd1 充值玩家--更新 5 years ago
zhanglingsheng 9b65fbaabb 超级签统计 5 years ago
chenxiaojun 31e045bdba 充值玩家--更新 5 years ago
chenzhi a61e0f36b5 优化注册统计今日本周本月不变 5 years ago
chenxiaojun a15440e299 充值玩家--更新 5 years ago
chenxiaojun e3742a9d8a 充值玩家--更新 5 years ago
zhanglingsheng befc2ef62b 超级签统计 5 years ago
zhanglingsheng 244e036a21 超级签统计 5 years ago
zhanglingsheng 153c397cf6 超级签统计 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
ELF b1844a0082 修改落地页 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