3831 Commits (19cbae833aaf68c8c7e18282d58b2a9d9464dcc4)

Author SHA1 Message Date
ELF 35b267027c Merge branch 'hotfix/download_name' into release 5 years ago
ELF 129a1103e2 修改beta版下载名称 5 years ago
zhengyongxing 5626dfaf99 Merge remote-tracking branch 'origin/release' into release 5 years ago
zhengyongxing 21cac27332 Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing 70ddcb63e0 生成下游个人结算单bug修改 5 years ago
zhengchanglong 858c028faf Merge branch 'feature/add_promote_company' into release
# Conflicts:
#	Data/update.sql
5 years ago
zhengyongxing e6d136410d Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing 065cf7d566 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zhengyongxing 938a82e993 生成下游个人结算单bug修改 5 years ago
liuweiwen e15460b08f 合作方 5 years ago
chenzhi 6bb3387b0e 新增推广公司分成比例百分号 5 years ago
chenzhi f507dde70b 新增推广公司导出功能 5 years ago
yulingwei dfe52865bd upt 5 years ago
zhengyongxing 64122ca8c7 Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing 3b47c94b1e Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zhengyongxing 2589a76603 生成下游个人结算单bug修改 5 years ago
zhengchanglong ec2c929450 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zhengchanglong 5f5abce2ec 玩家信息数据显示权限BUG修复 5 years ago
zhengyongxing 0b7327bc4e Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing c8f333fa9a 生成下游个人结算单bug修改 5 years ago
zhengyongxing 46ccf0e3ce Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zhengyongxing 71dabfae53 生成下游个人结算单bug修改 5 years ago
chenzhi 31deafcb3c 优化合作公司列表页面 5 years ago
ELF 055e246f70 修改bug 5 years ago
liuweiwen 6d13be7863 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
liuweiwen 7da5e25e16 合作方 5 years ago
zhengchanglong c066620128 Merge branch 'feature/admin_optimize' into release 5 years ago
chenzhi a26a1191cc 优化上游结算提示 5 years ago
yulingwei 469a037b0f merge 5 years ago
yulingwei 3c44d5d200 upt 5 years ago
chenzhi 5cea54585f 优化上游结算单选择后初始值变动 5 years ago
chenzhi 8c25f55c6e 修复不能cp公司选择无效问题 5 years ago
zhengchanglong 99f62f3c14 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
5 years ago
chenzhi 44a34bc89f 新增推广公司删除 5 years ago
chenzhi 4e28b39999 新增推广公司编辑功能 5 years ago
chenzhi 6ea7a581f5 推广公司查看 5 years ago
chenzhi f218544e7f 优化推广公司添加 5 years ago
chenzhi da2e3a769c 推广列表查看 5 years ago
liuweiwen a1c3ad8fb3 数据展示权限 5 years ago
liuweiwen 4b480e6f94 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
liuweiwen 8462f80777 合作方 5 years ago
zhengchanglong 4ce9af39e5 Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing fb14c5888a Merge branch 'hotfix/test_order' into release 5 years ago
zhengyongxing a9924e67c1 测试订单列表与录入bug修改 5 years ago
zhengyongxing 2d0d59c0a5 Merge branch 'hotfix/test_order' of 47.111.118.107:wmtx/platform into hotfix/test_order
 Conflicts:
	Application/Admin/Controller/TestOrderController.class.php
