3954 Commits (2ff97a4f41b084fb7e394578951439fea09f15c0)

Author SHA1 Message Date
ELF dad83c8d38 押金付款方式添加选项 5 years ago
yulingwei dc96411757 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei 0513f0fa5e fix bug 5 years ago
zhengyongxing 4f65efad9b 结算单管理添加审核状态 5 years ago
liuweiwen fbdd7a4339 Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen daec62ec95 奖罚记录管理-》编辑,无修改时提示错误 5 years ago
chenzhi da454a9474 Merge branch 'feature/data_divide' of 47.111.118.107:wmtx/platform into fix/divide_test 5 years ago
chenxiaojun 70b68d3ade 推广平台>财务管理>结算中心--更新 5 years ago
chenxiaojun ae9293e206 推广平台>财务管理>结算中心--更新 5 years ago
chenxiaojun 29c8470b7f 推广平台>财务管理>结算中心--更新 5 years ago
chenxiaojun 118aae4f83 推广平台>财务管理>结算中心--更新 5 years ago
chenxiaojun 167cc5b58d 推广平台>财务管理>结算中心--更新 5 years ago
chenxiaojun 43b5038778 推广平台>财务管理>结算中心--更新 5 years ago
chenxiaojun f5c1531b71 推广平台>财务管理>结算中心--更新 5 years ago
chenxiaojun 23f38f6a07 推广平台>财务管理>结算中心--更新 5 years ago
chenzhi c2de546abb Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi 578948347f 优化公会内外团占比 5 years ago
chenxiaojun f354e1eed7 推广平台>财务管理>结算中心--更新 5 years ago
chenxiaojun 3d35ce3769 推广平台>财务管理>结算中心--更新 5 years ago
chenzhi c52ba1cf99 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi fa92868548 优化公会统计团体占比 5 years ago
zhengyongxing 3c16659bf3 Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing 9edc77bead 生成下游个人结算单bug修改 5 years ago
zhengyongxing 4d1cfb36ec 生成下游个人结算单bug修改 5 years ago
yulingwei 619ea78b18 upt 5 years ago
yulingwei 3f5246f66c Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei c59aeaa9d3 upt 5 years ago
chenzhi 1bfcade0a8 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi 62a867c592 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize 5 years ago
chenzhi 5b45c4273c 优化公会统计选择游戏 5 years ago
yulingwei 5468239cf3 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei e8e0af97bf 修复结算时间 5 years ago
chenzhi 43a6a746b0 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release 5 years ago
zhengyongxing 061d7373fb 市场结算管理内外团新增内团分发 5 years ago
chenzhi f0d298c042 公会统计新增团体类型 5 years ago
chenxiaojun a863f7ff99 推广平台>财务管理>提现记录--更新 5 years ago
chenxiaojun 46d712cce7 推广平台>数据管理>推广员指标--更新
推广平台>财务管理>结算中心--更新
5 years ago
yulingwei 82bc3a8dbd upt 5 years ago
yulingwei b99138fa85 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei 14b5ea78cd upt 5 years ago
zhengyongxing ccc1b177a0 Merge remote-tracking branch 'origin/release' into release 5 years ago
zhengyongxing 96fd5cbdd5 测试服订单管理bug修正 5 years ago
liuweiwen 077a770de7 奖罚记录管理-》奖罚时间为空判读,新增编辑判读 5 years ago
liuweiwen e8f07f4292 日期格式修改 5 years ago
liuweiwen 5b63a2fe84 Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen f9fe74986c Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen b2e039b460 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
liuweiwen f6af63ca3e 合同期限为空时间格式,公司信息导航高亮 5 years ago
zhengyongxing 5158b07d85 测试订单管理高亮添加 5 years ago
zhengyongxing 932958a071 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
zhengyongxing be932b1ebd 奖罚管理bug修改 5 years ago
zhanglingsheng a26a02b36f Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
zhengchanglong c6a0f87dfe 奖罚编辑部分字段只读 5 years ago
zhanglingsheng 9afd27cdc6 Merge branch 'hosfix/tool_pay' into release 5 years ago
liuweiwen 5949542b70 Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen 6d91ec7c60 推广员-》奖罚记录管理-》上下游公司与公司类型联动,解决未显示下游公司问题 5 years ago
ELF fe130a06d9 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
ELF e58bb1149f 修改落地页授权 5 years ago
zhengchanglong e55bfcb2d8 奖罚编辑部分字段只读 5 years ago
chenzhi 2361c6502a Merge branches 'release' and 'feature/finance_cwflhz' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi b3560b4345 优化财务汇总统计 5 years ago
zhengchanglong 586dbf49e9 添加奖罚记录返回出现错误提示BUG修复 5 years ago
chenzhi 3ddef5d790 Merge branch 'feature/finance_cwflhz' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi e4854d4ac7 优化财务汇总名词写错问题 5 years ago
liuweiwen e243675bcc 将子窗口的方法转到ajax控制器 5 years ago
liuweiwen 854ab9f509 合作方导出不打开新窗口 5 years ago
liuweiwen d50627e4fb Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen 70c71abac1 隐藏我方分成比例 5 years ago
chenzhi 07053d822e Merge branch 'feature/add_promote_company' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi bb276f2bcc 优化推广公司列表 5 years ago
liuweiwen a114c7e659 Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen efe9d25988 Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen 3efe7167f2 公司性质 5 years ago
liuweiwen d333b8d61e Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen 8dedae5587 公司性质 5 years ago
chenzhi 43a3beae23 合并财务分类汇总 5 years ago
ELF 0134a158e1 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
ELF 2967d023d7 Merge branch 'hotfix/download_name' into release 5 years ago
ELF ec4bc4d46e 修改极速版下载描述文字 5 years ago
chenzhi cbbbcfd8ff 新增外团分发和其他团统计 5 years ago
liuweiwen 2ac78def85 Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen 3bb3a8b45d 显示调整 5 years ago
liuweiwen 5b6477e782 Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen 5f74f692d5 Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen 58aefd2997 显示调整 5 years ago
yulingwei 37c4e8ab73 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei 762cd1cbb1 Merge branch 'feature/ylw' into release 5 years ago
yulingwei dc2b55456d upt 5 years ago
liuweiwen 6af2277d94 Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen b8ec26a3e9 合作方开票税点百分比改为存小数 5 years ago
liuweiwen 70984bea99 Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen 48252d0f3a 合作方列表样式调整 5 years ago
zhengchanglong 1b37ec3d37 Merge branch 'feature/add_promote_company' into release 5 years ago
chenzhi f5529fc2dd 优化推广公司首页样式 5 years ago
liuweiwen 5544bb1797 合作方列表样式调整 5 years ago
sunke 3bc44925cd 推广配置 5 years ago
sunke 072b3e0199 推广配置修改 5 years ago
liuweiwen 4cb88be352 数据权限 5 years ago
ELF 124cc21e49 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
ELF 9d01a8d43b 修改提示语 5 years ago
zhengchanglong 26038f379e Merge branch 'feature/admin_optimize' into release 5 years ago
zhengchanglong 8bd26b36c0 玩家账号信息权限设置 5 years ago
ELF 3fef1f7910 Merge branch 'hotfix/download_name' into release 5 years ago
ELF afb5c3b246 修改落地页样式 5 years ago
yulingwei 73706808e3 Merge branch 'feature/ylw' into release 5 years ago
yulingwei 19e7f2af0c upt 5 years ago
yulingwei d349c4223d Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei 0652c31664 upt 5 years ago
yulingwei 25e66d84ff 修改问题 5 years ago
liuweiwen 87de8d2717 Merge branch 'feature/admin_optimize' into release 5 years ago
yulingwei 391d2a4a1f Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei e7497048a0 Merge branch 'feature/ylw' into release 5 years ago
yulingwei 8b51a16730 upt 5 years ago
liuweiwen 32f5137ac6 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
liuweiwen 04bb4a7bb7 合作方 5 years ago
sunke 790d56c638 Merge branch 'feature/add_promote_company' of 47.111.118.107:wmtx/platform into feature/add_promote_company 5 years ago
yulingwei e26f517df1 冲突解决 5 years ago
yulingwei 747bba16b0 汇总结算单管理 5 years ago
zhengyongxing 00a5fed6fd 游戏统计新增设备类型 5 years ago
chenzhi 4eaa92f0fb 优化导出银行卡变科学计数 5 years ago
liuweiwen 52668ace85 合作方导出优化 5 years ago
yulingwei 40ddeae55a upt 5 years ago
yulingwei 47d01e0aff upt 5 years ago
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