2261 Commits (f37cdc596d02e0a7733daa840402b58ea5b7accb)

Author SHA1 Message Date
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
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 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
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 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
zhanglingsheng c6e1493035 易宝支付 5 years ago
chenzhi 71f2453bb4 绑币回收-操作日志 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
chenzhi 31a0a174bd 后台发放-操作日志 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
zhengyongxing 6483047fe4 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log 5 years ago
zhengyongxing 5e794bd785 推广员日志记录添加 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 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
zhengyongxing 601151718f Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing e01bcc236f Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zhengyongxing 260ca6fe9e 结算单管理审核状态bug修改 5 years ago
zhengchanglong 6b68ae8197 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
5 years ago
zhengchanglong eecd38e424 Merge branch 'fix/divide_test' into release 5 years ago
liuweiwen 2cf7b7471f Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen 305cbf34cd 导航高亮 5 years ago
liuweiwen 941ba5628d Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
liuweiwen c05b10cb87 对账单系统-》未审核不可确认 5 years ago
ELF 5627dd94d2 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
ELF 7cd28cc7ce 删除多余代码 5 years ago
yulingwei e2851c13f1 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei 5dde3ef96e upt 5 years ago
ELF 3411f90430 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
ELF dad83c8d38 押金付款方式添加选项 5 years ago
yulingwei dc96411757 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei 0513f0fa5e fix bug 5 years ago
zhengyongxing 4f65efad9b 结算单管理添加审核状态 5 years ago
liuweiwen fbdd7a4339 Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen daec62ec95 奖罚记录管理-》编辑,无修改时提示错误 5 years ago
chenzhi da454a9474 Merge branch 'feature/data_divide' of 47.111.118.107:wmtx/platform into fix/divide_test 5 years ago
chenxiaojun 29c8470b7f 推广平台>财务管理>结算中心--更新 5 years ago
chenxiaojun 118aae4f83 推广平台>财务管理>结算中心--更新 5 years ago
chenxiaojun f5c1531b71 推广平台>财务管理>结算中心--更新 5 years ago
chenxiaojun 23f38f6a07 推广平台>财务管理>结算中心--更新 5 years ago
chenzhi c2de546abb Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi 578948347f 优化公会内外团占比 5 years ago
chenzhi c52ba1cf99 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi fa92868548 优化公会统计团体占比 5 years ago
zhengyongxing 3c16659bf3 Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing 9edc77bead 生成下游个人结算单bug修改 5 years ago
zhengyongxing 4d1cfb36ec 生成下游个人结算单bug修改 5 years ago
yulingwei 619ea78b18 upt 5 years ago
yulingwei 3f5246f66c Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei c59aeaa9d3 upt 5 years ago
chenzhi 1bfcade0a8 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi 62a867c592 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize 5 years ago
chenzhi 5b45c4273c 优化公会统计选择游戏 5 years ago
yulingwei 5468239cf3 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei e8e0af97bf 修复结算时间 5 years ago
chenzhi 43a6a746b0 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release 5 years ago
zhengyongxing 061d7373fb 市场结算管理内外团新增内团分发 5 years ago
chenzhi f0d298c042 公会统计新增团体类型 5 years ago
yulingwei 82bc3a8dbd upt 5 years ago
yulingwei b99138fa85 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei 14b5ea78cd upt 5 years ago
zhengyongxing ccc1b177a0 Merge remote-tracking branch 'origin/release' into release 5 years ago
zhengyongxing 96fd5cbdd5 测试服订单管理bug修正 5 years ago
liuweiwen 077a770de7 奖罚记录管理-》奖罚时间为空判读,新增编辑判读 5 years ago
liuweiwen e8f07f4292 日期格式修改 5 years ago
liuweiwen 5b63a2fe84 Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen f9fe74986c Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen b2e039b460 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
liuweiwen f6af63ca3e 合同期限为空时间格式,公司信息导航高亮 5 years ago
zhengyongxing 5158b07d85 测试订单管理高亮添加 5 years ago
zhengyongxing 932958a071 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
zhengyongxing be932b1ebd 奖罚管理bug修改 5 years ago
zhanglingsheng a26a02b36f Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
zhengchanglong c6a0f87dfe 奖罚编辑部分字段只读 5 years ago
zhanglingsheng 9afd27cdc6 Merge branch 'hosfix/tool_pay' into release 5 years ago
liuweiwen 5949542b70 Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen 6d91ec7c60 推广员-》奖罚记录管理-》上下游公司与公司类型联动,解决未显示下游公司问题 5 years ago
zhengchanglong e55bfcb2d8 奖罚编辑部分字段只读 5 years ago
chenzhi 2361c6502a Merge branches 'release' and 'feature/finance_cwflhz' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi b3560b4345 优化财务汇总统计 5 years ago
zhengchanglong 586dbf49e9 添加奖罚记录返回出现错误提示BUG修复 5 years ago
chenzhi 3ddef5d790 Merge branch 'feature/finance_cwflhz' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi e4854d4ac7 优化财务汇总名词写错问题 5 years ago
liuweiwen e243675bcc 将子窗口的方法转到ajax控制器 5 years ago
liuweiwen 854ab9f509 合作方导出不打开新窗口 5 years ago
liuweiwen d50627e4fb Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen 70c71abac1 隐藏我方分成比例 5 years ago
chenzhi 07053d822e Merge branch 'feature/add_promote_company' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi bb276f2bcc 优化推广公司列表 5 years ago
liuweiwen a114c7e659 Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen efe9d25988 Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen 3efe7167f2 公司性质 5 years ago
liuweiwen d333b8d61e Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen 8dedae5587 公司性质 5 years ago
chenzhi 43a3beae23 合并财务分类汇总 5 years ago
ELF 0134a158e1 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
ELF 2967d023d7 Merge branch 'hotfix/download_name' into release 5 years ago
ELF ec4bc4d46e 修改极速版下载描述文字 5 years ago
chenzhi cbbbcfd8ff 新增外团分发和其他团统计 5 years ago
liuweiwen 2ac78def85 Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen 3bb3a8b45d 显示调整 5 years ago
liuweiwen 5b6477e782 Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen 5f74f692d5 Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen 58aefd2997 显示调整 5 years ago
yulingwei 37c4e8ab73 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei 762cd1cbb1 Merge branch 'feature/ylw' into release 5 years ago
yulingwei dc2b55456d upt 5 years ago
liuweiwen 6af2277d94 Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen b8ec26a3e9 合作方开票税点百分比改为存小数 5 years ago
liuweiwen 70984bea99 Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen 48252d0f3a 合作方列表样式调整 5 years ago
zhengchanglong 1b37ec3d37 Merge branch 'feature/add_promote_company' into release 5 years ago
chenzhi f5529fc2dd 优化推广公司首页样式 5 years ago
liuweiwen 5544bb1797 合作方列表样式调整 5 years ago
sunke 3bc44925cd 推广配置 5 years ago
sunke 072b3e0199 推广配置修改 5 years ago
liuweiwen 4cb88be352 数据权限 5 years ago
zhengchanglong 26038f379e Merge branch 'feature/admin_optimize' into release 5 years ago
zhengchanglong 8bd26b36c0 玩家账号信息权限设置 5 years ago
yulingwei 73706808e3 Merge branch 'feature/ylw' into release 5 years ago
yulingwei 19e7f2af0c upt 5 years ago
yulingwei d349c4223d Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei 0652c31664 upt 5 years ago
yulingwei 25e66d84ff 修改问题 5 years ago
liuweiwen 87de8d2717 Merge branch 'feature/admin_optimize' into release 5 years ago
yulingwei 391d2a4a1f Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei e7497048a0 Merge branch 'feature/ylw' into release 5 years ago
yulingwei 8b51a16730 upt 5 years ago
liuweiwen 32f5137ac6 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
liuweiwen 04bb4a7bb7 合作方 5 years ago
sunke 790d56c638 Merge branch 'feature/add_promote_company' of 47.111.118.107:wmtx/platform into feature/add_promote_company 5 years ago
yulingwei e26f517df1 冲突解决 5 years ago
yulingwei 747bba16b0 汇总结算单管理 5 years ago
zhengyongxing 00a5fed6fd 游戏统计新增设备类型 5 years ago