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

200 Commits (9582f96b922b51e1f8906fef3985d7fe7932e0d6)

Author SHA1 Message Date
zhengyongxing 5c65f356b2 市场业绩开发类型修正 4 years ago
ELF ad34536256 修改 4 years ago
ELF 6fcaa1362c 重置权限缓存 4 years ago
zhengyongxing 0631c22c93 上游导出修正 4 years ago
chenzhi bcdbb3d0a0 优化导出保留两位小数 4 years ago
chenzhi f73a9033b3 新增下游个人比例 4 years ago
万盟天下 c60d7c6671 Merge branch 'hotfix/market_percentage' of wmtx/platform into master 
上游导出修正
 4 years ago
zhengyongxing 288078c959 上游导出修正 4 years ago
陈志 0c696fd8a5 Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
修改
 4 years ago
zhengyongxing 5acd5197ae 小bug修改 4 years ago
ELF bdc23b7d90 修改 4 years ago
zhengyongxing a146dd820a 平台结算导出与列表选项修改 4 years ago
chenzhi d63edee6b3 优化结算单界面信息 4 years ago
chenzhi 5db1f7ce24 优化比例显示 5 years ago
chenzhi 4143a67238 优化下游个人导出 5 years ago
chenzhi 9ee69f9bd4 优化下游结算单导出 5 years ago
chenzhi 82787ca561 优化上游结算单导出模板样式 5 years ago
chenzhi 07fd53a6aa 优化上游导出文件格式及时间问题 5 years ago
chenzhi 7ba9c25610 优化上游导出% 5 years ago
廖金灵 6c8699dc1e Merge branch 'hotfix/market_percentage' of wmtx/platform into master 
平台币导出bug修正
 5 years ago
zyx 8c0646d2a0 平台币导出bug修正 5 years ago
廖金灵 0665e8265a Merge branch 'hotfix/market_percentage' of wmtx/platform into master 
市场结算管理bug修正
 5 years ago
zyx 5dcc25f97e 市场结算管理bug修正 5 years ago
chenzhi 1ac4c280ad 优化其他导出 5 years ago
chenzhi 54239b1f54 优化导出 5 years ago
chenzhi 9d9eae85ec 优化上游比例获取 5 years ago
廖金灵 d73ab9c4cd Merge branch 'feature/payment_merchant' of wmtx/platform into release 
完善支付商户操作日志
 5 years ago
ELF a4d4a51a2c 完善支付商户操作日志 5 years ago
chenzhi 205c6a83f8 优化上游结算 5 years ago
zhengyongxing a960e0a7e4 商户bug修改 5 years ago
zhengyongxing 9670bf86b6 商户bug修改 5 years ago
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 
 Conflicts:
	Data/update.sql
 5 years ago
ELF 557f0203ac 解决冲突 5 years ago
chenzhi a3f28b67a5 新增游戏搜索 5 years ago
zhengyongxing 341fa19b6f 聚合公司功能提交 5 years ago
zhengyongxing 1ff82cce20 聚合下游公司列表添加 5 years ago
chenzhi 2619e598e8 合并marster 5 years ago
zhengyongxing cacb1e4cf4 商户统计结算功能添加 5 years ago
chenzhi f731a417bd 优化工会关系 5 years ago
zhengyongxing 53979941a0 列表全部开发给市场专员，其他人员的数据隐藏 5 years ago
zhengyongxing 1acef89380 市场业绩提成市场总监管理组添加查看全部用户的权限 5 years ago
zhengyongxing 2975b9fe35 市场业绩提成优化 5 years ago
zhengyongxing 4bfa0dfa2f 市场专员业绩结算结构修改 5 years ago
zhengyongxing d40ce89901 市场专员业绩结算发放时间选项修改 5 years ago
zhengyongxing 9a23b5588b 市场专员业绩计算修正 5 years ago
zhengyongxing 97161900ac 市场专员业绩管理bug修改 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
ELF 3f42d2967c 修改 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 0ba02069a0 优化补点计算方式 5 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
chenzhi e1d624fe8b 优化导出并聚合数据 5 years ago
chenzhi c5e3d78835 新增导出 5 years ago
chenzhi e80d4eb539 新增确认 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 fd4e0baffd 新增游戏比例模板 5 years ago
sunke a4377c017e 支付设置 5 years ago
chenzhi 55d49e8b4b 优化推广公会列表导出 5 years ago
chenzhi 1761d37b5c 推广公会列表 适配新内外团规则 5 years ago
chenzhi ccda6e0b39 开启操作日志 5 years ago
ELF 9e82faf6f3 关闭后台操作日志 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 f35c7bdc77 实时充值查询增加易宝支付 5 years ago
liuweiwen 5d596094a6 增加易宝支付 5 years ago
liuweiwen 3b415976eb 增加易宝支付 5 years ago
zhanglingsheng c6e1493035 易宝支付 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
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