elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,482 Commits
1 Branch
0 Tags
154 MiB
master
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'f22dc90e96'
${ noResults }
Commit Graph

227 Commits (f22dc90e96952e25e83b7133cb0aa8aecad1a0c8)

Author SHA1 Message Date
zhengyongxing 9a23b5588b 市场专员业绩计算修正 5 years ago
zhengyongxing 97161900ac 市场专员业绩管理bug修改 5 years ago
chenzhi c9d6b9859d 合并热更 5 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
 5 years ago
zhengyongxing 83717b64ae 市场专员业绩管理优化 5 years ago
chenzhi 5fc03a14a4 优化cp添加 5 years ago
ELF 3f42d2967c 修改 5 years ago
zhengyongxing dbad9a08db Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_statistics 
 Conflicts:
	Application/Admin/Common/function.php
	Application/Admin/Controller/TimingController.class.php
 5 years ago
ELF 990a2bd206 解决冲突 5 years ago
ELF 8224cfb362 修改 5 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
 5 years ago
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance 
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
 5 years ago
zhengyongxing cd0d9e295f 市场专员结算代码上传 5 years ago
zhengyongxing 379716298a 市场专员结算代码上传 5 years ago
ELF f0a8b6bc3b 修改 5 years ago
ELF 76fcfec7c2 修改 5 years ago
ELF 5f5a6ee1af 修改 5 years ago
廖金灵 a808b86865 Merge branch 'feature/paytime_summary' of wmtx/platform into release 
汇付宝
 5 years ago
chenzhi 511f53e83c 优化权限 5 years ago
chenzhi 0ba02069a0 优化补点计算方式 5 years ago
zhengyongxing 9aed64f46d 推广员充值汇总优化，补单功能添加 5 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
chenzhi e1d624fe8b 优化导出并聚合数据 5 years ago
chenzhi c5e3d78835 新增导出 5 years ago
chenzhi e80d4eb539 新增确认 5 years ago
chenzhi 93a8bb70e1 新增编辑 5 years ago
tping 9fd06c27d3 Merge branch 'hotfix/alipaytoalipay' into feature/platfrom_aggregate_finance 
# Conflicts:
#	Data/update.sql
 5 years ago
chenzhi 6162f9f8a1 生成上下游结算单 5 years ago
zhengyongxing 5f0b7a6de0 充值方式文字修正，金猪改成苹果 5 years ago
sunke d7e61edaa1 汇付宝 5 years ago
chenzhi afee89ec03 优化模板无聚合 5 years ago
chenzhi 6a3b9b6da3 新增游戏分成比例 5 years ago
chenzhi fd4e0baffd 新增游戏比例模板 5 years ago
sunke a4377c017e 支付设置 5 years ago
chenzhi 450ef803d6 合并 5 years ago
chenzhi 3e7778df35 优化零元问题 5 years ago
zhengyongxing 4d938b85f4 导出账号权限修改配置 5 years ago
zhengyongxing 0482836a8e 导出账号权限添加 5 years ago
廖金灵 bab7fec46d Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release 
游戏名称不含设备类型优化
 5 years ago
chenzhi c45ca2942d 优化设备名称函数 5 years ago
chenzhi 6f7e0de83d 优化平台币设备，名称 5 years ago
chenzhi f0a19cfc99 优化设备名称为字典 5 years ago
chenzhi 9064fc7c58 游戏统计 游戏名称不含设备类型优化 5 years ago
chenzhi 55d49e8b4b 优化推广公会列表导出 5 years ago
chenzhi 1761d37b5c 推广公会列表 适配新内外团规则 5 years ago
chenzhi ccda6e0b39 开启操作日志 5 years ago
ELF 9e82faf6f3 关闭后台操作日志 5 years ago
chenzhi 0344471659 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi cfbbf8e76b 优化默认公司名称为海南万盟天下科技 5 years ago
zhengyongxing c6eef5124d 测试资源修改 5 years ago
zhengyongxing 800680c6c0 测试资源申请审核验证增加区服 5 years ago
zhengyongxing d6db0d3789 测试资源根据可用余额进行验证 5 years ago
zhengyongxing f840a59ce2 日志操作bug修复 5 years ago
chenzhi 0b8cf1d3ee Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi 44f44d0c4a 操作日志函数修改 5 years ago
zhengyongxing 3b73c1d340 操作日志bug修正 5 years ago
liuweiwen 010080e32b Merge branch 'feature/yibao_company' into release 5 years ago
liuweiwen f35c7bdc77 实时充值查询增加易宝支付 5 years ago
liuweiwen 969bf4dc8a Merge branch 'feature/yibao_company' into release 
# Conflicts:
#	Application/Admin/Common/extend.php
 5 years ago
