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

4097 Commits (ea21c1ee49b58d162eef7ff0e920cc00bd01d503)

Author SHA1 Message Date
zhengyongxing 6a86a5e76f 12.18功打款能提交
chenzhi 9ab8454970 优化结算汇总
zhengyongxing 8a6191810b 12.18功打款能提交
chenzhi 40005b7177 优化游戏统计
tping ccf0589e4f 导入
chenzhi c0926299dc 优化平台币充值
tping 824b7b3f06 公会信息导入导出
chenzhi fa9dc518d5 导出
chenzhi 4fdb94c617 优化订单查询
chenzhi 45d883e89c 优化渠道统计
zhengyongxing 7c4e0e7521 12.18功能提交
zhengyongxing 8430fa1813 12.18功能提交
chenzhi 19c62de87c 優化公會統計
张谷成 e669d1bc38 Merge pull request '刷新' () from hotfix/1211bug into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/38
tping 6e63176176 刷新
tping 24fcfc4b90 公会信息
张谷成 a7553cf116 Merge pull request '1' () from hotfix/1211bug into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/36
tping 1dbc61a602 1
tping 0f7b23ad57 1
张谷成 0c7e4b2d30 Merge pull request 'hotfix/1211bug' () from hotfix/1211bug into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/35
tping 858e929199 甲乙方公司
tping 304c59be10 甲乙方公司
tping 08df25eab3 展示错误
tping d6f34127df 1
chenzhi 5b5029d570 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
chenzhi 5f0d0a7101 优化游戏统计导出
chenzhi c5bc21cb36 优化游戏导出
chenzhi f00ef7fcc9 优化导出
chenzhi 236bd8f538 优化财务游戏汇总
chenzhi 76874cf34a 优化游戏统计
张谷成 91701cc612 Merge pull request '公会信息' () from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/34
廖金灵 feb46d1954 Merge pull request 'feature/add_item_two' () from feature/add_item_two into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/33
zhengyongxing 87c6c71d0a 汇总bug修改
zhengyongxing 699449a702 未结算数据的补充
zhengyongxing 0c49d1d655 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_two
zhengyongxing c30e396b2c 未结算数据的补充
zhengyongxing 32abdbb390 汇总统计修改
chenzhi fc75b7d81d 优化统计
chenzhi 79588d52e8 优化财务汇总
chenzhi 8ef35174dc 优化个人补点
chenzhi ad73fe03b3 优化上游结算
chenzhi 419793d91b 优化上游结算
tping 0aef9e3019 公会信息
chenzhi e6af0fbcd5 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
chenzhi b7cc3ccd77 优化权限
ELF 9f61cdade9 Merge branch 'master' of 8.136.139.249:wmtx/platform into release
chenzhi 3fdc14120f 优化首页折线
郑永星 6699ce1045 Merge pull request '未结算数据的补充' () from feature/add_item into release 
未结算数据的补充
zhengyongxing f13ee0583c 未结算数据的补充
chenzhi d08691c13a 优化充值列表导出
chenzhi 29636f2922 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
chenzhi 78451f0551 消除打印信息
chenzhi 96ead18ff6 优化打印
chenzhi 7abcd38f36 解决推广公司bug
chenzhi fb798e82bf 优化下游推广公司搜索
chenzhi fe75b57618 合并master
廖金灵 72135079fa Merge pull request '数据授权js错误修正' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/16
zhengyongxing a31e3bf1ab 数据授权js错误修正
chenzhi 0d533525fe 优化权限修改
廖金灵 342b592976 Merge pull request 'feature/testing_resource_verify_admin' () from feature/testing_resource_verify_admin into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
郑永星 ca8a2ada0e Merge pull request '12月功能提交,手机万能验证码屏蔽提交' () from feature/add_item into release 
12月功能提交,手机万能验证码屏蔽提交
zhengyongxing 309b195986 12月功能提交
陈志 79ad02ba2e Merge pull request '优化' () from feature/st_mange_20201202 into release 
优化
chenzhi 1945cae9a5 优化
chenzhi 28e93fe832 新增文件
张谷成 6e63a3857e Merge pull request 'feature/1211' () from feature/1211 into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/8
tping cf88d4c1db Merge branch 'release' into feature/1211 
# Conflicts:
#	Application/Home/Controller/BaseController.class.php
tping 6c266178df 数据互通
陈志 9d30d48fac Merge pull request 'feature/st_mange_20201202' () from feature/st_mange_20201202 into release 
优化公式
chenzhi f4f430cf61 优化公式
zhengyongxing 23e5632eec 12月功能提交
chenzhi a3e0ecb949 优化结算公式
chenzhi 0f82acf447 优化权限修改
zhengyongxing f804b7af3f 12份功能提交
廖金灵 bdad3f8db9 Merge branch 'release' into feature/add_item
zhengyongxing fb0acddb3f 12份功能提交
chenzhi 753098a85f 优化子站点配置
chenzhi f034698dbc 新增多库
zhengyongxing af5aad352a 备注bug修改
tping 481646222f 后台 手机号规则 实名认证修改
zhengyongxing ec3491943b 12月功能提交
ELF b73b502a67 修改
zhengyongxing 52ff4a2bc6 12月功能提交
zhengyongxing 9bec07c7d4 不结算bug修改
zhengyongxing 747224dae9 12月功能提交
tping e79f18e618 1211 审核列表 甲乙方公司
zhengyongxing 27ffddfe75 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item 
# Conflicts:
#	Data/update.sql
zhengyongxing 8bb8e4379f 12月功能提交
zhengyongxing b8af3ea384 12月功能提交
chenzhi 4f1bebc3af 优化游戏统计说明
zhengyongxing 7e41ad1e18 12月功能提交
zyx 6b0de87280 未结算接口修改
chenzhi 2bc72f9ae2 优化个人补点不修改公式
chenzhi 8d1f77537a 优化订单列表新增列
chenzhi a741e8d37d 订单新增设备类型
chenzhi 0b979d9b68 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/st_mange_20201202
chenzhi 24f3489e65 优化导出新增公式
chenzhi 8d156ffb64 新增结算公式
zhengyongxing 166c1d63d6 12月功能提交
tping 31ce7b071c 1211
ELF 78caa452b2 测试资源添加审核人
ELF 88402dfac0 修改
廖金灵 9483e4b7b3 Merge branch 'feature/add_item' of wmtx/platform into master 
编辑页面调整,及多个编辑错误修正
zhengyongxing 7c5c67a87c 编辑页面调整,及多个编辑错误修正
ELF cf42967f4f Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
ELF b28e00b9f2 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
chenzhi d06cc0ea10 优化去除同公司奖罚
chenzhi 3053461ee5 优化奖罚排序
廖金灵 401ad97cbc Merge branch 'feature/add_item' of wmtx/platform into master 
编辑扣款旧的验证添加
zhengyongxing bb0d37bb53 编辑扣款旧的验证添加
zhengyongxing 10ddadece7 js字符类型修改成数字类型
廖金灵 5b096ad2ff Merge branch 'feature/add_item' of wmtx/platform into master 
11月bug修复
zhengyongxing 923851fea7 11月bug修复
廖金灵 470bcdfebf Merge branch 'feature/add_item' of wmtx/platform into master 
11月bug修复
chenzhi 943d63faac 优化财务汇总
zhengyongxing 564a2ec91d 11月bug修复
郑永星 3f7c20c3ab Merge branch 'feature/add_item' of wmtx/platform into release 
11月bug修复
zhengyongxing 0e67e37436 11月bug修复
郑永星 e179d507e8 Merge branch 'feature/add_item' of wmtx/platform into release 
11月bug修复
zhengyongxing 0572fde5ad 11bug修复
廖金灵 3e27f09e7d Merge branch 'feature/add_item' of wmtx/platform into master 
特殊补点用户名修正
chenzhi a20285a42e 优化是否参与结算导出
zhengyongxing 08dd238ca4 特殊补点用户名修正
chenzhi e7cd32b2a2 优化是否结算参数
廖金灵 bfbac3b30a Merge branch 'feature/add_item' of wmtx/platform into master 
汇总刷新接口提交
zhengyongxing ef13761820 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item_others
zhengyongxing d6b8fa208c 汇总刷新接口提交
chenzhi 2890f3e820 优化订单查看
chenzhi 147cac3a9e 优化公会统计
chenzhi b9b497e255 优化公会结算
chenzhi 9ddfb6f794 现在参与结算筛选
chenzhi 9803de1edb Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/game_change_statement_20201125
chenzhi 2d0bba8de5 优化修改推广游戏操作日志
chenzhi 7e1d2fb879 优化日志
chenzhi 5644570c1e 新增日志
陈志 4da7fa623f Merge branch 'feature/add_item' of wmtx/platform into release 
优化新增仅单参与结算是结算
chenzhi 5e9723b040 优化新增仅单参与结算是结算
chenzhi 74d9d6ed18 优化充值操作
郑永星 9a008d2bfc Merge branch 'feature/add_item' of wmtx/platform into release 
换行字数修正
zhengyongxing b54b37e99c 换行字数修正
郑永星 4262b55a66 Merge branch 'feature/add_item' of wmtx/platform into release 
市场业绩bug修正
zhengyongxing 59ec6c28ca 市场业绩bug修正
陈志 ff23d13c54 Merge branch 'feature/game_select_bug' of wmtx/platform into release
chenzhi 73f8c16379 游戏统计修改bug
郑永星 89909c10fd Merge branch 'feature/add_item' of wmtx/platform into release 
小数点保留
zhengyongxing ed8d1fee0a 小数点保留
郑永星 d090b707dc Merge branch 'feature/add_item' of wmtx/platform into release 
小数点保留两位添加
zhengyongxing b54b2660d4 小数点保留两位添加
郑永星 a866fd6b8d Merge branch 'feature/add_item' of wmtx/platform into release 
保留两位小数判断
zhengyongxing 711992a287 保留两位小数判断
chenzhi eeb1821859 暂存
郑永星 9b36a1c6bc Merge branch 'feature/add_item' of wmtx/platform into release 
保留两位小数
zhengyongxing c829c56956 保留两位小数
郑永星 66902a13ec Merge branch 'feature/add_item' of wmtx/platform into release 
内团去除比例结束时间减1
zhengyongxing 1717c2958b 最大值判断添加
zhengyongxing 4dd097667f 内团去除比例结束时间减1
郑永星 37d1419bb9 Merge branch 'feature/add_item' of wmtx/platform into release 
最大值判断添加
zhengyongxing ff21751d31 最大值判断添加
万盟天下 8482cd9382 Merge branch 'feature/elf_version_1117' of wmtx/platform into release 
修改游戏统计bug
ELF e46cc5b52e 修改bug
tping 43c62c05d7 Merge branch 'release' into feature/zgc_1126 
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
万盟天下 4557b3dc2f Merge branch 'feature/elf_version_1117' of wmtx/platform into release 
修改游戏统计bug
ELF 47fcab323b 修改游戏统计bug
万盟天下 41ab9703a9 Merge branch 'feature/add_item' of wmtx/platform into release 
11月功能提交
万盟天下 82cf73ede5 Merge branch 'feature/elf_version_1117' of wmtx/platform into release 
游戏统计/后台登录时间修改
zhengyongxing b32f5efd91 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_others 
 Conflicts:
	Data/update.sql
