elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,525 Commits
1 Branch
0 Tags
154 MiB
Commit Graph

2099 Commits (a5b73d82f5bff833fc8fb2d86ce027ba12007b65)

Author SHA1 Message Date
zhengyongxing 4d1cfb36ec 生成下游个人结算单bug修改
yulingwei 619ea78b18 upt
yulingwei 3f5246f66c Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei c59aeaa9d3 upt
chenzhi 1bfcade0a8 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release
chenzhi 62a867c592 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize
chenzhi 5b45c4273c 优化公会统计选择游戏
yulingwei 5468239cf3 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei e8e0af97bf 修复结算时间
chenzhi 43a6a746b0 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release
zhengyongxing 061d7373fb 市场结算管理内外团新增内团分发
chenzhi f0d298c042 公会统计新增团体类型
yulingwei 82bc3a8dbd upt
yulingwei b99138fa85 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei 14b5ea78cd upt
zhengyongxing ccc1b177a0 Merge remote-tracking branch 'origin/release' into release
zhengyongxing 96fd5cbdd5 测试服订单管理bug修正
liuweiwen 077a770de7 奖罚记录管理-》奖罚时间为空判读，新增编辑判读
liuweiwen e8f07f4292 日期格式修改
liuweiwen 5b63a2fe84 Merge remote-tracking branch 'origin/release' into release
liuweiwen f9fe74986c Merge branch 'feature/admin_optimize' into release
liuweiwen b2e039b460 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen f6af63ca3e 合同期限为空时间格式，公司信息导航高亮
zhengyongxing 5158b07d85 测试订单管理高亮添加
zhengyongxing 932958a071 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhengyongxing be932b1ebd 奖罚管理bug修改
zhanglingsheng a26a02b36f Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhengchanglong c6a0f87dfe 奖罚编辑部分字段只读
zhanglingsheng 9afd27cdc6 Merge branch 'hosfix/tool_pay' into release
liuweiwen 5949542b70 Merge branch 'feature/admin_optimize' into release
liuweiwen 6d91ec7c60 推广员-》奖罚记录管理-》上下游公司与公司类型联动，解决未显示下游公司问题
zhengchanglong e55bfcb2d8 奖罚编辑部分字段只读
chenzhi 2361c6502a Merge branches 'release' and 'feature/finance_cwflhz' of 47.111.118.107:wmtx/platform into release
chenzhi b3560b4345 优化财务汇总统计
zhengchanglong 586dbf49e9 添加奖罚记录返回出现错误提示BUG修复
chenzhi 3ddef5d790 Merge branch 'feature/finance_cwflhz' of 47.111.118.107:wmtx/platform into release
chenzhi e4854d4ac7 优化财务汇总名词写错问题
liuweiwen e243675bcc 将子窗口的方法转到ajax控制器
liuweiwen 854ab9f509 合作方导出不打开新窗口
liuweiwen d50627e4fb Merge remote-tracking branch 'origin/release' into release
liuweiwen 70c71abac1 隐藏我方分成比例
chenzhi 07053d822e Merge branch 'feature/add_promote_company' of 47.111.118.107:wmtx/platform into release
chenzhi bb276f2bcc 优化推广公司列表
liuweiwen a114c7e659 Merge branch 'feature/admin_optimize' into release
liuweiwen efe9d25988 Merge remote-tracking branch 'origin/release' into release
liuweiwen 3efe7167f2 公司性质
liuweiwen d333b8d61e Merge branch 'feature/admin_optimize' into release
liuweiwen 8dedae5587 公司性质
chenzhi 43a3beae23 合并财务分类汇总
ELF 0134a158e1 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
ELF 2967d023d7 Merge branch 'hotfix/download_name' into release
ELF ec4bc4d46e 修改极速版下载描述文字
chenzhi cbbbcfd8ff 新增外团分发和其他团统计
liuweiwen 2ac78def85 Merge branch 'feature/admin_optimize' into release
liuweiwen 3bb3a8b45d 显示调整
liuweiwen 5b6477e782 Merge remote-tracking branch 'origin/release' into release
liuweiwen 5f74f692d5 Merge branch 'feature/admin_optimize' into release
liuweiwen 58aefd2997 显示调整
yulingwei 37c4e8ab73 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei 762cd1cbb1 Merge branch 'feature/ylw' into release
yulingwei dc2b55456d upt
liuweiwen 6af2277d94 Merge branch 'feature/admin_optimize' into release
liuweiwen b8ec26a3e9 合作方开票税点百分比改为存小数
liuweiwen 70984bea99 Merge remote-tracking branch 'origin/release' into release
liuweiwen 48252d0f3a 合作方列表样式调整
zhengchanglong 1b37ec3d37 Merge branch 'feature/add_promote_company' into release
chenzhi f5529fc2dd 优化推广公司首页样式
liuweiwen 5544bb1797 合作方列表样式调整
sunke 3bc44925cd 推广配置
sunke 072b3e0199 推广配置修改
liuweiwen 4cb88be352 数据权限
zhengchanglong 26038f379e Merge branch 'feature/admin_optimize' into release
zhengchanglong 8bd26b36c0 玩家账号信息权限设置
yulingwei 73706808e3 Merge branch 'feature/ylw' into release
yulingwei 19e7f2af0c upt
yulingwei d349c4223d Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei 0652c31664 upt
yulingwei 25e66d84ff 修改问题
liuweiwen 87de8d2717 Merge branch 'feature/admin_optimize' into release
yulingwei 391d2a4a1f Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei e7497048a0 Merge branch 'feature/ylw' into release
yulingwei 8b51a16730 upt
liuweiwen 32f5137ac6 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen 04bb4a7bb7 合作方
sunke 790d56c638 Merge branch 'feature/add_promote_company' of 47.111.118.107:wmtx/platform into feature/add_promote_company
yulingwei e26f517df1 冲突解决
yulingwei 747bba16b0 汇总结算单管理
zhengyongxing 00a5fed6fd 游戏统计新增设备类型
chenzhi 4eaa92f0fb 优化导出银行卡变科学计数
liuweiwen 52668ace85 合作方导出优化
yulingwei 40ddeae55a upt
yulingwei 47d01e0aff upt
ELF 35b267027c Merge branch 'hotfix/download_name' into release
ELF 129a1103e2 修改beta版下载名称
zhengyongxing 5626dfaf99 Merge remote-tracking branch 'origin/release' into release
zhengyongxing 21cac27332 Merge branch 'feature/admin_optimize' into release
zhengyongxing 70ddcb63e0 生成下游个人结算单bug修改
zhengchanglong 858c028faf Merge branch 'feature/add_promote_company' into release 
# Conflicts:
#	Data/update.sql
zhengyongxing e6d136410d Merge branch 'feature/admin_optimize' into release
zhengyongxing 065cf7d566 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 938a82e993 生成下游个人结算单bug修改
liuweiwen e15460b08f 合作方
chenzhi 6bb3387b0e 新增推广公司分成比例百分号
chenzhi f507dde70b 新增推广公司导出功能
yulingwei dfe52865bd upt
zhengyongxing 64122ca8c7 Merge branch 'feature/admin_optimize' into release
zhengyongxing 3b47c94b1e Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 2589a76603 生成下游个人结算单bug修改
zhengchanglong ec2c929450 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengchanglong 5f5abce2ec 玩家信息数据显示权限BUG修复
zhengyongxing 0b7327bc4e Merge branch 'feature/admin_optimize' into release
zhengyongxing c8f333fa9a 生成下游个人结算单bug修改
zhengyongxing 46ccf0e3ce Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 71dabfae53 生成下游个人结算单bug修改
chenzhi 31deafcb3c 优化合作公司列表页面
ELF 055e246f70 修改bug
liuweiwen 6d13be7863 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen 7da5e25e16 合作方
zhengchanglong c066620128 Merge branch 'feature/admin_optimize' into release
chenzhi a26a1191cc 优化上游结算提示
yulingwei 469a037b0f merge
yulingwei 3c44d5d200 upt
chenzhi 5cea54585f 优化上游结算单选择后初始值变动
chenzhi 8c25f55c6e 修复不能cp公司选择无效问题
zhengchanglong 99f62f3c14 Merge branch 'feature/admin_optimize' into release 
# Conflicts:
#	Data/update.sql
chenzhi 44a34bc89f 新增推广公司删除
chenzhi 4e28b39999 新增推广公司编辑功能
chenzhi 6ea7a581f5 推广公司查看
chenzhi f218544e7f 优化推广公司添加
chenzhi da2e3a769c 推广列表查看
liuweiwen a1c3ad8fb3 数据展示权限
liuweiwen 4b480e6f94 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen 8462f80777 合作方
zhengchanglong 4ce9af39e5 Merge branch 'feature/admin_optimize' into release
zhengyongxing fb14c5888a Merge branch 'hotfix/test_order' into release
zhengyongxing a9924e67c1 测试订单列表与录入bug修改
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
zhengyongxing 12903ef3cd 测试订单列表与录入bug修改
chenzhi 38fc3c3054 推广公司列表2
zhengyongxing c461623b5e Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 6f48940e21 生成下游个人结算单回退功能添加
chenzhi a3aa3700a7 修正company_belong模糊问题
chenzhi 542c76f266 推广公司列表1
zhengyongxing cf2cb338f1 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 8dd5f7bf5c 结算单管理添加
chenzhi 92929b1db7 优化推广公司添加
chenzhi 84f5ff2e95 优化添加推广公司结构
liuweiwen ada2913cdc 奖罚记录管理根据公司类型搜索
chenzhi 1f1e75e736 新增推广公司添加
chenzhi 6a612565c6 扩展推广公司添加
chenxiaojun 15ed062db3 管理后台>推广员>结算管理>公会分成管理--更新
chenxiaojun b2909d07d9 管理后台>推广员>结算管理>公会分成管理--更新
sunke 3dbacf225b 指标下载处理
sunke ffd29e2662 指标导出处理
zhengyongxing f51a576b1d Merge branch 'feature/admin_optimize' into release
zhengyongxing 9ab70c84d8 市场结算管理下游结算审核状态添加
zhengyongxing 0cbd58862e Merge branch 'release' of 47.111.118.107:wmtx/platform into release 
 Conflicts:
	Data/update.sql
