elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,613 Commits
1 Branch
0 Tags
173 MiB
Commit Graph

1384 Commits (5241f98c689f32a16543bf519e2fe72e25dabe85)

Author SHA1 Message Date
zyx 0d090ded9b 礼包界面
chenzhi 5d454e5429 我的游戏
chenzhi ad6eb5b0d7 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi bf728438d7 优化
zhengchanglong 16d54e6add Merge branch 'feature/promote' into dev
zyx 938c4e9eda Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx 8f0ae7dd8b 充值界面模板嵌套
sunke 5bba1e5df4 游戏推广协议
chenzhi 9764d361f1 123
chenzhi fbf8a76ec9 123
ELF 17a7045036 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 9e83202467 修改bug
chenzhi 40001277bc login
chenxiaojun ee97f42261 推广平台->数据管理->数据汇总--检索更新
chenxiaojun e2fa14c1c8 推广平台->数据管理->数据汇总->合计--更新
sunke 97a973079a charge
chenzhi 0cd21feb28 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 44e2623efe 123
chenzhi 451ea9588e base
chenzhi 4b7d9202b7 123
ELF 175e38f712 修改bug
zyx a0e27f9e7a 覆盖vbs脚本
chenzhi c3196b7be0 123
chenzhi b52eee941b 优化
chenzhi 3098558fe0 lww代码合并
chenzhi 4c2e1f294e 去vs
chenzhi 68eead8d31 123
chenzhi 63c5421d49 Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev_lww
chenzhi a28acf200d 个人中心
zhengchanglong 5af7ab4e5e Merge remote-tracking branch 'origin/dev_lww' into dev_lww
zhengchanglong d9e75cd4c0 充值
chenzhi 71c1ad1437 Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev_lww
chenzhi 737e7786e8 移动官网手机及账号注册
chenxiaojun 3d9865f507 推广平台->财务管理->结算明细--检索调整
zhengchanglong 0b188b12bb 充值
ELF 5bfecf5fc6 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 2e610bc245 优化手机注册1
ELF e2d75ec2c6 修改推广后台首页
chenzhi 8ad35726fb 账号注册ok
chenzhi ddad6f6bf4 优化注册
ELF 16d458155a 修改打包日志
ELF ed82ea4103 添加打包日志记录
ELF f90a6a09fb Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF f2765313fd 优化打包
chenxiaojun 98f43acc96 推广平台->数据管理--检索样式调整
chenxiaojun 486090ca0a 推广平台->财务管理--时间检索提示调整|数据管理->订单查询|注册明细--检索样式调整
chenxiaojun 4ac069e28a 推广平台->财务管理->结算明细--检索调整
yulingwei 5a2e6c2b63 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 6ea4c72416 修改部分导出报表问题
zhengchanglong acb062ed3e Merge branch 'feature/promote' into dev
ELF 8968223dd2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 6c636a92f5 修改
zyx 102013e527 部长数据统计修正
sunke 3a109a6444 bug修改
zhengchanglong 2783890ac2 修改网页title
dev_lww c94dc6b3a5 手机官网
dev_lww 584a228fb4 手机官网
sunke 21782ff951 实时刷新可下载状态
ELF be6357eeac Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote
chenxiaojun 00188569fe 推广平台->财务管理->结算中心->提现--bug修复
ELF e56256ba1d 修改bug
ELF c4d35c26d4 修改bug
chenxiaojun 669e641c1e 推广平台->财务管理->(结算中心|结算明细--检索日期范围调整)(提现记录->结算单--侧边栏高亮修复)
ELF 905efbfd9a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 9fde84f6ca Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF e4291c48b0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 85e466c3fd 修改bug
jbrazz c8f072f983 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
jbrazz 2a6d9b7571 推广员名称
ELF 3fe3ae5dcd 修改bug
chenxiaojun 9d3dfd622b 推广平台->退出登录--更新
ELF d112a3c7ff Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF e58b20b576 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF e27c5a5266 修改bug
jbrazz 5deb0c2b05 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
jbrazz 8a513767dd upt
chenxiaojun 467b193037 推广平台->退出登录--更新
sunke e75907ed07 隐藏用户信息
sunke 9e2bb1e809 安全管理admin后台
ELF d7b4ec366f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote
chenxiaojun 773ffb5160 管理后台->游戏编辑--更新推广充值CPS比例时同步未提现订单的分成比例 
推广平台->数据管理->每日概况|数据汇总--检索日期间隔调整为31天
推广平台->财务管理->结算中心->提现--权限更新
sunke f8c4f2c0b6 更改下载权限
ELF b2df7e0fe3 修改bug
ELF fbce375679 修改bug
“用lww fa69e8ba83 手机端官网修改
ELF d9419ae64e Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 3d46a55811 修改bug
chenxiaojun 6307625efc 管理后台->推广员->结算管理->推广提现->--更新
ELF efd2ed361f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF c88892ec59 修改
sunke 2e37b23f2b 权限控制
ELF 84b36e2d78 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 784de48bf9 修改bug
jbrazz 8be3ee9560 upt
jbrazz 31948423e0 upt
jbrazz 20c168a537 三级改四级配置
zhengchanglong d2f547eb9c Merge branch 'feature/promote' into dev
zhengchanglong f1f7666e1e Merge branch 'dev_lww' into feature/promote
zhengchanglong 37bdcc60c8 Merge remote-tracking branch 'origin/feature/promote' into feature/promote
sunke 3b0a6a5479 promote
“用lww c20f08f9b3 pc端官网修改
sunke 7d474f09cd 推广员
sunke f592cd0b24 listsIndex.html
ELF fc028dd272 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF c2c8f11d01 修改
sunke c918864264 safeCSS
zhengchanglong 20d8be8807 Merge branch 'dev_lww' into feature/promote
sunke b94f7b50c2 ajax-get
sunke d2b1a474fb ajax-get
sunke 52dafe9ed3 remit
sunke 4fff44e0f8 汇款证明下载
chenxiaojun c8281d2bb2 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新
chenxiaojun 5afd0ffd63 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新
“用lww 7962cc62b4 pc端官网修改
sunke 908e552b81 base
sunke 129aa74f2e safe
sunke f39bff03c2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
sunke 246f1324f7 loginsafe
ELF 2b2d9d04de Merge branch 'feature/promote' into dev
ELF ae66feb819 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
sunke 856446087f safe
ELF 47e2706e26 修改bug
sunke d9c9271e17 del safe
“用lww cf78ecd0cc pc端官网修改
“用lww 9ef65ced5c Merge branch 'feature/promote' of D:\workspace\git\platform with conflicts.
chenzhi 484216ae65 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi c11814f902 修改背景
chenxiaojun d57e4a211f 推广平台->财务管理->提现记录->结算单--更新
ELF 6f4ec4ff30 Merge branch 'feature/promote' into dev
ELF f1625fec2d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF afb6de56f8 添加3级变四级脚本
chenxiaojun c057c5cf47 管理后台->推广员->结算管理->推广提现->上传汇款证明--格式限制
zhengchanglong f21403a05b Merge branch 'dev_lww' into feature/promote
chenxiaojun 578d640524 管理后台->推广员->结算管理->推广提现--更新
sunke 4ea2029976 大小写
chenxiaojun 1c157d78b9 管理后台->推广员->结算管理->推广提现->订单详情--更新
sunke 1d7597d468 修改大小写文件
chenxiaojun 93b2c65db5 推广平台->财务管理->提现记录->汇款证明--更新
ELF f049d4834c Merge branch 'feature/promote' into dev
ELF 1eebbeff5d 修改菜单
ELF 68d39bb3c9 Merge branch 'feature/promote' into dev
“用lww e019e23ca4 pc端官网修改
jbrazz 14081fe0cc Merge branch 'featurer/ylw_4.0' into dev
jbrazz 3f1b2d34c2 upt
sunke e8d2879218 下载中心内容补充
zyx 68e57ab1f5 导出链路问题修正
chenxiaojun 0787c976ef 管理后台->推广员->结算管理->推广提现--更新
chenxiaojun 895265a330 管理后台->推广员->结算管理->推广提现--更新
sunke f948bfbb7d 下载器内容
ELF ad15ac9d1b 修改页面
ELF e1115d6632 Merge branch 'feature/promote' into dev
ELF 1fed7cdfc6 修改
ELF 6bf4e10916 Merge branch 'hotfix/oa' of 47.111.118.107:/srv/git/platform into dev
Your Name a9a95765e2 OA获取信息-手机系统变更消息推送
ELF f03fec9e43 Merge branch 'feature/promote' into dev
ELF ed2fbea24c Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 070cc2e7c2 修改bug
jbrazz e57dfd3fae 修改设备号查询
jbrazz f4a46335ca upt
jbrazz 7396e69a61 upt
jbrazz 380c930686 Merge branch 'featurer/ylw_4.0' into dev
jbrazz 52880f1a91 upt
jbrazz ea4c861559 upt
zyx 97a1b634b9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 0a819757cb 测试资源时间bug修正
zyx 0ce8984c13 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx ce008b284e 月结统计bug修正
jbrazz b21df0a8f4 upt
ELF 12016f1b34 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 679acf6cf1 修改分包
chenxiaojun c81abece71 推广后台->财务管理->结算明细--更新
jbrazz 0dcb2a2014 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz c9996e071c fix grand_id
ELF 09672d13b4 修改分包bug
ELF e853fc1c3e Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF c6627a53c2 将plist demo写入php文件
chenxiaojun a29015937a 推广后台->财务管理->提现记录->结算单--更新
chenzhi 58db110844 合并
chenzhi 115bafc067 新增补链日期及取消补链功能
chenxiaojun e1fd669aa8 推广后台->财务管理->提现记录->结算单--新增
“用lww 0d83da8446 手机官网->首页->解决首页底部菜单由于引入bootstrap导致和其他页面不一致
ELF bcc4b10bd6 落地页/下载页添加旧版兼容及链接黑名单
ELF 831456b333 解决冲突
chenxiaojun 258d1fbc1a 推广后台->安全密码|财务管理--调整
ELF 50c17baf8e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 2beec440db 修改bug
ELF 327bf6cd87 修改配置
ELF edc6a7be73 修改冲突
ELF 9abb4ebb2c 修改
chenzhi 7e37f3a2df 优化迁移用户addshifttask
jbrazz 9300280f78 merge feture/ylw
jbrazz 2dd1372b78 upt
jbrazz db1ea1370a upt
jbrazz 5e9cfb023f uypt
Your Name f642fb2c90 游戏充值订单添加CP订单号字段
jbrazz 74be3407b1 upt
“用lww cb76357dae Merge branch 'dev' into dev_lww
ELF a8bc52df33 修改
“用lww 6d5bb2a9a1 手机官网-底部菜单高亮bug修复
ELF 65866d7fa1 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 6f1e4551ac 修改bug
zyx cbfb286d53 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx 5f673b346d 月结统计添加部长渠道
Your Name b54f73e4c2 OA获取信息
Your Name 31e90a9dee OA获取信息
Your Name f9eac7138f OA获取信息
ELF e0d542b5f6 解决冲突
“用lww 63d99584ed Merge branch 'dev' into dev_lww
ELF eb15fc7dfc Merge branch 'feature/pack' into feature/promote
ELF 2f4cd4c101 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF f056143dee 修改bug
chenzhi 9a6c75b41d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi a653b46f0e 优化月份统计接口新增事务
jbrazz 8a2c99681a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi c2e686c38e 123
chenzhi 537ed0857a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 9d09fa4665 4角色聚合
Your Name 90105716d5 OA获取信息修改
Your Name 93bbc57ef2 OA获取信息修改
Your Name 94480951cb OA获取信息修改
“用lww 631a635dfe 还原新版本
“用lww 4edd0bac4a 修改
zyx 5eca14b69e Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx 9e9d742275 导出添加引号
zhengchanglong 943564f82d Merge branch 'dev_zyx' into dev
zyx d5a90238ec 导出加大默认内存
chenxiaojun 02d862cb7a 推广后台->安全密码--样式调整
jbrazz c66c35b686 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz 68df391d9c upt
ELF d79da20c28 Merge branch 'hotfix/media' into dev
ELF 3d88a82794 回滚官网
zhengchanglong 0223ecb125 Merge branch 'dev_zyx' into dev
zyx 35e1b2631a 导出添加游戏订单号
zhengchanglong 945ea1173a Merge branch 'dev_zyx' into dev
zyx a307bf343e 游戏详情查看导出，按日期分成多个sheet
ELF 1e1eb99b85 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 387e019db7 删除无用代码
“用lww 322aed6379 官网-游戏详情
“用lww fb99dc3389 官网
chenxiaojun 3f7fd8c3c7 推广后台->结算明细|分成比例--样式调整
zhengchanglong 4dd2ab92f3 Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev
“用lww 320ebf1b6e 新增分支dev_lww
zhengchanglong 2d67812f90 Merge branch 'dev_zyx' into dev
zyx 7e4aaf0a2e Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx 266202c06b 游戏详情查看导出，按日期分成多个sheet
Your Name 330216e20e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name 51701a485d SDK菜单添加平台选型
ELF 38c2efdd08 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 08774a0954 完善添加推广员
“用lww bde48df713 官网-商务合作
chenxiaojun 0cd7206f24 推广后台->数据管理->每日概况--bug修复
chenxiaojun 9b65745ee5 推广后台->验证安全密码--更新
chenxiaojun 265aa20a60 推广后台->验证安全密码--更新
chenxiaojun b731b827e1 推广后台->验证安全密码--更新
chenxiaojun 43eaaf67c6 推广后台->验证安全密码--更新
chenxiaojun f5d6bd27ab 推广后台->验证安全密码--更新
chenxiaojun 03cbc66d92 推广后台->验证安全密码--更新
chenxiaojun 1561e71977 推广后台->验证安全密码--更新
zyx 602e53e82f 合并分支dev_zyx财务部分的代码
chenxiaojun 8ae754f74a 推广后台->财务管理->结算明细--更新
ELF 71feea26fb 修改bug
ELF 89b243930d 落地页下载页优化
zhengchanglong 561b183bec Merge branch 'dev_zyx' into dev
chenzhi a9bc64a4b2 优化统计逻辑
zhengchanglong 78e23d19b2 Merge branch 'dev_zyx' into dev
zyx 8fd435a324 月结统计，游戏查看名称修改
chenxiaojun a32565e2e1 推广后台->数据管理->数据汇总|每日概况--更新
chenxiaojun 7220247ecd 推广后台->数据管理->数据汇总|每日概况--更新
zhengchanglong e5c834e054 Merge branch 'dev_zyx' into dev
zyx 4dfec50ba5 月结统计修改
chenxiaojun 43603cf493 推广后台->数据管理->数据汇总--更新
chenzhi 0ae24bf2cd 优化财务聚合接口2
chenzhi 58c405e914 优化财务聚合接口
ELF c3502c6120 打包添加ios13兼容
chenzhi 0df9045e67 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi f54305911c 优化api暂存
chenxiaojun 3e2d027910 推广后台->财务管理->结算明细--更新
chenxiaojun fba89ccb48 推广后台->财务管理->结算明细--更新
chenxiaojun 1d6ce31515 推广后台->财务管理->结算明细--更新
chenxiaojun 30aff2bd38 推广后台->财务管理->新增->结算明细
ELF dbf113d9d4 修改bug
ELF 6c6b3b54aa Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 7547e867bb 三级变四级修改
ELF fc89281a48 3级变4级修改
chenzhi eacdea6f9b 暂存修改
chenzhi a9b7b22a4b Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 81192f36c8 xiufu
sunke 372ec046d0 安全中心
zyx 3d8ed52daf 推广后台首页条件修改
chenzhi 6c45b4dd3f 修改获取下级函数
ELF ae44fc79bd 修改
zhengchanglong 879accf9f5 Merge branch 'dev_zyx' into dev
zyx f44a11a915 月结统计提示语修改
chenzhi 2a7d4a435c Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 18be299b4c 同步dev
zhengchanglong 78846c699f Merge branch 'dev_zyx' into dev
zyx 9539b38e86 月结统计提示语修改
jbrazz 48b1cdf66f upt
zhengchanglong 3c3a13c068 Merge branch 'dev_zyx' into dev
zyx f0559c3576 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Application/Admin/View/Finance/index.html
zyx cfa33d3e42 月结统计提示语修改
jbrazz a8125bf377 upt
zhengchanglong 9dd5a34bf7 Merge branch 'dev_zyx' into dev
zyx a850cfa048 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 50c775a78b Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx 71b2287647 测试资源日志管理修改
chenzhi f9397efebf 修改总流水统计方式
chenxiaojun b6a62e2df1 推广后台->数据管理->每日概况 -- 更新
zhengchanglong 6dcd1549d0 Merge branch 'dev_zyx' into dev 
# Conflicts:
#	Data/update.sql
zyx 5a7432ef40 月结统计新增平台比收入字段，将平台币流水改为平台币支出
chenzhi c8da11a12e 新增平台币流水充值
chenxiaojun 81ed43afdd 推广后台->数据管理->每日概况|数据汇总 -- 更新
zyx b6080180ab 测试资源bug修正
chenzhi b4c9f60ac9 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
elf@home fc1cef9ec1 修改落地页/下载页
ELF b4168a23f1 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF edc40b8a1b ss
chenzhi 8212b4ecaf 4级推广申请资源修正
chenzhi 498de9ab75 同步dev
chenzhi ab2252375d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi c8fb1bb207 修改
chenxiaojun 681c401686 推广后台->数据管理->每日概况|数据汇总 -- 更新
chenxiaojun 42d330bbc4 推广后台->数据管理->每日概况|数据汇总 -- 更新
chenxiaojun b1b10645fc 推广后台->数据管理->每日概况|数据汇总 -- 更新
ELF 689cc08b69 修改
zhengchanglong 5b93736468 Merge branch 'dev_zyx' into dev
zyx 1201180f79 游戏到处删除玩家昵称栏位
sunke 8633efd7d6 增加部门长分级
jbrazz 48de85a3c3 upt
chenzhi 02535dee01 dev
chenzhi 5b40ebdf91 dev
zhengchanglong 2c80186025 Merge branch 'dev_zyx' into dev
zyx fcbf41fa65 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx 27e8a0c0b5 提示栏文字调整,组长渠道与推广员渠道添加文字提示栏
chenzhi dcc5939692 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi b4b4e7bc00 新增强制重新更新
zyx a97ce09429 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx 414f471ac1 提示栏文字调整
zhengchanglong bf24f74d00 Merge branch 'dev_zyx' into dev
chenzhi c547d43330 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi d91a44184f 优化数据更新提示
zyx 7167366949 提示栏文字调整
zyx 064a3d0098 搜索框样式调整
zyx 6f77f576d1 标签位置调整
zyx bbc75a419d bug修正，样式更新
zhengchanglong fd97ecf494 Merge branch 'dev_zyx' into dev
chenzhi fa29554923 肯定没错
zhengchanglong d554815d12 Merge branch 'dev_zyx' into dev
chenzhi a1f22ad756 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 2e4067e1de 测试