chenzhi 9da9941c9f 优化支付数据查看
zhengyongxing 3d1ab70123 11月功能提交
zhengyongxing 5c27c63835 11月功能提交
廖金灵 5c23366b73 Merge branch 'feature/promote_tg_dm' of wmtx/platform into master 
根据推广公司配置推广后台
zhengyongxing 9b87b9c4a1 11月功能提交
zhengyongxing 41e9820d83 11月功能提交
zhengyongxing e138517136 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 710439d8df 11月功能提交
ELF 289783eecd 修改
tping dd786dc27f 1126 批量上下架
tping b722175785 1126 权限
chenzhi 986065ab4b 优化名词
tping 033cd00aee 1126
zhengyongxing c749df4936 11月功能提交
tping d8924dc8be 1126 客服qq
zhengyongxing 36d40bc24e 11月功能提交
zhengyongxing 5add29fa6b 11月功能提交
zhengyongxing 8bce1bd12c Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 2040991894 11月功能提交
ELF ef8334dd18 添加域名前缀限制
chenzhi e7501be7c3 优化审核流程
tping ff4975bacb 1126
zhengyongxing f3a45dfac6 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing a6263b2205 11月功能提交
tping 3471639489 支付通知 补单
tping 103acdd15d 支付通知 小数点后面.00
chenzhi 5bdc0e6f6e 优化汇总方案
tping 0d52dc7d61 1126
chenzhi 55dd67e34d 优化撤回
chenzhi 56681580dd 合并
chenzhi 6d4fce53eb 优化线下打款
chenzhi bd125be3dd 优化汇总审核流程
ELF c339623c78 优化
elf@home dd66846e68 根据推广公司配置推广后台