2462 Commits (f132189ea456a479c77cfe85d6bdabdbf3592023)

Author SHA1 Message Date
sunke b47eced096 日志分页 5 years ago
liuweiwen 1686c7c3c0 Merge branch 'release-1.0.0' into dev 5 years ago
liuweiwen 587da83973 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
zhanglingsheng 43d49b10a0 Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0 5 years ago
zhanglingsheng 5d01cb1ff5 游戏充值预下单 5 years ago
liuweiwen c6ffac041f 官网充值页面弹窗提示修改:alert改为popmsg.msg 5 years ago
zhanglingsheng 50dbc200e5 时间转换函数全部精确到秒 5 years ago
sunke 0cb7a40ea9 行为日志角色id 5 years ago
zhanglingsheng 6d2c4fc3a2 游戏充值预下单 5 years ago
zhengyongxing 7ec754e0eb Merge branches 'dev' and 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng a5cc0f339f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 62502f0732 游戏充值预下单 5 years ago
zhengyongxing e6c45bc494 推广补链导出修改 5 years ago
sunke 92523d7429 充值状态 5 years ago
sunke 4c1471f6bb 行为日志 5 years ago
zhengyongxing 6fbf14c9fe Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0 5 years ago
zhengchanglong ba4339977e Merge branch 'dev' into release-1.0.0 5 years ago
zhengyongxing 24dab9158b 管理后台bug修改 5 years ago
liuweiwen f5316aee55 Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
5 years ago
zhanglingsheng 812532a52d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 3a20c68117 游戏充值预下单修改 5 years ago
liuweiwen dabfc64dc9 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen 146b9e518a 解决落地页视频不置顶无视频显示视频框,滚动层被游戏截图挡住 5 years ago
chenzhi db6131a135 暂存 5 years ago
chenxiaojun 01ef816ee1 推广平台>数据管理>订单查询--更新 5 years ago
zhengyongxing 46538019d4 管理后台新开发功能修改 5 years ago
zhengchanglong 6fa8392766 Merge branch 'master_zcl' into release-1.0.0 5 years ago
zhengchanglong ec0fb0d0b4 Merge branch 'master_zcl' into dev 5 years ago
zhengchanglong 65b5fc4a26 隐藏游戏充值列表部分字段 5 years ago
chenxiaojun 69fd83a2f0 推广平台>数据管理>充值玩家--更新 5 years ago
liuweiwen e30f2f9601 Merge branch 'dev' into dev_lww
# Conflicts:
#	Application/Admin/Controller/FileController.class.php
#	Application/Admin/Controller/GameController.class.php
#	Application/Admin/View/Game/edit.html
#	Application/Home/Controller/HomeController.class.php
#	Application/Home/View/default/Home/landingPage.html
#	Public/Home/css/index2.css
5 years ago
chenxiaojun f05034486c 推广平台>数据管理>充值玩家 5 years ago
sunke 660397bf4f 双乾支付 5 years ago
sunke 2cef293427 Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0 5 years ago
sunke 2c17a4c24f 双乾支付 5 years ago
zhengchanglong 4e8abd5975 Merge branch 'master_zcl' into release-1.0.0
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
5 years ago
zhengchanglong 996b9bceac Merge branch 'master_zcl' into dev
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
5 years ago
chenxiaojun be9619e25a 推广平台>落地页--更新 5 years ago
zhengchanglong d265c9b03f 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
chenxiaojun 25ea7569cd 推广平台>落地页--更新 5 years ago
zhengchanglong 381fa8d633 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong ed584bfb2f 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong a55efe582b 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
chenxiaojun aa67148398 推广平台>落地页--更新 5 years ago
chenxiaojun a93d11d871 推广平台>落地页--更新 5 years ago
chenxiaojun 44e912d9dc 推广平台>落地页--更新 5 years ago
chenxiaojun 50e0d22a8f 推广平台>落地页--更新 5 years ago
chenxiaojun 3719548d78 推广平台>落地页--更新 5 years ago
chenxiaojun 5a4d26a6e5 推广平台>落地页--更新 5 years ago
chenxiaojun 9d3a818fab 推广平台>落地页--更新 5 years ago
chenxiaojun aebd5bd396 推广平台>落地页--更新 5 years ago
zhengchanglong c32c1780e6 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
chenxiaojun 3f2433fa4a 推广平台>落地页--更新 5 years ago
chenxiaojun d4d3d3fe5d 推广平台>落地页--更新 5 years ago
chenzhi ab29dafffc 补链旧数据脚本 5 years ago
sunke cbca0b0d51 行为日志检索修复 5 years ago
chenxiaojun f9b6f0a793 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun e9c804413f 推广平台>数据管理>充值玩家--更新 5 years ago
chenzhi 9df450f8cc 优化订单日期内多个推广员无法补链 5 years ago
zhengyongxing b2d1c27054 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Data/update.sql
5 years ago
zhengyongxing 8b2d04f986 管理后台新开发功能修改 5 years ago
sunke 54f288133e 下载修改 5 years ago
zhengyongxing e2e685e8c3 管理后台新开发功能修改 5 years ago
ELF 0a7054c4f9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 32a73f0386 Merge branch 'hotfix/close-shift-player' into dev 5 years ago
ELF ad7c276fdf 测试 5 years ago
chenzhi 60c7bdce34 新增补链时判断是否已结算 5 years ago
chenxiaojun 131c670731 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun 756e0a342e 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun cb253e1ee9 推广平台>落地页更新 5 years ago
chenxiaojun 946c99ff61 推广平台>落地页更新 5 years ago
chenxiaojun 8b1ff62ca5 推广平台>落地页更新 5 years ago
chenxiaojun 9475a54dec 推广平台>落地页更新 5 years ago
liuweiwen 08e2cc6eaf pc官网样式调整 5 years ago
sunke d426395607 充值玩家下载增加游戏累计登陆天数 5 years ago
ELF 050ecd3bc4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 254022ed6d Merge branch 'hotfix/mend_amount' into dev 5 years ago
ELF bb2996dbee 迁移忽略结算 5 years ago
chenxiaojun 9d09913bd0 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun 64eb3ce4cb 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun b27906d470 推广平台>数据管理>充值玩家--更新 5 years ago
chenzhi 1ccbd03a0f 超级签新增支付方式 5 years ago
sunke 49408030f0 行为日志 5 years ago
liuweiwen b992d5a744 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 98f7653f2a pc官网-》家长监护-》更换家长监护引导内容 5 years ago
zhanglingsheng cf7440e87e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng ad97083c9f 行为日志文案 5 years ago
zhengyongxing f225cff461 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Data/update.sql
5 years ago
chenxiaojun a389f9a245 推广平台>落地页>安卓添加视频 5 years ago
chenxiaojun ff2481cdc4 推广平台>落地页>安卓添加视频 5 years ago
chenzhi 08a97a2f9f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
ELF 991861e488 解决冲突 5 years ago
ELF 289b40329f 添加换绑时金额 5 years ago
chenzhi 0c62e80e67 优化总览表格高度 5 years ago
zhengyongxing f112364f63 超级签功能bug修改 5 years ago
chenzhi 6188102e04 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi 1bf6adb6c7 优化用户列表默认时间 5 years ago
zhengyongxing 11177b895c Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
liuweiwen f8df1d57dd Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	Data/update.sql
5 years ago
liuweiwen 188abdcbdd 落地页视频置顶判断 5 years ago
zhengyongxing 7b12780d9c 管理后台新开发功能修改 5 years ago
zhengyongxing 976a697b24 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenxiaojun 3b5a915bda 推广平台>数据管理>订单查询--更新 5 years ago
chenzhi 1010fe2674 推广补链新增查询条件 5 years ago
chenzhi 3d672db381 推广补链新增一系列查询条件 5 years ago
ELF c61a3e200a 解决冲突 5 years ago
ELF c451921b92 后台添加IOS打包方式选择 5 years ago
liuweiwen cdeea23034 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 14644b44a2 落地页图片改为使用游戏截图 5 years ago
zhanglingsheng f8498638ad 游戏充值行为日志 5 years ago
zhanglingsheng f392ad4de0 游戏充值行为日志 5 years ago
zhanglingsheng ac0132575f Merge branch 'hotfix/log' into dev 5 years ago
chenzhi 1649cd1e80 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi df50ce6352 补链csv导出 5 years ago
liuweiwen c31ae44f79 落地页去掉App购买 5 years ago
chenxiaojun 4047208871 推广平台>数据管理>订单查询--更新 5 years ago
ELF 92accdc727 修改 5 years ago
chenzhi 5359e67860 优化补链记录为ajax 5 years ago
ELF a2de4bed7b 切换IOS新旧打包方式 5 years ago
liuweiwen aff492b470 超级签新增需求-》后台增加超级签级签状态,手机端验证状态是否可下载与显示 5 years ago
liuweiwen 04bd089bd9 上传视频格式提示 5 years ago
liuweiwen e6dcd25bc4 解绑手机 5 years ago
ELF 1409846ac3 切换IOS新旧打包 5 years ago
chenzhi f8cbe8d9ef 分开推广补链和补链记录 5 years ago
liuweiwen 9892d72910 落地页样式调整 5 years ago
liuweiwen 52b134fe90 落地页样式调整 5 years ago
liuweiwen ce85de6f5c 落地页新增需求-增加app购买浮层 5 years ago
zhengyongxing fd187aa04f 白名单修改 5 years ago
chenzhi 68f4ffc559 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi 70aab2f137 角色查询新增创角时间区间查询 5 years ago
chenzhi 6ad8154832 优化vip等级筛选时的玩家列表 5 years ago
liuweiwen 7995273b9f Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen fcbde62500 落地页游戏关闭下载判断 5 years ago
zhengyongxing fa393d9c90 管理后台新增功能添加 5 years ago
sunke 5ee4ce6552 修改下载日志 5 years ago
liuweiwen 5697e8d2c6 落地页前端修改 5 years ago
liuweiwen 53a4038622 落地页前端修改 5 years ago
liuweiwen dfa14fbbc7 落地页视频前端修改 5 years ago
liuweiwen 563b672c21 加提示 5 years ago
liuweiwen 14258a01a9 前端判断上传视频的大小与格式 5 years ago
liuweiwen a1bdc4b936 提示 5 years ago
chenzhi 95aa18a928 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
liuweiwen b0748243b9 编辑游戏-》上传视频 5 years ago
sunke 7bcbb6c9d1 订单查询充值状态增加 5 years ago
liuweiwen fb5d9afded 落地页视频上传和显示 5 years ago
liuweiwen e3fe1cc03f 后台管理-》编辑游戏-》上传视频
手机端落地页显示视频
5 years ago
chenzhi 768c03c78d 优化总览导出为前端导出 5 years ago
chenxiaojun 45f061d81c 推广平台>数据管理>订单查询--更新 5 years ago
liuweiwen 522ba58a4d 推广公司 5 years ago
liuweiwen 59b1e3149e 管理后台-推广公司搜索 5 years ago
liuweiwen ecdfd078fc Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
elf@home 9c3b872cb9 修改打包模式 5 years ago
ELF 1a8be9429c 修改打包方式 5 years ago
chenzhi 48fac5ab4d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi c2fb23f9a2 优化用户列表结束 5 years ago
chenzhi d948dee3df 用户列表优化3 5 years ago
liuweiwen f9eedf339b 文字修改 5 years ago
liuweiwen 3c6ca71bb6 解绑手机 5 years ago
liuweiwen 1a9b90d5cc 解绑手机 5 years ago
liuweiwen aadfb0af62 充值页面问号 5 years ago
chenzhi 20ff424e52 优化用户列表4 5 years ago
chenzhi 03a03fd61e 优化用户列表3 5 years ago
chenzhi d4968e4c72 优化推广员 5 years ago
liuweiwen 8380f6d33b 官网超级签不可点击 5 years ago
liuweiwen ceb5502af3 官网超级签不可点击 5 years ago
yulingwei 84fc4e367b 更新 5 years ago
zhengyongxing 4df0f91f43 管理后台上传图片修改 5 years ago
zhengyongxing a074b4a319 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing dce35b6ff1 管理后台游戏编辑上传图片限制大小 5 years ago
liuweiwen a7c5957201 推广公司管理 5 years ago
liuweiwen fd7481a940 风控管理样式调整 5 years ago
liuweiwen 93d46b74ae 样式调整 5 years ago
chenzhi 3f358bb818 优化用户列表2 5 years ago
liuweiwen 0c3225a9bc 【家长监护】页面导航改为介绍详细说明 5 years ago
liuweiwen 02f6ce3bb0 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 6b13ab0c66 招商合作改为商务合作 5 years ago
liuweiwen 1693f7fa98 推广公司 5 years ago
zhengyongxing f009243399 官网登录跳转修正 5 years ago
chenzhi 4aa9ac6767 用户表优化1 5 years ago
liuweiwen d51725f1af 新增推广员时,新增推广所属公司 5 years ago
liuweiwen ea4b25065e Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
liuweiwen 473ad69fa3 补充用户协议 5 years ago
liuweiwen e6e382fa2a 手机官网商务合作文字修改 5 years ago
liuweiwen 3caf155a43 Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
zhengyongxing 767359f3e7 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing cfdea5db7c 管理后台导出数据一部分修改 5 years ago
liuweiwen d2df0e6631 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen d630645398 官网增加国浩律师链接 5 years ago
zhengyongxing 30b3794ef4 管理后台导出数据bug修正 5 years ago
zhengyongxing ee32adb459 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing 4f385a87c6 管理后台导出数据修改 5 years ago
zhengchanglong ef523bf653 落地页下载安装提示图片顺序修改 5 years ago
zhengchanglong 6bf056fb60 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
zhengchanglong e54b7ba88d 超级签购买测试 5 years ago
liuweiwen 836b2013d5 官网首页 5 years ago
liuweiwen 3383a6864a Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen ef5073e9cb 去掉单位 5 years ago
zhengyongxing d6184531d8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing fbead8c3a1 推广补链导出修改 5 years ago
liuweiwen fb39008cb5 Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
chenzhi d48b0f1341 优化统计 5 years ago
zhengchanglong 628b90b72c 超级签购买测试 5 years ago
zhengyongxing 65fd27fe36 导出修改 5 years ago
zhengyongxing 79198191a7 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing 2fb77092cf 管理后台导出数据一部分修改 5 years ago
chenzhi a8753d0932 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 3abfc47677 优化推广后台显示的开服公告 5 years ago
zhengchanglong 8a96875e27 超级签购买测试 5 years ago
liuweiwen 4f63c08bc0 手机官网隐藏昵称 5 years ago
liuweiwen fd5c9fba0f Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 56b6153d26 解绑手机 5 years ago
chenzhi c4eca18b4e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 25313a0fb1 实名认证样式修改 5 years ago
liuweiwen 070d9dd9b7 解绑手机 5 years ago
liuweiwen c64aab6d39 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 65af73145a 绑定手机页面修改,修改密码页面修改 5 years ago
chenxiaojun a128fff331 推广平台->首页--更新 5 years ago
chenxiaojun e8a4da70cc 推广平台->首页--更新 5 years ago
chenxiaojun 097240f5ec 推广平台->首页--更新 5 years ago
chenxiaojun e9bfaef26b 推广平台->首页--更新 5 years ago
chenzhi 84d55a687f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 25cb177aea 新增游戏区服开服预告 5 years ago
liuweiwen 6f2ef23c7b 忘记密码 5 years ago
liuweiwen ea430f0b35 我的游戏去掉立即进入 5 years ago
ELF 1c83185aaf 修改打包方式 5 years ago
liuweiwen 914c9a5cf8 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 1f23955af1 手机官网-忘记密码改为新页面,两个页面何为一个页面 5 years ago
ELF ebbe43d918 Merge branch 'master' of 47.111.118.107:/srv/git/platform 5 years ago
ELF 69708490ba Merge branch 'hotfix/download' 5 years ago
chenzhi dbc77d07e7 优化聚合排序 5 years ago
sunke 34b53c4ec1 数据汇总合计 5 years ago
sunke b82803c1e5 合计 5 years ago
liuweiwen 220a458e11 落地页 5 years ago
liuweiwen 7dc73e7210 落地页 5 years ago
liuweiwen 8551160563 落地页 5 years ago
liuweiwen a162511034 落地页 5 years ago
liuweiwen fdce7a9a08 落地页 5 years ago
liuweiwen f61d739764 落地页 5 years ago
liuweiwen b736b00f57 落地页 5 years ago
liuweiwen a4da5aa6c2 落地页 5 years ago
liuweiwen c528c66540 落地页 5 years ago
liuweiwen b157adb6e4 落地页 5 years ago
liuweiwen c877f4d7cd 落地页 5 years ago
liuweiwen 24747f1ba0 落地页 5 years ago
liuweiwen 8c3278975e 落地页 5 years ago
liuweiwen 3cd616d64c 落地页 5 years ago
liuweiwen e860ee083c 落地页 5 years ago
liuweiwen afd5ecb036 落地页 5 years ago
liuweiwen 66e4244e45 落地页 5 years ago
liuweiwen 9a0354a287 落地页 5 years ago