2439 Commits (0d8ec00225fe06060987d9791e0a3dc85a5d490f)

Author SHA1 Message Date
zhengyongxing 4361b3c3ba 支付渠道意愿a标签悬停变成手势 5 years ago
廖金灵 d781d6825c Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计文字修改,及排序方式修正
5 years ago
zhengyongxing 674e727921 支付渠道意愿统计文字修改 5 years ago
张谷诚 170b116333 Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计bug上传
5 years ago
zhengyongxing 9eff370801 支付渠道意愿统计bug上传 5 years ago
张谷诚 e42281bdfe Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计bug上传
5 years ago
zhengyongxing f40bd57698 支付渠道意愿统计bug上传 5 years ago
廖金灵 985fdab851 Merge branch 'feature/limit_pay' of wmtx/platform into release
支付限额
5 years ago
张谷诚 b9f466f73c Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付意向
支付限额白名单
5 years ago
zhengyongxing f7c9730153 市场结算管理优化 5 years ago
sunke d31f5c8691 位数 5 years ago
sunke 55316d475f 限额 5 years ago
sunke 163ad97d60 支付限额 5 years ago
sunke 817b39c391 支付限额 5 years ago
sunke 56b5144440 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/limit_pay 5 years ago
廖金灵 9222d99127 Merge branch 'feature/change_company_belong' of wmtx/platform into release
推广员内外团归属优化
5 years ago
sunke 19af71ce72 支付限额 5 years ago
sunke 68572d10e6 支付限额 5 years ago
sunke a30317be91 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/limit_pay 5 years ago
chenzhi d6e44d32dc 优化推广员申请游戏名称及选择样式 5 years ago
chenzhi f0a19cfc99 优化设备名称为字典 5 years ago
chenzhi 84fe51efef 支付渠道/测试订单 游戏名字优化 5 years ago
chenzhi 2401acb9a0 优化公会统计bug 5 years ago
chenzhi 6d3f1b67e2 支付渠道统计-首页 名称优化 5 years ago
sunke ab1c99d95a 时间 5 years ago
sunke dfb83d35d0 时间样式 5 years ago
ELF ef56ea2180 修改 5 years ago
ELF a512fb224e 修改bug 5 years ago
ELF fb6a00859e 修改会长押金需求 5 years ago
sunke 098caeaa90 时间样式 5 years ago
sunke 4f98f9fabe 样式控制 5 years ago
chenzhi cc966711d1 公会统计 游戏名称与设备名称分开 5 years ago
zhengyongxing 4ce89ee670 支付白名单列表功能完善 5 years ago
zhengyongxing 6b8f9a47d0 Merge branch 'feature/user_paywhite_list' of 47.111.118.107:wmtx/platform into feature/pay_white_list 5 years ago
zyx fc9fa629ae 游戏充值bug修改 5 years ago
sunke fa70a3c77a 限制规则 5 years ago
zhengyongxing ad08aeeace 支付意向统计代码提交 5 years ago
sunke c8b3cb87d8 支付限额 5 years ago
sunke ac54bb41a4 支付限额导出 5 years ago
sunke 5c8221d9dc 支付限额 5 years ago
chenzhi 9064fc7c58 游戏统计 游戏名称不含设备类型优化 5 years ago
chenzhi 121fc02f18 推广员内外团归属优化2 5 years ago
chenzhi 2b7f434955 财务管理-游戏管理 游戏名称列表和导出优化 5 years ago
chenzhi 55d49e8b4b 优化推广公会列表导出 5 years ago
ELF 4a1ffd2955 解决冲突 5 years ago
chenzhi f2148320a8 新增公会旧数据归属刷新脚本 5 years ago
chenzhi 61d0418340 推广公司管理 修改内外团影响底下 5 years ago
chenzhi 1761d37b5c 推广公会列表 适配新内外团规则 5 years ago
chenzhi d7662eb305 推广员现在归属于公司团体 5 years ago
chenzhi dd86a85485 推广公会归属管理 改为公会归属不可选择 5 years ago
yulingwei 82620c9ae6 merge 5 years ago
yulingwei bec210c158 修复会员层级关系检索问题 5 years ago
廖金灵 09b04c502e Merge branch 'fix/member_user_info' of wmtx/platform into release
优化游戏统计弹框时间错误问题
5 years ago
chenzhi 82aa4f762b 优化游戏统计弹框时间错误问题 5 years ago
chenzhi d7737291ed 暂存1 5 years ago
sunke e7397e38b9 ios 5 years ago
廖金灵 43562f6746 Merge branch 'feature/download_type_list' of wmtx/platform into release
修复检索问题
5 years ago
yulingwei c40f5dda26 upt 5 years ago
廖金灵 f72220eeb0 Merge branch 'feature/fee_form' of wmtx/platform into release
ios下载账号隐藏中间部分
5 years ago
zhengyongxing 1987fcd865 ios下载账号隐藏中间部分 5 years ago
sunke 49efb2e60f xiufu 5 years ago
sunke 0ffa97a1dd 修复 5 years ago
廖金灵 05444593b5 Merge branch 'feature/fee_form' of wmtx/platform into release
ios下载账号隐藏中间部分
5 years ago
zhengyongxing b32910a79e ios下载账号隐藏中间部分 5 years ago
sunke 797102a556 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/PlatFormCoinData 5 years ago
sunke 5b74e65585 统计 5 years ago
zhengyongxing 6249b6cf81 Merge branches 'feature/fee_form' and 'release' of 47.111.118.107:wmtx/platform into feature/fee_form
 Conflicts:
	Application/Admin/Controller/FinanceController.class.php
