1559 Commits (30b5e6ed4671023f234457a69dc2e813d24d8f7c)

Author SHA1 Message Date
zhengyongxing 118f706440 脚本去除部分输出 5 years ago
zhengchanglong 15695d5b5d Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Application/Mobile/Controller/SsgController.class.php
5 years ago
chenxiaojun 0e81ba6401 推广平台->数据管理--标题调整 5 years ago
chenxiaojun 7e0cd3c297 推广平台->数据管理--标题调整 5 years ago
chenxiaojun 21070ac3a4 推广平台->财务管理--标题调整 5 years ago
chenxiaojun 0f5da378fc 推广平台->财务管理--标题调整 5 years ago
zhengyongxing 0edc4452e3 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Application/Mobile/Controller/SsgController.class.php
5 years ago
chenzhi 2a417c2746 123 5 years ago
sunke b73472fd9d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
sunke 426d8e4fae bug 5 years ago
ELF 6403bc9859 修改 5 years ago
ELF d2cb9b9a2b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 0b4416f057 修改bug 5 years ago
chenzhi e61a8af93d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 313cd11796 恢复 5 years ago
ELF 9d5b0e235a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 639e7117b8 修改bug 5 years ago
chenzhi 4ecbec2f49 回掉1.0 5 years ago
chenzhi 48be6af89b 回掉0.4 5 years ago
chenzhi f8f5c3b4e0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 222b9d2ec6 回0.3 5 years ago
ELF 2abdcd6147 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF de00fe5e48 修改bug 5 years ago
chenzhi 13700e6123 回调0.2 5 years ago
chenzhi 397eab9c30 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi ca5fe30969 回调0.1 5 years ago
ELF 2254610041 修改bug 5 years ago
chenzhi 4c2931c8d3 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi e986b5de58 123 5 years ago
zhengyongxing 8e8e59c61c 登录sdk,跳转至购买超级签,无需重新登陆 5 years ago
zhengyongxing 4e06af0acf 登录sdk,跳转至购买超级签,无需重新登陆 5 years ago
zhengchanglong 286febdff6 Merge branch 'dev_lww' into dev 5 years ago
zhanglingsheng fb85d32c87 合并分支 5 years ago
chenzhi 0649501b8a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi c211c493ed 1 5 years ago
sunke 275c0a8022 下载提交方式修改 5 years ago
chenzhi 4ebba110d9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 90253ddcf6 优化回调 5 years ago
sunke 0688a046d3 修改bug 5 years ago
chenzhi 995ea3f9a5 验证签名 5 years ago
zhengchanglong 5d9d6542ad Merge branch 'dev_lww' into dev_zcl 5 years ago
chenzhi fd53bdda15 解决回掉 5 years ago
zhanglingsheng a685e7340e 礼包列表过滤超级签 5 years ago
“用lww 8076110f31 手机注册-修改账号密码验证规则 5 years ago
“用lww ba506916d0 复制兑换码提示框修改 5 years ago
chenzhi 8191f5a50f 提示测试 5 years ago
yulingwei a11c07c7a6 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 38680ddb05 更新 5 years ago
zhengyongxing 1626123074 数据统计7日平均时长修正 5 years ago
zhengchanglong f8008a4b5e Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Data/update.sql
5 years ago
zhengyongxing 64c059cccc 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 366f5b9add 推广平台->游戏管理->专服|混服--样式调整 5 years ago
chenxiaojun b4a1a24dda 推广平台->游戏管理->专服|混服--样式调整 5 years ago
yulingwei 24d3e6ab07 修改bug 5 years ago
yulingwei 046beee6be 修改bug 5 years ago
zhengchanglong a4dc55f4e3 Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Data/update.sql
5 years ago
zhengchanglong 65014bb66a Merge branch 'dev_lww' into dev_zcl 5 years ago
zhengchanglong 974a9d93e4 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Data/update.sql
5 years ago
zhengyongxing f4cb9a98c8 数据管理启动机型代码优化 5 years ago
zhengyongxing 2fb1effdcd 后台数据分析应用概况优化 5 years ago
“用lww c1b5569213 手机官网-手机注册与账号注册修改,昵称自动生成 5 years ago
sunke 05bb9b4aa3 推广业绩导出修复 5 years ago
chenxiaojun 232a6f7918 修改冲突 5 years ago
chenxiaojun 5d2f499cfd Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengchanglong aa8e612ead 超级签测试金额修改 5 years ago
ELF 3ebaf13810 修改bug 5 years ago
“用lww ff976bb9eb pc端问题反馈修改 5 years ago
“用lww a13e8a5152 Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
ELF 270e24346d 修改bug 5 years ago
ELF e575e3107c 调试 5 years ago
ELF b69699f5d0 代码还原 5 years ago
ELF 1fd7023c5f 代码优化 5 years ago
ELF c75d1bf3ad Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 9e1c25a2a3 修改bug 5 years ago
sunke 158d8e8fc2 认证图片隐藏 5 years ago
chenzhi 255d830229 优化提示及输入ok 5 years ago
chenzhi 16d1a28f67 优化提示2 5 years ago
chenzhi 8be0cfb188 优化提示 5 years ago
chenzhi 22b0738203 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 7149c94d19 测试 5 years ago
sunke d941477d47 时间检索 资质认证 5 years ago
chenxiaojun de9a8d6eb8 推广平台->数据管理->订单查询|注册明细--更新 5 years ago
chenxiaojun d5d555bde2 推广平台->数据管理->订单查询|注册明细--更新 5 years ago
chenxiaojun 0a075aed45 推广平台->数据管理->订单查询|注册明细--更新 5 years ago
chenzhi 6e522e08cd Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi a6f52ccdb8 优化注册管理员提示信息 5 years ago
chenxiaojun b606ee5765 推广平台->数据管理->订单查询|注册明细--更新 5 years ago
zhanglingsheng a514e5b5dc 支付方式添加快捷 5 years ago
zhanglingsheng e07e1ff2aa 支付方式添加快捷 5 years ago
chenzhi 29d204bf97 修复添加管理员报错 5 years ago
chenzhi 360cf3f3ba 优化前端展示 5 years ago
chenxiaojun d8acd44d08 推广平台->数据管理->数据汇总--更新 5 years ago
chenxiaojun 67af68fc43 推广平台->数据管理->数据汇总--更新 5 years ago
sunke e31ad349ae register get method 5 years ago
chenzhi 04c5f17790 优化脚本 5 years ago
ELF b4afa5d8b2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 065245d657 优化查询 5 years ago
chenxiaojun 71fca054fd 推广平台->数据管理->每日概况|数据汇总--登录统计优化 5 years ago
chenxiaojun 15373077b7 推广平台->数据管理->每日概况|数据汇总--登录统计优化 5 years ago
sunke b64882554a 管理后台增加资质审核检索 5 years ago
chenxiaojun 9f94d3f3ab 推广平台->登录统计--暂时去除区服检索 5 years ago
chenxiaojun 1c79152b5c 推广平台->登录统计--暂时去除区服检索 5 years ago
chenxiaojun 304aca17df 推广平台->登录统计--暂时去除区服检索 5 years ago
chenxiaojun 1cfa474b83 推广平台->登录统计--暂时去除区服检索 5 years ago
chenzhi 37d8f72c6d 优化首页展示 5 years ago
sunke dc35008201 资质认证 5 years ago
sunke fe3dc2f378 充值玩家导出默认时间 5 years ago
sunke 60d1a4ced8 防错 5 years ago
sunke 7d080f9d73 基础信息 5 years ago
sunke 0b8f3450c6 审核后台 5 years ago
zhengchanglong e5c3ee02ae Merge remote-tracking branch 'origin/dev' into dev 5 years ago
zhengchanglong 25b32a6036 官网监护提醒修改 5 years ago
chenzhi e1739209e3 1 5 years ago
“用lww 8120d41204 Merge remote-tracking branch 'origin/dev' into dev_lww
# Conflicts:
#	Application/Common/Conf/seo_media_config.php
#	Application/Mobile/View/Index/introduce.html
#	Application/Mobile/View/User/login.html
#	Application/Mobile/View/User/recharge.html
#	Application/Mobile/View/User/step1.html
#	Application/Mobile/View/User/userset.html
#	Public/Mobile/css/common-cz.css
#	Public/Mobile/js/home.js
5 years ago
chenzhi 521a343fc3 123 5 years ago
“用lww 176aa70c8d 去除vbs代码 5 years ago
chenzhi 39e682e69e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenxiaojun 395cd01d0d 推广平台->数据管理->订单查询|注册明细--优化 5 years ago
chenxiaojun 0ec50eeee1 推广平台->数据管理->订单查询|注册明细--优化 5 years ago
sunke 52a668f546 异步时间 5 years ago
sunke c7804aa905 时间限制 5 years ago
sunke 9dec8e702d 认证信息 5 years ago
sunke d2d211737f bug 5 years ago
sunke eac235d498 身份认证后台 5 years ago
sunke 8df42a80c1 bug 5 years ago
sunke 486be7e3ed bug 5 years ago
ELF afbdec3d5d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF a1c1cb44ae 修改bug 5 years ago
sunke bb1ce4bf14 bug 5 years ago
sunke 303a176f8b bug 5 years ago
ELF adb10b2959 修改bug 5 years ago
ELF 8d56157601 修改bug 5 years ago
ELF f322f98773 修改 5 years ago
ELF 01dfe50442 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 3092dcb237 修改 5 years ago
chenxiaojun bbe32dd3b2 推广平台->数据管理->每日概况|数据汇总--sql优化 5 years ago
chenxiaojun 936424a482 推广平台->数据管理->每日概况|数据汇总--sql优化 5 years ago
chenxiaojun e2b7d7edb0 管理后台->推广员->财务管理->推广提现--结算详情分 5 years ago
chenxiaojun 232760c351 推广平台->数据管理->每日概况|数据汇总--sql优化 5 years ago
zhengchanglong cfe66517d5 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
zhengyongxing 392c42f356 数据管理玩家充值玩家账号加密 5 years ago
zhengchanglong d95fd1b1a7 Merge branch 'dev_zcl' into dev 5 years ago
zhengchanglong 00858df9fb PC官网修改 5 years ago
ELF 0cbc9e5d8a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 7acf0e13bf 修改bug 5 years ago
sunke e9b234df02 下载数据加密 5 years ago
zhanglingsheng d0a0068039 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 94cc0bacbf SDK菜单链接修改 5 years ago
chenxiaojun 9933463c70 管理后台->推广员->财务管理->推广提现--结算详情分页 5 years ago
chenxiaojun f9d26bab7c 管理后台->推广员->财务管理->推广提现--结算详情分页 5 years ago
sunke 787d7573f0 bug 5 years ago
zhanglingsheng 21b02ca200 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng f074ce853b sdk菜单配置修改 5 years ago
yulingwei 82bdfadb7d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 2e0a8d2ad0 更新统计数据 5 years ago
zhanglingsheng 5b3c01e1ba Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 3453de757f sdk菜单配置修改 5 years ago
chenxiaojun 5e3cc42bc1 管理后台->推广员->推广员编辑--二级密码名词解释更改 5 years ago
chenxiaojun cc572ca66e 管理后台->推广员->推广员编辑--二级密码名词解释更改 5 years ago
ELF 14e36e31bb Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 1dbd96c15b 修改bug 5 years ago
zhengyongxing d386337922 管理中心重要的信息加密 5 years ago
chenxiaojun 3d2b5c48f3 推广平台->数据管理->订单查询--更新 5 years ago
chenxiaojun 88afeea8a0 推广平台->数据管理->订单查询--更新 5 years ago
ELF 2ae21b162f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 3d9d85d008 修改bug 5 years ago
chenxiaojun 31f564c8e4 推广平台->安全管理->用户基本信息--权限设置 5 years ago
chenxiaojun de4b80588f 推广平台->安全管理->用户基本信息--权限设置 5 years ago
chenxiaojun 7972eaa5da 推广平台->安全管理->用户基本信息--权限设置 5 years ago
chenxiaojun 76d8a88ea3 推广平台->管理中心--更新 5 years ago
chenxiaojun b84134c68d 推广平台->管理中心--更新 5 years ago
ELF 57b552f4f3 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF f7c7f9acc6 修改bug 5 years ago
zhengyongxing 49cb4c86eb Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
 Conflicts:
	Application/Home/View/default/Finance/withdrawRecord.html
