4755 Commits (c708fb6d114efed304fb7346fa0b18e2469a03ca)

Author SHA1 Message Date
廖金灵 8f35271925 Merge branch 'hotfix/pack_package' of wmtx/platform into master
优化打包
5 years ago
zhengyongxing 4352b0c733 将官方渠道修改为江息网络 5 years ago
廖金灵 bd8842759e Merge branch 'hotfix/pack_package' of wmtx/platform into release
优化打包
5 years ago
ELF 02259ae330 修改bug 5 years ago
ELF 769193883d 修改bug 5 years ago
ELF d5d6c255b0 优化打包 5 years ago
yulingwei 6ada5711ab upt 5 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
chenzhi dff3542fdd 新增个人信息获取 5 years ago
zhengyongxing 6da0ec1607 用户列表修改提交 5 years ago
chenzhi c6f4149d6a 修改下游个人聚合 5 years ago
chenzhi a3633ea52e 新增下游查看导出 5 years ago
廖金灵 b62eb3be7c Merge branch 'hotfix/hide_promote_phone' of wmtx/platform into release
隐藏市场总监电话
5 years ago
ELF 0c4ccab587 隐藏市场总监电话 5 years ago
chenzhi 7ac118c024 下游公司查看 5 years ago
chenzhi 7a5c42eb5e 上游导出优化 5 years ago
chenzhi 427d6457fc 上游查看及导出 5 years ago
chenzhi eeec8b13f2 cp查看 5 years ago
chenzhi 4e4da92420 优化比例 5 years ago
chenzhi 2cf0fdf905 新增公会归属编辑规则修改 5 years ago
chenzhi 22aa5d3dd4 暂存 5 years ago
zhengyongxing f08c0cec9b 苹果beta包添加测试ip白名单 5 years ago
chenzhi 02e7d85e44 优化生成结算单 5 years ago
chenzhi a9e0b303dd 推广公司新增支付宝账号 5 years ago
chenzhi bf24f9bc9d 开户网点该帐户名 5 years ago
chenzhi f7d67ff4c4 新增合作方阿里账号及用户 5 years ago
chenzhi cd0ff2ef8a 暂存 5 years ago
zhengyongxing 1e4a1aef4e 苹果beta包添加第三方支付名单 5 years ago
chenzhi 466f1f4680 汇总提交ok 5 years ago
chenzhi c39da62037 新增是否打款 5 years ago
chenzhi e1d624fe8b 优化导出并聚合数据 5 years ago
chenzhi 903fc71255 新增补链账号错误 5 years ago
chenzhi caf432f5d4 新增高亮 5 years ago
chenzhi 8bfe249251 新增备注 5 years ago
chenzhi c5e3d78835 新增导出 5 years ago
chenzhi 1d92fdb1db 新增重算接口 5 years ago
chenzhi e80d4eb539 新增确认 5 years ago
chenzhi e115ae48b8 优化cp编辑 5 years ago
chenzhi 93a8bb70e1 新增编辑 5 years ago
ELF 91eb2125cd 修改后台链接 5 years ago
ELF 39c0aff9f0 修改bug 5 years ago
ELF aa0a2288a7 修改超级签链接地址 5 years ago
chenzhi 669bfa8f25 暂存 5 years ago
tping 9fd06c27d3 Merge branch 'hotfix/alipaytoalipay' into feature/platfrom_aggregate_finance
# Conflicts:
#	Data/update.sql
5 years ago
ELF d2826e7bf0 修改落地页二维码图标问题 5 years ago
chenzhi 6162f9f8a1 生成上下游结算单 5 years ago
chenzhi 380243dbb8 优化结算的补点 5 years ago
chenzhi 4c0c51e0ae 上游结算ok 5 years ago
chenzhi fe7d21943b 暂存2 5 years ago
chenzhi c71c142227 暂存 5 years ago
chenzhi b4c93cc433 接口还原分离 5 years ago
chenzhi c59a314afe 优化聚合cp获取接口 5 years ago
tping c0fce78ec3 抵扣通知 5 years ago
chenzhi 36ab480d50 公司绑定结束 5 years ago
chenzhi 6695129127 新增公司绑定提醒 5 years ago
zhengyongxing 5f0b7a6de0 充值方式文字修正,金猪改成苹果 5 years ago
sunke d7e61edaa1 汇付宝 5 years ago
sunke 51551e91df Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/paytime_summary 5 years ago
zhengyongxing a508094a68 ip封禁隐藏区域,文字修改 5 years ago
zhengyongxing 32d9aebc24 ip封禁隐藏区域,名称修改 5 years ago
zhengyongxing 394ce7a544 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/ip_forbit 5 years ago
zhengyongxing 9aae41fd20 ip封禁隐藏区域 5 years ago
chenzhi 5c1a8d69a0 新增生效列表页面 5 years ago
chenzhi 8a508c050d 新增编辑 5 years ago
chenzhi fac157ddd7 优化操作手势 5 years ago
chenzhi 4b8538a3bb 新增审核操作 5 years ago
chenzhi f20cfde7c7 新增审核列表导出 5 years ago
chenzhi e684191b45 优化审核列表 5 years ago
chenzhi 5ce3676e02 公司绑定添加 5 years ago
chenzhi b5a604d385 优化添加 5 years ago
chenzhi e5dc86118e 新增优化 5 years ago
chenzhi 1139b37a50 新增公司关系绑定 5 years ago
chenzhi afee89ec03 优化模板无聚合 5 years ago
chenzhi 3b8e7eb2b0 推广游戏分成管理ok 5 years ago
chenzhi 1a483850b9 优化高亮 5 years ago
chenzhi a8fddb8f2f 优化游戏分成 5 years ago
chenzhi 0d8ec00225 优化排序 5 years ago
chenzhi 8a83e17485 新增导出 5 years ago
chenzhi 4533b84d2c 权限 5 years ago
zhengyongxing 0953eb4dd4 Merge branches 'feature/juhe_sms' and 'master' of 47.111.118.107:wmtx/platform into feature/juhe_sms 5 years ago
chenzhi 6a3b9b6da3 新增游戏分成比例 5 years ago
chenzhi 1c8ef3493d 优化比例模板 5 years ago
chenzhi c1283ebfeb 游戏比例模板导出删除 5 years ago
chenzhi adbc76c3ae 游戏模板修改 5 years ago
chenzhi 3a8273283e 游戏比例模板新增 5 years ago
万盟天下 04178efac9 Merge branch 'hotfix/admin_three_optimization' of wmtx/platform into release
优化合作公司列表显示
5 years ago
chenzhi 9c1a12296d 优化合作公司列表显示 5 years ago
chenzhi 6c6dddf6ac Merge branch 'release' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization 5 years ago
chenzhi 982a7f4c1b 更新合作公司列表显示 5 years ago
chenzhi fd4e0baffd 新增游戏比例模板 5 years ago
zhengyongxing a4cbd2e314 开户网点推广公司查询添加 5 years ago
zhengyongxing fba271cd64 Merge branches 'fix/admin_second_optimization' and 'master' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization 5 years ago
zhengyongxing 4a33e7deb5 Merge branches 'feature/juhe_sms' and 'release' of 47.111.118.107:wmtx/platform into feature/juhe_sms 5 years ago
chenzhi 8b9a4e73fe 接口数据1 5 years ago
zhengyongxing 1c5a02594a 身份认证后台添加 5 years ago
万盟天下 f7a0d82314 Merge branch 'hotfix/upload_oss' of wmtx/platform into release
修改
5 years ago
ELF 4b852cf071 修改 5 years ago
万盟天下 e4be42865b Merge branch 'hotfix/upload_oss' of wmtx/platform into release
修改推广平台游戏上下架bug
5 years ago
ELF ce990d3181 修改bug 5 years ago
万盟天下 48abd2d464 Merge branch 'hotfix/upload_oss' of wmtx/platform into master
修改分包
5 years ago
万盟天下 7c0ba028b1 Merge branch 'hotfix/upload_oss' of wmtx/platform into release
优化分包
5 years ago
chenzhi e84d545a2d Merge branch 'fix/admin_second_optimization' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization 5 years ago
zhengyongxing e949f92434 ip限制操作日志添加 5 years ago
廖金灵 2d7189a224 Merge branch 'fix/admin_second_optimization' of wmtx/platform into master
优化空值修改
5 years ago
廖金灵 bd2a1d580a Merge branch 'fix/admin_second_optimization' of wmtx/platform into release
优化空值修改5
5 years ago
chenzhi 42a9b318fb 优化空值修改5 5 years ago
廖金灵 90fed8c5b1 Merge branch 'fix/admin_second_optimization' of wmtx/platform into release
优化空值修改4
5 years ago
chenzhi 4ebe2780cc 优化空值修改4 5 years ago
廖金灵 548ca893d3 Merge branch 'fix/admin_second_optimization' of wmtx/platform into release
优化空值3
5 years ago
chenzhi 644e38fd1f 优化空值3 5 years ago
廖金灵 7649327b2b Merge branch 'fix/admin_second_optimization' of wmtx/platform into release
优化空值修改2
5 years ago
chenzhi 644100dc3b 优化空值修改2 5 years ago
廖金灵 cd53b69c64 Merge branch 'fix/admin_second_optimization' of wmtx/platform into release
优化可以为空填写
5 years ago
chenzhi 3b6f8c70cc 优化可以为空填写 5 years ago
chenzhi ba9468fedc 新增打款配置 5 years ago
廖金灵 d99db944c5 Merge branch 'fix/admin_second_optimization' of wmtx/platform into master
bug修复及cp下游接口添加
5 years ago
chenzhi 748ec401f3 新增打款配置1 5 years ago
sunke 55a6b20f6e 手机号绑定 5 years ago
sunke bb9654f09f Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/loginInfo 5 years ago
廖金灵 08f068b553 Merge branch 'fix/admin_second_optimization' of wmtx/platform into release
修改查看
5 years ago
chenzhi 6c4319cfe2 Revert "暂存"
This reverts commit a685c14e23.
5 years ago
chenzhi 42a17754e4 修改查看 5 years ago
zhengyongxing 8746d68493 cp下游接口添加 5 years ago
chenzhi c886b508f9 Merge branch 'fix/admin_second_optimization' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization 5 years ago
chenzhi bb995ab355 合并 5 years ago
chenzhi a685c14e23 暂存 5 years ago
廖金灵 e39ab6806e Merge branch 'fix/admin_second_optimization' of wmtx/platform into release
bug修复及cp合作方获取接口添加
5 years ago
zhengyongxing 7a96d4b6c0 Merge branch 'feature/modify_bug' into fix/admin_second_optimization 5 years ago
ELF c871575e23 修改打包失败提示 5 years ago
zhengyongxing c10e05e688 cp合作方获取接口添加 5 years ago
chenzhi ec4d180287 优化公会更改 5 years ago
chenzhi 09e71420e0 优化推广员归属审核 5 years ago
sunke 2a017bfb45 loginmodel 5 years ago
sunke 9ea29c2371 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/loginInfo 5 years ago
chenzhi e1e431804c 优化审批 5 years ago
chenzhi 6557938e53 优化聚合渠道财务结算单 5 years ago
chenzhi 5ebdda1c85 修改合作方可为空 5 years ago
sunke 44c969ac0c 登陆 5 years ago
sunke 51c4656da6 denglu 5 years ago
sunke a4377c017e 支付设置 5 years ago
zhengyongxing 1f0cfca3ce 管理后台推广公司管理及合作方管理部分文字修改 5 years ago
zhengyongxing 742d3b5470 管理后台推广公司管理及合作方管理部分文字修改 5 years ago
chenzhi 50462e3470 优化合作方必填项 5 years ago
chenzhi e770a00cbb 优化推广公司必填项目 5 years ago
chenzhi 9f7e15caac 优化推广公司检验规则 5 years ago
chenzhi c3f01ede43 推广公司新增信息填写无效修复 5 years ago
sunke 0b82acf19d 登录 5 years ago
sunke 177d8b4538 登陆 5 years ago
sunke 8694412609 登陆 5 years ago
sunke a29365fed8 登陆 5 years ago
zhengyongxing 2933d2d223 管理后台文字修正 5 years ago
chenzhi 5a89280915 隐藏平台币充值 5 years ago
chenzhi 5deb4a798b 隐藏超级签入口 5 years ago
chenzhi 35d8e379d8 优化操作行为日志隐藏玩家 5 years ago
chenzhi 673e3fb5cd 角色权限修改状态提醒优化 5 years ago
chenzhi 6885ec61fc 优化公会统计平台币收回提醒 5 years ago
chenzhi 289b99c293 合作方管理页面文字错误 5 years ago
chenzhi c93a8577c4 合并 5 years ago
chenzhi 22f0039cb3 预发布官网平台币展示 5 years ago
张谷诚 bb833deb98 Merge branch 'hotfix/test_resource_search' of wmtx/platform into master
测试资源搜索功能添加
5 years ago
chenzhi ae4c58b6fd 修改推广员流水可选填 5 years ago
zhengyongxing 132b601f74 测试资源搜索功能添加 5 years ago
zhengyongxing 878414aeb2 测试资源搜索修正 5 years ago
张谷诚 c5f9a25a9e Merge branch 'feature/export_authority' of wmtx/platform into release
导出bug修改
5 years ago
zyx ee9f53ce0b 导出权限bug修改 5 years ago
zhengyongxing 301a5a7f5a 导出bug修改 5 years ago
zhengyongxing 5e71728097 导出bug修改 5 years ago
chenzhi 450ef803d6 合并 5 years ago
chenzhi 3e7778df35 优化零元问题 5 years ago
chenzhi 861fd07965 优化检索 5 years ago
chenzhi 834dbe0867 优化导出支付信息不记录 5 years ago
廖金灵 52b483356d Merge branch 'feature/export_authority' of wmtx/platform into release
游戏统计bug修改
5 years ago
zhengyongxing 6081e088db 游戏统计bug修改 5 years ago
chenzhi 0dab114f1e 优化操作提醒 5 years ago
廖金灵 44a49a1b2e Merge branch 'feature/export_authority' of wmtx/platform into release
游戏统计导出修改
5 years ago
廖金灵 5d0b9d65ed Merge branch 'feature/ylw-4-27' of wmtx/platform into release
市场专员新增合作团队可自动匹配到市场总监
5 years ago
廖金灵 3e43b8cb7c Merge branch 'hotfix/company_bank' of wmtx/platform into release
优化银行信息不记录
5 years ago
chenzhi 14efc9650f 优化银行信息不记录 5 years ago
zhengyongxing 1659c55ef2 用户行为日志修改 5 years ago
zhengyongxing 0ca2f2a064 游戏统计导出修改 5 years ago
chenzhi 2ad89c2fb6 优化导出时间 5 years ago
chenzhi 5a9fc76374 申请编辑信息遮罩不关闭 5 years ago
zhengyongxing 4d43e877a1 Merge branches 'feature/export_authority' and 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
 Conflicts:
	Data/update.sql