5 years ago
zhengyongxing 87b1b04040 充值财务管理金额保留小数点 5 years ago
廖金灵 4a766dfec8 Merge branch 'feature/download_type_list' of wmtx/platform into release
导出问题修复
5 years ago
yulingwei eca43f471d upt 5 years ago
廖金灵 dee22176f5 Merge branch 'feature/ip_forbit' of wmtx/platform into release
测试资源bug修正
5 years ago
zhengyongxing 3b58c877c4 测试资源配置状态添加 5 years ago
廖金灵 4c8cb3c171 Merge branch 'feature/IOSdata' of wmtx/platform into release
修改bug
5 years ago
sunke fea5f4d2d7 ios 5 years ago
廖金灵 bf80a2d99a Merge branch 'feature/download_type_list' of wmtx/platform into release
问题修复
5 years ago
yulingwei 132dee220a fix 5 years ago
廖金灵 c2b57233a0 Merge branch 'feature/ip_forbit' of wmtx/platform into release
测试资源定时脚本修正
5 years ago
sunke 7194cd49ae 平台币 5 years ago
zhengyongxing 61b5fb48b6 测试资源配置状态添加 5 years ago
廖金灵 21bf9744fb Merge branch 'feature/ip_forbit' of wmtx/platform into release
ip限制白名单苹果内购限制总开关去除
5 years ago
zhengyongxing 6ac97fa7b1 ip限制白名单页面去除内购总开关 5 years ago
廖金灵 112134ec93 Merge branch 'feature/work_order' of wmtx/platform into release
修改样式问题
5 years ago
廖金灵 e8282fc00c Merge branch 'feature/ip_forbit' of wmtx/platform into release
ip白名单页面问题修正
5 years ago
zhengyongxing bd181dab51 ip限制白名单页面修改 5 years ago
yulingwei 3415ef8336 修改样式问题 5 years ago
廖金灵 7be530e5b3 Merge branch 'feature/download_type_list' of wmtx/platform into release
iOS下载统计问题修复
5 years ago
yulingwei a2ab7b1c66 merge 5 years ago
yulingwei 1ad299ffbe 修复统计问题 5 years ago
sunke fd815ef5a6 html平台币 5 years ago
sunke 88109eb0cd Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/PlatFormCoinData 5 years ago
廖金灵 ff5ff3ee80 Merge branch 'feature/ip_forbit' of wmtx/platform into release
ip限制白名单提示语修改
5 years ago
zhengyongxing 6f749fb99d Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_opertion_log
 Conflicts:
	Application/Admin/Controller/FinancePromoteController.class.php
	Application/Common/Common/extend.php
5 years ago
zhengyongxing 2adbd95bfb Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/ip_forbit
 Conflicts:
	Data/update.sql
5 years ago
sunke e0d8539ea0 ex 5 years ago
sunke 35f5cc03bb value_detail 5 years ago
sunke e94c64a881 平台币统计 5 years ago
廖金灵 3be1bd78ed Merge branch 'feature/work_order' of wmtx/platform into release
工单管理
5 years ago
yulingwei 26f89f3c64 merge 5 years ago
廖金灵 aae20bce96 Merge branch 'feature/download_type_list' of wmtx/platform into release
修改下载统计bug
5 years ago
yulingwei f34975478b upt 5 years ago
廖金灵 a1f3c6e205 Merge branch 'feature/download_type_list' of wmtx/platform into release
iOS下载统计
5 years ago
廖金灵 e2a32b11dc Merge branch 'fix/member_user_info' of wmtx/platform into release
玩家列表新增去重数据栏
5 years ago
zhengyongxing e7aa7885e8 ip限制白名单提示语修改 5 years ago
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
yulingwei 175502e384 fix 5 years ago
zhengyongxing 5d81a253db ip限制控制器提交 5 years ago
yulingwei b10717e8b6 upt 5 years ago
chenzhi bfee0578d0 玩家列表新增去重数据栏 5 years ago
yulingwei 18b0c3024d upt 5 years ago
yulingwei ead4a8598e upt 5 years ago
yulingwei d9c338acd8 upt 5 years ago
chenzhi c61f750549 优化新增推广员员时手机号错误问题 5 years ago
zhengyongxing a086b38d3e 管理后台日志唯一键值bug修改 5 years ago
zhengyongxing f904ecec94 管理后台日志唯一键值bug修改 5 years ago
chenzhi 26300062b1 推广员-数据管理-实时充值 优化打开速度 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 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
ELF dae2dd5fd9 优化游戏 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 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
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
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