3040 Commits (1bea859fd49f25989fd1b9c909b9ea5001b0ce74)

Author SHA1 Message Date
chenzhi 8c191c2f05 优化推广员公司列表 4 years ago
chenzhi 5367ea4aae 优化前端 4 years ago
ELF f3b323bda8 修改 4 years ago
yulingwei e5996b47cc upt 4 years ago
yulingwei 0a9e7ed3ef upt 4 years ago
yulingwei e789c941ed upt 4 years ago
yulingwei 7830cef93d upt 4 years ago
chenzhi bffbd6a2b1 优化ok 4 years ago
chenzhi 2619e598e8 合并marster 4 years ago
chenzhi 22a65f8404 优化下游支付宝导出 4 years ago
yulingwei e0d74cbffd upt 4 years ago
chenzhi 1bc3dab93c 新增下游渠道比例 4 years ago
yulingwei 066610f236 upt 4 years ago
yulingwei 877a53e892 upt 4 years ago
yulingwei f373bd2025 upt 4 years ago
yulingwei deac7da5ff upt 4 years ago
yulingwei 25dec010be upt 4 years ago
yulingwei 28a44019e4 upt 4 years ago
yulingwei eaa25ebcda feature/desposit 4 years ago
zhengyongxing cacb1e4cf4 商户统计结算功能添加 4 years ago
ELF 096e32d581 商户配置 4 years ago
yulingwei 2fbea72d26 up 4 years ago
chenzhi b4c6f4316a 优化显示 4 years ago
chenzhi afac0376be 新增下游审批 4 years ago
chenzhi 7d404c6904 优化查看 4 years ago
chenzhi cafdc39f2a 优化添加 4 years ago
zhengyongxing cb0ceda1cb 聚合财务导出模板修正 4 years ago
zhengyongxing ee6be3b45b 市场业绩提成当流水不足起提流水时,税后毛利不予展示 4 years ago
chenzhi d662c89b7e zancun 4 years ago
zhengyongxing 960903a31c 新功能添加 4 years ago
chenzhi f731a417bd 优化工会关系 4 years ago
chenzhi d9d55a3bcb 优化新增下游公司 4 years ago
zhengyongxing 1abaa7c646 支付渠道名称修改 4 years ago
zhengyongxing 729136a95c 聚合订单代码导出,及重算功能修改 4 years ago
ELF e8a925b64c 游戏统计添加聚合充值数据 4 years ago
chenzhi 69adcbabf8 优化推广公司 4 years ago
chenzhi 5aa7427504 新增公司信息编辑 4 years ago
chenzhi c708fb6d11 优化CP搜索 4 years ago
yulingwei 20ac65f12a upt 4 years ago
yulingwei dda43c7289 Merge branch 'feature/deposit' of 47.111.118.107:wmtx/platform into feature/deposit 4 years ago
yulingwei 555fd052fe upt 4 years ago
chenzhi 35f2fe3f05 优化公司显示 4 years ago
yulingwei e337ecac5e upt 4 years ago
yulingwei c8bd476a60 upt 4 years ago
zhengyongxing 2fefd44d0c 公会统计推广员支付时间修正 4 years ago
chenzhi f7d90780aa 新增CP公司审核 4 years ago
zhengyongxing cd8f64c7e6 游戏详情订单修改 4 years ago
chenzhi 33cf2cf8a6 新增审核列表 4 years ago
yulingwei adc3acd992 upt 4 years ago
yulingwei 33049f5a9f upt 4 years ago
ELF 05fac79ed3 修改 4 years ago
chenzhi 0c2e2db65d 新增税费费率 4 years ago
zhengyongxing 288f121955 添加手机登录的功能 4 years ago
yulingwei e155c92ed6 1 4 years ago
zhengyongxing 114e51ebe2 Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 4 years ago
chenzhi 58c8508ce4 新增cp导出 4 years ago
chenzhi bd3510581f 新增CP导出生效时间 4 years ago
chenzhi f66ec6d1ff 优化函数 4 years ago
chenzhi 296b5a0d8f 优化关系函数 4 years ago
chenzhi 3349304e10 新增上游预警金额读取 4 years ago
ELF c87b61d94b 修改发票类型 4 years ago
ELF 0f0d52c78f 修改 4 years ago
ELF b448f0829e 修改公司绑定默认值 4 years ago
yulingwei 98413791aa repair 4 years ago
万盟天下 32d4450e4a Merge branch 'featurn/markets' of wmtx/platform into master
名字增加修改
4 years ago
zhengyongxing 53f490ea20 名字增加修改 4 years ago
万盟天下 00d99897b0 Merge branch 'hotfix/gitbag_op' of wmtx/platform into master
优化后台礼包
4 years ago
ELF 007b7b5c1f 优化后台 4 years ago
ELF 15d0b454a4 修改 4 years ago
万盟天下 72115a9ede Merge branch 'feature/promote_statistics' of wmtx/platform into release
推广员统计修改
4 years ago
yulingwei 64bb801be2 1 4 years ago
yulingwei 6390d680ec upt 4 years ago
yulingwei 96327507f4 upt 4 years ago
yulingwei 52b478f570 upt 4 years ago
yulingwei 7fc6609d78 upt 4 years ago
yulingwei aa77fb7821 upt 4 years ago
zhengyongxing 2220a6cfec 财务支付时间修改,增加手机登录验证,及开发推广员列表名称 4 years ago
yulingwei 51a1c9c707 upt 4 years ago
yulingwei b9dfe08177 upt 4 years ago
yulingwei 1119e8faf9 upt 4 years ago
chenzhi 2f9269f29f 取消默认选择时间 4 years ago
chenzhi 6c1f898fb9 优化换绑时间 4 years ago
yulingwei 80597c4894 upt 4 years ago
chenzhi db64bea72f 优化提醒 4 years ago
chenzhi 617cfbd4bf 优化换绑 4 years ago
yulingwei 5e5aa8ca3f upt 4 years ago
yulingwei 0b54c71cb0 upt 4 years ago
chenzhi d6ec8e0248 新增导出 4 years ago
廖金灵 831c87c9ee Merge branch 'hotfix/market_percentage' of wmtx/platform into master
优化公会统计
4 years ago
廖金灵 420c3454fc Merge branch 'hotfix/fan_promote' of wmtx/platform into master
优化公会统计
4 years ago
廖金灵 3065ba060f Merge branch 'hotfix/market_percentage' of wmtx/platform into release
条数修改
4 years ago
zhengyongxing fd926a0795 条数修改 4 years ago
郑永星 b77a3a1136 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
groupby市场专员id添加
4 years ago
zhengyongxing 5ea0f21574 groupby市场专员id添加 4 years ago
廖金灵 3095270a84 Merge branch 'hotfix/fan_promote' of wmtx/platform into release
修改工会统计
4 years ago
ELF f167d63c4a 修改 4 years ago
郑永星 8076e22b2f Merge branch 'hotfix/market_percentage' of wmtx/platform into release 4 years ago
zhengyongxing ce2540919c 市场专员筛选 4 years ago
郑永星 c036175a14 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场专员筛选,月份跳转,及时间筛选修正
4 years ago
zhengyongxing 039b496b28 市场专员筛选,月份跳转,及时间筛选修正 4 years ago
zhengyongxing 96f68c4f50 市场专员筛选,月份跳转,及时间筛选修正 4 years ago
elf@home fb87be0b43 修改 4 years ago
廖金灵 83a1f15de5 Merge branch 'feature/market_percentage' of wmtx/platform into release
跳转汇总结算单默认事件添加
4 years ago
zhengyongxing cd208fbfd7 跳转汇总结算单默认事件添加 4 years ago
廖金灵 6f3a94a31b Merge branch 'feature/market_percentage' of wmtx/platform into release
跳转汇总结算单默认事件添加
4 years ago
zhengyongxing 19c2f8b2de 跳转汇总结算单默认事件添加 4 years ago
廖金灵 98dab102f4 Merge branch 'feature/market_percentage' of wmtx/platform into release
跳转汇总结算单跳转修正,添加筛选发放状态的代码
4 years ago
zhengyongxing ced9d51845 跳转汇总结算单跳转修正,添加筛选发放状态的代码 4 years ago
廖金灵 6af9e39ec9 Merge branch 'feature/market_percentage' of wmtx/platform into release
重算展示权限添加
4 years ago
zhengyongxing dae421270f 重算展示权限添加 4 years ago
廖金灵 262940a42f Merge branch 'feature/market_percentage' of wmtx/platform into release
列表全部开发给市场专员,其他人员的数据隐
4 years ago
zhengyongxing 53979941a0 列表全部开发给市场专员,其他人员的数据隐藏 4 years ago
廖金灵 1ec683a86e Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成市场总监管理组添加查看全部用户的权限
4 years ago
zhengyongxing 1acef89380 市场业绩提成市场总监管理组添加查看全部用户的权限 4 years ago
廖金灵 27f14f0292 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成bug修改
4 years ago
zhengyongxing bded27756e 市场业绩提成bug修改 4 years ago
廖金灵 c008157b0a Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成bug修改
4 years ago
zhengyongxing 0c5e857ca2 市场业绩提成bug修改 4 years ago
廖金灵 6deed99b79 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成bug修改
4 years ago
zhengyongxing 5ab96edd8f 市场业绩提成bug修改 4 years ago
zhengyongxing 8f4505205b 市场业绩提成优时间大小判断 4 years ago
廖金灵 b58f66f9b8 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成优化
4 years ago
zhengyongxing b64e5858ea 市场业绩提成优化 4 years ago
zhengyongxing 5f113b8bfc 市场业绩提成优化 4 years ago
廖金灵 886c70665c Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成优化
4 years ago
zhengyongxing 2975b9fe35 市场业绩提成优化 4 years ago
廖金灵 31de395c6e Merge branch 'feature/market_percentage' of wmtx/platform into release
提现汇总表时间检索bug修正
4 years ago
zhengyongxing cbb0e82db1 提现汇总表时间检索bug修正 4 years ago
郑永星 a9e8905e27 Merge branch 'feature/market_percentage' of wmtx/platform into release
提现汇总表时间检索bug修正
4 years ago
zhengyongxing 3eeeb449de 提现汇总表时间检索bug修正 4 years ago
zhengyongxing 4e562ffcc4 提现汇总表时间检索bug修正 4 years ago
廖金灵 8ad5533c53 Merge branch 'feature/market_percentage' of wmtx/platform into release
汇率逻辑修改
4 years ago
zhengyongxing 0ac831dece 汇率逻辑修改 4 years ago
廖金灵 aebc8b9f70 Merge branch 'feature/market_percentage' of wmtx/platform into release
编辑汇率时间控件修改
4 years ago
zhengyongxing a1df3c547e 编辑汇率时间控件修改 4 years ago
廖金灵 7576434beb Merge branch 'feature/market_percentage' of wmtx/platform into release
时间控件修改
4 years ago
zhengyongxing 5dc5222091 时间控件修改 4 years ago
郑永星 7608fb3b99 Merge branch 'feature/market_percentage' of wmtx/platform into release 4 years ago
zhengyongxing c637d7a1d7 离职发放发放完成隐藏 4 years ago
廖金灵 6d6ec065b2 Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改导出bug
4 years ago
ELF a17bb698dc 修改bug 4 years ago
廖金灵 39af00fe0e Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改bug
4 years ago
ELF 2dadc11d09 修改bug 4 years ago
廖金灵 578087e50e Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改留存率
4 years ago
ELF fa4de7ece5 修改 4 years ago
zhengyongxing 585f523984 arpu分析bug修正 4 years ago
zhengyongxing a6dd2a9830 市场专员业绩导出公式添加 4 years ago
zhengyongxing f4789a1534 市场专员业绩提成bug修正 4 years ago
zhengyongxing 3603f5fa21 市场专员业绩提成bug修正 4 years ago
zhengyongxing 944a424b3c 市场专员业绩提成bug修正 4 years ago
zhengyongxing 44feb6957d 市场专员业绩提成bug修正 4 years ago
zhengyongxing e4d1ced122 市场专员业绩提成bug修正 4 years ago
zhengyongxing b9255647f7 市场专员业绩提成汇总单检索
修正
4 years ago
zhengyongxing 0ca629518d 市场专员业绩结算结构修改 4 years ago
zhengyongxing 5c76d1180d 市场专员业绩结算结构修改 4 years ago
zhengyongxing 4bfa0dfa2f 市场专员业绩结算结构修改 4 years ago
zhengyongxing d40ce89901 市场专员业绩结算发放时间选项修改 4 years ago
zhengyongxing 8053806801 市场专员业绩bug修改 4 years ago
zhengyongxing f7c11991ca 市场专员业绩bug修改 4 years ago
chenzhi 2a4541569d 优化列表显示 4 years ago
zhengyongxing 2303c439aa 市场专员业绩计页面修改 4 years ago
chenzhi c11266291f Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/change_cp_time 4 years ago
chenzhi 63054ac0d8 优化订单校验 4 years ago
zhengyongxing de3d7d52b7 市场专员业绩计bug修正 4 years ago
chenzhi 04e13844c3 zancun 4 years ago
zhengyongxing 962d140d80 Merge branch 'hotfix/pay_channel_modify' into feature/market_percentage 4 years ago
zhengyongxing 043ee29f54 市场专员业绩计bug修正 4 years ago
zhengyongxing 8430444b8e 市场专员业绩计bug修正 4 years ago
zhengyongxing 2da9821caf 市场专员业绩计算修正 4 years ago
zhengyongxing 9a23b5588b 市场专员业绩计算修正 4 years ago
zhengyongxing ea21948984 支付渠道bug修改 4 years ago
zhengyongxing 97161900ac 市场专员业绩管理bug修改 4 years ago
chenzhi c9d6b9859d 合并热更 4 years ago
chenzhi c18eb439c5 优化游戏获取逻辑 4 years ago
zhengyongxing 1c535ee74b 市场专员业绩管理 重算调用脚本命令修改 4 years ago
zhengyongxing bdeacbd718 市场专员业绩管理 重算调用脚本命令修改 4 years ago
zhengyongxing c96340afa9 市场专员业绩管理bug修改 4 years ago
chenzhi 048931ce9e 优化搜索3 4 years ago
chenzhi 35380ae9b0 优化搜索2 4 years ago
chenzhi 587d7913ca 优化检索 4 years ago
zhengyongxing 1e80004e3e 市场专员业绩管理bug修改 4 years ago
zhengyongxing 17ff8d9029 市场专员业绩管理模板指定 4 years ago
zhengyongxing 70d6c3c7bf 市场专员业绩管理权限判断 4 years ago
zhengyongxing 80dc2b860c Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/market_percentage
 Conflicts:
	Application/Admin/Common/extend.php
	Application/Admin/Controller/TimingController.class.php
	Data/update.sql
