83 Commits (fc567339dbcbce6a61dff3330d7835ad721d4a22)

Author SHA1 Message Date
zhengyongxing 53ba2c7698 2.7号功能提交 4 years ago
chenzhi 8323fafd30 优化只读账号 4 years ago
chenzhi 343ecc8587 优化登陆 4 years ago
陈志 ff23d13c54 Merge branch 'feature/game_select_bug' of wmtx/platform into release 4 years ago
tping 103acdd15d 支付通知 小数点后面.00 4 years ago
ELF 773068b57c 优化代码 4 years ago
ELF dd7068e3ae 改用redis存储session 4 years ago
ELF 6a50654045 游戏统计/后台登录时间修改 4 years ago
廖金灵 79af51d27b Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
测试资源发放
4 years ago
ELF c0fe59864c 修改 4 years ago
廖金灵 0665e8265a Merge branch 'hotfix/market_percentage' of wmtx/platform into master
市场结算管理bug修正
4 years ago
zhengyongxing 22961561d4 充值订单充值状态增加 4 years ago
ELF 95672ffc90 修改bug 4 years ago
ELF e34d28e2c8 修改 4 years ago
ELF 81a706e809 修改session过期时间 4 years ago
chenzhi 213b152398 优化打款权限 5 years ago
chenzhi 309300299d 新增显示全部 5 years ago
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
5 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
tping c0fce78ec3 抵扣通知 5 years ago
廖金灵 9222d99127 Merge branch 'feature/change_company_belong' of wmtx/platform into release
推广员内外团归属优化
5 years ago
chenzhi 55d49e8b4b 优化推广公会列表导出 5 years ago
廖金灵 09b04c502e Merge branch 'fix/member_user_info' of wmtx/platform into release
优化游戏统计弹框时间错误问题
5 years ago
chenzhi a5b73d82f5 回滚测试 5 years ago
zhengyongxing 6f749fb99d Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_opertion_log
 Conflicts:
	Application/Admin/Controller/FinancePromoteController.class.php
	Application/Common/Common/extend.php
5 years ago
sunke e94c64a881 平台币统计 5 years ago
chenzhi 76cd530239 优化获取子渠道基函数 5 years ago
chenzhi 71530c53e3 优化公会统计内充详情不符问题 5 years ago
zhengyongxing 61c2519ccd 单独判断admin 5 years ago
zhengyongxing b87dec3aee 管理员权限从用户改成以组的形式 5 years ago
ELF 423b4ae77b 解决冲突 5 years ago
liaojinling 843a429b43 下载添加部门/小组 5 years ago
chenxiaojun 10665cc869 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
chenxiaojun 66a238dfd4 结算管理--更新 5 years ago
ELF 5c0a38c02a Merge branch 'feature/site_sms' into release 5 years ago
chenxiaojun 258e10c9d1 结算管理--更新 5 years ago
ELF e4daff1be8 修改短信接口 5 years ago
ELF 0f44d9e95c 解决冲突 5 years ago
ELF f472f5e9d3 文件保存改成cdn 5 years ago
chenxiaojun c074b5fb86 结算管理--更新 5 years ago
chenxiaojun e884214546 会长提现|公会分成管理--更新 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
chenxiaojun 116d1891a1 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun 75faf37260 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun e9f9a421f5 管理后台>推广员管理>公会分成管理--更新 5 years ago
liuweiwen a9959e9544 解决推广员列表搜索底下推广员时自动过滤掉锁定的 5 years ago
chenxiaojun 410a3cda1b 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenzhi ff6c70e380 合并cz 5 years ago
zhanglingsheng 50dbc200e5 时间转换函数全部精确到秒 5 years ago
chenzhi df50ce6352 补链csv导出 5 years ago