5111 Commits (4911aa1629c9d4767f63195500afa2b96878ef21)

Author SHA1 Message Date
chenzhi 296b5a0d8f 优化关系函数 4 years ago
chenzhi 3349304e10 新增上游预警金额读取 4 years ago
万盟天下 2528313ba0 Merge branch 'hotfix/promote_achievement' of wmtx/platform into master
修改推广员业绩查询默认值
4 years ago
ELF aeade79e67 修改 4 years ago
ELF 80cb58cdc9 推广员业绩查询时间范围限制为31天 4 years ago
ELF c87b61d94b 修改发票类型 4 years ago
ELF 0f0d52c78f 修改 4 years ago
ELF b448f0829e 修改公司绑定默认值 4 years ago
yulingwei 98413791aa repair 4 years ago
ELF 451b2b3105 修改 4 years ago
廖金灵 80e89c651a Merge branch 'feature/excel_payment' of wmtx/platform into master
优化手机设置
4 years ago
chenzhi ad2078cfbe 优化手机设置 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
chenzhi 4b2995f279 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/excel_payment 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
chenzhi ba4d08cc8b 取消线上打款权限 4 years ago
万盟天下 0885bbdcb7 Merge branch 'feature/excel_payment' of wmtx/platform into release
打款账号
4 years ago
yulingwei 52b478f570 upt 4 years ago
chenzhi 5231b508e6 优化打款权限 4 years ago
chenzhi 213b152398 优化打款权限 4 years ago
chenzhi bed393c5a0 打款账号 4 years ago
yulingwei 7fc6609d78 upt 4 years ago
yulingwei aa77fb7821 upt 4 years ago
chenzhi fd706fb314 优化打款列表 4 years ago
万盟天下 093d73e883 Merge branch 'feature/excel_payment' of wmtx/platform into release
优化打款
4 years ago
chenzhi 628a58d5e1 取消测试环境 4 years ago
chenzhi f58154a07a 优化打款 4 years ago
chenzhi 309300299d 新增显示全部 4 years ago
zhengyongxing 2220a6cfec 财务支付时间修改,增加手机登录验证,及开发推广员列表名称 4 years ago
chenzhi 60e89f6868 修改导出 4 years ago
chenzhi 52b1168930 优化打款记录 4 years ago
yulingwei 51a1c9c707 upt 4 years ago
yulingwei b9dfe08177 upt 4 years ago
chenzhi b460b7409f 优化打款系统登陆 4 years ago
chenzhi e9c3355c90 优化打款名称 4 years ago
yulingwei 1119e8faf9 upt 4 years ago
chenzhi 84f5592359 Merge branch 'hotfix/shift_promote' of 47.111.118.107:wmtx/platform into hotfix2/shift_promote 4 years ago
chenzhi 2f9269f29f 取消默认选择时间 4 years ago
chenzhi 17aea456e5 Merge branch 'hotfix/shift_promote' of 47.111.118.107:wmtx/platform into hotfix2/shift_promote 4 years ago
chenzhi 6c1f898fb9 优化换绑时间 4 years ago
yulingwei 80597c4894 upt 4 years ago
chenzhi db64bea72f 优化提醒 4 years ago
chenzhi b1c09b698d Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix2/shift_promote 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
chenzhi 0c91774854 解决冲突 4 years ago
chenzhi 17e1f4b1fa 优化前端提醒 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
chenzhi a0b04cf81e 优化公司为模糊搜索 4 years ago
chenzhi 41f214c7e7 优化基础参数 4 years ago
chenzhi 5362c1e9e4 优化批量导出 4 years ago
chenzhi 2104a3e4b6 优化批次号 4 years ago
廖金灵 1ec683a86e Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成市场总监管理组添加查看全部用户的权限
4 years ago
chenzhi 9cbcbc7013 优化打款 4 years ago
chenzhi 9ff3153f57 打款ok 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
chenzhi 9292aa7862 优化打款 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
chenzhi 9cb0e33531 znac 4 years ago
chenzhi 74e39c7b20 excel打款列表 4 years ago
chenzhi 24f2b76bd6 新增导入 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
chenzhi 399c3b37cf 新增文件读取 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
chenzhi 8d32b5104e 新增excel打款 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
廖金灵 89edac1fee Merge branch 'hotfix/market_name' of wmtx/platform into master
市场专员识别
4 years ago
廖金灵 56619e58b7 Merge branch 'hotfix/market_name' of wmtx/platform into release
市场专员识别
4 years ago
ELF 3f42d2967c 修改 4 years ago
ELF 70c9e26ce4 修改bug 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
zhengyongxing 1234349844 市场专员业绩计算修改 4 years ago
chenzhi f62cfca22b 隐藏推广公司分成比例 4 years ago
zhengyongxing dbad9a08db Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_statistics
 Conflicts:
	Application/Admin/Common/function.php
	Application/Admin/Controller/TimingController.class.php