4 years ago
zhengyongxing 83717b64ae 市场专员业绩管理优化 4 years ago
chenzhi 5fc03a14a4 优化cp添加 4 years ago
chenzhi 0dda3b1c61 优化合同不需要限制时间 4 years ago
chenzhi 490197a490 移除合作方合同时间限制 4 years ago
chenzhi 03f4130e9e 新增上游合作 4 years ago
ELF 3f42d2967c 修改 4 years ago
zhengyongxing 06bd0bf848 市场专员业绩管理代码提交 4 years ago
chenzhi d52ab03714 新增推广公司游戏选择 4 years ago
廖金灵 4a755d2269 Merge branch 'feature/market_admin' of wmtx/platform into release
修改换绑bug
4 years ago
ELF ecc228409d 修改 4 years ago
廖金灵 ed9d193531 Merge branch 'feature/promote_statistics' of wmtx/platform into release
推广员充值换榜定时器优化
4 years ago
zhengyongxing 3128c079d3 推广员充值换榜定时器优化 4 years ago
zhengyongxing ef8d16fc6e 推广员充值换榜定时器优化 4 years ago
zhengyongxing acc45f5911 江息网络漏掉的修改 4 years ago
chenzhi bc75da8c14 解决冲突 4 years ago
zhengyongxing 15b9efcd7e 江息网络漏掉的修改 4 years ago