5 years ago
zhengyongxing 12903ef3cd 测试订单列表与录入bug修改 5 years ago
chenzhi 38fc3c3054 推广公司列表2 5 years ago
zhengyongxing c461623b5e Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zhengyongxing 6f48940e21 生成下游个人结算单回退功能添加 5 years ago
chenzhi a3aa3700a7 修正company_belong模糊问题 5 years ago
chenzhi 542c76f266 推广公司列表1 5 years ago
zhengyongxing cf2cb338f1 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zhengyongxing 8dd5f7bf5c 结算单管理添加 5 years ago
chenzhi 92929b1db7 优化推广公司添加 5 years ago
chenzhi 84f5ff2e95 优化添加推广公司结构 5 years ago
liuweiwen ada2913cdc 奖罚记录管理根据公司类型搜索 5 years ago
chenzhi 1f1e75e736 新增推广公司添加 5 years ago
chenzhi 6a612565c6 扩展推广公司添加 5 years ago
chenxiaojun 13a39d1080 推广平台>数据管理>推广员指标--更新 5 years ago
chenxiaojun ed7a731ae5 推广平台>数据管理>推广员指标--更新 5 years ago
chenxiaojun db6aeb26eb 推广平台>数据管理>推广员指标--更新 5 years ago
chenxiaojun ff489f8a17 Merge remote-tracking branch 'origin/feature/promote_quota' into feature/promote_quota 5 years ago
chenxiaojun 2defa249e8 推广平台>数据管理>推广员指标--更新 5 years ago
ELF 7833847e72 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
ELF 641e401c73 Merge branch 'feature/promote_group' into release 5 years ago
ELF 9ca131aaaa 修改推廣員bug 5 years ago
chenxiaojun 15ed062db3 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
chenxiaojun b2909d07d9 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
sunke 3dbacf225b 指标下载处理 5 years ago
sunke ffd29e2662 指标导出处理 5 years ago
sunke 712010b241 推广员指标 5 years ago
zhengyongxing f51a576b1d Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing 9ab70c84d8 市场结算管理下游结算审核状态添加 5 years ago
zhengyongxing 0cbd58862e Merge branch 'release' of 47.111.118.107:wmtx/platform into release
 Conflicts:
	Data/update.sql
