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

2187 Commits (61d04183402b76845e8cba9dd96b945209a34861)

Author SHA1 Message Date
liuweiwen 4a45103650 平台币充值汇总补一列
chenzhi 037675ce1d Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
zhengyongxing 5224eec9f2 上游结算单管理日志添加
liuweiwen 9221b18955 游戏统计汇总权限
chenzhi cbd1625ecb Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
chenzhi 6cb25fe7fe 游戏充值-操作日志
zhengyongxing 6483047fe4 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing 5e794bd785 推广员日志记录添加
chenzhi e129a044d4 操作日志-角色权限
zhengyongxing 8aae878cf8 游戏统计修改
zhengyongxing 3c628fa1c6 统计日志添加
chenzhi 81830703f3 角色权限-操作日志1
zhanglingsheng 9c39b731fd Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhanglingsheng dbd1e6f070 易宝支付配置
liuweiwen 94293b4bec Merge branch 'feature/resource_config' into release
liuweiwen b4fafbe0bf 修改配置比例范围
chenzhi 3a9575c602 管理员列表增删改导出-操作日志
liuweiwen fa9746342f Merge remote-tracking branch 'origin/release' into release
liuweiwen cc8e2149e0 最低额度，最高额度，比例数据格式校验
zhengchanglong ba96083bb5 录入测试订单 时间控件修改
zhanglingsheng 0363058592 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhanglingsheng c9eecfa9c5 获取支付配置添加易宝支付
liuweiwen 1e24fadb79 最低申请额度与最高申请额度不能小于0
chenzhi 40d2c2777f 测试白名单增删改操作日志
zhengyongxing a6a29bf63a 统计日志添加
chenzhi dc171af556 分控新增与解除操作日志
liuweiwen 8e3ee63a44 自动审核规则调整
chenzhi 55fd5d94e8 实名认证，防沉迷
liuweiwen 7d879686af 自动审核规则调整，锁定显示红色字体
chenzhi 50e4185d9c 操作日志-登陆记录
liuweiwen aa8d296dd8 推广后台-》测试资源申请-》符合规则的自动审核
chenzhi 0e0a7263e3 操作日志-防刷预警
chenzhi 97ff3baaff 优化操作日志下载
chenzhi 7141e3752e 优化操作日志基函数
chenzhi a8c83122db Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
chenzhi 148d445f10 用户新增导出操作日志
zhengyongxing ce59d5dc72 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing 3f4f39e238 封装时间函数
chenzhi 580eb9dea3 优化移动公共函数后的变化
zhengyongxing 756b3b9975 操作日志公用函数移到extend.php中
chenzhi 2de1d9bccb 优化批量操作
liuweiwen 02920aab8a 资源审核配置列表、新增、编辑、删除、锁定、解锁
chenzhi 02407d1c50 优化操作日志函数
zhengyongxing dd478e264f 行为日志按照原型修改完成
zhengyongxing 1aa12fe2d1 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing d2867b4635 行为日志完成
chenzhi bd53d01a0e 用户编辑优化
chenzhi 80f8eb431c 用户编辑结束
chenzhi 6dfb13e4d9 新增操作权限
chenzhi 0d4ca0840b 优化平台币回收内存
zhengchanglong 7d13703398 角色列表角色ID和角色名改为不受权限控制
liuweiwen ad48df6c91 数据展示权限
liuweiwen 446e6f8176 Merge remote-tracking branch 'origin/release' into release
liuweiwen 3f5739c1d7 游戏充值和平台币充值数据展示权限
zhanglingsheng a1b79b57ae Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhanglingsheng 31466db00d 支付类型添加易宝支付
zhengyongxing 009ef6719d 结算单管理审核状态bug修改
zhengyongxing 601151718f Merge branch 'feature/admin_optimize' into release
zhengyongxing e01bcc236f Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 260ca6fe9e 结算单管理审核状态bug修改
zhengchanglong 6b68ae8197 Merge branch 'feature/admin_optimize' into release 
# Conflicts:
#	Data/update.sql
zhengchanglong eecd38e424 Merge branch 'fix/divide_test' into release
liuweiwen 2cf7b7471f Merge remote-tracking branch 'origin/release' into release
liuweiwen 305cbf34cd 导航高亮
liuweiwen 941ba5628d Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen c05b10cb87 对账单系统-》未审核不可确认
ELF 5627dd94d2 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
ELF 7cd28cc7ce 删除多余代码
yulingwei e2851c13f1 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei 5dde3ef96e upt
ELF 3411f90430 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
ELF dad83c8d38 押金付款方式添加选项
yulingwei dc96411757 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei 0513f0fa5e fix bug
zhengyongxing 4f65efad9b 结算单管理添加审核状态
liuweiwen fbdd7a4339 Merge branch 'feature/admin_optimize' into release
liuweiwen daec62ec95 奖罚记录管理-》编辑，无修改时提示错误
chenzhi da454a9474 Merge branch 'feature/data_divide' of 47.111.118.107:wmtx/platform into fix/divide_test
chenxiaojun 29c8470b7f 推广平台>财务管理>结算中心--更新
chenxiaojun 118aae4f83 推广平台>财务管理>结算中心--更新
chenxiaojun f5c1531b71 推广平台>财务管理>结算中心--更新
chenxiaojun 23f38f6a07 推广平台>财务管理>结算中心--更新
chenzhi c2de546abb Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release
chenzhi 578948347f 优化公会内外团占比
chenzhi c52ba1cf99 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release
chenzhi fa92868548 优化公会统计团体占比
zhengyongxing 3c16659bf3 Merge branch 'feature/admin_optimize' into release
zhengyongxing 9edc77bead 生成下游个人结算单bug修改
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 测试订单录入添加分页