elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,593 Commits
1 Branch
0 Tags
154 MiB
Commit Graph

2150 Commits (fd815ef5a6eace998d3e6b58907b514510faed9a)

Author SHA1 Message Date
chenzhi aba7ed22d1 财务汇总分类脚本-按收入类型
zyx 4be5b1ba2c cp分成比例方法添加
chenxiaojun cbe40d4b0f 管理后台更新
chenxiaojun f1b454627e 管理后台更新
sk c612fbc5fd Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company
chenxiaojun 37ab08b9be 管理后台>推广员>结算管理>公会分成管理--规则修改
chenxiaojun a8008fbe05 管理后台>推广员>结算管理>公会分成管理--规则修改
zhengchanglong 58bd9414d6 Merge branch 'hotfix/recharge_statistics' into release
liuweiwen b5a2ddba3c 游戏订单查看，查询时0点属于当天
chenxiaojun 73f1055303 管理后台>推广员>结算管理>推广提现--增加自动审核功能
zhengchanglong 72d222a64a CP分成比例修改
chenzhi 29868a6331 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize
chenzhi 158c56d543 优化甲方可以自由选择
zyx 07279467ca 管理后台部分限制规则修改 / 开放甲乙方都能为万盟天下后，无法检索出万盟天下
chenzhi 332ff4c3c4 优化生成上游对账单手机及银行卡验证规则
zyx fea720339b 结算单功能优化 / 下游结算单：列表展示游戏不区分安卓IOS，直接展示汇总信息
chenxiaojun 10665cc869 管理后台>推广员>结算管理>公会分成管理--更新
廖金灵 f66c6505d1 Merge branch 'hotfix/testWhileList' of wmtx/platform into master 
测试外网充值白名单设置BUG修复
sk 636aabb5a0 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company
zyx d4850b60be Merge branch 'hotfix/testWhiteList' into release
zyx 2ad5017fae 测试白名单编辑修改成删除
sk f93c9c569d Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company
xxxx a85c217c6b OA管理员绑定
zyx aac1d6f7b5 Merge branch 'hotfix/testWhiteList' into release
zyx 7beb0938e3 测试白名单修改
sk ce9faf7271 公司录入
jbRotk 65461ff200 c
liuweiwen 0fba64c6f1 数据展示权限：勾选权限时，*号屏蔽的地方要开放，另没数据权限的地方补上
ELF 56a97f7eef 修改bug
ELF e8a0975981 解决冲突
ELF 6993d164a3 解决冲突
ELF d3a3b8cdb7 修改
yulingwei 22addc182c 修改检索问题
sunke 0e0c1798f4 推广导入空数据初始化
yulingwei ac8d7300ad Merge branch 'feature/game_divide_warn' into dev
yulingwei 33a19fbb6a upt
yulingwei f0109e9554 合并请求
yulingwei 45b3c27292 upt
sunke b9ddc1aafb 推广配置
yulingwei eef229d22d Merge branch 'feature/sms_up' of 47.111.118.107:wmtx/platform into feature/sms_up
ELF 2195bb4c55 修改短信发送
zhengchanglong e6f3329ac8 内外团归属BUG修复
zhengchanglong 9961448831 Merge branch 'release' into dev
yulingwei 55ef999729 upt
yulingwei 6daf38aa43 upt
yulingwei dfd274a667 Merge branch 'release' into feature/game_divide_warn
yulingwei 0ebe11027e upt
chenzhi 56617b1e25 Merge branch 'feature/ghcount_change' of 47.111.118.107:wmtx/platform into dev
chenzhi fa784fac8a 优化游戏订单导出
chenzhi 54f2e0abcd 游戏统计新增会长和公司
zhengyongxing ef41dbfcee 下游输出错误修改
zhengyongxing 561e6bd84c 下游输出错误修改
sunke d2b7e91a64 推广配置
liuweiwen 490b6a3369 工会归属隐藏导出
ELF 9c493dd8ef Merge branch 'release' into dev
ELF 0d45be780f 解决冲突
ELF c01b0f1083 发送短信添加ip地址
chenxiaojun 5a75ea406a 更新
liuweiwen ccca9fb0bd 管理后台-》推广员列表可关键内外团搜索
liuweiwen 38c64f5430 管理后台-》推广员列表可关键内外团搜索
yulingwei 076b4393eb upt
yulingwei aafc877e71 merghe
yulingwei d33d0c3f46 upt
liuweiwen 323facd599 管理后台推广员添加时手机号码不可重复
zhengyongxing 46a3028fc9 输出删除
chenxiaojun 29789f5ef6 公会分成管理--更新
zhengyongxing 3fca3c89ad 短信验证码提交
chenxiaojun b367b4a8d3 公会分成管理--更新
zhengyongxing 3741b0d27f 市场结算修正
chenxiaojun 42e07d0f2f 结算管理--更新
chenxiaojun 66a238dfd4 结算管理--更新
zhengyongxing 1ba566a02c 市场结算修正
zhengyongxing a68858d4ed Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhengyongxing 9d5b877220 市场结算生成下游代码修改
chenxiaojun 6e05546db6 公会分成管理--更新
chenxiaojun 71e02a4add 结算管理--更新
chenxiaojun 28897755c9 结算管理--更新
chenxiaojun 258e10c9d1 结算管理--更新
zhengyongxing 4c42ee90e3 市场结算生成下游对账单代码优化
liuweiwen ef975943bb 针对admin的后台账号对游戏充值和角色查询做完全访问权限，没完全访问权限时必须通过搜索才显示结果
zhengyongxing 136f565f9f 市场结算管理设备类型条件修正
yulingwei 23f2334e45 新增充值权限查看
zhengyongxing f86265d38c 市场结算管理设备类型条件修正
sunke 9152a3ef59 推广配置导入功能
zhengchanglong d054e70c73 Merge branch 'release' into dev 
# Conflicts:
#	Application/Admin/Controller/MemberController.class.php
#	Application/Admin/View/Promote/belong_edit.html
zhengyongxing 38cea3f972 用户列表导出锁定备注bug修正
chenxiaojun 63d947f754 推广提现--更新
chenxiaojun 517d4ec05f 公会分成管理--更新
chenxiaojun 48ca90bbf3 公会分成管理--更新
liuweiwen cdfa8e4eee admin权限
liuweiwen 1b2cf94c9b Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 21806993d4 admin权限
chenzhi 5fdb7946cc 新增登陆记录列表统计权限
chenzhi 07e4fb2e56 优化列表和统计权限函数
zhengyongxing 43a335bc28 市场结算管理总流水弹窗优化
liuweiwen c8b184b877 Merge remote-tracking branch 'origin/release' into release
liuweiwen 86fe5f1f9f 工会归属admin不加密推广员账号
chenzhi 4e1567f013 新增玩家列表列表及统计权限
zhengyongxing 16814af0d2 市场结算管理总流水弹窗优化
zhengyongxing 3559d91a32 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhengyongxing 7770fc13c8 市场结算管理总流水弹窗优化
liuweiwen d1022c85fd Merge remote-tracking branch 'origin/release' into release
liuweiwen 5a633ccb49 工会归属申请时间日期格式化
zhengyongxing 8cbf3574e3 市场结算管理总流水弹窗优化
zhengyongxing f4b6fa4738 用户信息小号隐藏
zhengyongxing 076daf0d4e query冲突解决
liuweiwen 822ec35ff8 Merge branch 'feature/group_type' into release
liuweiwen 2b3099a2d8 工会归属会长不可编辑
ELF a31e42b7c4 Merge branch 'hotfix/link_info' into release
ELF f7a53c7562 Merge branch 'feature/account_safe' into release
ELF c4934613ae 解决冲突
ELF b0bc4c0496 解决冲突
ELF 0f44d9e95c 解决冲突
zhengchanglong bb08c723a3 Merge branch 'feature/group_type' into release-1.0.1
liuweiwen 08f8c518a6 从dev复制代码
liuweiwen 7431072bbf 从dev复制代码
chenzhi dff83c73d0 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 33be79e5cf Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi f34b71114f 优化数字提示
zhengyongxing ec027503cc Merge branch 'feature/group_type' into dev
zhengyongxing 13d1da8733 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing 63b44a78ff 下游订单生成bug修正
chenzhi fd36d6e674 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi ee5330bfc9 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi e5d8710f0a 优化罚款保存后数据不对
liuweiwen 16d8dd6dcb Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 2d060e6e72 Merge branch 'feature/group_type' into dev
liuweiwen a26b0ab53f Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 6f7dcb9ca5 修改上下游对账单导出文件名
chenxiaojun 6d215bda63 公会分成管理--更新
chenxiaojun 6012fdbdf1 公会分成管理--更新
chenxiaojun 02ccf125dc 公会分成管理--更新
chenxiaojun 365a276b95 公会分成管理--更新
zhengyongxing 1a52a129f2 Merge branch 'feature/group_type' into dev
zhengyongxing 122a27634b Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing e73d795ace 生成下游结算单下拉选项框优化
chenzhi 7ff7758df2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi ef0b3c86f0 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi ce92602ca0 优化生成上游订单重复提醒
liuweiwen 9b026796f2 Merge branch 'feature/group_type' into dev
liuweiwen 6caf99e984 对账系统登录界面修改
zhengyongxing c07167e784 结算单bug修正
zhengyongxing 943969bddd Merge branch 'feature/group_type' into dev
zhengyongxing c09c3a591e 结算单bug修正
chenzhi b566a2352a Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi cdb0b10c9a 结算列表新增对账单地址
chenzhi fd18ed01fe 合并
chenzhi dbc0e00132 合并
chenzhi d889bef13d 优化上游时间选择提示
chenzhi c3848e5b55 优化上游信息提示
zhengyongxing 8965fe8201 Merge branch 'feature/group_type' into dev 
# Conflicts:
#	Application/Admin/Controller/QueryController.class.php
zhengyongxing a2ce005497 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 71f2d75b8e 市场结算管理总流水点击查看各个渠道的流水
chenxiaojun ba9b5e33d1 更新
chenxiaojun d615a1402f 公会分成管理--更新
liuweiwen bbc1b05e1c Merge branch 'feature/group_type' into dev
liuweiwen b8e36847a3 cp对账系统退出
liuweiwen f480c20fb7 Merge branch 'feature/group_type' into dev
liuweiwen 57a1d8ed8c 对账系统
zhengyongxing a51291216a Merge branch 'feature/group_type' into dev
zhengyongxing f36202486d 生成上游订单修改
zhengyongxing abfc54a0af Merge branch 'feature/group_type' into dev
zhengyongxing 2f1d5fbd38 生成上游订单修改
chenzhi 0f8da4afac 优化页面显示
chenzhi 9c1cb95290 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 41421a9b10 优化页面显示
liuweiwen 0fa27e9c03 Merge branch 'feature/group_type' into dev
liuweiwen ed706c1b86 公司信息管理加提示
zhengyongxing b735706006 Merge branch 'feature/group_type' into dev
zhengyongxing 7f99dafb2c 市场结算管理 上游结算流水bug修正
liuweiwen af28ff9155 工会归属查询
liuweiwen c7b9e2a7d6 Merge branch 'feature/group_type' into dev
liuweiwen a7e9f62367 对账系统自动登录
liuweiwen 3f5791ff3f Merge branch 'feature/group_type' into dev
liuweiwen 51844a824e 工会归属会长必填
liuweiwen e2095af7a8 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 49e0e19cc8 推广员与合作公司只能看到自己的公司的对账记录
zhengchanglong a67ffa18d6 Merge branch 'feature/group_type' into dev
zhengchanglong 6e405febc1 设置分成比例安卓IOS同步更新
zhanglingsheng 4043cc04e6 支付设置--添加支付限额
zhengyongxing ae2ad86247 Merge branch 'feature/group_type' into dev
zhengyongxing 8b4c641f02 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing 3c9a828537 市场结算官方渠道检索修正
chenzhi 4cd3d5b618 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 5996b5f45e Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi cc653c2d2d 优化tp1.id错误
zhengyongxing a4b53c4e9a 结算单管理字段名修正
zhengyongxing 0c403ddf57 结算单管理字段名修正
zhengyongxing 4d6a45657c Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing 73578f1b64 生成下游订单修改
chenzhi 96466100bb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 864e8d693a 优化前端浮点数计算
liuweiwen 64cdea78a3 工会归属管理
zhengyongxing 6baba8db28 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 5d593cf266 Merge branch 'feature/group_type' into dev
zhengyongxing 135cba359e 菜单高亮修改
liuweiwen 7f0dbe1112 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 1e4b7f69d5 cp/工会对账系统
zhengchanglong 73fb719628 Merge branch 'feature/group_type' into dev
zhengyongxing c27518b988 市场结算添加编辑添加户名
zhengchanglong 868fde2d07 Merge branch 'feature/group_type' into dev
zhengyongxing 26c7190654 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing ef53562d06 市场结算添加编辑添加户名
chenzhi 8ff8d1dab8 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi ac0405329f 优化编辑
liuweiwen 21ee77609c cp/工会对账系统
zhengchanglong 1c00290da9 Merge branch 'feature/group_type' into dev 
# Conflicts:
#	Data/update.sql
chenxiaojun 6a8e58325c 更新
chenxiaojun bfc93e0626 公会分成管理--更新
chenxiaojun d995675829 更新
chenxiaojun 1594500eca 资质认证--更新
zhengyongxing 547b0439e3 市场结算添加编辑添加户名
chenzhi 1275c740d5 新增cp对账单删除
zhengyongxing da420ceb5c 市场结算添加编辑添加户名
zhengyongxing b74ac306ae 市场结算添加编辑添加户名
chenzhi 1bb038db4e 优化查看2
chenzhi 89d21c6218 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi f06cddc093 优化查看
zhengyongxing 2b335ec910 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 45ea27fd1f 市场结算列表删除操作
chenzhi cba3fc898c 新增查看
liuweiwen fc5db0b298 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 
# Conflicts:
#	Application/Admin/Controller/AjaxController.class.php
#	Data/update.sql
liuweiwen 394a3e4bb5 cp/工会对账系统
zhengyongxing 6bda9fe842 市场结算管理代码编辑完善
zhengyongxing ad901c31db 市场结算管理代码编辑完善
zhengyongxing 99f23254ed 市场结算管理代码提交
zhengyongxing 68312cc277 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 71b1498c71 市场结算管理代码提交
chenzhi 25240227e4 新增编辑
chenxiaojun 4a53915c22 更新
chenxiaojun 82784f9da9 推广提现--更新
yulingwei 9fe9a47b6f Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenxiaojun 56956d90de 更新
chenxiaojun 9b47108400 推广提现--更新
chenxiaojun a6b9e5e39f 更新
chenxiaojun 843c54ced5 推广提现--更新
yulingwei b5d71ae215 Merge branch 'feature/pop_rules' into dev
yulingwei 7ea2a465bf 修复问题
chenzhi 72405e45f5 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi ea6d820408 优化页面显示
chenxiaojun 009842c218 更新
chenxiaojun 4286817dea 推广提现--更新
zhengchanglong 9952029e6c Merge branch 'feature/group_type' into dev
zhengchanglong 066fe46064 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengchanglong eb114b33b3 游戏分成比例设定体验优化
zhengyongxing dddd640f9f 结算单管理列表修改
chenzhi d484c96744 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi cccbc3bfa8 新增cp结算单判断是否已经有交叉时间
zhengchanglong 10f2caefca Merge branch 'feature/group_type' into dev
zhengchanglong b34eec98ee 游戏分成比例设定体验优化
chenxiaojun 2d0143a378 更新
chenxiaojun dcea6b7e05 推广提现--更新
zhengchanglong 89d9b79930 Merge branch 'feature/group_type' into dev
zhengchanglong 5ac23b6a5b Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengchanglong de8386c0cb 游戏用户锁定备注显示
chenzhi 0934cd472a 新增cp结算单到列表中
zhengyongxing 2154899a6a Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing f87026a32c 结算单管理生成下游订单
chenzhi cda9d0c1a8 合并
chenzhi cd427a9409 新增添加cp上游对账单
zhengchanglong 437800b30b Merge branch 'feature/group_type' into dev
zhengchanglong 87096e180e 游戏用户锁定备注显示
zhengchanglong 7e1b90fc19 Merge branch 'feature/group_type' into dev
zhengchanglong 93fe724c15 游戏用户锁定备注显示
zhengchanglong ba4d2a4a2e Merge branch 'feature/group_type' into dev
zhengchanglong 941978bb07 【游戏】-【合作方管理】，联系人改为必填项，必填项前面加红色※号
chenxiaojun a0bcdb2c04 更新
chenxiaojun 08dd26f942 推广提现--更新
zhengchanglong 8144e3c50f Merge branch 'feature/group_type' into dev
zhengchanglong e914fde68d 玩家列表账号锁定添加备注
chenxiaojun 3a9a7177fe 推广结算--更新
chenxiaojun ad80923bed 更新
chenxiaojun 114cb2f7a5 更新
chenxiaojun f244b42ab7 推广结算--更新
yulingwei 37156e0dce Merge branch 'feature/pop_rules' into dev
yulingwei ed9ddd2d67 修复检索问题
yulingwei 5cb129e95f 修复冲突
yulingwei e3f0a24e43 弹窗推广后台更新
zhengchanglong 505e12beab Merge branch 'feature/group_type' into dev
zhengchanglong 326d9e5a12 管理后台-游戏-游戏编辑：参数配置-新增CP游戏分成比例
zhengyongxing ea140a430f 导出模板方法上传
liuweiwen 602fb33fcc 新增需求：管理后台-》系统-》扩展工具-》公司信息管理
yulingwei 249044b0de Merge branch 'feature/pop_rules' into dev
yulingwei 5542994e36 upt
zhengyongxing c6f798dc47 市场结算管理bug修正
zhengyongxing f124e4b7ff Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 7adb991d0e 市场结算管理上传
zhengyongxing ba158e6b9a 市场结算管理上传
ELF b6500f939d Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 247f10447a Merge branch 'feature/account_safe' into dev
ELF 500d0fdc2c 后台管理系统登录后改变session_id
chenzhi 377bdaee72 合并gt
chenzhi ff67974413 修复获取推广员统计bug
zhengyongxing 5e14eaf4c9 新增市场结算管理完善
liuweiwen 50320be1d2 新增需求：管理后台-》推广公会归属管理，列表，新增，编辑，审批
zhengyongxing 4fb2806656 新增市场结算管理
chenxiaojun c8fd6309a7 更新
chenxiaojun f1e8811df3 推广结算--更新
chenzhi 5326ef28db 合并
chenzhi 94243a5ea6 修改update冲突
chenzhi c711601fdf Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 216321f46b 优化换绑逻辑判断是否订单在审核中
zhengyongxing 89883d2005 新增市场结算管理
chenxiaojun f2e0cec5aa 更新
chenxiaojun 0927417ce9 推广结算--更新
万盟天下 e6d4304d74 Merge branch 'hotfix/shift-player' of wmtx/platform into release 
还原补链限制
chenzhi dfdad21d8e Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 414f326cf4 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 0039431ccb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
zhengyongxing f1a48fbdaa 权限分配 — 未给下级渠道分配（游戏充值）查看权限时，页面展示（游戏充值页面）修正
chenzhi 1295857697 优化工会统计各级检索条件结束
chenzhi 0561d8ff15 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi f95d23b091 优化公会统计各级条件展示
ELF 6b7d1b9b51 Merge branch 'feature/add_cdn' into dev
ELF fe68d8e8c9 修改oss上传返回结果
liuweiwen 4892db340e 管理后台-》游戏-》合作方管理-》列表增加字段联系人，联系电话，邮寄地址。公司税号，收款方名称，银行账号，开户行
ELF b220ac1c7f Merge branch 'feature/add_cdn' into dev
ELF f472f5e9d3 文件保存改成cdn
chenzhi 9e2eb46904 公会统计游戏统计新增多重搜索
chenxiaojun 09f2ca4ab6 更新
chenxiaojun 962c284467 推广结算--更新
liuweiwen fa3adf2e0b 新增合作方时，新增录入内容 
新增联系人，联系电话，邮寄地址。公司税号，收款方名称，
银行账号，开户行
chenzhi c20d507df6 优化订单判断
chenzhi 9faec272e3 优化订单判断
chenzhi 3e54338685 取消多个推广员无法补链注释
chenzhi 3f53bc266b Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 878badef43 换绑新增判断渠道是否已经结算
chenzhi bb7e1c269c Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 876952f3b4 公会统计新增内外团检索
chenxiaojun 89965bd8fb 导出
chenxiaojun a636c2dcf6 导出
zhengchanglong 715abb2b3e Merge branch 'hotfix/fix_get_gameist' into dev
liuweiwen fe0f308e54 财务管理下的ajax请求不判断权限
chenxiaojun ba1f6565cc 更新
chenxiaojun 631c23568d 上传汇款证明--调整
chenxiaojun d792e34348 结算管理--更新
chenxiaojun 90eed6f5ca 结算管理--更新
chenxiaojun 461e80bd30 结算管理--更新
chenxiaojun 3faf5db4f7 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenxiaojun c074b5fb86 结算管理--更新
chenzhi 3840959f05 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi a37d0d6ec4 优化推广员充值统计排序问题
chenzhi 9cef29ebeb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 43774e9099 推广员充值统计新增官方渠道统计
chenxiaojun 4721e60d32 推广员资质认证
chenzhi 4ba400fa78 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 14fa967f00 优化推广员统计数据
chenxiaojun 0ff9f77181 推广员资质认证
zhengchanglong 7c1593e0e1 Merge branch 'feature/group_type' into dev
zhengyongxing 302ee7a2ca Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 5343ef2162 工会统计新增内外团
chenzhi 0caa548525 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 836eccfa78 支付渠道新增支付渠道比
zhengyongxing acd816c766 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing cc0f5a03c4 工会统计新增内外团导出
chenzhi 07f6e9919d 区服列表 区服名称改区服id
ELF 7c5b3bb5e7 Merge branch 'feature/account_safe' into dev
chenzhi 0f7134c838 游戏充值 区服名称改区服id
ELF 4fb2c35495 Merge branch 'hotfix/link_info' into dev
chenzhi 3bf288fa41 优化登陆记录区服名称为区服id
chenzhi 5e08bda6c2 优化行为日志区服名称为区服id
ELF 0a0cedafd5 各个系统登录提示安全优化，sessionon_id变更
zhengchanglong 10c0b3a18a Merge branch 'feature/group_type' into dev 
# Conflicts:
#	Application/Admin/Controller/PromoteController.class.php
#	Data/update.sql
chenzhi 432c84ba01 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi e39c811da8 修改月结月份显示错误问题
zhanglingsheng 5ea753b595 支付宝设置添加公钥私钥
liuweiwen 4addf4c281 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 0b3ae062b1 优化：推广员新增与编辑的推广公司增加万盟天下科技 
新增需求：推广员增加工会归属和工会关系属性
zhengyongxing 10f6caddfa 工会统计新增内外团占比
ELF 8ab02a5e0b 还原补链限制
廖金灵 b12b133a06 Merge branch 'hotfix/shift-player' of wmtx/platform into release 
修改玩家迁移限制
elf@home 0bc50cbf70 修改限制
zhengyongxing d842a5c468 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing e9ffc0af79 平台币充值添加推广员充值搜索修改，玩家列表时间检索非必填
chenxiaojun 6054b5f6c0 更新
chenxiaojun 0baf97f717 会长提现--更新
zhengyongxing 0068a0d1c4 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing f324567258 平台币充值添加推广员充值搜索修改，玩家列表时间检索非必填
zhengyongxing 346bbaa117 平台币充值添加推广员充值搜索修改，玩家列表时间检索非必填
chenxiaojun 5930642f8b 更新
chenxiaojun a12c3ecf9e 会长提现--更新
yulingwei c5f737cb0b Merge branch 'hotfix/login_crontab' into dev
yulingwei 25606949f5 修复登录统计问题
chenxiaojun e884214546 会长提现|公会分成管理--更新
zhengyongxing 8652c19f5c 平台币充值添加推广员充值搜索
chenxiaojun c329ec09f4 更新
chenxiaojun 0758062837 会长提现--更新
chenxiaojun 73537c120e 更新
chenxiaojun 35ea788ed0 公会分成管理--更新
chenxiaojun 936240d06a 推广结算--更新
chenxiaojun 15174f8547 推广结算--更新
chenxiaojun 311aeffbb7 推广结算--更新
chenxiaojun 053417f7f8 推广结算--更新
chenxiaojun cda8e4c1c0 推广结算--更新
zhengchanglong 0e5be6e4a3 Merge branch 'release-1.0.0' into dev
chenxiaojun 5a0769eb3b 更新
chenxiaojun e447159971 公会分成管理--更新
chenzhi 4d0606d6fc 新增渠道查看公司联动
chenzhi f594e3bb14 公会统计新增公司联动
elf@home 6e354fe3b3 优化链接归属查询
liuweiwen 6625eaa4f7 工会统计
liuweiwen 809e9d36f1 工会统计
liuweiwen 28a1efe2f4 工会统计列表数据与搜索修复
liuweiwen b3e32506cc 工会统计搜索公司
liuweiwen c44e5ee1a7 编辑推广员时，只允许会长修改推广公司，同时更改底下推广员的公司
zhanglingsheng 7a9fe4fb45 超级签统计--导出
zhanglingsheng 34020fd725 超级签统计--样式
yulingwei 9d5bfc5ef2 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng e3ef73e7e3 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng e709816781 补单记录
yulingwei 75d3e87f89 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
yulingwei 899877e872 同步修改
ELF 834115c213 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 561787a4ac 修改
zhanglingsheng 8a9e0a9a8b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng ca401adbd0 补单记录
ELF a70c1aee21 Merge branch 'release-1.0.0' into dev
chenzhi 04c560312f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 715a1a8a2c 优化推广统计区服问题
yulingwei f4495f93a9 ltv修改
yulingwei 3ec7ccc188 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
yulingwei 873c81605e 修复
zhanglingsheng 908de1336f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng b88f395c9a 补单记录
zhanglingsheng 6a28abedc0 补单记录
chenxiaojun 905769f922 Merge remote-tracking branch 'origin/dev' into dev
chenxiaojun 9a0313b763 公会分成管理--更新
sunke 453c0c3682 链接归属名词修改
chenxiaojun e66893dc7f 公会分成管理--更新
yulingwei 8ccde7749a Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei 3e11b4d0ad 更新
yulingwei 1e3079870e Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei ee18eac375 修复
yulingwei b868b14273 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
yulingwei 21cc6865d5 Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei 2ed2117b6d 更新
ELF ad67717292 Merge branch 'release-1.0.0' into dev
yulingwei e2ed862130 Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei 7d1808a7bf Merge branch 'hotfix/ltv' into dev
yulingwei 12f00ad268 修复
chenzhi a5c926b2cd 优化区服预告区服选择
chenzhi ff46ab04ca Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi f580b44289 优化推广员统计区服选择
liuweiwen 2db651ae9c Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen bc28933369 游戏订单查看-》导出通知成功数据
zhengyongxing e055cc27d5 ajax游戏区服搜索设备非必填
zhengyongxing e49ed7aa30 支付渠道统计计添加平台币直充金额说明
sunke dcf7efad6f 下载链接菜单显示bug
liuweiwen 6dbfd09e91 编辑推广员时推广公司必填
zhengyongxing ea80b8fd44 游戏充值统计检索条件修正
zhengyongxing d59e8633c6 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing 2f25386518 游戏充值统计检索条件修正
ELF 841bf0c0b9 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 9bf45ae0d3 修改
zhengyongxing b96e65b8fe 游戏充值统计检索条件修正
chenzhi 1d69c616d6 优化公会统计页面跳转问题
chenzhi f38e007d80 优化渠道的公司检索
chenzhi 47595c81b8 优化公会统计公司
chenzhi c590b948ef 优化推广员充值统计导出
chenzhi 0a006bbcc2 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi fd23b640ea 优化推广员充值优化代码
zhengyongxing 7c7971d48e Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing 13f5128dd8 支付渠道统计导出bug修正,游戏充值充值方式检索修正
zhanglingsheng 162e2fe19c Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng 5b81f89308 游戏编辑
zhengyongxing dd86fbaddf 支付渠道统计bug修正
zhanglingsheng eabf59d3e3 超级签统计
zhengyongxing b5c06df195 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing 4e3206a5c1 支付渠道统计bug修正
zhanglingsheng 1c2bb7e584 超级签统计
zhanglingsheng 08e98945ed Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng ae2b498e45 超级签统计
chenzhi 5e246dde2b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 85b821081f 优化推广员充值统计今日本周本月不变
zhanglingsheng 683fc44d94 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng 9b65fbaabb 超级签统计
chenzhi a61e0f36b5 优化注册统计今日本周本月不变
zhanglingsheng befc2ef62b 超级签统计
zhanglingsheng 244e036a21 超级签统计
zhanglingsheng 153c397cf6 超级签统计
ELF a167c51582 Merge branch 'dev' into release-1.0.0
yulingwei e97b1ed22e Merge branch 'feature/ltv' into dev
yulingwei 65ed103d3a 修复beta链接格式
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
liuweiwen e40b92a0d7 优化-【统计】-【平台统计】-【游戏注册】、【游戏充值统计】、【注册方式统计】和【充值方式统计】的今日充值、本周充值、本月充值不根据时间筛选改变
zhengyongxing b0899f3fc9 支付渠道统计bug修正，官网与推广后台充值计入平台币
ELF 9b5697a859 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 1fcbe2dd65 Merge branch 'dev' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng 56da5cd85a Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhanglingsheng 59709fa295 游戏--添加支付方式渠道配置
liuweiwen 1e9409ef1a 优化-【统计】-【平台统计】-【游戏注册】、【游戏充值统计】、【注册方式统计】和【充值方式统计】的今日充值、本周充值、本月充值不根据时间筛选改变
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 超级签统计--搜索修改