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

2073 Commits (e008e1404603944a7a7b8658d32f448978a3c299)

Author SHA1 Message Date
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 汇总统计修改
tping 0aef9e3019 公会信息
chenzhi b7cc3ccd77 优化权限
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错误修正
廖金灵 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
张谷成 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
陈志 9d30d48fac Merge pull request 'feature/st_mange_20201202' () from feature/st_mange_20201202 into release 
优化公式
chenzhi 0f82acf447 优化权限修改
chenzhi f034698dbc 新增多库
zhengyongxing af5aad352a 备注bug修改
tping 481646222f 后台 手机号规则 实名认证修改
ELF b73b502a67 修改
zhengyongxing 9bec07c7d4 不结算bug修改
tping e79f18e618 1211 审核列表 甲乙方公司
chenzhi 4f1bebc3af 优化游戏统计说明
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 8d156ffb64 新增结算公式
tping 31ce7b071c 1211
ELF 88402dfac0 修改
廖金灵 9483e4b7b3 Merge branch 'feature/add_item' of wmtx/platform into master 
编辑页面调整,及多个编辑错误修正
zhengyongxing 7c5c67a87c 编辑页面调整,及多个编辑错误修正
ELF b28e00b9f2 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
chenzhi d06cc0ea10 优化去除同公司奖罚
廖金灵 401ad97cbc Merge branch 'feature/add_item' of wmtx/platform into master 
编辑扣款旧的验证添加
zhengyongxing bb0d37bb53 编辑扣款旧的验证添加
zhengyongxing 10ddadece7 js字符类型修改成数字类型
廖金灵 470bcdfebf Merge branch 'feature/add_item' of wmtx/platform into master 
11月bug修复
chenzhi 943d63faac 优化财务汇总
zhengyongxing 0572fde5ad 11bug修复
chenzhi 2890f3e820 优化订单查看
chenzhi 147cac3a9e 优化公会统计
chenzhi b9b497e255 优化公会结算
chenzhi 9803de1edb Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/game_change_statement_20201125
chenzhi 74d9d6ed18 优化充值操作
陈志 ff23d13c54 Merge branch 'feature/game_select_bug' of wmtx/platform into release
万盟天下 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 优化支付数据查看
廖金灵 5c23366b73 Merge branch 'feature/promote_tg_dm' of wmtx/platform into master 
根据推广公司配置推广后台
zhengyongxing 9b87b9c4a1 11月功能提交
zhengyongxing 41e9820d83 11月功能提交
tping dd786dc27f 1126 批量上下架
tping b722175785 1126 权限
tping 033cd00aee 1126
zhengyongxing c749df4936 11月功能提交
tping d8924dc8be 1126 客服qq
zhengyongxing 5add29fa6b 11月功能提交
zhengyongxing 2040991894 11月功能提交
ELF ef8334dd18 添加域名前缀限制
zhengyongxing f3a45dfac6 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing a6263b2205 11月功能提交
tping 103acdd15d 支付通知 小数点后面.00
tping 0d52dc7d61 1126
chenzhi 56681580dd 合并
chenzhi 6d4fce53eb 优化线下打款
chenzhi bd125be3dd 优化汇总审核流程
ELF c339623c78 优化
elf@home dd66846e68 根据推广公司配置推广后台
zhengyongxing 1626640066 11月功能提交
zhengyongxing 4eff2f0aaa 11月功能提交
tping 025d90f5fa 1126
chenzhi ad1d4e65a5 优化游戏汇总
chenzhi bea27fd5de 优化游戏汇总
tping c75d73c9f7 1126
ELF 6a50654045 游戏统计/后台登录时间修改
chenzhi 7f9bb248dd 优化推广员统计
chenzhi 1f694ef47b 优化推广员充值
chenzhi a6f9d82245 优化推广员累计注册
chenzhi 7a876e01ab 优化新增推广员汇总
zhengyongxing f49cd75e86 11月功能提交
zhengyongxing 6811eb806c Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/add_item 
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
	Application/Admin/Controller/CompanyStatementSetController.class.php
	Data/update.sql
