63 Commits (c6b3d1948e8adb8834841d423f236e96eb67cbfe)

Author SHA1 Message Date
yulingwei 9a380d7756 upt 5 years ago
yulingwei 7b9bb91e16 upt 5 years ago
yulingwei 64bb801be2 1 5 years ago
yulingwei 6390d680ec upt 5 years ago
yulingwei 96327507f4 upt 5 years ago
yulingwei 52b478f570 upt 5 years ago
yulingwei 7fc6609d78 upt 5 years ago
yulingwei aa77fb7821 upt 5 years ago
yulingwei b9dfe08177 upt 5 years ago
yulingwei 1119e8faf9 upt 5 years ago
yulingwei 80597c4894 upt 5 years ago
yulingwei 0b54c71cb0 upt 5 years ago
zhengyongxing dbad9a08db Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_statistics
 Conflicts:
	Application/Admin/Common/function.php
	Application/Admin/Controller/TimingController.class.php
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 9aed64f46d 推广员充值汇总优化,补单功能添加 5 years ago
廖金灵 a4d86b4fdd Merge branch 'feature/promote_statistics' of wmtx/platform into master
推广员充值统计添加默认时间
5 years ago
zhengyongxing 711f98ef86 推广员充值统计添加默认时间 5 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
chenzhi c93a8577c4 合并 5 years ago
zhengyongxing 001e9e70f8 管理后台导出权限添加 5 years ago
chenzhi 52c78bb835 优化统计-统计-推广员统计 5 years ago
zhengyongxing a6a29bf63a 统计日志添加 5 years ago
chenzhi cc653c2d2d 优化tp1.id错误 5 years ago
chenzhi ff67974413 修复获取推广员统计bug 5 years ago
chenzhi a37d0d6ec4 优化推广员充值统计排序问题 5 years ago
chenzhi 43774e9099 推广员充值统计新增官方渠道统计 5 years ago
chenzhi 14fa967f00 优化推广员统计数据 5 years ago
chenzhi 715a1a8a2c 优化推广统计区服问题 5 years ago
chenzhi f580b44289 优化推广员统计区服选择 5 years ago
zhengyongxing ea80b8fd44 游戏充值统计检索条件修正 5 years ago
zhengyongxing 2f25386518 游戏充值统计检索条件修正 5 years ago
zhengyongxing b96e65b8fe 游戏充值统计检索条件修正 5 years ago
chenzhi c590b948ef 优化推广员充值统计导出 5 years ago
chenzhi fd23b640ea 优化推广员充值优化代码 5 years ago
chenzhi 85b821081f 优化推广员充值统计今日本周本月不变 5 years ago
chenzhi a61e0f36b5 优化注册统计今日本周本月不变 5 years ago
liuweiwen e40b92a0d7 优化-【统计】-【平台统计】-【游戏注册】、【游戏充值统计】、【注册方式统计】和【充值方式统计】的今日充值、本周充值、本月充值不根据时间筛选改变 5 years ago
zhengyongxing c1e16ed8d4 推广员充值统计汇总为当前页面的总额,改为所有数据的总和 5 years ago
liuweiwen 9ac0277f82 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen cfd032b1fa 推广员统计 5 years ago
chenzhi c0a0f44287 优化推广员注册统计->区服选择不相应bug 5 years ago
zhengchanglong dba78c08cd 非管理员数据导出隐藏 5 years ago
zhengyongxing 5417e1751d 平台统计修改 5 years ago
zhengyongxing 32e362ab80 平台统计修改 5 years ago
zhengyongxing 6255d05472 平台统计修改 5 years ago
liuweiwen 3b23c0c5cf 后台管理-》统计-》推广员统计,增加判断是否有官方渠道权限 5 years ago
liuweiwen 126d1ca9bc 管理后台-》统计-》推广员统计,增加判断当前管理员是否有官方渠道权限 5 years ago
liuweiwen 0b2eb4a45b 管理后台-》推广员统计-》推广员注册统计列表数据权限与导出权限
管理后台-》推广员统计-》推广员充值统计列表数据权限与导出权限
5 years ago
liuweiwen 47f53a4941 管理后台-》平台统计-》游戏注册统计列表数据权限与导出权限
管理后台-》平台统计-》游戏充值统计列表数据权限与导出权限
管理后台-》平台统计-》注册方式统计列表数据权限与导出权限
管理后台-》平台统计-》充值方式统计列表数据权限与导出权限
5 years ago
zhengyongxing deaeed6027 数据授权修改内容提交 5 years ago