5 years ago
zhengyongxing 8a1a15e845 市场结算管理下游结算符号bug修正 5 years ago
zhengyongxing 031d40dc22 生成个人结算单编辑的功能模板 5 years ago
zhengyongxing 955a1917b3 生成个人结算单的功能完成 5 years ago
zhengchanglong 9b43cc90b4 Merge branch 'hotfix/test_order' into release
# Conflicts:
#	Data/update.sql
5 years ago
zhengchanglong 282033afe7 测试订单录入添加分页 5 years ago
sunke e2b6a09958 电子文档弹窗按钮 5 years ago
sunke afbba4d20b 电子文档弹窗按钮 5 years ago
yulingwei e670dfcf7c Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei e35f20ee70 游戏预警 5 years ago
zhengchanglong cb5cef678d Merge branch 'hotfix/test_order' into release 5 years ago
zhengchanglong d0de91e89d 测试订单查询修改 5 years ago
sunke 8298ef3e3d 删除打印 5 years ago
sunke 739eff3d00 删除打印 5 years ago
zhengchanglong 42a0876ab2 Merge remote-tracking branch 'origin/hotfix/test_order' into hotfix/test_order 5 years ago
zhengchanglong 2b99184273 Merge remote-tracking branch 'origin/hotfix/test_order' into hotfix/test_order
# Conflicts:
#	Application/Admin/View/TestOrder/lists.html
5 years ago
zhengyongxing 2aa68e4412 测试订单录入功能提交 5 years ago
zhengchanglong 53b9573d71 测试订单查询修改 5 years ago
zhengyongxing 8aba8728f0 测试订单录入功能提交 5 years ago
ELF 947c58952b 部门/组长删除搜索框 5 years ago
ELF c95f771ba0 解决冲突 5 years ago
ELF 423b4ae77b 解决冲突 5 years ago
ELF 227c6e6ef9 添加推广员搜索功能添加组名/部门名 5 years ago
zhengyongxing 56ecea6998 下游个人结算单生成代码上传 5 years ago
zhengchanglong 284f42b315 测试订单录入 5 years ago
zhengchanglong fc0bb831a7 测试订单录入 5 years ago
zhengchanglong 254d29f3f2 测试订单录入 5 years ago
chenxiaojun 89c7855337 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
chenxiaojun 66d68b0b49 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
sunke f92533e6a5 渠道计算修复 5 years ago
sunke 8db53afc8b 电子文档及公司录入信息 5 years ago
sunke 5fe238ccbd 渠道流水计算 5 years ago
liuweiwen 319dde1090 奖罚记录管理根据公司类型搜索 5 years ago
ELF bc2f5dd117 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
ELF bbb31890f6 未收押金会长禁用落地页/下载页 5 years ago
sunke 7f169dc211 渠道流水计算 5 years ago
ELF ed25d54dc8 解决冲突 5 years ago
ELF 501b8099d4 解决冲突 5 years ago
ELF b4d35af3cb 推广员列表显示 5 years ago
chenzhi 2fe965749e 财务汇总ok 5 years ago
chenxiaojun fa3a346096 推广平台>财务管理--更新 5 years ago
chenxiaojun e48056686d 推广平台>数据管理--新增推广员指标 5 years ago
sunke 889a79a6b5 电子文档弹窗 5 years ago
chenxiaojun b7d2931106 管理后台--更新 5 years ago
chenxiaojun e9dae29deb 管理后台>推广员>推广员管理>推广员列表--新增资质认证 5 years ago
chenxiaojun e9581a2e04 管理后台>推广员>结算管理>推广提现--更新 5 years ago
chenxiaojun c57f67a43b 推广平台>财务管理>提现记录--更新 5 years ago
sunke 56981a0acc 渠道计算 5 years ago
yulingwei 0983ea1027 Merge branch 'feature/admin_optimize' into feature/ylw 5 years ago
yulingwei 2cd5574de7 新增审核时间 5 years ago
yulingwei 6b6baa4f92 合并 5 years ago
ELF 69185016a0 修改 5 years ago
liuweiwen dfd198e9b7 对账系统增加奖罚数据 5 years ago
zhengyongxing 5ab9f2cc1c 下游个人结算单生成代码上传 5 years ago
zhengyongxing 77463c7e1d 市场结算管理上游流水符号修正 5 years ago
liuweiwen 2ba96aa424 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
liuweiwen ce960beb6d 合作方手机格式验证修改 5 years ago
chenxiaojun 2c52bccaf7 管理后台>推广员>结算管理>推广提现>自动审核管理--更新 5 years ago
chenxiaojun d5a63a7849 管理后台>推广员>结算管理>推广提现>自动审核管理--更新 5 years ago
liuweiwen e6cbcd86d3 Merge branch 'release' into feature/admin_optimize 5 years ago
liuweiwen 2af2505819 合并热修复 5 years ago
liuweiwen 2ed47500f0 Merge branch 'hotfix/recharge_statistics' into feature/admin_optimize 5 years ago
liaojinling e596d11cee 会长押金 5 years ago
zyx 079027a778 Merge branch 'hotfix/dopositCpModify' into release 5 years ago
zyx a9cae8424b 游戏充值bug修改 5 years ago
zyx c2b54611b7 Merge branch 'hotfix/dopositCpModify' into release 5 years ago
zyx 1cfc48ded2 游戏充值cp订单号修改 5 years ago
liuweiwen 2bffe498bf 奖罚记录管理优化 5 years ago
zyx 0aad9c4735 下游结算单生成功能上传 5 years ago
廖金灵 e3ecd0b757 Merge branch 'hotfix/recharge_statistics' of wmtx/platform into master
游戏统计订单时间为1号00:00:00时订单未统计BUG修复
5 years ago
chenzhi aaf67b85cc 新增旧月份统计方法 5 years ago
jbRotk a6b1194be0 解决冲突 5 years ago
jbRotk 5d315d4182 添加工会类型 5 years ago
chenzhi 57e979408e 优化奖罚规则 5 years ago
chenzhi 3703d7040b 财务分类统计脚本1.0 5 years ago
chenzhi 1f5944c0a4 优化奖罚符号问题 5 years ago
liaojinling 843a429b43 下载添加部门/小组 5 years ago
zhengchanglong 24d1366d0a Merge branch 'hotfix/recharge_statistics' into release 5 years ago
liuweiwen b94bf93823 0点游戏统计 5 years ago
chenzhi 29618ce878 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize 5 years ago
chenzhi 58eb6a0e12 新增cp公司优化奖罚自动获取 5 years ago
liuweiwen 2b51122d13 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
liuweiwen 9e9a925429 奖罚记录管理 5 years ago
chenxiaojun a7891d6b57 管理后台>推广员>结算管理>推广提现--部分功能优化 5 years ago
chenxiaojun 065821a2d9 推广平台>财务管理>结算中心--更新 5 years ago
jbRotk 72cfd9ec64 新增渠道费率 5 years ago
zhengchanglong 4aeaf8f74c Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen 51d2d91671 验证手机号码格式修改 5 years ago
sk edf8d07a4e 充值明细条件更变 5 years ago
chenzhi 7657db3b18 财务分类-支付渠道/支付类型 5 years ago
jbRotk c84cde9567 Merge branch 'feature/ylw' into feature/admin_optimize 5 years ago
jbRotk 5f510cd4d9 新增奖惩时间 5 years ago
liuweiwen 289fd24ab6 内部公司信息管理 5 years ago
liuweiwen b444a3546b Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
# Conflicts:
#	Data/update.sql
5 years ago
liuweiwen c92fa425d2 内部公司信息管理 5 years ago
chenzhi cb4e457ace 财务汇总-按合作方类型 5 years ago
jbRotk c968e54cf8 解决冲突 5 years ago
jbRotk 94afe49b0c upt 5 years ago
廖金灵 5d281e4647 Merge branch 'hotfix/close_promote_register' of wmtx/platform into master
清除推广员注册代码
5 years ago
liaojinling b02ca653b2 Merge branch 'hotfix/close_promote_register' into release 5 years ago
liaojinling 6cecac4862 清除推广员注册代码 5 years ago
liaojinling d789a175f8 推广员/组长添加备注 5 years ago
chenxiaojun 4e1d6938f8 推广平台>数据管理>订单查询--bug修复 5 years ago
sk d98bfa04b9 资质认证电子文档 5 years ago
chenzhi 993bedc98f 收入类型-测试收入 5 years ago
chenxiaojun f1fda49e9e 推广平台>财务管理--更新 5 years ago
chenzhi 39c43c1bee 优化游戏分成比例获取函数备注 5 years ago
zyx b0c225591f Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zyx 414d36c373 cp分成比例方法修正 5 years ago
chenzhi f95b084f88 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize 5 years ago
chenzhi 8c756d61d9 cp分成增加符号后上游比例获取修正 5 years ago
zyx 782de31ca8 cp分成比例方法添加 5 years ago
zyx f58f05d00d cp分成比例方法修正 5 years ago
jbRotk 35b6d25ebc upt 5 years ago
chenzhi 5eaadd974a 财务分类汇总-按收入类型1 5 years ago
chenzhi aba7ed22d1 财务汇总分类脚本-按收入类型 5 years ago
zyx 4be5b1ba2c cp分成比例方法添加 5 years ago
chenxiaojun cbe40d4b0f 管理后台更新 5 years ago
chenxiaojun f1b454627e 管理后台更新 5 years ago
sk c612fbc5fd Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company 5 years ago
chenxiaojun 37ab08b9be 管理后台>推广员>结算管理>公会分成管理--规则修改 5 years ago
chenxiaojun a8008fbe05 管理后台>推广员>结算管理>公会分成管理--规则修改 5 years ago
zhengchanglong 58bd9414d6 Merge branch 'hotfix/recharge_statistics' into release 5 years ago
liuweiwen b5a2ddba3c 游戏订单查看,查询时0点属于当天 5 years ago
chenxiaojun 73f1055303 管理后台>推广员>结算管理>推广提现--增加自动审核功能 5 years ago
zhengchanglong 72d222a64a CP分成比例修改 5 years ago
chenzhi 29868a6331 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize 5 years ago
chenzhi 158c56d543 优化甲方可以自由选择 5 years ago
zyx 07279467ca 管理后台部分限制规则修改 / 开放甲乙方都能为万盟天下后,无法检索出万盟天下 5 years ago
chenzhi 332ff4c3c4 优化生成上游对账单手机及银行卡验证规则 5 years ago
zyx fea720339b 结算单功能优化 / 下游结算单:列表展示游戏不区分安卓IOS,直接展示汇总信息 5 years ago
chenxiaojun 10665cc869 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
廖金灵 f66c6505d1 Merge branch 'hotfix/testWhileList' of wmtx/platform into master
测试外网充值白名单设置BUG修复
5 years ago
sk 636aabb5a0 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company 5 years ago
zyx d4850b60be Merge branch 'hotfix/testWhiteList' into release 5 years ago
zyx 2ad5017fae 测试白名单编辑修改成删除 5 years ago
sk f93c9c569d Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company 5 years ago
xxxx a85c217c6b OA管理员绑定 5 years ago
zyx aac1d6f7b5 Merge branch 'hotfix/testWhiteList' into release 5 years ago
zyx 7beb0938e3 测试白名单修改 5 years ago
sk ce9faf7271 公司录入 5 years ago
jbRotk 65461ff200 c 5 years ago
liuweiwen 0fba64c6f1 数据展示权限:勾选权限时,*号屏蔽的地方要开放,另没数据权限的地方补上 5 years ago
ELF 9ab7688056 调试 5 years ago
ELF 7928282e99 调试 5 years ago
ELF b79ab76a39 调试 5 years ago
ELF 8ff17d9872 修改bug 5 years ago
ELF 13cb680955 修改bug 5 years ago
ELF 56a97f7eef 修改bug 5 years ago
ELF d0e700d2e8 优化程序 5 years ago
ELF e8a0975981 解决冲突 5 years ago
ELF 8136bff2f9 优化查询 5 years ago
ELF 6993d164a3 解决冲突 5 years ago
sunke 8b82e03328 下载刷新 5 years ago
sunke 5b6e9da5d8 获取区服名 5 years ago
ELF 0f5e3944c0 财务管理加入权限判断 5 years ago
ELF 2b039e2b8a 优化程序 5 years ago
ELF 709094c5be 修改bug 5 years ago
ELF b7cf4c28a7 修改 5 years ago
ELF 3af87434b9 权限判断修改 5 years ago
ELF 526bbc1556 添加ios下载控制功能 5 years ago
sunke 5974047e1c 推广员指标下载 5 years ago
ELF d3a3b8cdb7 修改 5 years ago
yulingwei 22addc182c 修改检索问题 5 years ago
sunke 0e0c1798f4 推广导入空数据初始化 5 years ago
yulingwei ac8d7300ad Merge branch 'feature/game_divide_warn' into dev 5 years ago
yulingwei 33a19fbb6a upt 5 years ago
yulingwei f0109e9554 合并请求 5 years ago
yulingwei 45b3c27292 upt 5 years ago
sunke b9ddc1aafb 推广配置 5 years ago
yulingwei eef229d22d Merge branch 'feature/sms_up' of 47.111.118.107:wmtx/platform into feature/sms_up 5 years ago
chenxiaojun 8c43defff3 推广员指标管理--更新 5 years ago
chenxiaojun 784f416ad5 推广员指标管理--更新 5 years ago
chenxiaojun 5fbe482fba 推广员指标管理--更新 5 years ago
ELF 2195bb4c55 修改短信发送 5 years ago
zhengchanglong e6f3329ac8 内外团归属BUG修复 5 years ago
chenxiaojun 47b7dc0d2f 市场总监联系方式 5 years ago