4220 Commits (3423aff9dc69dfb579776641a0379789c4727b6d)

Author SHA1 Message Date
zhengyongxing 1d27db663a ip限制白名单提示语修改 5 years ago
zhengyongxing 5f815370e8 ip限制白名单提交 5 years ago
zhengyongxing c3adec70ec ip限制白名单提交 5 years ago
sunke 41f6797e97 表格样式 5 years ago
sunke 7da471b6ee 支付时间 5 years ago
yulingwei 8e7dd34b92 upt 5 years ago
yulingwei 4afce87caa upt 5 years ago
yulingwei b56ba0b882 upt 5 years ago
yulingwei 823062c0f6 upt 5 years ago
yulingwei adf11e2b60 upt 5 years ago
yulingwei fc3b7be03e upt 5 years ago
ELF 6112d6d00c 修改样式 5 years ago
yulingwei 175502e384 fix 5 years ago
zhengyongxing 5d81a253db ip限制控制器提交 5 years ago
yulingwei b10717e8b6 upt 5 years ago
ELF d6a30964b1 修改落地页 5 years ago
chenzhi bfee0578d0 玩家列表新增去重数据栏 5 years ago
ELF bda92e4e1a 用户重复标识-注册事件通知 5 years ago
yulingwei 18b0c3024d upt 5 years ago
yulingwei ead4a8598e upt 5 years ago
yulingwei d9c338acd8 upt 5 years ago
ELF a06b199068 落地页记录下载日志 5 years ago
chenzhi c61f750549 优化新增推广员员时手机号错误问题 5 years ago
廖金灵 82bd30c4d4 Merge branch 'hotfix/guanwang_beian' of wmtx/platform into release
新增备案跳转
5 years ago
chenzhi 3c8289f382 优化链接打开方式 5 years ago
chenzhi 9ff62b1648 新增备案跳转 5 years ago
zhengyongxing a086b38d3e 管理后台日志唯一键值bug修改 5 years ago
zhengyongxing f904ecec94 管理后台日志唯一键值bug修改 5 years ago
chenzhi 26300062b1 推广员-数据管理-实时充值 优化打开速度 5 years ago
廖金灵 5f6bc934a9 Merge branch 'hotfix/apply_game' of wmtx/platform into release
修改添加下級游戲無法顯示推廣員bug
5 years ago
ELF c4b03c2a7d 修改添加下級游戲無法顯示推廣員bug 5 years ago
zhengyongxing d5561209fd 管理后台日志唯一键值bug修改 5 years ago
zhengyongxing 958fb41227 管理后台日志唯一键值修改 5 years ago
廖金灵 e885a75d1d Merge branch 'fix/member_user_info' of wmtx/platform into release
优化游戏统计及公会统计打开速度
5 years ago
chenzhi 381327ae21 优化游戏统计 5 years ago
chenzhi a33bf22e52 优化弹框 5 years ago
chenzhi a69ef9e118 优化公会统计平台币内充详情不符问题 5 years ago
chenzhi 76cd530239 优化获取子渠道基函数 5 years ago
chenzhi 27d4e7835d 优化公会统计索引1 5 years ago
廖金灵 9b6d2a72d9 Merge branch 'fix/member_user_info' of wmtx/platform into release
优化用户列表统计数据
5 years ago
yulingwei cf0762cb9c upt 5 years ago
yulingwei 315ebb2152 upt 5 years ago
chenzhi 71530c53e3 优化公会统计内充详情不符问题 5 years ago
chenzhi 75c934490e 测试 回退 5 years ago
chenzhi b8d4204ef9 ceshi 5 years ago
chenzhi 02d36af96a Merge branch 'feature/add_opertion_log' of 47.111.118.107:wmtx/platform into feature/add_opertion_log 5 years ago
chenzhi d64895896f 优化公会统计默认值 5 years ago
zhengyongxing e31138b5a5 测试白名单bug修改 5 years ago
chenzhi ccda6e0b39 开启操作日志 5 years ago
chenzhi 45cad05508 优化用户列表统计数据 5 years ago
sunke 0c0b2d2f01 record_PromoteLogs热修复 5 years ago
chenzhi 44afe1f65d 优化玩家列表统计方式及回退去重功能 5 years ago
yulingwei fa41426908 upt 5 years ago
yulingwei 1e3533720b utp 5 years ago
yulingwei 4caa02a76b upt 5 years ago
yulingwei b8fda2417a 工单管理 5 years ago
sunke 31ac6f0a1a 推广后台财务管理退回导出设备版本 5 years ago
sunke 389ef7e967 bug修复 5 years ago
ELF b81842e6e0 解决冲突 5 years ago
zhengyongxing 48239c0f13 测试订单bug修改 5 years ago
ELF 9e82faf6f3 关闭后台操作日志 5 years ago
sunke 098c63d63d 支付渠道优化 5 years ago
zhengyongxing 141bdf561a 支付渠道添加索引 5 years ago
sunke 2ecb05d924 支付渠道统计 5 years ago
zhengyongxing 2ff97a4f41 Merge branch 'feature/user_repeat' into release 5 years ago
zhengyongxing e32be1bb57 测试资源权限去除 5 years ago
zhengyongxing 02b6db4aac Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
zhengyongxing 71751034b0 Merge branch 'feature/user_repeat' into release 5 years ago
zhengyongxing 458aea9c2a 测试资源bug修正 5 years ago
sunke 3edb0640ed 新增管理后台测试订单导出功能 5 years ago
chenzhi 0344471659 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi cfbbf8e76b 优化默认公司名称为海南万盟天下科技 5 years ago
zhengyongxing 3302015365 行为日志增加修改绑定推广员操作 5 years ago
zhengyongxing 4ee6146a49 Merge branch 'feature/user_repeat' into release 5 years ago
zhengyongxing c6eef5124d 测试资源修改 5 years ago
zhengyongxing 7f0c883904 Merge remote-tracking branch 'origin/release' into release 5 years ago
zhengyongxing 11f8434215 Merge branch 'feature/user_repeat' into release 5 years ago
zhengyongxing a2312d9eaa 用户去重bug修改 5 years ago
chenzhi 50b21f45ab Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi 7fa400a0a5 优化公会统计统计栏样式 5 years ago
zhengyongxing 443abed206 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log 5 years ago
zhengyongxing 19d85f3717 测试资源可用余额接口修改 5 years ago
chenzhi 8fdcf88825 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi 3cbf6c5a39 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi fac54ad10d 优化绑币收回内存 5 years ago
zhengyongxing 15cd1b51da Merge branch 'feature/user_repeat' into release 5 years ago
zhengyongxing 1a6282c52c 测试资源可用余额接口修改 5 years ago
zhengyongxing caddcd1543 日志管理删除url开启 5 years ago
zhengyongxing 14c3d365e3 Merge branch 'feature/user_repeat' into release 5 years ago
zhengyongxing 800680c6c0 测试资源申请审核验证增加区服 5 years ago
zhengyongxing ffd6238bc1 测试订单bug修正 5 years ago
zhengyongxing d6db0d3789 测试资源根据可用余额进行验证 5 years ago
chenzhi fd7dc828bd Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi 650d0c8f69 优化公会统计内外团检索 5 years ago
chenzhi 63314e6ccc Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi a340a74864 优化公会统计游戏统计的内外团统计 5 years ago
chenzhi 9208f78293 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi cc3552b862 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi d0f07315da 操作日志前端检索名词修改 5 years ago
yulingwei 4b195fa3ba Merge branch 'hotfix/fix_bug' into release 5 years ago
万盟天下 a47d41903a Merge branch 'hotfix/fix_bug' of wmtx/platform into master
渠道费率问题
5 years ago
yulingwei 68cee2d381 fix 5 years ago
zhengyongxing 8ef0543b56 游戏统计错位bug提交 5 years ago
zhengyongxing f840a59ce2 日志操作bug修复 5 years ago
sunke 772f6c0a2d 操作日志降序 5 years ago
zhengyongxing a763b96199 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log 5 years ago
zhengyongxing c1ad1396bc 日志操作bug修复 5 years ago
chenzhi 62c8c1e54d Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi a44b8670b0 玩家信息修改操作日志 5 years ago
chenzhi 7d5d6c3b3d 礼包管理-操作日志 5 years ago
zhengyongxing b864934969 行为日志时间筛选修正 5 years ago
chenzhi dd0f930105 游戏预告-操作日志 5 years ago
zhengyongxing 10f2f4b210 行为日志导出错误修改 5 years ago
zhengyongxing 0443871173 用户列表去除重复行 5 years ago
chenzhi c24b5b9e9c 合作方管理-操作日志 5 years ago
chenzhi 79108b7a93 原包管理-操作日志 5 years ago
zhengyongxing 61c2519ccd 单独判断admin 5 years ago
zhengyongxing 67ab1fa89e Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log 5 years ago
zhengyongxing b87dec3aee 管理员权限从用户改成以组的形式 5 years ago
zhengyongxing 25954045e9 Merge remote-tracking branch 'origin/release' into release 5 years ago
zhengyongxing 0b8c42379d 游戏导出设备类型修正 5 years ago
chenzhi 0b8cf1d3ee Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi 44f44d0c4a 操作日志函数修改 5 years ago
chenzhi ae34eecb24 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi 77dbc94063 游戏类型-操作日志 5 years ago
zhengyongxing 3b73c1d340 操作日志bug修正 5 years ago
万盟天下 52e058ba49 Merge branch 'hotfix/landing-page' of wmtx/platform into master
修改落地页ios注册
5 years ago
万盟天下 bab656e823 Merge branch 'hotfix/log-landing-page' of wmtx/platform into master
落地页useragent记录
5 years ago
zhengyongxing 7f0cc29c78 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
zhengyongxing 77ddb1eded Merge branch 'feature/operation_log' into release 5 years ago
liuweiwen 1f9a407794 Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen 010080e32b Merge branch 'feature/yibao_company' into release 5 years ago
liuweiwen f35c7bdc77 实时充值查询增加易宝支付 5 years ago
zhengyongxing 19cbae833a 操作日志bug修正 5 years ago
zhengyongxing bfe5aeec0a Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log 5 years ago
zhengyongxing 31948abdf4 操作日志bug修正 5 years ago
chenzhi b7d0012d6e 游戏列表-操作日志 5 years ago
zhengyongxing f9be1c2f48 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log 5 years ago
zhengyongxing 498508b7f1 推广结算管理日志添加 5 years ago
zhengyongxing 665b4c8bfa 推广结算管理日志添加 5 years ago
zhengyongxing 9a2ee9d28f 行为日志行为字段bug修改 5 years ago
chenzhi 61a29307f2 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log 5 years ago
chenzhi 8bb790cf4e 优化月结导出错误 5 years ago
zhengyongxing ab6e063c9a 推广员管理管理日志添加 5 years ago
chenzhi a9f984d0aa 充值大块-操作日志ok 5 years ago
liuweiwen 10ebbedcbb Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen 969bf4dc8a Merge branch 'feature/yibao_company' into release
# Conflicts:
#	Application/Admin/Common/extend.php
5 years ago
liuweiwen 5d596094a6 增加易宝支付 5 years ago
liuweiwen f74cfcc756 增加易宝支付 5 years ago
liuweiwen 3b415976eb 增加易宝支付 5 years ago
chenzhi 31c7732002 支付渠道统计-操作日志 5 years ago
ELF 2971f260da Merge branch 'hotfix/landing-page' into release 5 years ago
ELF cd8d6d5a76 调试 5 years ago
zhanglingsheng c6e1493035 易宝支付 5 years ago
chenzhi 71f2453bb4 绑币回收-操作日志 5 years ago
ELF 350fd45b40 Merge branch 'hotfix/log-landing-page' into release 5 years ago
ELF 3ef3e8e819 落地页useragent记录 5 years ago
ELF 02e85ac94c Merge branch 'hotfix/log-landing-page' into release 5 years ago
ELF 0105fafcb3 落地页useragent记录 5 years ago
liuweiwen aa7e6fa0ec 推广公司新增与编辑减少必填项 5 years ago
chenzhi cb696c923f 后台发放(玩家)-操作日志 5 years ago
chenzhi e6fe04a218 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log 5 years ago
chenzhi 60edd1f8ca 后台发放(玩家)1-操作日志 5 years ago
zhengyongxing 9cb8fadf39 测试资源管理日志添加 5 years ago
ELF ae29e6ef53 Merge branch 'hotfix/landing-page' into release 5 years ago
ELF 0010ca54f7 修改落地页样式 5 years ago
chenzhi 31a0a174bd 后台发放-操作日志 5 years ago
ELF e55d8021ee Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
ELF 7a6b996752 Merge branch 'hotfix/landing-page' into release 5 years ago
ELF 04bbf3534b 修改落地页ios注册 5 years ago
chenzhi 4cd078450c 平台币充值-操作日志 5 years ago
chenzhi 6617fff329 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log 5 years ago
chenzhi f6d991124b 平台币充值-操作日志 5 years ago
liuweiwen c9d69414ba Merge branch 'hotfix/game_recharge_stat' into release 5 years ago
liuweiwen 22aa120ad6 去掉多余的换行 5 years ago
liuweiwen 1a4bf752c4 Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen 9468366a99 Merge remote-tracking branch 'origin/release' into release 5 years ago
zhengyongxing 04f2b0c8df Merge branch 'feature/operation_log' into release
# Conflicts:
#	Application/Admin/Common/extend.php
#	Data/update.sql
5 years ago
liuweiwen b081544805 Merge branch 'hotfix/game_recharge_stat' into release 5 years ago
zhengyongxing 0aa1f53a5f 下游结算单管理日志添加 5 years ago
zhanglingsheng 95f93bdc04 配置添加易宝支付 5 years ago
liuweiwen 4a45103650 平台币充值汇总补一列 5 years ago
chenzhi 037675ce1d Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log 5 years ago
zhengyongxing 5224eec9f2 上游结算单管理日志添加 5 years ago
liuweiwen 9221b18955 游戏统计汇总权限 5 years ago
chenzhi cbd1625ecb Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log 5 years ago
chenzhi 6cb25fe7fe 游戏充值-操作日志 5 years ago
sunke 5dd81207cc 日志 5 years ago
sunke cb80f197ff Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_log 5 years ago
sunke 715d8ace1c 下载中心修复 5 years ago
zhengyongxing 6483047fe4 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log 5 years ago
zhengyongxing 5e794bd785 推广员日志记录添加 5 years ago
liuweiwen b84bd08f95 Merge branch 'feature/resource_config' into release 5 years ago
liuweiwen 1f4f00d696 增加注释 5 years ago
sunke 1f6de9be57 操作日志 5 years ago
liuweiwen bf7a2e36e4 Merge remote-tracking branch 'origin/release' into release 5 years ago
zhanglingsheng efdba69f60 易宝支付配置 5 years ago
zhengchanglong a78b38c88e 录入测试订单 时间控件修改 5 years ago
zhanglingsheng ee3db4d472 获取支付配置添加易宝支付 5 years ago
liuweiwen 5d05edbca6 资源自动审核扣除已审核额度,申请后续增加自动审核功能 5 years ago
chenzhi e129a044d4 操作日志-角色权限 5 years ago
zhengyongxing 8aae878cf8 游戏统计修改 5 years ago
zhengyongxing 3c628fa1c6 统计日志添加 5 years ago
chenzhi 81830703f3 角色权限-操作日志1 5 years ago
zhanglingsheng 9c39b731fd Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
zhanglingsheng dbd1e6f070 易宝支付配置 5 years ago
liuweiwen 94293b4bec Merge branch 'feature/resource_config' into release 5 years ago
liuweiwen b4fafbe0bf 修改配置比例范围 5 years ago
chenzhi 3a9575c602 管理员列表增删改导出-操作日志 5 years ago
liuweiwen fa9746342f Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen cc8e2149e0 最低额度,最高额度,比例数据格式校验 5 years ago
zhengchanglong ba96083bb5 录入测试订单 时间控件修改 5 years ago
zhanglingsheng 0363058592 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
zhanglingsheng c9eecfa9c5 获取支付配置添加易宝支付 5 years ago
liuweiwen 1e24fadb79 最低申请额度与最高申请额度不能小于0 5 years ago
chenzhi 40d2c2777f 测试白名单增删改操作日志 5 years ago
zhengyongxing a6a29bf63a 统计日志添加 5 years ago
chenzhi dc171af556 分控新增与解除操作日志 5 years ago
liuweiwen 8e3ee63a44 自动审核规则调整 5 years ago
chenzhi 55fd5d94e8 实名认证,防沉迷 5 years ago
liuweiwen 7d879686af 自动审核规则调整,锁定显示红色字体 5 years ago
chenzhi 50e4185d9c 操作日志-登陆记录 5 years ago
liuweiwen 47cdce733c 推广后台-》测试资源申请-》符合规则的自动审核 5 years ago
liuweiwen aa8d296dd8 推广后台-》测试资源申请-》符合规则的自动审核 5 years ago
chenzhi 0e0a7263e3 操作日志-防刷预警 5 years ago
chenzhi 97ff3baaff 优化操作日志下载 5 years ago
chenzhi 7141e3752e 优化操作日志基函数 5 years ago
chenzhi a8c83122db Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log 5 years ago
chenzhi 148d445f10 用户新增导出操作日志 5 years ago
zhengyongxing ce59d5dc72 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log 5 years ago
zhengyongxing 3f4f39e238 封装时间函数 5 years ago
chenzhi 580eb9dea3 优化移动公共函数后的变化 5 years ago
zhengyongxing 756b3b9975 操作日志公用函数移到extend.php中 5 years ago
chenzhi 2de1d9bccb 优化批量操作 5 years ago
liuweiwen 02920aab8a 资源审核配置列表、新增、编辑、删除、锁定、解锁 5 years ago
chenzhi 02407d1c50 优化操作日志函数 5 years ago
zhengyongxing dd478e264f 行为日志按照原型修改完成 5 years ago
zhengyongxing 1aa12fe2d1 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log 5 years ago
zhengyongxing d2867b4635 行为日志完成 5 years ago
chenzhi bd53d01a0e 用户编辑优化 5 years ago
chenzhi 80f8eb431c 用户编辑结束 5 years ago
chenzhi 6dfb13e4d9 新增操作权限 5 years ago
chenzhi 0d4ca0840b 优化平台币回收内存 5 years ago
zhengchanglong 7d13703398 角色列表角色ID和角色名改为不受权限控制 5 years ago
liuweiwen ad48df6c91 数据展示权限 5 years ago
liuweiwen 446e6f8176 Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen 3f5739c1d7 游戏充值和平台币充值数据展示权限 5 years ago
zhanglingsheng a1b79b57ae Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
zhanglingsheng 31466db00d 支付类型添加易宝支付 5 years ago
zhengyongxing 009ef6719d 结算单管理审核状态bug修改 5 years ago