5 years ago
zhengyongxing 97b9a06e69 推广后台bug修正 5 years ago
ELF 5602892a8f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF bc92414aab 修改bug 5 years ago
chenxiaojun 576efcb3eb 推广平台->财务管理--更新 5 years ago
chenxiaojun 662eb93763 推广平台->财务管理--更新 5 years ago
chenxiaojun 30421feb34 推广平台->财务管理->提现记录--样式调整 5 years ago
chenxiaojun 39378b1926 推广平台->财务管理->提现记录--样式调整 5 years ago
chenxiaojun f7d0109ee7 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
chenxiaojun 5caf75afb9 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
chenxiaojun 8ac33bb9e4 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
chenxiaojun fd53997094 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
zhengchanglong 0b8dfcdc89 管理后台时时实时注册查询修改 5 years ago
chenxiaojun e96bd42ef6 管理后台->游戏--去除CP分成比例同步 5 years ago
chenxiaojun 25b319f87c 管理后台->游戏--去除CP分成比例同步 5 years ago
zhengyongxing 0b15e9edd5 推广后台管理中心修正 5 years ago
chenxiaojun 6ad8277aa0 管理后台--更新 5 years ago
chenxiaojun 2e7ecfa53c 管理后台--更新 5 years ago
zhengyongxing 0b93ee2db9 推广后台订单查询隐藏操作 5 years ago
zhengyongxing 1a29dddd0d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing 110d88d76f 推广后台角色查询玩家账号加密 5 years ago
sunke ee8a954566 查看消费记录滚动 5 years ago
zhengyongxing 1528d0488b 推广后台首页当月新增金额修正 5 years ago
zhengyongxing 77da9cf429 推广后台bug修正 5 years ago
yulingwei a7f6d8b7a4 upt 5 years ago
elf@home 06486d458c 修改bug 5 years ago
elf@home 1036589f3b 修改代码 5 years ago
chenxiaojun c68716bbae 推广平台->数据管理->每日概况|数据汇总--区服检索更新 5 years ago
chenxiaojun cd1f93e394 推广平台->数据管理->每日概况|数据汇总--区服检索更新 5 years ago
ELF 2c24a9740b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 3af8fe116d 修改bu 5 years ago
zhengchanglong e7985f366b 管理中心菜单权限开放 5 years ago
zhengchanglong 531494029f 管理中心菜单权限开放 5 years ago
zhengchanglong ab46f9f6ec Merge branch 'feature/promote' into dev 5 years ago
chenxiaojun 83cbc45374 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
chenxiaojun a84ea0e679 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
chenxiaojun 1bf12d3a6d 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
chenxiaojun 55fe6a2c7d 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
chenxiaojun 98c69ac360 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
chenxiaojun 638ceba6cc 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
zhengyongxing 21579a3e07 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing aa5eadaa02 扶持号管理更名为测试号管理 5 years ago
chenxiaojun 33f5cf9ac3 管理后台->游戏订单->游戏充值--更新 5 years ago
chenxiaojun 9075730d83 管理后台->游戏订单->游戏充值--更新 5 years ago
chenxiaojun 37aab8f279 管理后台->游戏订单->游戏充值--列表样式调整 5 years ago
chenxiaojun f473c0abc1 管理后台->游戏订单->游戏充值--列表样式调整 5 years ago
zhengyongxing e5d425cd47 订单查询订单信息隐藏,扶持号管理更名为测试号管理 5 years ago
sunke 04e53e2329 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
sunke 165718170a 平台币按钮权限 5 years ago
chenxiaojun 3250d05a01 管理后台->游戏订单->游戏充值--sql优化 5 years ago
chenxiaojun 3fbdc9daa0 管理后台->游戏订单->游戏充值--sql优化 5 years ago
zhengyongxing 29e71cc4fa 文章详情返回按钮回到主页 5 years ago
zhengyongxing 37eda1113d 推广页面图标修改 5 years ago
zhengyongxing 176efd1a88 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing c88e759e3b 推广后台bug修复 5 years ago
sunke d55c4220a1 查询 5 years ago
chenxiaojun 83e8427c8b cs 5 years ago
ELF 6920cecd99 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 634ade3ecd 修改bug 5 years ago
sunke 8951a502c2 修改bug 5 years ago
sunke 94bede9a41 平台币修改 5 years ago
sunke c3caed08b3 bug 5 years ago
yulingwei c6779497c2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei d90186b301 付款订单有效性问题 5 years ago
sunke cf1449f09a 安全下载中心 5 years ago
zhengyongxing 9ff153c1da 测试git 5 years ago
ELF 1c11622eb2 修改bug 5 years ago
ELF 3b681670df 上传 5 years ago
ELF b0b0056c43 修改bug 5 years ago
ELF e942f378c6 修改bug 5 years ago
ELF 6cdee448c0 修改bug 5 years ago
ELF 73cd26c1a4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 1bffd62357 修改bug 5 years ago
sunke 055b5df6e7 增加条件 5 years ago
ELF 90d5d53994 解决冲突 5 years ago
ELF b0b3d3f80d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 9d19a2ce6b 修改冲突 5 years ago