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

3135 Commits (14ce9c02fac012d98bf5506d5ac025ffbd4a3e8d)

Author SHA1 Message Date
chenzhi 5996b5f45e Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi cc653c2d2d 优化tp1.id错误
zhengyongxing a4b53c4e9a 结算单管理字段名修正
zhengyongxing 0c403ddf57 结算单管理字段名修正
zhengyongxing 4d6a45657c Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing 73578f1b64 生成下游订单修改
chenzhi 864e8d693a 优化前端浮点数计算
zhengyongxing 6baba8db28 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing 135cba359e 菜单高亮修改
liuweiwen 7f0dbe1112 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 1e4b7f69d5 cp/工会对账系统
zhengyongxing c27518b988 市场结算添加编辑添加户名
zhengyongxing 26c7190654 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing ef53562d06 市场结算添加编辑添加户名
chenzhi 8ff8d1dab8 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi ac0405329f 优化编辑
liuweiwen 21ee77609c cp/工会对账系统
chenxiaojun bfc93e0626 公会分成管理--更新
zhengyongxing 547b0439e3 市场结算添加编辑添加户名
chenzhi 1275c740d5 新增cp对账单删除
zhengyongxing da420ceb5c 市场结算添加编辑添加户名
zhengyongxing b74ac306ae 市场结算添加编辑添加户名
chenzhi 1bb038db4e 优化查看2
chenzhi 89d21c6218 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi f06cddc093 优化查看
zhengyongxing 2b335ec910 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 45ea27fd1f 市场结算列表删除操作
chenzhi cba3fc898c 新增查看
liuweiwen fc5db0b298 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 
# Conflicts:
#	Application/Admin/Controller/AjaxController.class.php
#	Data/update.sql
liuweiwen 394a3e4bb5 cp/工会对账系统
zhengyongxing 6bda9fe842 市场结算管理代码编辑完善
zhengyongxing ad901c31db 市场结算管理代码编辑完善
chenxiaojun 7550bafdf7 充值玩家--更新
zhengyongxing 99f23254ed 市场结算管理代码提交
zhengyongxing 68312cc277 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 71b1498c71 市场结算管理代码提交
chenzhi 25240227e4 新增编辑
chenxiaojun 82784f9da9 推广提现--更新
yulingwei 9910485523 修改
chenxiaojun 9b47108400 推广提现--更新
chenxiaojun 843c54ced5 推广提现--更新
yulingwei 7ea2a465bf 修复问题
chenzhi 72405e45f5 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi ea6d820408 优化页面显示
chenxiaojun 4286817dea 推广提现--更新
zhengchanglong 066fe46064 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengchanglong eb114b33b3 游戏分成比例设定体验优化
zhengyongxing dddd640f9f 结算单管理列表修改
chenzhi d484c96744 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi cccbc3bfa8 新增cp结算单判断是否已经有交叉时间
zhengchanglong b34eec98ee 游戏分成比例设定体验优化
chenxiaojun dcea6b7e05 推广提现--更新
zhengchanglong 5ac23b6a5b Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengchanglong de8386c0cb 游戏用户锁定备注显示
chenzhi 0934cd472a 新增cp结算单到列表中
zhengyongxing 2154899a6a Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing f87026a32c 结算单管理生成下游订单
chenzhi cda9d0c1a8 合并
chenzhi cd427a9409 新增添加cp上游对账单
zhengchanglong 87096e180e 游戏用户锁定备注显示
zhengchanglong 93fe724c15 游戏用户锁定备注显示
zhengchanglong 941978bb07 【游戏】-【合作方管理】，联系人改为必填项，必填项前面加红色※号
chenxiaojun 08dd26f942 推广提现--更新
zhengchanglong e914fde68d 玩家列表账号锁定添加备注
chenxiaojun cf0680eddf 开服预告正序显示
yulingwei 56b0216ff0 修改问题
chenxiaojun 0c0d59dd43 财务管理--更新
chenxiaojun ad80923bed 更新
chenxiaojun f244b42ab7 推广结算--更新
yulingwei ed9ddd2d67 修复检索问题
yulingwei e3f0a24e43 弹窗推广后台更新
zhengchanglong 326d9e5a12 管理后台-游戏-游戏编辑：参数配置-新增CP游戏分成比例
zhengyongxing ea140a430f 导出模板方法上传
liuweiwen 602fb33fcc 新增需求：管理后台-》系统-》扩展工具-》公司信息管理
yulingwei 5542994e36 upt
zhengyongxing c6f798dc47 市场结算管理bug修正
zhengyongxing f124e4b7ff Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 7adb991d0e 市场结算管理上传
zhengyongxing ba158e6b9a 市场结算管理上传
ELF 500d0fdc2c 后台管理系统登录后改变session_id
chenzhi ff67974413 修复获取推广员统计bug
zhengyongxing 5e14eaf4c9 新增市场结算管理完善
liuweiwen 50320be1d2 新增需求：管理后台-》推广公会归属管理，列表，新增，编辑，审批
zhengyongxing 4fb2806656 新增市场结算管理
chenxiaojun f1e8811df3 推广结算--更新
chenzhi c711601fdf Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 216321f46b 优化换绑逻辑判断是否订单在审核中
zhengyongxing 89883d2005 新增市场结算管理
chenxiaojun 0927417ce9 推广结算--更新
ELF fb64d574cb 修改包下载bug
ELF 710ef727e4 Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/shift-player
chenzhi 414f326cf4 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
ELF 04fccce6dc 修改上传网络请求限制
zhengyongxing f1a48fbdaa 权限分配 — 未给下级渠道分配（游戏充值）查看权限时，页面展示（游戏充值页面）修正
chenzhi 1295857697 优化工会统计各级检索条件结束
chenzhi 0561d8ff15 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi f95d23b091 优化公会统计各级条件展示
ELF fe68d8e8c9 修改oss上传返回结果
liuweiwen 4892db340e 管理后台-》游戏-》合作方管理-》列表增加字段联系人，联系电话，邮寄地址。公司税号，收款方名称，银行账号，开户行
ELF e6c891a945 修改