5 years ago
zhengyongxing acaebe0217 Merge branches 'feature/export_authority' and 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
 Conflicts:
	Data/update.sql
5 years ago
zhengyongxing 60c0c8ee39 Merge branches 'feature/promote_data_config' and 'release' of 47.111.118.107:wmtx/platform into feature/promote_data_config
 Conflicts:
	Data/update.sql
5 years ago
chenzhi 22dc7a62ce 优化游戏统计导出游戏类型不识别 5 years ago
chenzhi 496d6a27bb 优化推广员选择后驻留问题 5 years ago
chenzhi 7fa6baf860 玩家登陆显示优化 5 years ago
zhengyongxing c58cdd31af 用户行为日志导出修正 5 years ago
zhengyongxing 613d60e4a7 数据权限配置修改 5 years ago
zhengyongxing 057a51dbeb 游戏统计bug修正 5 years ago
廖金灵 e88867abe5 Merge branch 'feature/aggregate_finance' of wmtx/platform into release
新增权限不验证
5 years ago
zhengyongxing 81bd79ecf8 游戏统计bug修正 5 years ago
chenzhi 973f7ca394 现在权限不验证 5 years ago
廖金灵 ff5b2e3483 Merge branch 'feature/aggregate_finance' of wmtx/platform into release
聚合财务结算单
5 years ago
zhengyongxing 4b63c7b786 游戏统计bug修正 5 years ago
chenzhi 21a985ae82 聚合财务结算单ok 5 years ago
zhengyongxing 4f88cd025e 绑币导出修正 5 years ago
chenzhi 8137778ec1 新增聚合操作日志 5 years ago
zhengyongxing 38f478d63d 数据调整修改 5 years ago
zhengyongxing 8d7dbe5469 测试资源修改 5 years ago
zhengyongxing 727b335b45 测试资源修改 5 years ago
chenzhi 63f5354dc3 优化重算 5 years ago
zhengyongxing 5dbd0eb8fa 业绩配置修改 5 years ago
zhengyongxing a9ce0585cc 测试资源配置 5 years ago
chenzhi 2a28cf9008 聚合财务优化权限 5 years ago
zhengyongxing 014c7541f3 落地页下载页面更新行为日志 5 years ago
zhengyongxing b768d41935 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
 Conflicts:
	Application/Home/Controller/PackageController.class.php
