1629 Commits (95b464f636b74bbbbf1d30eca5ead60af78c9c8b)

Author SHA1 Message Date
chenzhi 2f9269f29f 取消默认选择时间 4 years ago
yulingwei 80597c4894 upt 4 years ago
yulingwei 5e5aa8ca3f upt 4 years ago
yulingwei 0b54c71cb0 upt 4 years ago
chenzhi d6ec8e0248 新增导出 4 years ago
廖金灵 420c3454fc Merge branch 'hotfix/fan_promote' of wmtx/platform into master
优化公会统计
4 years ago
廖金灵 3095270a84 Merge branch 'hotfix/fan_promote' of wmtx/platform into release
修改工会统计
4 years ago
ELF f167d63c4a 修改 4 years ago
zhengyongxing 039b496b28 市场专员筛选,月份跳转,及时间筛选修正 4 years ago
zhengyongxing 96f68c4f50 市场专员筛选,月份跳转,及时间筛选修正 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
廖金灵 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
廖金灵 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
廖金灵 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
zhengyongxing a6dd2a9830 市场专员业绩导出公式添加 4 years ago
zhengyongxing f4789a1534 市场专员业绩提成bug修正 4 years ago
zhengyongxing e4d1ced122 市场专员业绩提成bug修正 4 years ago
zhengyongxing 0ca629518d 市场专员业绩结算结构修改 4 years ago
zhengyongxing 4bfa0dfa2f 市场专员业绩结算结构修改 4 years ago
chenzhi 2a4541569d 优化列表显示 4 years ago
zhengyongxing 2303c439aa 市场专员业绩计页面修改 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 9a23b5588b 市场专员业绩计算修正 4 years ago
zhengyongxing 97161900ac 市场专员业绩管理bug修改 4 years ago
chenzhi c9d6b9859d 合并热更 4 years ago
zhengyongxing bdeacbd718 市场专员业绩管理 重算调用脚本命令修改 4 years ago
zhengyongxing c96340afa9 市场专员业绩管理bug修改 4 years ago
chenzhi 587d7913ca 优化检索 4 years ago
zhengyongxing 1e80004e3e 市场专员业绩管理bug修改 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
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
zhengyongxing acc45f5911 江息网络漏掉的修改 4 years ago
chenzhi bc75da8c14 解决冲突 4 years ago
chenzhi f62cfca22b 隐藏推广公司分成比例 4 years ago
zhengyongxing 2bc4bf79d9 市场结算管理公司税率提交 4 years ago
ELF 990a2bd206 解决冲突 4 years ago
chenzhi 91ae987c3c 优化游戏比例分成无需大于 4 years ago
chenzhi 9dd4a507e9 隐藏模板批量操作 4 years ago
chenzhi f1824fd7b3 优化新增名称 4 years ago
zhengyongxing 682ce333b1 市场结算管理公司税率提交 4 years ago
chenzhi c76cf038cd 己方公司 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 379716298a 市场专员结算代码上传 4 years ago
ELF e3b53e7df1 修改 4 years ago
ELF 34691d6baa 修改 4 years ago
ELF 76fcfec7c2 修改 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
zhengyongxing c3956f7ed2 平台币金额解释添加 4 years ago
廖金灵 1907985e7b Merge branch 'feature/ylw-06-10' of wmtx/platform into release
新增公司选择默认模板
4 years ago
yulingwei ff9b2249b8 新增公司默认选择默认模板 4 years ago
廖金灵 db32f11215 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
取消测试的虚拟验证码
4 years ago
chenzhi 95d9f45612 新增检索 4 years ago
yulingwei c8924779c4 Merge branch 'release' into feature/ylw-06-17 4 years ago
yulingwei 8c18f2aa1d 1 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
chenzhi ca551b9c50 己方公司新增搜索项目 4 years ago
chenzhi e0b588be11 新加加载load 4 years ago
chenzhi 26ccc9c450 优化导出权限 4 years ago
chenzhi 40940b4536 优化比例 4 years ago
zhengyongxing 25ae6a03a4 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance 4 years ago
zhengyongxing b664ba46ad 汇总单代码提交 4 years ago
chenzhi 53b9513935 新增结算 4 years ago
chenzhi 53004adf5d 新增打款 4 years ago
zhengyongxing 9d43914b17 汇总单结算代码上传 4 years ago
chenzhi fdccc92c43 新增只支持脚本访问 4 years ago
chenzhi 38ab488cd0 修复搜索错误 4 years ago
chenzhi 261e63b898 取消未结算的导出 4 years ago
chenzhi 0312c1bc75 修复常见bug 4 years ago
chenzhi b28231d12f 优化己方公司返回 4 years ago
chenzhi 31ef129b2d 修复己方公司不能删除 4 years ago
chenzhi ffee256f93 优化bug1 4 years ago
chenzhi fb0edbe752 新增支付备注 4 years ago
chenzhi d5aeb21b33 新增结算周期读取 4 years ago
chenzhi 553d9b0f91 新增分成生效模板 4 years ago
chenzhi 3611e4855d 合并冲突 4 years ago
zhengyongxing 825fba2d8b 用户数据权限bug修复,筛选bug修复 4 years ago
zhengyongxing e680289742 用户数据权限bug修复 4 years ago
yulingwei 0472fe9cbc upt 4 years ago
zhengyongxing ac42c54bf8 用户数据权限bug修复 4 years ago
chenzhi 6929f53e6e 新增打款列表 4 years ago
chenzhi c7c67f279a 打款信息查看 4 years ago
chenzhi 3ef24c2c57 新增打款信息编辑 4 years ago
chenzhi 1f155020d4 新增是否允许打款 4 years ago
ELF 486b5e1f83 优化curl 4 years ago
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