elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,228 Commits
1 Branch
0 Tags
173 MiB
master
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '61d12c2750'
${ noResults }
Commit Graph

153 Commits (61d12c2750fc2cb395fb9690eb7883e2a4fbc32b)

Author SHA1 Message Date
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
zhengchanglong cb5cef678d Merge branch 'hotfix/test_order' into release 5 years ago
zhengyongxing 56ecea6998 下游个人结算单生成代码上传 5 years ago
zhengchanglong 254d29f3f2 测试订单录入 5 years ago
liuweiwen dfd198e9b7 对账系统增加奖罚数据 5 years ago
zhengyongxing 77463c7e1d 市场结算管理上游流水符号修正 5 years ago
liuweiwen 51d2d91671 验证手机号码格式修改 5 years ago
chenzhi 39c43c1bee 优化游戏分成比例获取函数备注 5 years ago
zyx 414d36c373 cp分成比例方法修正 5 years ago
zyx 782de31ca8 cp分成比例方法添加 5 years ago
zyx f58f05d00d cp分成比例方法修正 5 years ago
zyx 4be5b1ba2c cp分成比例方法添加 5 years ago
chenxiaojun 10665cc869 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
chenxiaojun 258e10c9d1 结算管理--更新 5 years ago
liuweiwen 6f7dcb9ca5 修改上下游对账单导出文件名 5 years ago
zhengyongxing c09c3a591e 结算单bug修正 5 years ago
zhengyongxing 7f99dafb2c 市场结算管理 上游结算流水bug修正 5 years ago
liuweiwen 1e4b7f69d5 cp/工会对账系统 5 years ago
liuweiwen 21ee77609c cp/工会对账系统 5 years ago
liuweiwen 394a3e4bb5 cp/工会对账系统 5 years ago
zhengyongxing ea140a430f 导出模板方法上传 5 years ago
zhengyongxing ba158e6b9a 市场结算管理上传 5 years ago
liuweiwen 50320be1d2 新增需求：管理后台-》推广公会归属管理，列表，新增，编辑，审批 5 years ago
zhengyongxing 89883d2005 新增市场结算管理 5 years ago
zhengyongxing 13f5128dd8 支付渠道统计导出bug修正,游戏充值充值方式检索修正 5 years ago
chenzhi 82afa60d12 优化玩家列表导出2 5 years ago
chenzhi d3ccc3bb5b 暂存 5 years ago
chenzhi 9b7f3d1104 优化csv导出默认为不转码 5 years ago
chenzhi 9d89be4527 优化公司游戏名游戏类型关系检索 5 years ago
chenzhi cf89e73281 优化csv导出函数 5 years ago
zhengchanglong ab5f7267e5 Merge branch 'release-1.0.0' into dev 5 years ago
chenzhi 629c733742 删除函数重复问题 5 years ago
chenzhi 0ef4241570 合并statistcs 5 years ago
liuweiwen 2e818c04f8 登录记录搜索 5 years ago
zhengchanglong 484972e9f2 Merge branch 'release-1.0.0' into dev 5 years ago
zhengyongxing b8859837fb 登录数据权限数据 5 years ago
liuweiwen 2096c22826 注释 5 years ago
liuweiwen 86dd4a2952 【用户】-【玩家组】-【登录记录】-选择会长只显示这个会长的登录记录 
改为展示这个会长及其所属推广员的登录记录
 5 years ago
zhengchanglong 4968ace29d Merge branch 'release-1.0.0' into dev 
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Home/Controller/DownloadController.class.php
 5 years ago
zhengchanglong dbaf93b630 非管理员数据加密显示 5 years ago
chenzhi c5dc3b4f22 优化会长统计导出1 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
chenzhi b743cd73e1 新增导出csv函数 5 years ago
zhengyongxing d465be8969 数据权限提交 5 years ago
liuweiwen fe5ae6a499 搜索的推广员数据权限 5 years ago
chenxiaojun 5034cb863b 管理后台>推广员管理>公会分成管理--更新 5 years ago
zhengyongxing ce0e9f943d 数据权限bug修正 5 years ago
chenxiaojun aa5e404188 管理后台>推广员管理>公会分成管理--更新 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
zhengchanglong 7c7ec4fc1d Merge branch 'dev_permission' into release-1.0.0 
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/BehaviorLogController.class.php
#	Application/Admin/Controller/ExportController.class.php
 5 years ago
liuweiwen 62f5098df7 处理数据权限筛选时，不覆盖原有的搜索字段promote_id 5 years ago
chenxiaojun cf8f6d007f Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev_cxj 5 years ago
zhanglingsheng 3b444155d8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 09ba38fc79 超级签统计 5 years ago
chenxiaojun f2fc739db2 管理后台>推广员管理>公会分成管理--新增 5 years ago
chenxiaojun bd8c4331bd 管理后台>推广员管理>公会分成管理--新增 5 years ago
chenzhi ff04347526 公会统计1 5 years ago
zhanglingsheng 6ddf42181c 游戏查询联动 5 years ago
zhengyongxing 6dc8366018 数据授权修改内容提交 5 years ago
zhengchanglong 732ba257ec 修改身份证加密显示方式 5 years ago
zhengchanglong 8a241cceb8 修改身份证加密显示方式 5 years ago
liuweiwen de7d34576d 添加数据权限 
推广员-推广员管理-推广补链
推广员-数据管理
推广员-结算管理
 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
chenzhi ff6c70e380 合并cz 5 years ago
liuweiwen 42881595aa 获取当前管理员有权限查看所有推广员id 5 years ago
zhengchanglong 6851933966 新建分支 5 years ago
chenzhi db6131a135 暂存 5 years ago
zhengchanglong d265c9b03f 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
chenzhi af593e4326 优化首页折线统计统计方式 5 years ago
yulingwei 2ab47c0864 充值方式修改 5 years ago
yulingwei be33c5c471 更新 5 years ago
chenzhi b52113622d [bug]无法获取上线推广员问题 5 years ago
yulingwei 24d3e6ab07 修改bug 5 years ago
yulingwei 046beee6be 修改bug 5 years ago
zhanglingsheng a514e5b5dc 支付方式添加快捷 5 years ago
zhanglingsheng e07e1ff2aa 支付方式添加快捷 5 years ago
chenxiaojun 2e7ecfa53c 管理后台--更新 5 years ago
yulingwei 6ea4c72416 修改部分导出报表问题 5 years ago
jbrazz 5deb0c2b05 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
jbrazz 8a513767dd upt 5 years ago
chenxiaojun 6307625efc 管理后台->推广员->结算管理->推广提现->--更新 5 years ago
jbrazz 0dcb2a2014 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
jbrazz c9996e071c fix grand_id 5 years ago
ELF 831456b333 解决冲突 5 years ago
jbrazz 9300280f78 merge feture/ylw 5 years ago
jbrazz 5e9cfb023f uypt 5 years ago
jbrazz 48b1cdf66f upt 5 years ago
jbrazz a8125bf377 upt 5 years ago
jbrazz 48de85a3c3 upt 5 years ago
zyx 515ffa25b9 月结统计bug修正 5 years ago
zyx ee5dccfaeb 财务管理功能代码完善 5 years ago
zhengchanglong 5c8573df37 修改月份列表 5 years ago
zyx c65aa8d69a 财务管理bug修正，导出功能，合作方列表添加 5 years ago
zyx 224c745ba8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
zyx 112316c395 财务管理功能添加 5 years ago