1503 Commits (eb311348a8ed36a3371150a0b12b32ab796c965e)

Author SHA1 Message Date
ELF dc85bdb631 添加批量删除推广限制功能 4 years ago
ELF 69b09c582f 添加落地页限制规则 4 years ago
chenzhi d05d6e2159 新增导出 4 years ago
chenzhi 3b8d6eb128 新增导出 4 years ago
yulingwei 93601a3302 upt 4 years ago
chenzhi 88c70c29db 新增0不查看 4 years ago
yulingwei e6c8b51127 upt 4 years ago
yulingwei 02f52412c1 upt 4 years ago
chenzhi 0f632f386b 下游个人聚合 4 years ago
yulingwei f969802c26 upt 4 years ago
chenzhi f2ce52ada5 暂存 5 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
chenzhi a3633ea52e 新增下游查看导出 5 years ago
廖金灵 b62eb3be7c Merge branch 'hotfix/hide_promote_phone' of wmtx/platform into release
隐藏市场总监电话
5 years ago
chenzhi 7ac118c024 下游公司查看 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 a9e0b303dd 推广公司新增支付宝账号 5 years ago
chenzhi bf24f9bc9d 开户网点该帐户名 5 years ago
chenzhi f7d67ff4c4 新增合作方阿里账号及用户 5 years ago
zhengyongxing 1e4a1aef4e 苹果beta包添加第三方支付名单 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 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
chenzhi 669bfa8f25 暂存 5 years ago
tping 9fd06c27d3 Merge branch 'hotfix/alipaytoalipay' into feature/platfrom_aggregate_finance
# Conflicts:
#	Data/update.sql
5 years ago
chenzhi 36ab480d50 公司绑定结束 5 years ago
chenzhi 6695129127 新增公司绑定提醒 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 1a483850b9 优化高亮 5 years ago
chenzhi a8fddb8f2f 优化游戏分成 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 c1283ebfeb 游戏比例模板导出删除 5 years ago
chenzhi adbc76c3ae 游戏模板修改 5 years ago
chenzhi 3a8273283e 游戏比例模板新增 5 years ago
chenzhi fd4e0baffd 新增游戏比例模板 5 years ago
zhengyongxing a4cbd2e314 开户网点推广公司查询添加 5 years ago
zhengyongxing 1c5a02594a 身份认证后台添加 5 years ago
廖金灵 2d7189a224 Merge branch 'fix/admin_second_optimization' of wmtx/platform into master
优化空值修改
5 years ago
chenzhi 644e38fd1f 优化空值3 5 years ago
chenzhi 644100dc3b 优化空值修改2 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
chenzhi 6c4319cfe2 Revert "暂存"
This reverts commit a685c14e23.
5 years ago
chenzhi 42a17754e4 修改查看 5 years ago
chenzhi a685c14e23 暂存 5 years ago
zhengyongxing 7a96d4b6c0 Merge branch 'feature/modify_bug' into fix/admin_second_optimization 5 years ago
chenzhi ec4d180287 优化公会更改 5 years ago
chenzhi e1e431804c 优化审批 5 years ago
chenzhi 6557938e53 优化聚合渠道财务结算单 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
zhengyongxing 2933d2d223 管理后台文字修正 5 years ago
chenzhi 35d8e379d8 优化操作行为日志隐藏玩家 5 years ago
chenzhi 6885ec61fc 优化公会统计平台币收回提醒 5 years ago
chenzhi 289b99c293 合作方管理页面文字错误 5 years ago
zhengyongxing 132b601f74 测试资源搜索功能添加 5 years ago
zhengyongxing 878414aeb2 测试资源搜索修正 5 years ago
chenzhi 450ef803d6 合并 5 years ago
chenzhi 0dab114f1e 优化操作提醒 5 years ago
廖金灵 44a49a1b2e Merge branch 'feature/export_authority' 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 0ca2f2a064 游戏统计导出修改 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 613d60e4a7 数据权限配置修改 5 years ago
廖金灵 ff5b2e3483 Merge branch 'feature/aggregate_finance' of wmtx/platform into release
聚合财务结算单
5 years ago
chenzhi 21a985ae82 聚合财务结算单ok 5 years ago
chenzhi 8137778ec1 新增聚合操作日志 5 years ago
zhengyongxing 727b335b45 测试资源修改 5 years ago
chenzhi 63f5354dc3 优化重算 5 years ago
zhengyongxing a9ce0585cc 测试资源配置 5 years ago
chenzhi 2a28cf9008 聚合财务优化权限 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 b698495dbb 游戏统计添加元素修正 5 years ago
chenzhi 253b47b2a9 聚合财务子操作 5 years ago
chenzhi 990c62b06a 批注增删改查 5 years ago
chenzhi 6b5f60f8e6 新增凭证增删改查 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
zhengyongxing e60b9b2edf 测试资源批量封号 5 years ago
chenzhi 114cf4a503 聚合对账新增对账金额统计 5 years ago
chenzhi 51322e3317 聚合财务2 5 years ago
chenzhi 6d0e7c3a00 聚合对账1 5 years ago
zhengyongxing 63e4789069 游戏编辑支付宝 汇付宝添加 5 years ago
ELF 0af6a53ba7 后台arpu功能优化 5 years ago
zhengyongxing a5554f7fa3 推广员业务配置功能添加 5 years ago
zhengyongxing 295ca2d803 推广员业务配置功能添加 5 years ago
zhengyongxing 1a0b2dbaba 推广员游戏列表查看全选问题 5 years ago
zhengyongxing fcc7bf2aaa 管理后台-财务管理-游戏统计-添加元素 5 years ago
zhengyongxing 322b4b6cee 管理后台导出权限添加 5 years ago
zhengyongxing 001e9e70f8 管理后台导出权限添加 5 years ago
廖金灵 7ab6c8ad68 Merge branch 'feature/fix_work_order' of wmtx/platform into release
修复问题
5 years ago
yulingwei 2ac6f7ebee upt 5 years ago
廖金灵 820885f3dd Merge branch 'feature/platform_rule' of wmtx/platform into release
推广规则
5 years ago
sunke bde08adcc2 平台币 5 years ago
廖金灵 8b2ae9d6da Merge branch 'feature/fix_work_order' of wmtx/platform into release
工单统计及iOS下载数优化
5 years ago
廖金灵 72d1d2f338 Merge branch 'feature/president_modify' of wmtx/platform into release
修改会长押金编辑付款人付款账号非必填
5 years ago
sunke 0758921bfe 平台 5 years ago
sunke 848eb6c294 平台 5 years ago
sunke b6649a7b9d 平台币 5 years ago
yulingwei ac83e556ff upt 5 years ago
yulingwei f1428a8fe7 upt 5 years ago
sunke 031528411b 平台币 5 years ago
sunke 5fa22cfa40 弹窗 5 years ago
sunke fee97bb00a Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/platform_rule 5 years ago
yulingwei e462305587 upt 5 years ago
sunke c1168740b6 平台币 5 years ago
sunke 253c956794 平台币 5 years ago
sunke 2adcb68c06 平台币新增需求 5 years ago
sunke 1fe794b597 平台规则样式优化 5 years ago
sunke bdb688c985 编辑规则 5 years ago
zhengyongxing 2a54b0ed08 汇付宝添加支付宝与微信 5 years ago
ELF 94575cae29 修改会长押金编辑付款人付款账号非必填 5 years ago
yulingwei c1d03cc526 upt 5 years ago
zhengyongxing 541ec17db5 隐藏威富通添加汇付宝 5 years ago
yulingwei 007374e121 upt 5 years ago
廖金灵 8dc7adb539 Merge branch 'feature/giftbag_tf' of wmtx/platform into release
添加tf礼包
5 years ago
sunke 15f6cb19a3 渠道支付顺序 5 years ago
ELF 2a2e5f0d31 添加tf礼包问题 5 years ago
sunke b4e66dcd40 隐藏推广配置 5 years ago
张谷诚 c5af3c29d7 Merge branch 'hotfix/finance_game_name_change_2' of wmtx/platform into release
支付渠道测试订单录入bug修正,支付意愿统计功能优化
5 years ago
廖金灵 9f202c3991 Merge branch 'feature/finance_compare' of wmtx/platform into release
财务导入对比
5 years ago
chenzhi 9237bc3cc8 优化选择 5 years ago
廖金灵 86a90467ff Merge branch 'feature/president_apply' of wmtx/platform into release
修改会长押金需求
5 years ago
zhengyongxing d4aafd2983 支付渠道测试订单录入bug修正,支付意愿统计功能优化 5 years ago
yulingwei 6f7d285f9f 修复资源工单完成情况 5 years ago
chenzhi c0df7f23c3 优化高亮 5 years ago
zhengyongxing dc5437d7cb 支付渠道测试订单录入bug修正,支付意愿统计功能优化 5 years ago
chenzhi d4a498baba 优化用户登录时间为0时为暂无登录 5 years ago
chenzhi 5ddf75a600 财务对比ok 5 years ago
chenzhi b2ad4e8b6e 财务对比 v1 5 years ago
chenzhi a2db46d1c0 财务对比首页 5 years ago
zhengyongxing f37cdc596d 支付渠道测试订单录入bug修正,支付意愿统计功能优化 5 years ago
chenzhi 79f4719dec 财务对比7 5 years ago
chenzhi c4eb963cfe 财务比对5 5 years ago
zhengyongxing de646044c2 支付渠道详情检索修正 5 years ago
zhengyongxing e7e7df569b 支付渠道统计bug修改 5 years ago
chenzhi 202f9a45d1 财务对比4 5 years ago
chenzhi effe6c572e 财务比较3 5 years ago
zhengyongxing 96eee4f9f5 支付渠道统计bug修改 5 years ago
zhengyongxing ab01c02606 支付渠道意愿统计修改 5 years ago
chenzhi 33be2ba05b 优化游戏统计平台币直充搜索后数据不符合问题 5 years ago
chenzhi def286ec80 财务比较2 5 years ago
廖金灵 bab7fec46d Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release
游戏名称不含设备类型优化
5 years ago
chenzhi eaa51463e5 公会统计 5 years ago
chenzhi ea69ecb086 财务比较2 5 years ago
张谷诚 13c352a924 Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿a标签悬停变成手势
5 years ago
chenzhi e0c946e67c 工会统计2 5 years ago
chenzhi b36515a720 工会统计 5 years ago
chenzhi 48e5e4d824 财务对比1 5 years ago
zhengyongxing 4361b3c3ba 支付渠道意愿a标签悬停变成手势 5 years ago
廖金灵 d781d6825c Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计文字修改,及排序方式修正
5 years ago
zhengyongxing 674e727921 支付渠道意愿统计文字修改 5 years ago
张谷诚 170b116333 Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计bug上传
5 years ago
zhengyongxing 9eff370801 支付渠道意愿统计bug上传 5 years ago
张谷诚 e42281bdfe Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计bug上传
5 years ago
zhengyongxing f40bd57698 支付渠道意愿统计bug上传 5 years ago
廖金灵 985fdab851 Merge branch 'feature/limit_pay' of wmtx/platform into release
支付限额
5 years ago
张谷诚 b9f466f73c Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付意向
支付限额白名单
5 years ago
zhengyongxing f7c9730153 市场结算管理优化 5 years ago
sunke 163ad97d60 支付限额 5 years ago
sunke 817b39c391 支付限额 5 years ago
sunke 56b5144440 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/limit_pay 5 years ago
廖金灵 9222d99127 Merge branch 'feature/change_company_belong' of wmtx/platform into release
推广员内外团归属优化
5 years ago
sunke 68572d10e6 支付限额 5 years ago
chenzhi d6e44d32dc 优化推广员申请游戏名称及选择样式 5 years ago
chenzhi 84fe51efef 支付渠道/测试订单 游戏名字优化 5 years ago
chenzhi 6d3f1b67e2 支付渠道统计-首页 名称优化 5 years ago
sunke ab1c99d95a 时间 5 years ago
sunke dfb83d35d0 时间样式 5 years ago
ELF ef56ea2180 修改 5 years ago
ELF a512fb224e 修改bug 5 years ago
ELF fb6a00859e 修改会长押金需求 5 years ago
sunke 098caeaa90 时间样式 5 years ago
sunke 4f98f9fabe 样式控制 5 years ago
chenzhi cc966711d1 公会统计 游戏名称与设备名称分开 5 years ago
zhengyongxing 4ce89ee670 支付白名单列表功能完善 5 years ago
zhengyongxing 6b8f9a47d0 Merge branch 'feature/user_paywhite_list' of 47.111.118.107:wmtx/platform into feature/pay_white_list 5 years ago
zyx fc9fa629ae 游戏充值bug修改 5 years ago
sunke fa70a3c77a 限制规则 5 years ago
zhengyongxing ad08aeeace 支付意向统计代码提交 5 years ago
sunke ac54bb41a4 支付限额导出 5 years ago
sunke 5c8221d9dc 支付限额 5 years ago
chenzhi 9064fc7c58 游戏统计 游戏名称不含设备类型优化 5 years ago
chenzhi 121fc02f18 推广员内外团归属优化2 5 years ago
chenzhi 55d49e8b4b 优化推广公会列表导出 5 years ago
chenzhi 61d0418340 推广公司管理 修改内外团影响底下 5 years ago
chenzhi 1761d37b5c 推广公会列表 适配新内外团规则 5 years ago
chenzhi d7662eb305 推广员现在归属于公司团体 5 years ago
chenzhi dd86a85485 推广公会归属管理 改为公会归属不可选择 5 years ago
yulingwei 82620c9ae6 merge 5 years ago
yulingwei bec210c158 修复会员层级关系检索问题 5 years ago
chenzhi d7737291ed 暂存1 5 years ago
廖金灵 43562f6746 Merge branch 'feature/download_type_list' of wmtx/platform into release
修复检索问题
5 years ago
yulingwei c40f5dda26 upt 5 years ago
sunke 797102a556 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/PlatFormCoinData 5 years ago
sunke 5b74e65585 统计 5 years ago
zhengyongxing 6249b6cf81 Merge branches 'feature/fee_form' and 'release' of 47.111.118.107:wmtx/platform into feature/fee_form
 Conflicts:
	Application/Admin/Controller/FinanceController.class.php
5 years ago
zhengyongxing 87b1b04040 充值财务管理金额保留小数点 5 years ago
廖金灵 4c8cb3c171 Merge branch 'feature/IOSdata' of wmtx/platform into release
修改bug
5 years ago
sunke fea5f4d2d7 ios 5 years ago
廖金灵 bf80a2d99a Merge branch 'feature/download_type_list' of wmtx/platform into release
问题修复
5 years ago
yulingwei 132dee220a fix 5 years ago
sunke 7194cd49ae 平台币 5 years ago