liuweiwen 5d596094a6 增加易宝支付 5 years ago
liuweiwen 3b415976eb 增加易宝支付 5 years ago
zhanglingsheng c6e1493035 易宝支付 5 years ago
zhengyongxing 04f2b0c8df Merge branch 'feature/operation_log' into release 
# Conflicts:
#	Application/Admin/Common/extend.php
#	Data/update.sql
 5 years ago
zhanglingsheng 95f93bdc04 配置添加易宝支付 5 years ago
zhanglingsheng ee3db4d472 获取支付配置添加易宝支付 5 years ago
zhengyongxing 3c628fa1c6 统计日志添加 5 years ago
chenzhi dc171af556 分控新增与解除操作日志 5 years ago
chenzhi 97ff3baaff 优化操作日志下载 5 years ago
chenzhi 7141e3752e 优化操作日志基函数 5 years ago
zhengyongxing 3f4f39e238 封装时间函数 5 years ago
zhengyongxing 756b3b9975 操作日志公用函数移到extend.php中 5 years ago
liuweiwen 02920aab8a 资源审核配置列表、新增、编辑、删除、锁定、解锁 5 years ago
chenzhi f0d298c042 公会统计新增团体类型 5 years ago
zhengyongxing be932b1ebd 奖罚管理bug修改 5 years ago
yulingwei e26f517df1 冲突解决 5 years ago
yulingwei 3c44d5d200 upt 5 years ago
zhengchanglong 99f62f3c14 Merge branch 'feature/admin_optimize' into release 
# Conflicts:
#	Data/update.sql
 5 years ago
liuweiwen a1c3ad8fb3 数据展示权限 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 955a1917b3 生成个人结算单的功能完成 5 years ago
zhengchanglong cb5cef678d Merge branch 'hotfix/test_order' into release 5 years ago
zhengyongxing 56ecea6998 下游个人结算单生成代码上传 5 years ago
zhengchanglong 254d29f3f2 测试订单录入 5 years ago
liuweiwen dfd198e9b7 对账系统增加奖罚数据 5 years ago
zhengyongxing 77463c7e1d 市场结算管理上游流水符号修正 5 years ago
liuweiwen 51d2d91671 验证手机号码格式修改 5 years ago
chenzhi 39c43c1bee 优化游戏分成比例获取函数备注 5 years ago
zyx 414d36c373 cp分成比例方法修正 5 years ago
zyx 782de31ca8 cp分成比例方法添加 5 years ago
zyx f58f05d00d cp分成比例方法修正 5 years ago
zyx 4be5b1ba2c cp分成比例方法添加 5 years ago
chenxiaojun 10665cc869 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
chenxiaojun 258e10c9d1 结算管理--更新 5 years ago
liuweiwen 6f7dcb9ca5 修改上下游对账单导出文件名 5 years ago
zhengyongxing c09c3a591e 结算单bug修正 5 years ago
zhengyongxing 7f99dafb2c 市场结算管理 上游结算流水bug修正 5 years ago
liuweiwen 1e4b7f69d5 cp/工会对账系统 5 years ago
liuweiwen 21ee77609c cp/工会对账系统 5 years ago
liuweiwen 394a3e4bb5 cp/工会对账系统 5 years ago
zhengyongxing ea140a430f 导出模板方法上传 5 years ago