5 years ago
chenzhi fe662ce160 审核子操作ok 5 years ago
zhengyongxing b6b97c130d 测试资源代码修正 5 years ago
chenzhi 16d9813e18 聚合财务重算 5 years ago
zhengyongxing a9e6dafad3 行为日志修正 5 years ago
zhengyongxing b698495dbb 游戏统计添加元素修正 5 years ago
chenzhi 253b47b2a9 聚合财务子操作 5 years ago
chenzhi 990c62b06a 批注增删改查 5 years ago
chenzhi 6b5f60f8e6 新增凭证增删改查 5 years ago
chenzhi afd362d847 聚合结算单导出优化3 5 years ago
chenzhi 2fc38b25b6 聚合结算单导出优化2 5 years ago
chenzhi ce4c938080 优化聚合结算导出 5 years ago
chenzhi cf9480eb89 聚合财务导出 5 years ago
chenzhi 422728ed11 聚合财务编辑 5 years ago
zhengyongxing 0ebde4cb17 导出权限修正 5 years ago
chenzhi bf7c7ed14f 审核 5 years ago
ELF 4a92ab8543 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/web_register 5 years ago
zhengyongxing 13232b3b04 获取用户账号接口 5 years ago
zhengyongxing e60b9b2edf 测试资源批量封号 5 years ago
chenzhi 114cf4a503 聚合对账新增对账金额统计 5 years ago
chenzhi 51322e3317 聚合财务2 5 years ago
chenzhi 6d0e7c3a00 聚合对账1 5 years ago
ELF b217695c3f 修改分包oss文件上传 5 years ago
ELF d9cc82f73a 修改网站注册 5 years ago
chenzhi 73ac725950 聚合脚本ok 5 years ago
zhengyongxing 63e4789069 游戏编辑支付宝 汇付宝添加 5 years ago
ELF 0af6a53ba7 后台arpu功能优化 5 years ago
chenzhi 95cd9993e2 聚合财务1 5 years ago
zhengyongxing 941f27e2e3 获取用户账号的方法添加 5 years ago
yulingwei bbc1f6b89a upt 5 years ago
万盟天下 744cbcf7ea Merge branch 'hotfix/promote_game_bug' of wmtx/platform into master
修改游戏列表bug
5 years ago
万盟天下 53269d56e9 Merge branch 'hotfix/promote_game_bug' of wmtx/platform into release
修改游戏列表bug
5 years ago
zhengyongxing 4d938b85f4 导出账号权限修改配置 5 years ago
ELF 99ac9965d9 修改bug 5 years ago
ELF a56d861053 修改游戏列表bug 5 years ago
zhengyongxing 0482836a8e 导出账号权限添加 5 years ago
ELF ccfd01f70a 隐藏推广员指标 5 years ago
zhengyongxing a5554f7fa3 推广员业务配置功能添加 5 years ago
zhengyongxing 295ca2d803 推广员业务配置功能添加 5 years ago
万盟天下 aa663b3c02 Merge branch 'release' of wmtx/platform into master
优化游戏管理
5 years ago
ELF 144e4e4ea7 计算ARPU 5 years ago
万盟天下 c292e9ed6c Merge branch 'feature/promote_all_check' of wmtx/platform into release
推广员游戏列表查看全选问题修正
5 years ago
ELF 234d297272 恢复大笑隐藏 5 years ago