1257 Commits (3ebaf138101daae0614542cf21b5a2396b20cdc4)

Author SHA1 Message Date
zhengchanglong 16d54e6add Merge branch 'feature/promote' into dev 5 years ago
zyx 938c4e9eda Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
zyx 8f0ae7dd8b 充值界面模板嵌套 5 years ago
sunke 5bba1e5df4 游戏推广协议 5 years ago
chenzhi 9764d361f1 123 5 years ago
chenzhi fbf8a76ec9 123 5 years ago
ELF 17a7045036 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 9e83202467 修改bug 5 years ago
chenzhi 40001277bc login 5 years ago
chenxiaojun ee97f42261 推广平台->数据管理->数据汇总--检索更新 5 years ago
chenxiaojun e2fa14c1c8 推广平台->数据管理->数据汇总->合计--更新 5 years ago
sunke 97a973079a charge 5 years ago
chenzhi 0cd21feb28 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi 44e2623efe 123 5 years ago
chenzhi 451ea9588e base 5 years ago
chenzhi 4b7d9202b7 123 5 years ago
ELF 175e38f712 修改bug 5 years ago
zyx a0e27f9e7a 覆盖vbs脚本 5 years ago
chenzhi b52eee941b 优化 5 years ago
chenzhi 3098558fe0 lww代码合并 5 years ago
chenxiaojun 3d9865f507 推广平台->财务管理->结算明细--检索调整 5 years ago
ELF 5bfecf5fc6 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF e2d75ec2c6 修改推广后台首页 5 years ago
ELF 16d458155a 修改打包日志 5 years ago
ELF ed82ea4103 添加打包日志记录 5 years ago
ELF f90a6a09fb Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF f2765313fd 优化打包 5 years ago
chenxiaojun 98f43acc96 推广平台->数据管理--检索样式调整 5 years ago
chenxiaojun 486090ca0a 推广平台->财务管理--时间检索提示调整|数据管理->订单查询|注册明细--检索样式调整 5 years ago
chenxiaojun 4ac069e28a 推广平台->财务管理->结算明细--检索调整 5 years ago
yulingwei 5a2e6c2b63 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 6ea4c72416 修改部分导出报表问题 5 years ago
zhengchanglong acb062ed3e Merge branch 'feature/promote' into dev 5 years ago
ELF 8968223dd2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 6c636a92f5 修改 5 years ago
zyx 102013e527 部长数据统计修正 5 years ago
sunke 3a109a6444 bug修改 5 years ago
sunke 21782ff951 实时刷新可下载状态 5 years ago
ELF be6357eeac Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenxiaojun 00188569fe 推广平台->财务管理->结算中心->提现--bug修复 5 years ago
ELF e56256ba1d 修改bug 5 years ago
ELF c4d35c26d4 修改bug 5 years ago
chenxiaojun 669e641c1e 推广平台->财务管理->(结算中心|结算明细--检索日期范围调整)(提现记录->结算单--侧边栏高亮修复) 5 years ago
ELF 905efbfd9a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 9fde84f6ca Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF e4291c48b0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 85e466c3fd 修改bug 5 years ago
jbrazz c8f072f983 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
jbrazz 2a6d9b7571 推广员名称 5 years ago
ELF 3fe3ae5dcd 修改bug 5 years ago
chenxiaojun 9d3dfd622b 推广平台->退出登录--更新 5 years ago
ELF d112a3c7ff Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF e58b20b576 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF e27c5a5266 修改bug 5 years ago
jbrazz 5deb0c2b05 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
jbrazz 8a513767dd upt 5 years ago
chenxiaojun 467b193037 推广平台->退出登录--更新 5 years ago
sunke e75907ed07 隐藏用户信息 5 years ago
sunke 9e2bb1e809 安全管理admin后台 5 years ago
ELF d7b4ec366f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenxiaojun 773ffb5160 管理后台->游戏编辑--更新推广充值CPS比例时同步未提现订单的分成比例
推广平台->数据管理->每日概况|数据汇总--检索日期间隔调整为31天
推广平台->财务管理->结算中心->提现--权限更新
5 years ago
sunke f8c4f2c0b6 更改下载权限 5 years ago
ELF b2df7e0fe3 修改bug 5 years ago
ELF fbce375679 修改bug 5 years ago
ELF d9419ae64e Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 3d46a55811 修改bug 5 years ago
chenxiaojun 6307625efc 管理后台->推广员->结算管理->推广提现->--更新 5 years ago
ELF efd2ed361f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF c88892ec59 修改 5 years ago
sunke 2e37b23f2b 权限控制 5 years ago
ELF 84b36e2d78 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 784de48bf9 修改bug 5 years ago
jbrazz 8be3ee9560 upt 5 years ago
jbrazz 31948423e0 upt 5 years ago
jbrazz 20c168a537 三级改四级配置 5 years ago
zhengchanglong d2f547eb9c Merge branch 'feature/promote' into dev 5 years ago
zhengchanglong f1f7666e1e Merge branch 'dev_lww' into feature/promote 5 years ago
zhengchanglong 37bdcc60c8 Merge remote-tracking branch 'origin/feature/promote' into feature/promote 5 years ago
sunke 3b0a6a5479 promote 5 years ago
“用lww c20f08f9b3 pc端官网修改 5 years ago
sunke 7d474f09cd 推广员 5 years ago
sunke f592cd0b24 listsIndex.html 5 years ago
ELF fc028dd272 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF c2c8f11d01 修改 5 years ago
sunke c918864264 safeCSS 5 years ago
zhengchanglong 20d8be8807 Merge branch 'dev_lww' into feature/promote 5 years ago
sunke b94f7b50c2 ajax-get 5 years ago
sunke d2b1a474fb ajax-get 5 years ago
sunke 52dafe9ed3 remit 5 years ago
sunke 4fff44e0f8 汇款证明下载 5 years ago
chenxiaojun c8281d2bb2 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新 5 years ago
chenxiaojun 5afd0ffd63 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新 5 years ago
“用lww 7962cc62b4 pc端官网修改 5 years ago
sunke 908e552b81 base 5 years ago
sunke 129aa74f2e safe 5 years ago
sunke f39bff03c2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
sunke 246f1324f7 loginsafe 5 years ago
ELF 2b2d9d04de Merge branch 'feature/promote' into dev 5 years ago
ELF ae66feb819 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
sunke 856446087f safe 5 years ago
ELF 47e2706e26 修改bug 5 years ago
sunke d9c9271e17 del safe 5 years ago
“用lww cf78ecd0cc pc端官网修改 5 years ago
“用lww 9ef65ced5c Merge branch 'feature/promote' of D:\workspace\git\platform with conflicts. 5 years ago
chenzhi 484216ae65 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi c11814f902 修改背景 5 years ago
chenxiaojun d57e4a211f 推广平台->财务管理->提现记录->结算单--更新 5 years ago
ELF 6f4ec4ff30 Merge branch 'feature/promote' into dev 5 years ago
ELF f1625fec2d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF afb6de56f8 添加3级变四级脚本 5 years ago
chenxiaojun c057c5cf47 管理后台->推广员->结算管理->推广提现->上传汇款证明--格式限制 5 years ago
zhengchanglong f21403a05b Merge branch 'dev_lww' into feature/promote 5 years ago
chenxiaojun 578d640524 管理后台->推广员->结算管理->推广提现--更新 5 years ago
sunke 4ea2029976 大小写 5 years ago
chenxiaojun 1c157d78b9 管理后台->推广员->结算管理->推广提现->订单详情--更新 5 years ago
sunke 1d7597d468 修改大小写文件 5 years ago
chenxiaojun 93b2c65db5 推广平台->财务管理->提现记录->汇款证明--更新 5 years ago
ELF f049d4834c Merge branch 'feature/promote' into dev 5 years ago
ELF 1eebbeff5d 修改菜单 5 years ago
ELF 68d39bb3c9 Merge branch 'feature/promote' into dev 5 years ago
“用lww e019e23ca4 pc端官网修改 5 years ago
jbrazz 14081fe0cc Merge branch 'featurer/ylw_4.0' into dev 5 years ago
jbrazz 3f1b2d34c2 upt 5 years ago
sunke e8d2879218 下载中心内容补充 5 years ago
zyx 68e57ab1f5 导出链路问题修正 5 years ago
chenxiaojun 0787c976ef 管理后台->推广员->结算管理->推广提现--更新 5 years ago
chenxiaojun 895265a330 管理后台->推广员->结算管理->推广提现--更新 5 years ago
sunke f948bfbb7d 下载器内容 5 years ago
ELF ad15ac9d1b 修改页面 5 years ago
ELF e1115d6632 Merge branch 'feature/promote' into dev 5 years ago
ELF 1fed7cdfc6 修改 5 years ago
ELF 6bf4e10916 Merge branch 'hotfix/oa' of 47.111.118.107:/srv/git/platform into dev 5 years ago
Your Name a9a95765e2 OA获取信息-手机系统变更消息推送 5 years ago
ELF f03fec9e43 Merge branch 'feature/promote' into dev 5 years ago
ELF ed2fbea24c Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 070cc2e7c2 修改bug 5 years ago
jbrazz e57dfd3fae 修改设备号查询 5 years ago
jbrazz f4a46335ca upt 5 years ago
jbrazz 7396e69a61 upt 5 years ago
jbrazz 380c930686 Merge branch 'featurer/ylw_4.0' into dev 5 years ago
jbrazz 52880f1a91 upt 5 years ago
jbrazz ea4c861559 upt 5 years ago
zyx 97a1b634b9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx 0a819757cb 测试资源时间bug修正 5 years ago
zyx 0ce8984c13 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
zyx ce008b284e 月结统计bug修正 5 years ago
jbrazz b21df0a8f4 upt 5 years ago
ELF 12016f1b34 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 679acf6cf1 修改分包 5 years ago
chenxiaojun c81abece71 推广后台->财务管理->结算明细--更新 5 years ago
jbrazz 0dcb2a2014 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
jbrazz c9996e071c fix grand_id 5 years ago
ELF 09672d13b4 修改分包bug 5 years ago
ELF e853fc1c3e Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF c6627a53c2 将plist demo写入php文件 5 years ago
chenxiaojun a29015937a 推广后台->财务管理->提现记录->结算单--更新 5 years ago
chenzhi 58db110844 合并 5 years ago
chenzhi 115bafc067 新增补链日期及取消补链功能 5 years ago
chenxiaojun e1fd669aa8 推广后台->财务管理->提现记录->结算单--新增 5 years ago
“用lww 0d83da8446 手机官网->首页->解决首页底部菜单由于引入bootstrap导致和其他页面不一致 5 years ago
ELF bcc4b10bd6 落地页/下载页添加旧版兼容及链接黑名单 5 years ago
ELF 831456b333 解决冲突 5 years ago
chenxiaojun 258d1fbc1a 推广后台->安全密码|财务管理--调整 5 years ago
ELF 50c17baf8e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 2beec440db 修改bug 5 years ago
ELF 327bf6cd87 修改配置 5 years ago
ELF edc6a7be73 修改冲突 5 years ago
ELF 9abb4ebb2c 修改 5 years ago
chenzhi 7e37f3a2df 优化迁移用户addshifttask 5 years ago
jbrazz 9300280f78 merge feture/ylw 5 years ago
jbrazz 2dd1372b78 upt 5 years ago
jbrazz db1ea1370a upt 5 years ago
jbrazz 5e9cfb023f uypt 5 years ago
Your Name f642fb2c90 游戏充值订单添加CP订单号字段 5 years ago
jbrazz 74be3407b1 upt 5 years ago
“用lww cb76357dae Merge branch 'dev' into dev_lww 5 years ago
ELF a8bc52df33 修改 5 years ago
“用lww 6d5bb2a9a1 手机官网-底部菜单高亮bug修复 5 years ago
ELF 65866d7fa1 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 6f1e4551ac 修改bug 5 years ago
zyx cbfb286d53 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
zyx 5f673b346d 月结统计添加部长渠道 5 years ago
Your Name b54f73e4c2 OA获取信息 5 years ago
Your Name 31e90a9dee OA获取信息 5 years ago
Your Name f9eac7138f OA获取信息 5 years ago
ELF e0d542b5f6 解决冲突 5 years ago
“用lww 63d99584ed Merge branch 'dev' into dev_lww 5 years ago
ELF eb15fc7dfc Merge branch 'feature/pack' into feature/promote 5 years ago
ELF 2f4cd4c101 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF f056143dee 修改bug 5 years ago
chenzhi 9a6c75b41d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi a653b46f0e 优化月份统计接口新增事务 5 years ago
jbrazz 8a2c99681a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi c2e686c38e 123 5 years ago
chenzhi 537ed0857a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi 9d09fa4665 4角色聚合 5 years ago
Your Name 90105716d5 OA获取信息修改 5 years ago
Your Name 93bbc57ef2 OA获取信息修改 5 years ago
Your Name 94480951cb OA获取信息修改 5 years ago
“用lww 631a635dfe 还原新版本 5 years ago
“用lww 4edd0bac4a 修改 5 years ago
zyx 5eca14b69e Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
zyx 9e9d742275 导出添加引号 5 years ago
zhengchanglong 943564f82d Merge branch 'dev_zyx' into dev 5 years ago
zyx d5a90238ec 导出加大默认内存 5 years ago
chenxiaojun 02d862cb7a 推广后台->安全密码--样式调整 5 years ago
jbrazz c66c35b686 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
jbrazz 68df391d9c upt 5 years ago
ELF d79da20c28 Merge branch 'hotfix/media' into dev 5 years ago
ELF 3d88a82794 回滚官网 5 years ago
zhengchanglong 0223ecb125 Merge branch 'dev_zyx' into dev 5 years ago
zyx 35e1b2631a 导出添加游戏订单号 5 years ago
zhengchanglong 945ea1173a Merge branch 'dev_zyx' into dev 5 years ago
zyx a307bf343e 游戏详情查看导出,按日期分成多个sheet 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
“用lww 322aed6379 官网-游戏详情 5 years ago
“用lww fb99dc3389 官网 5 years ago
chenxiaojun 3f7fd8c3c7 推广后台->结算明细|分成比例--样式调整 5 years ago
zhengchanglong 4dd2ab92f3 Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev 5 years ago
“用lww 320ebf1b6e 新增分支dev_lww 5 years ago
zhengchanglong 2d67812f90 Merge branch 'dev_zyx' into dev 5 years ago
zyx 7e4aaf0a2e Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
zyx 266202c06b 游戏详情查看导出,按日期分成多个sheet 5 years ago
Your Name 330216e20e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
Your Name 51701a485d SDK菜单添加平台选型 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
“用lww bde48df713 官网-商务合作 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
zyx 602e53e82f 合并分支dev_zyx财务部分的代码 5 years ago
chenxiaojun 8ae754f74a 推广后台->财务管理->结算明细--更新 5 years ago
ELF 71feea26fb 修改bug 5 years ago
ELF 89b243930d 落地页下载页优化 5 years ago
zhengchanglong 561b183bec Merge branch 'dev_zyx' into dev 5 years ago
chenzhi a9bc64a4b2 优化统计逻辑 5 years ago
zhengchanglong 78e23d19b2 Merge branch 'dev_zyx' into dev 5 years ago
zyx 8fd435a324 月结统计,游戏查看名称修改 5 years ago
chenxiaojun a32565e2e1 推广后台->数据管理->数据汇总|每日概况--更新 5 years ago
chenxiaojun 7220247ecd 推广后台->数据管理->数据汇总|每日概况--更新 5 years ago
zhengchanglong e5c834e054 Merge branch 'dev_zyx' into dev 5 years ago
zyx 4dfec50ba5 月结统计修改 5 years ago
chenxiaojun 43603cf493 推广后台->数据管理->数据汇总--更新 5 years ago