578 Commits (df03c056513855d5463859d53ba5d31105bfbece)

Author SHA1 Message Date
ELF 9abb4ebb2c 修改 5 years ago
jbrazz 9300280f78 merge feture/ylw 5 years ago
ELF e0d542b5f6 解决冲突 5 years ago
ELF f056143dee 修改bug 5 years ago
chenxiaojun 02d862cb7a 推广后台->安全密码--样式调整 5 years ago
ELF 1e1eb99b85 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 387e019db7 删除无用代码 5 years ago
chenxiaojun 3f7fd8c3c7 推广后台->结算明细|分成比例--样式调整 5 years ago
ELF 38c2efdd08 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 08774a0954 完善添加推广员 5 years ago
chenxiaojun 0cd7206f24 推广后台->数据管理->每日概况--bug修复 5 years ago
chenxiaojun 9b65745ee5 推广后台->验证安全密码--更新 5 years ago
chenxiaojun 265aa20a60 推广后台->验证安全密码--更新 5 years ago
chenxiaojun b731b827e1 推广后台->验证安全密码--更新 5 years ago
chenxiaojun 43eaaf67c6 推广后台->验证安全密码--更新 5 years ago
chenxiaojun f5d6bd27ab 推广后台->验证安全密码--更新 5 years ago
chenxiaojun 03cbc66d92 推广后台->验证安全密码--更新 5 years ago
chenxiaojun 1561e71977 推广后台->验证安全密码--更新 5 years ago
chenxiaojun 8ae754f74a 推广后台->财务管理->结算明细--更新 5 years ago
ELF 71feea26fb 修改bug 5 years ago
ELF 89b243930d 落地页下载页优化 5 years ago
chenxiaojun a32565e2e1 推广后台->数据管理->数据汇总|每日概况--更新 5 years ago
chenxiaojun 7220247ecd 推广后台->数据管理->数据汇总|每日概况--更新 5 years ago
chenxiaojun 43603cf493 推广后台->数据管理->数据汇总--更新 5 years ago
chenxiaojun 3e2d027910 推广后台->财务管理->结算明细--更新 5 years ago
chenxiaojun fba89ccb48 推广后台->财务管理->结算明细--更新 5 years ago
chenxiaojun 1d6ce31515 推广后台->财务管理->结算明细--更新 5 years ago
chenxiaojun 30aff2bd38 推广后台->财务管理->新增->结算明细 5 years ago
ELF dbf113d9d4 修改bug 5 years ago
ELF 6c6b3b54aa Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 7547e867bb 三级变四级修改 5 years ago
ELF fc89281a48 3级变4级修改 5 years ago
sunke 372ec046d0 安全中心 5 years ago
zyx 3d8ed52daf 推广后台首页条件修改 5 years ago
ELF ae44fc79bd 修改 5 years ago
chenzhi 2a7d4a435c Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi 18be299b4c 同步dev 5 years ago
jbrazz 48b1cdf66f upt 5 years ago
jbrazz a8125bf377 upt 5 years ago
zyx 71b2287647 测试资源日志管理修改 5 years ago
chenxiaojun b6a62e2df1 推广后台->数据管理->每日概况 -- 更新 5 years ago
chenxiaojun 81ed43afdd 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
zyx b6080180ab 测试资源bug修正 5 years ago
elf@home fc1cef9ec1 修改落地页/下载页 5 years ago
ELF b4168a23f1 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi 498de9ab75 同步dev 5 years ago
chenzhi ab2252375d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi c8fb1bb207 修改 5 years ago
chenxiaojun 681c401686 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
chenxiaojun 42d330bbc4 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
chenxiaojun b1b10645fc 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
ELF 689cc08b69 修改 5 years ago
sunke 8633efd7d6 增加部门长分级 5 years ago
chenxiaojun 381a2e0a67 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
chenxiaojun bf7c353692 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
ELF 00966dc9e4 修改 5 years ago
ELF 22dcca566b 修改 5 years ago
chenxiaojun a14b18f54f 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
zhengchanglong e69bc5f459 Merge branch 'dev_zyx' into dev 5 years ago
sunke 9844d5a740 订单查询 5 years ago
sunke f15c6e68eb 注册明细,订单查询 修改等级结构 5 years ago
chenxiaojun 750a6dc596 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
chenxiaojun fffbdb739b 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
ELF 6d68ddfe07 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 3abbe94774 修改bug 5 years ago
jbrazz 459b722c1c upt 5 years ago
chenxiaojun 9c1eeb2448 推广后台->游戏管理->专服管理|混服管理 -- 更新 5 years ago
ELF 5b62b99765 三级变四级 5 years ago
chenxiaojun 9169a2084b 推广后台->数据管理->每日概况|数据汇总->合计更新 5 years ago
zyx 224c745ba8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenzhi a3d0c81d4b 修改 5 years ago
chenzhi f5ac904a49 优化扶持 5 years ago
zyx d7c9744872 扶持号时间格式修改 5 years ago
zyx 5c435bad74 公用文件添加排序 5 years ago
zyx ecc93af47c 测试资源排序添加 5 years ago
chenxiaojun 032e5de877 推广平台->注册明细->bug修复 5 years ago
chenxiaojun 8b2e384fb6 推广平台->注册明细->bug修复 5 years ago
zyx 7e37560efe 公告计数负数问题改正 5 years ago
zyx 56deca114f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx 2f2158dbe0 详情页公告提示修正 5 years ago
chenxiaojun 1ec9c156cf 推广平台->数据汇总|每日概况->bug修复 5 years ago
chenxiaojun 27665e5b14 推广平台->数据汇总|每日概况->bug修复 5 years ago
zyx b0411e3704 详情页公告提示修正 5 years ago
zyx 0ffbc8aff9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx 048e37fdd7 详情页公告提示修正 5 years ago
chenxiaojun 37188cb085 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整 5 years ago
chenxiaojun 36b9b51817 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整 5 years ago
zyx 95731bba09 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx 387f729773 首页公告提示修正 5 years ago
ELF 390974a557 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 4917458099 Merge branch 'hotfix/query' into dev 5 years ago
ELF c6a52282d5 修改bug 5 years ago
zyx 5637b496e9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx 36de2e17c5 扶持号js逻辑修正 5 years ago
zhengchanglong 954928b7f2 推广员首页优化 5 years ago
zyx 31039bdeab Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx 0d35370ade 扶持号管理推广员搜索改成下拉选项框,扶持号管理搜索异常修正,去除将text_resource的排序规则改回一般排序 5 years ago
zhengchanglong af68a2ef10 推官员首页优化 5 years ago
chenxiaojun 9ba9710670 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整 5 years ago
chenxiaojun af06ea8364 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整 5 years ago
chenxiaojun 155df3336d 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整 5 years ago
chenxiaojun c3c2f91c30 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整 5 years ago
chenxiaojun 3226b01dfb 推广平台->数据汇总|每日概况->列表名词解释调整 5 years ago
chenxiaojun cf5e6c849b 推广平台->数据汇总|每日概况->列表名词解释调整 5 years ago
zyx 4a23e1dd8a 日志管理bug修复 5 years ago
zyx a16c77181c 优化首页计算代码 5 years ago
zyx c461190682 首页用户注册充值信息修正,昨日注册用户 5 years ago
zyx 219596843b 首页用户注册充值信息修正,昨日注册用户 5 years ago
zyx c6da6fb705 首页用户注册充值信息修正 5 years ago
chenxiaojun f46a76649c 推广平台->84推广员开权限 5 years ago
chenxiaojun 74f88da239 推广平台->84推广员开权限 5 years ago
ELF eb09c67dd4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 5ff559cf11 修改bug 5 years ago
chenxiaojun df3c2d823c 推广员后台->2推广员开权限 5 years ago
chenxiaojun cd29b17e03 推广员后台->2推广员开权限 5 years ago
chenxiaojun e92790a89f 推广员后台->订单查询|注册明细->玩家账号检索修改为完整查询|玩家账号列表添加玩家ID显示 5 years ago
chenxiaojun d56bebdaa6 推广员后台->订单查询|注册明细->玩家账号检索修改为完整查询|玩家账号列表添加玩家ID显示 5 years ago
zyx 0112a0151c 首页用户注册充值信息修正 5 years ago
jbrazz c1ab4e789c Merge branch 'featrue/fix_bug' into dev 5 years ago
jbrazz 9bc5127223 upt 5 years ago
chenxiaojun 641dcd5b65 推广员后台->每日概况->游戏检索bug 5 years ago
chenxiaojun db424fde84 推广员后台->每日概况->游戏检索bug 5 years ago
ELF b7964e19d0 修改bug 5 years ago
ELF 4d0359aaba 修改bug 5 years ago
ELF cd90807d58 Merge branch 'hotfix/promote' into dev 5 years ago
ELF b29d62a4ac Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenxiaojun 5bb7e9850f 推广员后台->区服排序 5 years ago
chenxiaojun c3d4c112d6 推广员后台->区服排序 5 years ago
ELF b8f93f74c6 隐藏推广员系统目录 5 years ago
ELF 157676f268 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 260e45f4d9 Merge branch 'hotfix/query' into dev 5 years ago
ELF 2816054361 修改bug 5 years ago
zyx bb3109f5d3 测试账号冻结状态需要的字段修改 5 years ago
zyx 5ffc0bf9b0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx 560e13af03 更改文章详情的后退按钮的样式 5 years ago
chenxiaojun bb23bb2a03 推广员后台->检索bug修复 5 years ago
chenxiaojun a5873caf8d 推广员后台->检索bug修复 5 years ago
chenxiaojun 1ba358fabb 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type 5 years ago
chenxiaojun c322f6ec7e 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type 5 years ago
zyx 3c1b1673f2 测试资源申请页面检索数据修正,检索都统一改为模糊查询,文章详情页隐藏首页,添加返回按钮 5 years ago
ELF 608d24b732 开放测试帐号 5 years ago
ELF c888915daa Merge branch 'hotfix/query' into dev 5 years ago
ELF ece317d6fa 修改bug 5 years ago
zyx 91b773d974 开服信息,平台显示修正 5 years ago
zyx 9eb36bd81f 组长账号显示测试资源 5 years ago
zyx ccf7bfc65a 首页开服信息图标大小修改 5 years ago
zyx 595112e6b5 快捷菜单关闭回调事件添加 5 years ago
chenxiaojun 7d8f7b53e6 ios13.1绑定提示修改 下级推广员查询bug修复 5 years ago
chenxiaojun cff2dc911a 获取下级推广员bug修改 5 years ago
zyx 2c2446d38b 将首页开服信息icon改成80*80 5 years ago
zyx 66ced8930e 首页bug解决 5 years ago
ELF 24b1441632 修改超级签链接 5 years ago
zyx 5ef6cda158 首页开服信息区分平台bug修正 5 years ago
zyx ae1986b4a8 已读日志为零时不显示 5 years ago
zyx dd3e56d27c Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx 72036e51e3 首页时间问题修正,快捷菜单10个限制添加 5 years ago
ELF 2638929031 通过帐号隐藏目录 5 years ago
elf@home f7aaa9030e 修改bug 5 years ago
elf@home 4c5473a27f 修改bug 5 years ago
chenxiaojun b4653fa0b8 检索修改 5 years ago
chenxiaojun 9fb953ea60 检索修改 5 years ago
chenxiaojun ae9d502150 订单查询修改 5 years ago
chenxiaojun 82e2c3faab 订单查询修改 5 years ago
chenxiaojun a7f2695665 无检索条件默认包括本账号 5 years ago
chenxiaojun e3d0e885f2 无检索条件默认包括本账号 5 years ago
zhengchanglong a6398b488f Merge branch 'dev_zcl' into dev
# Conflicts:
#	Data/update.sql
5 years ago
ELF db956a2d77 修改bug 5 years ago
ELF cc9aa1a640 解决冲突 5 years ago
zyx bd572379b0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx 5c5d879710 资源日志bug修复 5 years ago
ELF 84174b18e9 修改bug 5 years ago
chenzhi d8095f3397 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
zyx f64225cff0 测试功能移交到总管理后台,扶持号管理bug修正 5 years ago
ELF 91866f4433 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF d9e7a55af4 修改bug 5 years ago
chenxiaojun 80e2a7e0fa 订单查询、注册明细->组长与推广员组合检索bug修复 5 years ago
chenxiaojun 57c9c7419a 订单查询、注册明细->组长与推广员组合检索bug修复 5 years ago
sunke 94e7594f40 删除id 5 years ago
chenxiaojun d93a68144f 订单查询->组长、推广员检索框位置更改 5 years ago
chenxiaojun 6947802527 订单查询->组长、推广员检索框位置更改 5 years ago
chenxiaojun 837d168f2d 每日概况、数据汇总、订单查询、注册明细 组长检索bug修复 5 years ago
chenxiaojun 307146cd3c 每日概况、数据汇总、订单查询、注册明细 组长检索bug修复 5 years ago
chenxiaojun 203e2df7c8 数据管理->订单查询->支付方式检索bug修复 5 years ago
chenxiaojun a01c8f04b8 数据管理->订单查询->支付方式检索bug修复 5 years ago
zhengchanglong 308903d396 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Application/Sdk/Controller/Ipa365Controller.class.php
5 years ago
chenxiaojun 580d52bf3c 新增->游戏管理->分成比例|设置 5 years ago
chenxiaojun c8f7014fb2 新增->游戏管理->分成比例|设置 5 years ago
chenxiaojun 414f3121fb 每页条数bug修复 5 years ago
chenxiaojun f91c0f0965 每页条数bug修复 5 years ago
zhengchanglong bb0a399ef7 推广员平台币支付 支付宝支付账户信息重配置文件读取 5 years ago
ELF b2f357608f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF c715996821 修改bug 5 years ago
sunke 2e18b8cc05 资料详情落地页增加layui样式 5 years ago
chenxiaojun a9cb458ada 订单查询支付方式修改 5 years ago
chenxiaojun 4e7904c3de 订单查询支付方式修改 5 years ago
zyx 607e32e43a 首页功能提示样式修改 5 years ago
chenxiaojun 0e87fc7267 订单查询支付方式修改 5 years ago
chenxiaojun 446085a154 订单查询支付方式修改 5 years ago
chenxiaojun 7456c891a8 区服ID更新 5 years ago
zyx e4be69d796 Merge branch 'dev' of 47.111.118.107:/srv/git/platform 5 years ago
zyx 3ed9092e07 首页功能隐藏 5 years ago
chenxiaojun 439c8f1ba9 更新 5 years ago
chenxiaojun 0355472a1c 区服ID 5 years ago
chenxiaojun b426a6e153 订单查询 注册明细 5 years ago
chenxiaojun 5e75ed2480 订单查询 注册明细 5 years ago
zyx eab8135549 首页添加日志及未读提醒功能 5 years ago
ELF 5dd9df5cd5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 8bea436dee 修改 5 years ago
chenxiaojun 66b86e074e 数据汇总 每日概况 5 years ago
chenxiaojun 52d9da8f1d 数据汇总 每日概况 5 years ago
ELF 580a531bc4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 24cbe37faa 修改bugt 5 years ago
chenxiaojun 329c9d1514 数据汇总 每日概况 5 years ago
chenxiaojun 3fc4438754 数据汇总 每日概况 5 years ago
chenxiaojun 9ef95cdabf 数据汇总 每日概况 5 years ago
chenxiaojun a5bd8c25c4 数据汇总 每日概况 5 years ago
ELF 4c4d3255d7 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 8ce7442062 修改bug 5 years ago
chenxiaojun c678968253 数据汇总 5 years ago
chenxiaojun e53268815c 数据汇总 5 years ago
chenxiaojun 9de8e33ba9 数据汇总 5 years ago
chenxiaojun 809778b449 数据汇总更新 5 years ago
ELF e610500db6 修改时间插件默认值显示bug 5 years ago
ELF 06bfdbca93 解决冲突 5 years ago
elf@home cda67249ac 修改 5 years ago
ELF d3412cc3ce 测试 5 years ago
zyx 700ac00fbc 测试资源title标签补全 5 years ago
zhengchanglong c8192c384d 无用菜单隐藏 5 years ago
sunke ae666881ed 修改专区防错 5 years ago
sunke c4bd54b6d5 资料专区菜单 5 years ago
chenxiaojun 007f2ec003 批量添加下级游戏bug修复 5 years ago
chenxiaojun 7f7d054dfc 批量添加下级游戏bug修复 5 years ago
chenxiaojun ddd7b9805f 批量添加下级游戏bug修复 5 years ago
chenxiaojun 98392b21b8 批量添加下级游戏bug修复 5 years ago
chenxiaojun 2fcca7fcaa 落地页 5 years ago
chenxiaojun 7c360e40f6 落地页测试 5 years ago
chenxiaojun 93cf48ef8e 落地页测试 5 years ago
chenxiaojun 1e014fe0b0 落地页 5 years ago
zyx 98a0ea3631 后台菜单修改提交 5 years ago
zyx 1aec352b50 防护日志功能添加,扶持号功能修改 5 years ago
“‘ 70a4ba3244 修复密码bug 5 years ago
“‘ b9bd9655b7 测试资源记录及发放 5 years ago
ELF ab4dc74784 修改 5 years ago
ELF 1a2ffac6be Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 7c19d63e17 Merge branch 'hotfix/promote-menu' into dev 5 years ago
ELF 4bb79166d8 Merge branch 'master' of 47.111.118.107:/srv/git/platform 5 years ago
ELF 85cabc0031 显示推广系统游戏菜单 5 years ago
“‘ c28cef6ee4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 0dc0063092 修改arpu 5 years ago
“‘ efccda637b 测试资源测试 5 years ago