4 years ago
chenzhi 21a738054a 隐藏推广公司比例 4 years ago
zhengyongxing 39e2bce6dd 推广员充值统计提交 4 years ago
zhengyongxing 2bc4bf79d9 市场结算管理公司税率提交 4 years ago
ELF 990a2bd206 解决冲突 4 years ago
chenzhi a020cb26df 新增不验证手机 己方 4 years ago
chenzhi 91ae987c3c 优化游戏比例分成无需大于 4 years ago
chenzhi 9dd4a507e9 隐藏模板批量操作 4 years ago
chenzhi f1824fd7b3 优化新增名称 4 years ago
ELF 7c3a001e25 修改 4 years ago
chenzhi 4fde001d4e 优化游戏分成比例不受档位限制 4 years ago
zhengyongxing 682ce333b1 市场结算管理公司税率提交 4 years ago
ELF 102e77267d 修改bug 4 years ago
chenzhi c76cf038cd 己方公司 4 years ago
ELF e94b6418f1 修改 4 years ago
ELF 8224cfb362 修改 4 years ago
ELF 77c692c44d 修改 4 years ago
zhengyongxing ca5c68d078 推广公司编辑添加合并错误去除 4 years ago
zhengyongxing f63b115641 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
4 years ago
zhengyongxing 2fae4219df 公会统计去除 4 years ago
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
4 years ago
zhengyongxing cd0d9e295f 市场专员结算代码上传 4 years ago
zhengyongxing 379716298a 市场专员结算代码上传 4 years ago
ELF e3b53e7df1 修改 4 years ago
ELF 73f5f4f5ea 修改 4 years ago
ELF 38c10a0f7a 修改 4 years ago
ELF 10aed50db7 修改 4 years ago
ELF f9b054e1cb 修改 4 years ago
ELF 34691d6baa 修改 4 years ago
ELF f0a8b6bc3b 修改 4 years ago
ELF 6f2f588617 优化 4 years ago
yulingwei 2680f92079 1 4 years ago
yulingwei 4058eb3963 1 4 years ago
ELF 76fcfec7c2 修改 4 years ago
yulingwei 22ac6bf293 修复问题 4 years ago
ELF 5f5a6ee1af 修改 4 years ago
zhengyongxing a2408407b7 上传市场专员结算代码 4 years ago
廖金灵 c1163e7b22 Merge branch 'release' of wmtx/platform into master
版本更新2020.06.24
4 years ago
廖金灵 4989deb7be Merge branch 'feature/loginInfo' of wmtx/platform into release
验证码提示样式修改
4 years ago
yulingwei efe84158da 修改错误样式 4 years ago
zhengyongxing c3956f7ed2 平台币金额解释添加 4 years ago
廖金灵 bc00b1112f Merge branch 'feature/apply_game' of wmtx/platform into release
task440
4 years ago
廖金灵 1907985e7b Merge branch 'feature/ylw-06-10' of wmtx/platform into release
新增公司选择默认模板
4 years ago
廖金灵 2fe024f696 Merge branch 'feature/loginInfo' of wmtx/platform into release
新增手机号限制
4 years ago
yulingwei ff9b2249b8 新增公司默认选择默认模板 4 years ago
yulingwei 34df4e5a8e upt 4 years ago
廖金灵 db32f11215 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
取消测试的虚拟验证码
4 years ago
chenzhi 7d8dca7421 取消测试的虚拟验证码 4 years ago
chenzhi 95d9f45612 新增检索 4 years ago
廖金灵 a808b86865 Merge branch 'feature/paytime_summary' of wmtx/platform into release
汇付宝
4 years ago
廖金灵 20b401fe85 Merge branch 'feature/promote_withdraw' of wmtx/platform into release
结算中心提现总金额等4个功能隐藏
4 years ago
zhengyongxing bdc5d3a385 结算中心提现总金额等4个功能隐藏 4 years ago
yulingwei c8924779c4 Merge branch 'release' into feature/ylw-06-17 4 years ago
yulingwei 8c18f2aa1d 1 4 years ago
廖金灵 c4ec5753f0 Merge branch 'feature/loginInfo' of wmtx/platform into release
手机验证码登录推广后台
4 years ago
ELF 2d872ed710 解决冲突 4 years ago
ELF 2589806e62 解决冲突 4 years ago
yulingwei 3f4406a1ee Merge branch 'release' into feature/ylw-06-17 4 years ago
yulingwei 0decb03cb1 merge 4 years ago
ELF a153fb9a0e 修改 4 years ago
chenzhi ad801a37fb 优化前端 4 years ago
yulingwei b2b28bce07 upt 4 years ago
yulingwei 5b604ab073 upt 4 years ago
yulingwei cdf2d903cd upt 4 years ago
chenzhi ca551b9c50 己方公司新增搜索项目 4 years ago