3255 Commits (d5a63a7849087ed0b56c7dfe37beec143d4e8db3)

Author SHA1 Message Date
zhengyongxing 6bda9fe842 市场结算管理代码编辑完善 5 years ago
zhengyongxing ad901c31db 市场结算管理代码编辑完善 5 years ago
chenxiaojun 7550bafdf7 充值玩家--更新 5 years ago
zhengyongxing 99f23254ed 市场结算管理代码提交 5 years ago
zhengyongxing 68312cc277 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
zhengyongxing 71b1498c71 市场结算管理代码提交 5 years ago
chenzhi 25240227e4 新增编辑 5 years ago
chenxiaojun 82784f9da9 推广提现--更新 5 years ago
yulingwei 9910485523 修改 5 years ago
chenxiaojun 9b47108400 推广提现--更新 5 years ago
chenxiaojun 843c54ced5 推广提现--更新 5 years ago
yulingwei 7ea2a465bf 修复问题 5 years ago
chenzhi 72405e45f5 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi ea6d820408 优化页面显示 5 years ago
chenxiaojun 4286817dea 推广提现--更新 5 years ago
zhengchanglong 066fe46064 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
zhengchanglong eb114b33b3 游戏分成比例设定体验优化 5 years ago
zhengyongxing dddd640f9f 结算单管理列表修改 5 years ago
chenzhi d484c96744 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi cccbc3bfa8 新增cp结算单判断是否已经有交叉时间 5 years ago
zhengchanglong b34eec98ee 游戏分成比例设定体验优化 5 years ago
chenxiaojun dcea6b7e05 推广提现--更新 5 years ago
zhengchanglong 5ac23b6a5b Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
zhengchanglong de8386c0cb 游戏用户锁定备注显示 5 years ago
chenzhi 0934cd472a 新增cp结算单到列表中 5 years ago
zhengyongxing 2154899a6a Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
zhengyongxing f87026a32c 结算单管理生成下游订单 5 years ago
chenzhi cda9d0c1a8 合并 5 years ago
chenzhi cd427a9409 新增添加cp上游对账单 5 years ago
zhengchanglong 87096e180e 游戏用户锁定备注显示 5 years ago
zhengchanglong 93fe724c15 游戏用户锁定备注显示 5 years ago
zhengchanglong 941978bb07 【游戏】-【合作方管理】,联系人改为必填项,必填项前面加红色※号 5 years ago
chenxiaojun 08dd26f942 推广提现--更新 5 years ago
zhengchanglong e914fde68d 玩家列表账号锁定添加备注 5 years ago
chenxiaojun cf0680eddf 开服预告正序显示 5 years ago
yulingwei 56b0216ff0 修改问题 5 years ago
chenxiaojun 0c0d59dd43 财务管理--更新 5 years ago
chenxiaojun ad80923bed 更新 5 years ago
chenxiaojun f244b42ab7 推广结算--更新 5 years ago
yulingwei ed9ddd2d67 修复检索问题 5 years ago
yulingwei e3f0a24e43 弹窗推广后台更新 5 years ago
zhengchanglong 326d9e5a12 管理后台-游戏-游戏编辑:参数配置-新增CP游戏分成比例 5 years ago
zhengyongxing ea140a430f 导出模板方法上传 5 years ago
liuweiwen 602fb33fcc 新增需求:管理后台-》系统-》扩展工具-》公司信息管理 5 years ago
yulingwei 5542994e36 upt 5 years ago
zhengyongxing c6f798dc47 市场结算管理bug修正 5 years ago
zhengyongxing f124e4b7ff Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
zhengyongxing 7adb991d0e 市场结算管理上传 5 years ago
zhengyongxing ba158e6b9a 市场结算管理上传 5 years ago
ELF 500d0fdc2c 后台管理系统登录后改变session_id 5 years ago
chenzhi ff67974413 修复获取推广员统计bug 5 years ago
zhengyongxing 5e14eaf4c9 新增市场结算管理完善 5 years ago
liuweiwen 50320be1d2 新增需求:管理后台-》推广公会归属管理,列表,新增,编辑,审批 5 years ago
zhengyongxing 4fb2806656 新增市场结算管理 5 years ago
chenxiaojun f1e8811df3 推广结算--更新 5 years ago
chenzhi c711601fdf Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi 216321f46b 优化换绑逻辑判断是否订单在审核中 5 years ago
zhengyongxing 89883d2005 新增市场结算管理 5 years ago
chenxiaojun 0927417ce9 推广结算--更新 5 years ago
ELF fb64d574cb 修改包下载bug 5 years ago
ELF 710ef727e4 Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/shift-player 5 years ago
chenzhi 414f326cf4 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
ELF 04fccce6dc 修改上传网络请求限制 5 years ago
zhengyongxing f1a48fbdaa 权限分配 — 未给下级渠道分配(游戏充值)查看权限时,页面展示(游戏充值页面)修正 5 years ago
chenzhi 1295857697 优化工会统计各级检索条件结束 5 years ago
chenzhi 0561d8ff15 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi f95d23b091 优化公会统计各级条件展示 5 years ago
ELF fe68d8e8c9 修改oss上传返回结果 5 years ago
liuweiwen 4892db340e 管理后台-》游戏-》合作方管理-》列表增加字段联系人,联系电话,邮寄地址。公司税号,收款方名称,银行账号,开户行 5 years ago
ELF e6c891a945 修改 5 years ago
ELF f472f5e9d3 文件保存改成cdn 5 years ago
chenzhi 9e2eb46904 公会统计游戏统计新增多重搜索 5 years ago
chenxiaojun 962c284467 推广结算--更新 5 years ago
liuweiwen fa3adf2e0b 新增合作方时,新增录入内容
新增联系人,联系电话,邮寄地址。公司税号,收款方名称,
银行账号,开户行
5 years ago
chenzhi c20d507df6 优化订单判断 5 years ago
chenzhi 878badef43 换绑新增判断渠道是否已经结算 5 years ago
ELF 91d4c9f753 补链/玩家迁移排除已结算订单(cp结算) 5 years ago
chenzhi 876952f3b4 公会统计新增内外团检索 5 years ago
chenxiaojun 89965bd8fb 导出 5 years ago
chenxiaojun 631c23568d 上传汇款证明--调整 5 years ago
chenxiaojun 90eed6f5ca 结算管理--更新 5 years ago
chenxiaojun c074b5fb86 结算管理--更新 5 years ago
chenzhi a37d0d6ec4 优化推广员充值统计排序问题 5 years ago
chenzhi 43774e9099 推广员充值统计新增官方渠道统计 5 years ago
chenzhi 14fa967f00 优化推广员统计数据 5 years ago
zhengyongxing 302ee7a2ca Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
zhengyongxing 5343ef2162 工会统计新增内外团 5 years ago
chenzhi 0caa548525 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi 836eccfa78 支付渠道新增支付渠道比 5 years ago
zhengyongxing acd816c766 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
zhengyongxing cc0f5a03c4 工会统计新增内外团导出 5 years ago
chenzhi 07f6e9919d 区服列表 区服名称改区服id 5 years ago
chenzhi 0f7134c838 游戏充值 区服名称改区服id 5 years ago
chenzhi 3bf288fa41 优化登陆记录区服名称为区服id 5 years ago
chenzhi 5e08bda6c2 优化行为日志区服名称为区服id 5 years ago
ELF 0a0cedafd5 各个系统登录提示安全优化,sessionon_id变更 5 years ago
chenzhi 432c84ba01 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi e39c811da8 修改月结月份显示错误问题 5 years ago
liuweiwen 4addf4c281 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
liuweiwen 0b3ae062b1 优化:推广员新增与编辑的推广公司增加万盟天下科技
新增需求:推广员增加工会归属和工会关系属性
5 years ago
zhengyongxing 10f6caddfa 工会统计新增内外团占比 5 years ago
ELF 8ab02a5e0b 还原补链限制 5 years ago
廖金灵 b12b133a06 Merge branch 'hotfix/shift-player' of wmtx/platform into release
修改玩家迁移限制
5 years ago
elf@home 0bc50cbf70 修改限制 5 years ago
elf@home e59a2f7350 添加玩家迁移只对同一推广员限制 5 years ago
chenxiaojun 0baf97f717 会长提现--更新 5 years ago
chenxiaojun a12c3ecf9e 会长提现--更新 5 years ago
ELF 96efc54888 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/login_crontab 5 years ago
yulingwei 25606949f5 修复登录统计问题 5 years ago
chenxiaojun e884214546 会长提现|公会分成管理--更新 5 years ago
ELF f1dc5f8920 推广员继承company_id 5 years ago
ELF 2efbeaf13f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
万盟天下 23defe8174 Merge branch 'master_hotfix_20191228' of wmtx/platform into master
修改工会统计bug
5 years ago
chenzhi 4d0606d6fc 新增渠道查看公司联动 5 years ago
chenzhi f594e3bb14 公会统计新增公司联动 5 years ago
ELF 88c8bef83e Merge branch 'hotfix/promote-status' into release-1.0.0 5 years ago
ELF 87fb1f526e 修改推广员添加时初始默认状态 5 years ago
elf@home 6e354fe3b3 优化链接归属查询 5 years ago
liuweiwen 6625eaa4f7 工会统计 5 years ago
liuweiwen 809e9d36f1 工会统计 5 years ago
liuweiwen 28a1efe2f4 工会统计列表数据与搜索修复 5 years ago
liuweiwen b3e32506cc 工会统计搜索公司 5 years ago
liuweiwen c44e5ee1a7 编辑推广员时,只允许会长修改推广公司,同时更改底下推广员的公司 5 years ago
zhanglingsheng 7a9fe4fb45 超级签统计--导出 5 years ago
zhanglingsheng 34020fd725 超级签统计--样式 5 years ago
yulingwei 9d5bfc5ef2 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
zhanglingsheng e3ef73e7e3 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
zhanglingsheng e709816781 补单记录 5 years ago
yulingwei 75d3e87f89 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
yulingwei 899877e872 同步修改 5 years ago
ELF 834115c213 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
ELF 561787a4ac 修改 5 years ago
zhanglingsheng 8a9e0a9a8b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
zhanglingsheng ca401adbd0 补单记录 5 years ago
ELF a70c1aee21 Merge branch 'release-1.0.0' into dev 5 years ago
ELF 0a86f3a33c 修改样式 5 years ago
chenzhi 04c560312f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
chenzhi 715a1a8a2c 优化推广统计区服问题 5 years ago
ELF 6297ff7011 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
ELF 67caddeef0 修改落地页样式 5 years ago
yulingwei f4495f93a9 ltv修改 5 years ago
yulingwei 3ec7ccc188 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
yulingwei 873c81605e 修复 5 years ago
zhanglingsheng 908de1336f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
zhanglingsheng b88f395c9a 补单记录 5 years ago
zhanglingsheng 6a28abedc0 补单记录 5 years ago
ELF 8cdf259fdf Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
ELF c054595a94 修改微信分享bug 5 years ago
chenxiaojun 905769f922 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
chenxiaojun 9a0313b763 公会分成管理--更新 5 years ago
sunke 453c0c3682 链接归属名词修改 5 years ago
chenxiaojun e66893dc7f 公会分成管理--更新 5 years ago
yulingwei 8ccde7749a Merge branch 'hotfix/ltv' into release-1.0.0 5 years ago
yulingwei 3e11b4d0ad 更新 5 years ago
yulingwei 1e3079870e Merge branch 'hotfix/ltv' into release-1.0.0 5 years ago
yulingwei ee18eac375 修复 5 years ago
yulingwei b868b14273 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
yulingwei 21cc6865d5 Merge branch 'hotfix/ltv' into release-1.0.0 5 years ago
yulingwei 2ed2117b6d 更新 5 years ago
ELF ad67717292 Merge branch 'release-1.0.0' into dev 5 years ago
yulingwei e2ed862130 Merge branch 'hotfix/ltv' into release-1.0.0 5 years ago
yulingwei 7d1808a7bf Merge branch 'hotfix/ltv' into dev 5 years ago
yulingwei 12f00ad268 修复 5 years ago
chenzhi a5c926b2cd 优化区服预告区服选择 5 years ago
chenzhi ff46ab04ca Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
chenzhi f580b44289 优化推广员统计区服选择 5 years ago
liuweiwen 2db651ae9c Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen bc28933369 游戏订单查看-》导出通知成功数据 5 years ago
zhengyongxing e055cc27d5 ajax游戏区服搜索设备非必填 5 years ago
zhengyongxing e49ed7aa30 支付渠道统计计添加平台币直充金额说明 5 years ago
sunke dcf7efad6f 下载链接菜单显示bug 5 years ago
liuweiwen 6dbfd09e91 编辑推广员时推广公司必填 5 years ago
zhengyongxing ea80b8fd44 游戏充值统计检索条件修正 5 years ago
zhengyongxing d59e8633c6 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx 5 years ago
zhengyongxing 2f25386518 游戏充值统计检索条件修正 5 years ago
ELF 841bf0c0b9 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
ELF 9bf45ae0d3 修改 5 years ago
zhengyongxing b96e65b8fe 游戏充值统计检索条件修正 5 years ago
chenzhi 1d69c616d6 优化公会统计页面跳转问题 5 years ago
chenzhi f38e007d80 优化渠道的公司检索 5 years ago
chenzhi 47595c81b8 优化公会统计公司 5 years ago
chenzhi c590b948ef 优化推广员充值统计导出 5 years ago
chenzhi 0a006bbcc2 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
chenzhi fd23b640ea 优化推广员充值优化代码 5 years ago
zhengyongxing 7c7971d48e Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx 5 years ago
zhengyongxing 13f5128dd8 支付渠道统计导出bug修正,游戏充值充值方式检索修正 5 years ago
zhanglingsheng 162e2fe19c Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
zhanglingsheng 5b81f89308 游戏编辑 5 years ago
ELF 460e7288a1 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
ELF 660e0063f7 修改落地页 5 years ago
zhengyongxing 9e99a3890e Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx 5 years ago
zhengyongxing dd86fbaddf 支付渠道统计bug修正 5 years ago
ELF 3246745e58 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
ELF c72888181b Merge branch 'dev' into release-1.0.0 5 years ago
zhanglingsheng 6ab69f8b29 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
zhanglingsheng eabf59d3e3 超级签统计 5 years ago
ELF 5e0c1c0f87 修改 5 years ago
zhengyongxing b5c06df195 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx 5 years ago
zhengyongxing 4e3206a5c1 支付渠道统计bug修正 5 years ago
zhanglingsheng a2062684af Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
zhanglingsheng 1c2bb7e584 超级签统计 5 years ago
chenxiaojun 0bc657a5fc 充值玩家--更新 5 years ago
chenxiaojun 40da308a08 充值玩家--更新 5 years ago
zhanglingsheng 08e98945ed Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
zhanglingsheng ae2b498e45 超级签统计 5 years ago
chenxiaojun cc83e0e585 充值玩家--更新 5 years ago
chenxiaojun d3a4933b5c 充值玩家--更新 5 years ago
chenxiaojun ee6c6e62b2 充值玩家--更新 5 years ago
ELF 1a8d66e2d7 Merge branch 'dev' into release-1.0.0 5 years ago
ELF cb63520de5 修改落地页 5 years ago
ELF a8643d20a0 Merge branch 'dev' into release-1.0.0 5 years ago
ELF db46d4b079 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
ELF 600d1a27f5 修改 5 years ago
chenzhi 5e246dde2b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
chenzhi 85b821081f 优化推广员充值统计今日本周本月不变 5 years ago
chenxiaojun f8b29d9d12 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
zhanglingsheng 683fc44d94 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
chenxiaojun 5cf9ad9fd1 充值玩家--更新 5 years ago
zhanglingsheng 9b65fbaabb 超级签统计 5 years ago
chenxiaojun 31e045bdba 充值玩家--更新 5 years ago
chenzhi a61e0f36b5 优化注册统计今日本周本月不变 5 years ago
chenxiaojun a15440e299 充值玩家--更新 5 years ago
chenxiaojun e3742a9d8a 充值玩家--更新 5 years ago
zhanglingsheng befc2ef62b 超级签统计 5 years ago
zhanglingsheng 244e036a21 超级签统计 5 years ago
zhanglingsheng 153c397cf6 超级签统计 5 years ago
ELF a167c51582 Merge branch 'dev' into release-1.0.0 5 years ago
yulingwei e97b1ed22e Merge branch 'feature/ltv' into dev 5 years ago
yulingwei 65ed103d3a 修复beta链接格式 5 years ago
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
5 years ago
liuweiwen e40b92a0d7 优化-【统计】-【平台统计】-【游戏注册】、【游戏充值统计】、【注册方式统计】和【充值方式统计】的今日充值、本周充值、本月充值不根据时间筛选改变 5 years ago
ELF b1844a0082 修改落地页 5 years ago
zhengyongxing b0899f3fc9 支付渠道统计bug修正,官网与推广后台充值计入平台币 5 years ago
ELF 9b5697a859 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
ELF 1fcbe2dd65 Merge branch 'dev' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
zhanglingsheng 56da5cd85a Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
zhanglingsheng 59709fa295 游戏--添加支付方式渠道配置 5 years ago
liuweiwen 1e9409ef1a 优化-【统计】-【平台统计】-【游戏注册】、【游戏充值统计】、【注册方式统计】和【充值方式统计】的今日充值、本周充值、本月充值不根据时间筛选改变 5 years ago
zhanglingsheng 669baefe5e 游戏--添加支付方式渠道配置 5 years ago
chenzhi 0ec79e6cb9 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
chenzhi 24c2ea0031 优化区服预告的区服选择 5 years ago
yulingwei 53b4bfa0b8 Merge branch 'feature/ltv' into dev 5 years ago
yulingwei 30922605e2 修复 5 years ago
yulingwei a851b31cb6 Merge branch 'feature/ltv' into dev 5 years ago
yulingwei 6671565b5e 修复问题 5 years ago
ELF 8a2f36b5a3 Merge branch 'dev' into release-1.0.0 5 years ago
yulingwei fe8a99b0ec Merge branch 'feature/ltv' into dev 5 years ago
yulingwei 931893640a 修改问题 5 years ago
chenzhi fe06fded2a 优化区服列表,隐藏操作,新增id 5 years ago
zhengyongxing c1e16ed8d4 推广员充值统计汇总为当前页面的总额,改为所有数据的总和 5 years ago