zhengyongxing 8a1a15e845 市场结算管理下游结算符号bug修正
zhengyongxing 031d40dc22 生成个人结算单编辑的功能模板
zhengyongxing 955a1917b3 生成个人结算单的功能完成
zhengchanglong 9b43cc90b4 Merge branch 'hotfix/test_order' into release 
# Conflicts:
#	Data/update.sql
zhengchanglong 282033afe7 测试订单录入添加分页
yulingwei e670dfcf7c Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei e35f20ee70 游戏预警
zhengchanglong cb5cef678d Merge branch 'hotfix/test_order' into release
zhengchanglong d0de91e89d 测试订单查询修改
sunke 8298ef3e3d 删除打印
sunke 739eff3d00 删除打印
zhengchanglong 42a0876ab2 Merge remote-tracking branch 'origin/hotfix/test_order' into hotfix/test_order
zhengchanglong 2b99184273 Merge remote-tracking branch 'origin/hotfix/test_order' into hotfix/test_order 
# Conflicts:
#	Application/Admin/View/TestOrder/lists.html
zhengyongxing 2aa68e4412 测试订单录入功能提交
zhengchanglong 53b9573d71 测试订单查询修改
zhengyongxing 8aba8728f0 测试订单录入功能提交
zhengyongxing 56ecea6998 下游个人结算单生成代码上传
zhengchanglong 284f42b315 测试订单录入
zhengchanglong fc0bb831a7 测试订单录入
zhengchanglong 254d29f3f2 测试订单录入
chenxiaojun 89c7855337 管理后台>推广员>结算管理>公会分成管理--更新
chenxiaojun 66d68b0b49 管理后台>推广员>结算管理>公会分成管理--更新
sunke f92533e6a5 渠道计算修复
sunke 8db53afc8b 电子文档及公司录入信息
sunke 5fe238ccbd 渠道流水计算
liuweiwen 319dde1090 奖罚记录管理根据公司类型搜索
ELF bc2f5dd117 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
ELF bbb31890f6 未收押金会长禁用落地页/下载页
sunke 7f169dc211 渠道流水计算
ELF ed25d54dc8 解决冲突
ELF 501b8099d4 解决冲突
chenzhi 2fe965749e 财务汇总ok
chenxiaojun b7d2931106 管理后台--更新
chenxiaojun e9dae29deb 管理后台>推广员>推广员管理>推广员列表--新增资质认证
chenxiaojun e9581a2e04 管理后台>推广员>结算管理>推广提现--更新
sunke 56981a0acc 渠道计算
yulingwei 0983ea1027 Merge branch 'feature/admin_optimize' into feature/ylw
yulingwei 2cd5574de7 新增审核时间
yulingwei 6b6baa4f92 合并
ELF 69185016a0 修改
liuweiwen dfd198e9b7 对账系统增加奖罚数据
zhengyongxing 5ab9f2cc1c 下游个人结算单生成代码上传
zhengyongxing 77463c7e1d 市场结算管理上游流水符号修正
liuweiwen 2ba96aa424 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen ce960beb6d 合作方手机格式验证修改
chenxiaojun 2c52bccaf7 管理后台>推广员>结算管理>推广提现>自动审核管理--更新
chenxiaojun d5a63a7849 管理后台>推广员>结算管理>推广提现>自动审核管理--更新
liuweiwen e6cbcd86d3 Merge branch 'release' into feature/admin_optimize
liuweiwen 2af2505819 合并热修复
liuweiwen 2ed47500f0 Merge branch 'hotfix/recharge_statistics' into feature/admin_optimize
liaojinling e596d11cee 会长押金
zyx 079027a778 Merge branch 'hotfix/dopositCpModify' into release
zyx a9cae8424b 游戏充值bug修改
zyx c2b54611b7 Merge branch 'hotfix/dopositCpModify' into release
zyx 1cfc48ded2 游戏充值cp订单号修改
liuweiwen 2bffe498bf 奖罚记录管理优化
zyx 0aad9c4735 下游结算单生成功能上传
chenzhi aaf67b85cc 新增旧月份统计方法
jbRotk a6b1194be0 解决冲突
jbRotk 5d315d4182 添加工会类型
chenzhi 57e979408e 优化奖罚规则
chenzhi 3703d7040b 财务分类统计脚本1.0
chenzhi 1f5944c0a4 优化奖罚符号问题
zhengchanglong 24d1366d0a Merge branch 'hotfix/recharge_statistics' into release
liuweiwen b94bf93823 0点游戏统计
chenzhi 29618ce878 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize
chenzhi 58eb6a0e12 新增cp公司优化奖罚自动获取
liuweiwen 2b51122d13 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen 9e9a925429 奖罚记录管理
chenxiaojun a7891d6b57 管理后台>推广员>结算管理>推广提现--部分功能优化
jbRotk 72cfd9ec64 新增渠道费率
zhengchanglong 4aeaf8f74c Merge branch 'feature/admin_optimize' into release
liuweiwen 51d2d91671 验证手机号码格式修改
chenzhi 7657db3b18 财务分类-支付渠道/支付类型
jbRotk c84cde9567 Merge branch 'feature/ylw' into feature/admin_optimize
jbRotk 5f510cd4d9 新增奖惩时间
liuweiwen 289fd24ab6 内部公司信息管理
liuweiwen b444a3546b Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 
# Conflicts:
#	Data/update.sql
liuweiwen c92fa425d2 内部公司信息管理
chenzhi cb4e457ace 财务汇总-按合作方类型
jbRotk c968e54cf8 解决冲突
jbRotk 94afe49b0c upt
chenzhi 993bedc98f 收入类型-测试收入
chenzhi 39c43c1bee 优化游戏分成比例获取函数备注
zyx b0c225591f Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zyx 414d36c373 cp分成比例方法修正
chenzhi f95b084f88 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize
chenzhi 8c756d61d9 cp分成增加符号后上游比例获取修正
zyx 782de31ca8 cp分成比例方法添加
zyx f58f05d00d cp分成比例方法修正
jbRotk 35b6d25ebc upt
chenzhi 5eaadd974a 财务分类汇总-按收入类型1
chenzhi aba7ed22d1 财务汇总分类脚本-按收入类型