zhengyongxing 3656c555d1 11月功能提交
ELF 89332c0d54 解决冲突
ELF c550846454 修改
zhengyongxing 4526b5b741 11月功能提交
ELF d0b2e5f459 优化
ELF 07f7bca3ee 修改
ELF 47ca2f2b9e 修改
chenzhi cdd1cd7d7f 优化页面页数
ELF dd71ccdf83 修改
廖金灵 648cde1eff Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release 
推广员信息显示通过权限控制
ELF 53f3ad6864 优化
廖金灵 38dc6c0c56 Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release 
市场专员信息显示通过权限控制
ELF dfdc31f4dc 市场专员信息显示通过权限控制
zhengyongxing 6021f91604 公会订单添加所属商户
zhengyongxing 3f04fa1507 公会统计商户名称修改
zhengyongxing 58ff5ad1ed 公会统计--订单详情 新增所属商户展示
zhengyongxing 0155111706 特殊比例申请比例限制提交
张谷诚 b642f671c7 Merge branch 'hotfix/orderquery' of wmtx/platform into release
tping e6ae117fd7 1,隐藏删除按钮（后台->推广->游戏分包） 
2,推广后台增加下单时间查询
zhengyongxing bb5547fb6f Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_other 
 Conflicts:
	Data/update.sql
zhengyongxing 80b148d6c5 外团推广功能提交
zhengyongxing 859f5b58c9 汇总功能还原修正
zhengyongxing f450df3265 汇总功能修正
zhengyongxing 54a0fde480 汇总公司与上游回退
zhengyongxing 27c95792ff 外团推广功能提交
zhengyongxing def69bf6aa 外团推广功能修正提交
zhengyongxing 823e241f2e 外团推广功能bug修正
zhengyongxing 5c497b94dc 分成比例导出修正
zhengyongxing 2dbb4a7940 市场部提示语修改
zhengyongxing c1b556b0b1 市场业绩排序修改
zhengyongxing 6ac5c1d524 比例逻辑修改
zhengyongxing 0c69c8f662 汇总结算结算时间位置修改
zhengyongxing 40664b5f8d 市场业绩功能修改，将不结算毛利以日来统计
zhengyongxing ba6323203a 模板比例bug修改提交
zhengyongxing 2848f0ce90 外团推广游戏功能高亮显示
zhengyongxing 2914f9964c 汇总编辑结算金额总计添加
zhengyongxing f0cbe3cafb 周结算金额bug修改
zhengyongxing 86769746ef 外团可申请游戏bug修改
zhengyongxing e30cd2fea7 外团推广功能提交
zhengyongxing 5c57abc794 历史流水比例修正
zhengyongxing f8a7d53ac8 外团推广功能提交
zhengyongxing a00834e4e5 外团推广功能不结算提交
zhengyongxing 9c49d8bedc 外团推广功能提交
ELF 47ff398bf4 修改
ELF ffad0d78c5 修改
ELF 62d2eaef72 去除商户规则配置删除功能
zhengyongxing 9bf3c89659 特殊比例与模板比例添加流水类型
万盟天下 f7bd731ead Merge branch 'feature/testing_resource_admin' of wmtx/platform into master 
测试资源功能提交
zhengyongxing 68ba764d72 Merge branch 'hotfix/modify_special_piont' into feature/add_item
zhengyongxing 6b47baf59a 汇总编辑前端修改
ELF ae3e49b95f 修改
ELF f77505925f 修改
ELF f3771dfd2d 修改
ELF a10bb888da 修改bug
zhengyongxing 4f35cacbab 汇总模板修改提交
ELF 18c3e95f30 修改
ELF 8e4ba0e20e 修改
ELF c5fe80639f 修改
ELF 06bd640c79 修改
ELF 263e35c097 初步提交
廖金灵 662efdb613 Merge branch 'feature/add_item' of wmtx/platform into master 
聚合结算单导出bug修正
zhengyongxing 3f90e1d9ee 汇总审批重算状态修正