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

199 Commits (e495105ed0f0d777ab2c70c81205a34671634b69)

Author SHA1 Message Date
yulingwei 2fbea72d26 up 5 years ago
chenzhi afac0376be 新增下游审批 5 years ago
chenzhi cafdc39f2a 优化添加 5 years ago
chenzhi d662c89b7e zancun 5 years ago
ELF e8a925b64c 游戏统计添加聚合充值数据 5 years ago
chenzhi 5aa7427504 新增公司信息编辑 5 years ago
chenzhi 33cf2cf8a6 新增审核列表 5 years ago
chenzhi f66ec6d1ff 优化函数 5 years ago
chenzhi 296b5a0d8f 优化关系函数 5 years ago
ELF 15d0b454a4 修改 5 years ago
chenzhi d6ec8e0248 新增导出 5 years ago
ELF f167d63c4a 修改 5 years ago
zhengyongxing 15b9efcd7e 江息网络漏掉的修改 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
廖金灵 c4ec5753f0 Merge branch 'feature/loginInfo' of wmtx/platform into release 
手机验证码登录推广后台
 5 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
chenzhi 6a3b9b6da3 新增游戏分成比例 5 years ago
sunke 2a017bfb45 loginmodel 5 years ago
zhengyongxing 132b601f74 测试资源搜索功能添加 5 years ago
zhengyongxing 6081e088db 游戏统计bug修改 5 years ago
zhengyongxing 057a51dbeb 游戏统计bug修正 5 years ago
zhengyongxing 81bd79ecf8 游戏统计bug修正 5 years ago
zhengyongxing 4b63c7b786 游戏统计bug修正 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
zhengyongxing b6b97c130d 测试资源代码修正 5 years ago
zhengyongxing b698495dbb 游戏统计添加元素修正 5 years ago
ELF d9cc82f73a 修改网站注册 5 years ago
ELF 908722c5be 修改 5 years ago
zhengyongxing fcc7bf2aaa 管理后台-财务管理-游戏统计-添加元素 5 years ago
zhengyongxing 001e9e70f8 管理后台导出权限添加 5 years ago
ELF 41e1801550 修改手机登录bug 5 years ago
廖金灵 bab7fec46d Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release 
游戏名称不含设备类型优化
 5 years ago
廖金灵 9222d99127 Merge branch 'feature/change_company_belong' of wmtx/platform into release 
推广员内外团归属优化
 5 years ago
chenzhi 2401acb9a0 优化公会统计bug 5 years ago
chenzhi 2b7f434955 财务管理-游戏管理 游戏名称列表和导出优化 5 years ago
chenzhi 55d49e8b4b 优化推广公会列表导出 5 years ago
ELF 4a1ffd2955 解决冲突 5 years ago
chenzhi 1761d37b5c 推广公会列表 适配新内外团规则 5 years ago
chenzhi d7662eb305 推广员现在归属于公司团体 5 years ago
zhengyongxing 6f749fb99d Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_opertion_log 
 Conflicts:
	Application/Admin/Controller/FinancePromoteController.class.php
	Application/Common/Common/extend.php
 5 years ago
廖金灵 a1f3c6e205 Merge branch 'feature/download_type_list' of wmtx/platform into release 
iOS下载统计
 5 years ago
