2949 Commits (484972e9f280fc5c8b21660043047b24f5a51c4a)
 

Author SHA1 Message Date
zhengchanglong 484972e9f2 Merge branch 'release-1.0.0' into dev 5 years ago
zhengchanglong 01c79143b1 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
zhengchanglong 42542ff640 非管理员数据加密显示 5 years ago
chenzhi f6cfceda96 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
chenzhi 8bd7ae4fdb 优化框架层级问题 5 years ago
liuweiwen eb6c65522d 修改提示 5 years ago
liuweiwen 1ba7f6130a Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen cc1e3ccbb3 推广员账号已存在判断 5 years ago
zhengyongxing b8859837fb 登录数据权限数据 5 years ago
chenzhi 88dfc33dbf Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
chenzhi 95f055b532 修改下拉框层级太大问题 5 years ago
liuweiwen 2b4c9b6f44 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen dfa5316ef1 推广员状态默认为待审核 5 years ago
chenzhi 624e321b70 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
chenzhi 96e52b267a 修复没总览依旧显示问题 5 years ago
liuweiwen 2096c22826 注释 5 years ago
liuweiwen ec4c820057 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen 86dd4a2952 【用户】-【玩家组】-【登录记录】-选择会长只显示这个会长的登录记录
改为展示这个会长及其所属推广员的登录记录
5 years ago
zhengchanglong 1ca183b547 非管理员数据加密显示 5 years ago
zhengchanglong 4d06b52b9d Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
zhengchanglong c6b8f99b6e 非管理员数据加密显示 5 years ago
chenzhi b3e09ad5db 放行ajax,首页无权限判断 5 years ago
zhengchanglong 9a2a7df2e6 非管理员数据加密显示 5 years ago
zhengchanglong cc6d095a1c 非管理员数据加密显示 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
liuweiwen e32491c108 bug修复,解决点击搜索框后下拉显示异常 5 years ago
tping 64543b10da -- user_play 增加create_time 5 years ago
ELF b36e1f1bc9 解决冲突 5 years ago
ELF c8bef581f5 Merge branch 'hotfix/task-65' into release-1.0.0 5 years ago
ELF c90851996c 修改bug 5 years ago
chenxiaojun 5da02389ac 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun 81306967d2 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun 206c2ed251 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenxiaojun 1f19360d72 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun 81fb39c004 管理后台>推广员管理>公会分成管理--更新 5 years ago
liuweiwen 73aebd513c 落地页测试 5 years ago
liuweiwen dabdbb6c98 落地页测试 5 years ago
liuweiwen 8f99c7354a 落地页测试 5 years ago
liuweiwen d7bd8326bd 落地页测试 5 years ago
liuweiwen b608f8587b 落地页测试 5 years ago
liuweiwen 3b23c0c5cf 后台管理-》统计-》推广员统计,增加判断是否有官方渠道权限 5 years ago
liuweiwen 5bebb747f7 落地页样式调整测试 5 years ago
liuweiwen 656c1a9bbb 落地页样式调整测试 5 years ago
sunke 7e68257724 充值玩家 5 years ago
sunke 5b7a0ad8b2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
liuweiwen 1c047c80a6 落地页样式调整测试 5 years ago
sunke 1699c155e8 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 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
liuweiwen 50bea19cd2 落地页样式调整测试 5 years ago