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

1238 Commits (e07e1ff2aaf685de57c9b0d5ebceb7aff91558e1)

Author SHA1 Message Date
ELF b0b3d3f80d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 9d19a2ce6b 修改冲突
ELF c1d05093e1 修改bug
sunke f6ab43f3f7 平台币转移
ELF 82c45808f2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 4f41651654 修改bug
zhanglingsheng 656e9b7231 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng fb0808445f 悬浮球加类型
sunke 1f34a3a0ce 平台币明细，sdk菜单图片上传
chenxiaojun 731d7cb482 推广平台->平台币管理->我的平台币->检索样式调整
ELF 219aae771e Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 2c608a73c9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 1a0175e583 修改结构
yulingwei cf67739a9e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 44954031bf upt
chenxiaojun f8abfa9995 推广平台--日期检索调整
zhengchanglong 5a56b41330 Merge branch 'feature/promote' into dev
zyx fd74d8d144 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx cbe9117e3d 充值界面bug修复
chenxiaojun db249a776e 推广平台->财务管理->提现记录->提现明细--检索调整
yulingwei 0d258c1d8d upt
chenxiaojun fa2efa0431 推广平台->游戏管理->我的游戏--检索样式调整
zhengchanglong 2e5973cf3b 删除冗余文件
zhengchanglong c781a9c1be Merge branch 'feature/promote' into dev
zyx 2b012aad08 我的礼包界面功能完善
sunke f61585967b achieve
sunke e28a33f6e6 设置同意协议
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 b52eee941b 优化
chenzhi 3098558fe0 lww代码合并
chenxiaojun 3d9865f507 推广平台->财务管理->结算明细--检索调整
ELF 5bfecf5fc6 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF e2d75ec2c6 修改推广后台首页
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修改
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
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