yulingwei ead4a8598e upt 5 years ago
zhengyongxing a086b38d3e 管理后台日志唯一键值bug修改 5 years ago
zhengyongxing 958fb41227 管理后台日志唯一键值修改 5 years ago
chenzhi 381327ae21 优化游戏统计 5 years ago
ELF dae2dd5fd9 优化游戏 5 years ago
zhengyongxing b87dec3aee 管理员权限从用户改成以组的形式 5 years ago
zhengyongxing 665b4c8bfa 推广结算管理日志添加 5 years ago
chenxiaojun 118aae4f83 推广平台>财务管理>结算中心--更新 5 years ago
liuweiwen 87de8d2717 Merge branch 'feature/admin_optimize' into release 5 years ago
yulingwei e26f517df1 冲突解决 5 years ago
zhengyongxing 00a5fed6fd 游戏统计新增设备类型 5 years ago
liuweiwen a1c3ad8fb3 数据展示权限 5 years ago
yulingwei 6b6baa4f92 合并 5 years ago
chenxiaojun 2c52bccaf7 管理后台>推广员>结算管理>推广提现>自动审核管理--更新 5 years ago
jbRotk c968e54cf8 解决冲突 5 years ago
chenxiaojun cbe40d4b0f 管理后台更新 5 years ago
chenxiaojun a8008fbe05 管理后台>推广员>结算管理>公会分成管理--规则修改 5 years ago
chenxiaojun 73f1055303 管理后台>推广员>结算管理>推广提现--增加自动审核功能 5 years ago
jbRotk 65461ff200 c 5 years ago
zhengchanglong e6f3329ac8 内外团归属BUG修复 5 years ago
chenxiaojun 66a238dfd4 结算管理--更新 5 years ago
chenxiaojun 71e02a4add 结算管理--更新 5 years ago
chenxiaojun 258e10c9d1 结算管理--更新 5 years ago
ELF f7a53c7562 Merge branch 'feature/account_safe' into release 5 years ago
ELF 0f44d9e95c 解决冲突 5 years ago
zhengchanglong bb08c723a3 Merge branch 'feature/group_type' into release-1.0.1 5 years ago
chenxiaojun 365a276b95 公会分成管理--更新 5 years ago
liuweiwen 394a3e4bb5 cp/工会对账系统 5 years ago
chenxiaojun 4286817dea 推广提现--更新 5 years ago
chenxiaojun 08dd26f942 推广提现--更新 5 years ago
chenxiaojun f244b42ab7 推广结算--更新 5 years ago
ELF 500d0fdc2c 后台管理系统登录后改变session_id 5 years ago
ELF fe68d8e8c9 修改oss上传返回结果 5 years ago
ELF f472f5e9d3 文件保存改成cdn 5 years ago
chenxiaojun 90eed6f5ca 结算管理--更新 5 years ago
chenxiaojun c074b5fb86 结算管理--更新 5 years ago
ELF 0a0cedafd5 各个系统登录提示安全优化，sessionon_id变更 5 years ago
liuweiwen 0b3ae062b1 优化：推广员新增与编辑的推广公司增加万盟天下科技 
新增需求：推广员增加工会归属和工会关系属性
 5 years ago
chenxiaojun e884214546 会长提现|公会分成管理--更新 5 years ago
liuweiwen aaabd0a07f 游戏统计搜索时间范围 5 years ago
liuweiwen 20bee7bbc9 管理后台登录时间改为1小时 5 years ago
liuweiwen fcbd598e3c 管理后台登录时间改为1小时 5 years ago
chenzhi 0ef4241570 合并statistcs 5 years ago
zhengchanglong 39b6e98f3b Merge branch 'release-1.0.0' into dev 
# Conflicts:
#	Application/Admin/Controller/BehaviorLogController.class.php
#	Application/Admin/Controller/ExportController.class.php
#	Data/update.sql
 5 years ago
zhengyongxing ba59b41fb9 数据权限官方渠道添加 5 years ago
zhengyongxing d465be8969 数据权限提交 5 years ago
zhengyongxing ce0e9f943d 数据权限bug修正 5 years ago
zhengchanglong e08a2eb3ce Merge branch 'release-1.0.0' into dev 
# Conflicts:
#	Application/Admin/Controller/access_data_foldline.txt
#	Data/update.sql
 5 years ago
liuweiwen cdbf059ee4 平台币直充明细列表，搜索，导出 
内充支出明细列表，搜索，导出
 5 years ago
chenxiaojun bd8c4331bd 管理后台>推广员管理>公会分成管理--新增 5 years ago
liuweiwen 39e3350dd9 游戏订单查看 5 years ago
chenxiaojun f032257838 推广平台>数据管理>充值玩家--更新 5 years ago
liuweiwen c0fac39c18 游戏统计 5 years ago
liuweiwen 5d6716b239 游戏统计 5 years ago
chenxiaojun 61bfbd00cc 公会分成管理 5 years ago
zhengyongxing 6dc8366018 数据授权修改内容提交 5 years ago
liuweiwen 42ccd44de3 Merge branch 'dev_lww' into dev_permission 
# Conflicts:
#	Application/Admin/Common/extend.php
#	Application/Admin/Controller/MendController.class.php
#	Application/Admin/Controller/PromoteController.class.php
#	Application/Admin/Model/MemberModel.class.php
 5 years ago
liuweiwen 1212d3249e 添加数据权限 
推广员-推广员管理-推广员列表
推广员-推广员管理-游戏分包
 5 years ago