Commit Graph

3193 Commits (709094c5bedab5553efc92ad3b2f768858e29b14)

Author SHA1 Message Date
ELF 04fccce6dc 修改上传网络请求限制
zhengyongxing f1a48fbdaa 权限分配 — 未给下级渠道分配(游戏充值)查看权限时,页面展示(游戏充值页面)修正
chenzhi 1295857697 优化工会统计各级检索条件结束
chenzhi 0561d8ff15 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi f95d23b091 优化公会统计各级条件展示
ELF fe68d8e8c9 修改oss上传返回结果
liuweiwen 4892db340e 管理后台-》游戏-》合作方管理-》列表增加字段联系人,联系电话,邮寄地址。公司税号,收款方名称,银行账号,开户行
ELF e6c891a945 修改
ELF f472f5e9d3 文件保存改成cdn
chenzhi 9e2eb46904 公会统计游戏统计新增多重搜索
chenxiaojun 962c284467 推广结算--更新
liuweiwen fa3adf2e0b 新增合作方时,新增录入内容
新增联系人,联系电话,邮寄地址。公司税号,收款方名称,
银行账号,开户行
chenzhi c20d507df6 优化订单判断
chenzhi 878badef43 换绑新增判断渠道是否已经结算
ELF 91d4c9f753 补链/玩家迁移排除已结算订单(cp结算)
chenzhi 876952f3b4 公会统计新增内外团检索
chenxiaojun 89965bd8fb 导出
chenxiaojun 631c23568d 上传汇款证明--调整
chenxiaojun 90eed6f5ca 结算管理--更新
chenxiaojun c074b5fb86 结算管理--更新
chenzhi a37d0d6ec4 优化推广员充值统计排序问题
chenzhi 43774e9099 推广员充值统计新增官方渠道统计
chenzhi 14fa967f00 优化推广员统计数据
zhengyongxing 302ee7a2ca Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 5343ef2162 工会统计新增内外团
chenzhi 0caa548525 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 836eccfa78 支付渠道新增支付渠道比
zhengyongxing acd816c766 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing cc0f5a03c4 工会统计新增内外团导出
chenzhi 07f6e9919d 区服列表 区服名称改区服id
chenzhi 0f7134c838 游戏充值 区服名称改区服id
chenzhi 3bf288fa41 优化登陆记录区服名称为区服id
chenzhi 5e08bda6c2 优化行为日志区服名称为区服id
ELF 0a0cedafd5 各个系统登录提示安全优化,sessionon_id变更
chenzhi 432c84ba01 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi e39c811da8 修改月结月份显示错误问题
liuweiwen 4addf4c281 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 0b3ae062b1 优化:推广员新增与编辑的推广公司增加万盟天下科技
新增需求:推广员增加工会归属和工会关系属性
zhengyongxing 10f6caddfa 工会统计新增内外团占比
ELF 8ab02a5e0b 还原补链限制
廖金灵 b12b133a06 Merge branch 'hotfix/shift-player' of wmtx/platform into release
修改玩家迁移限制
elf@home 0bc50cbf70 修改限制
elf@home e59a2f7350 添加玩家迁移只对同一推广员限制
chenxiaojun 0baf97f717 会长提现--更新
chenxiaojun a12c3ecf9e 会长提现--更新
ELF 96efc54888 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/login_crontab
yulingwei 25606949f5 修复登录统计问题
chenxiaojun e884214546 会长提现|公会分成管理--更新
ELF f1dc5f8920 推广员继承company_id
ELF 2efbeaf13f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
万盟天下 23defe8174 Merge branch 'master_hotfix_20191228' of wmtx/platform into master
修改工会统计bug
chenzhi 4d0606d6fc 新增渠道查看公司联动
chenzhi f594e3bb14 公会统计新增公司联动
ELF 88c8bef83e Merge branch 'hotfix/promote-status' into release-1.0.0
ELF 87fb1f526e 修改推广员添加时初始默认状态
elf@home 6e354fe3b3 优化链接归属查询
liuweiwen 6625eaa4f7 工会统计
liuweiwen 809e9d36f1 工会统计
liuweiwen 28a1efe2f4 工会统计列表数据与搜索修复
liuweiwen b3e32506cc 工会统计搜索公司
liuweiwen c44e5ee1a7 编辑推广员时,只允许会长修改推广公司,同时更改底下推广员的公司
zhanglingsheng 7a9fe4fb45 超级签统计--导出
zhanglingsheng 34020fd725 超级签统计--样式
yulingwei 9d5bfc5ef2 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng e3ef73e7e3 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng e709816781 补单记录
yulingwei 75d3e87f89 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
yulingwei 899877e872 同步修改
ELF 834115c213 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 561787a4ac 修改
zhanglingsheng 8a9e0a9a8b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng ca401adbd0 补单记录
ELF a70c1aee21 Merge branch 'release-1.0.0' into dev
ELF 0a86f3a33c 修改样式
chenzhi 04c560312f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 715a1a8a2c 优化推广统计区服问题
ELF 6297ff7011 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 67caddeef0 修改落地页样式
yulingwei f4495f93a9 ltv修改
yulingwei 3ec7ccc188 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
yulingwei 873c81605e 修复
zhanglingsheng 908de1336f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng b88f395c9a 补单记录
zhanglingsheng 6a28abedc0 补单记录
ELF 8cdf259fdf Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF c054595a94 修改微信分享bug
chenxiaojun 905769f922 Merge remote-tracking branch 'origin/dev' into dev
chenxiaojun 9a0313b763 公会分成管理--更新
sunke 453c0c3682 链接归属名词修改
chenxiaojun e66893dc7f 公会分成管理--更新
yulingwei 8ccde7749a Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei 3e11b4d0ad 更新
yulingwei 1e3079870e Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei ee18eac375 修复
yulingwei b868b14273 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
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
zhengyongxing f8092fa9e5 支付渠道游戏订单bug修正
zhanglingsheng 3a7c4c9bad 超级签统计--合计
zhanglingsheng 6d34f317a1 超级签统计--合计金额
zhengchanglong 8fc5190830 Merge branch 'master_hotfix' into dev
zhengchanglong 56750b3829 Merge branch 'master_hotfix' into release-1.0.0
chenzhi 652b193f71 优化玩家列表设备号赛选
chenzhi 901d780165 优化公会弹框游戏选择
zhengchanglong a69c7c19ab Merge branch 'dev' into release-1.0.0
zhengchanglong f640531c0b Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen 8615caa33f 游戏统计-搜索
zhengchanglong dc57a5e5f4 Merge branch 'master_hotfix' into release-1.0.0
zhengyongxing f8b570c20e 支付渠道统计bug修正
chenzhi 3561a87d4a 优化玩家列表数据
liuweiwen ed0283aff6 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen d31c2f28f3 游戏统计
zhengyongxing 9b4ebd6c29 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing 7a98ee81cb 支付渠道统计bug修正
ELF aa0ec5758a 修改
ELF 727795050c 修改
ELF cd6f6e5610 修改
ELF eddc5eb7a6 修改
ELF b20e7f233b Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF a1862fd240 修改
liuweiwen 93c5e311a6 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen 4f96c4728d Merge remote-tracking branch 'origin/dev' into dev
liuweiwen c58f88fe7f Merge branch 'master_hotfix' into dev
liuweiwen 765188890b like 加前%导致没用索引
ELF 4b46cd4563 修改
ELF 4536b77714 修改
ELF 18e39c5fc7 修改
ELF 6621467b58 修改
ELF 5c7d699353 修改落地页
ELF 0405ada382 修改落地页
ELF 51086b0c94 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 1de7a0f3ac 修改落地页
zhengyongxing 444c4e61f2 支付渠道统计bug修正
ELF cb74200850 修改落地页
ELF 2373eb5ae3 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF d7b244e5d5 修改落地页
zhengyongxing 7ed0be2a29 支付渠道统计bug修正
ELF 4ae7fab2bf Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 48b18db141 修改落地页
chenzhi 882fec0390 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi b4972959f7 优化公会渠道为空问题
liuweiwen 69013539cd 修改excel路径,自动跳过excel为空的行
chenzhi 769cbb9e37 优化玩家列表检索方式及导出
liuweiwen 1def746be4 修改excel路径
chenzhi 469db01864 优化玩家列表说明
chenzhi 2433844bf2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 82afa60d12 优化玩家列表导出2
chenzhi d3ccc3bb5b 暂存
yulingwei d172b0ec8b Merge branch 'feature/ltv' into dev
yulingwei 2f36d3eb1c 新增bata链接和开关
liuweiwen 78e1fefbc7 推广员账号判断
liuweiwen 600ac3fd9e 添加推广员时推广公司必填