Commit Graph

1258 Commits (5f6611fc30b8577806358cbe984babb48af2f5fd)

Author SHA1 Message Date
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 推广员充值统计汇总为当前页面的总额,改为所有数据的总和
zhengyongxing e8313dd92b 支付渠道统计时间筛选历史记录去除
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修正
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 加前%导致没用索引
zhengyongxing 444c4e61f2 支付渠道统计bug修正
zhengyongxing 7ed0be2a29 支付渠道统计bug修正
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 添加推广员时推广公司必填
zhanglingsheng 39f1ea9d0c 超级签统计--样式
chenzhi c602946088 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 12966e83bd 优化玩家列表数据显示规则
zhanglingsheng 35375a0c01 超级签统计--JS
zhanglingsheng 6ffd20525d Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhanglingsheng 3a3afa739c 超级签统计--搜索修改
sunke ec1cb552d0 落地页管理检索初始化
liuweiwen 9236c4135a Merge remote-tracking branch 'origin/dev' into dev
liuweiwen fb4b017515 导出搜索时间修改
zhengyongxing 237faf5956 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
tping 127be94d60 充值补单
zhengyongxing 5f4b02b9c5 超级签订单菜单修正
liuweiwen 3244238849 修改文字
liuweiwen 82c76cbbba Merge remote-tracking branch 'origin/dev' into dev
liuweiwen ea3cdf26d8 游戏统计搜索合作公司与游戏联动
直充支出明细多条数据可滚动
chenzhi 34aac60bfa Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 44407cdb89 优化游戏选择公司联动
zhengyongxing 17821039ab Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing bd39f880fe 平台统计修正
chenzhi e1ad428dfe Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 795c1983ad 优化官方渠道没有渠道查看
tping 964eea79e5 1, 平台币补单
2,repair_pay表
liuweiwen adaa402a14 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 1291009a02 游戏统计搜索时间范围
chenzhi a6ad40b45a 公会统计新增返回按钮
chenzhi 6288e5e64e 优化游戏列表搜索推广员没掉问题
chenzhi 43ba5afd45 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 9549812c41 修复第二页数据不显示问题
zhengyongxing 65e13bbcc5 测试白名单bug修正
zhengyongxing 1922e29542 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing 2d63204546 支付渠道统计权限注释
chenzhi 23306ba33b Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 4ab8977f06 取消财务管理数据权限
zhengyongxing 80ebdc7f80 支付渠道统计添加权限
chenzhi 9b7f3d1104 优化csv导出默认为不转码
chenzhi 5bbe0c1dcd Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 9d89be4527 优化公司游戏名游戏类型关系检索
liuweiwen 491f8526bb Merge remote-tracking branch 'origin/dev' into dev
liuweiwen aaabd0a07f 游戏统计搜索时间范围
zhengchanglong bf6a61f41d Merge branch 'release-1.0.0' into dev
liuweiwen b1e9127e9d Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 7b87c7718d 游戏统计搜索时间范围
chenzhi cceae049bb Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi d1cca460be 优化公会统计游戏搜索框
zhanglingsheng 087a935c45 补单记录
zhanglingsheng 93123b3b95 订单记录
ELF de81412aef Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 88c1cdcd1b 解决冲突
tping 5af705c2f9 通知到账
liuweiwen 26726f32bf 游戏统计下拉框改为select2
zhengyongxing e4f49e91c2 Merge branch 'dev_statistics' into dev
zhengyongxing 7eb430f746 渠道统计bug修正
zhengchanglong 42c508edee Merge remote-tracking branch 'origin/dev' into dev
ELF 67dd874ccf 修改
chenzhi 5f70aa78d8 优化补链记录
zhengchanglong 616c7f583f Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Data/update.sql
zhengyongxing 27b4eaded5 Merge branch 'dev_statistics' into dev
zhengyongxing 261adfa33c 渠道统计bug修正
zhengyongxing 6e5cfb72b4 渠道统计bug修正
zhengyongxing 4068c12480 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing 3dbab290e6 Merge branch 'dev_statistics' into dev
zhengyongxing e506f45ed2 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
zhengyongxing 44dac56d85 渠道统计bug修正
chenzhi 9dcc55d472 优化用户列表选择设备无响应问题
chenzhi 116dc2c86f 优化三角色说明
chenzhi 1f4490733a 优化推广员注册用户
chenzhi 0cec46ed37 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 8c577ec4af 新增平台统计说明
liuweiwen 9ac0277f82 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen cfd032b1fa 推广员统计
chenzhi 7a82b930bf 优化区服选择不响应问题
chenzhi 8b968fc9fb 优化区服选择无效问题
chenzhi c0a0f44287 优化推广员注册统计->区服选择不相应bug
ELF 8d934c8d88 修改
chenxiaojun 92b0bc2c87 公会分成管理--更新
chenxiaojun ec273ab157 公会分成管理--更新
zhengyongxing 66d098a81b 数据权限跳转提示去除,直接跳转
liuweiwen 3e5dbd6571 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 20bee7bbc9 管理后台登录时间改为1小时
chenzhi 0890e39675 公会统计首页新增分页
chenzhi 85e474c299 公会统计首页新增分页
chenzhi 4dc8a8cb6d 优化导出为新开一个窗口
chenzhi cf89e73281 优化csv导出函数
zhengchanglong ab5f7267e5 Merge branch 'release-1.0.0' into dev
zhengyongxing a2c4e3f2e3 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing 792906e448 平台币充值功能添加
liuweiwen fcbd598e3c 管理后台登录时间改为1小时
zhengyongxing eb187fa8d8 超级签详情链接添加
chenzhi 629c733742 删除函数重复问题
zhengchanglong dba78c08cd 非管理员数据导出隐藏
zhengchanglong a45fde72dd 非管理员数据导出隐藏
chenzhi 0ef4241570 合并statistcs
zhengyongxing 09924a5cc3 超级签详情链接添加
zhengyongxing 5417e1751d 平台统计修改
zhengyongxing 32e362ab80 平台统计修改
zhengyongxing 8f1847341f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing 6255d05472 平台统计修改