Commit Graph

634 Commits (391b997f182963615307b96f6e19e0a7e90feb70)

Author SHA1 Message Date
ELF 634ade3ecd 修改bug
sunke c3caed08b3 bug
yulingwei c6779497c2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei d90186b301 付款订单有效性问题
sunke cf1449f09a 安全下载中心
zhengyongxing 9ff153c1da 测试git
sunke 055b5df6e7 增加条件
ELF 90d5d53994 解决冲突
ELF b0b3d3f80d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 9d19a2ce6b 修改冲突
ELF c1d05093e1 修改bug
sunke f6ab43f3f7 平台币转移
ELF 4f41651654 修改bug
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 修改结构
chenxiaojun f8abfa9995 推广平台--日期检索调整
zhengchanglong 5a56b41330 Merge branch 'feature/promote' into dev
chenxiaojun db249a776e 推广平台->财务管理->提现记录->提现明细--检索调整
chenxiaojun fa2efa0431 推广平台->游戏管理->我的游戏--检索样式调整
sunke f61585967b achieve
sunke e28a33f6e6 设置同意协议
zhengchanglong 16d54e6add Merge branch 'feature/promote' into dev
sunke 5bba1e5df4 游戏推广协议
chenxiaojun ee97f42261 推广平台->数据管理->数据汇总--检索更新
chenxiaojun e2fa14c1c8 推广平台->数据管理->数据汇总->合计--更新
sunke 97a973079a charge
ELF 175e38f712 修改bug
chenxiaojun 3d9865f507 推广平台->财务管理->结算明细--检索调整
ELF 5bfecf5fc6 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF e2d75ec2c6 修改推广后台首页
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
zyx 102013e527 部长数据统计修正
sunke 3a109a6444 bug修改
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 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 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
chenxiaojun 467b193037 推广平台->退出登录--更新
sunke e75907ed07 隐藏用户信息
ELF d7b4ec366f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote
chenxiaojun 773ffb5160 管理后台->游戏编辑--更新推广充值CPS比例时同步未提现订单的分成比例
推广平台->数据管理->每日概况|数据汇总--检索日期间隔调整为31天
推广平台->财务管理->结算中心->提现--权限更新
sunke f8c4f2c0b6 更改下载权限
ELF efd2ed361f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF c88892ec59 修改
sunke 2e37b23f2b 权限控制
ELF 784de48bf9 修改bug
zhengchanglong d2f547eb9c Merge branch 'feature/promote' into dev
sunke 3b0a6a5479 promote
sunke 7d474f09cd 推广员
sunke f592cd0b24 listsIndex.html
ELF fc028dd272 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
sunke c918864264 safeCSS
sunke b94f7b50c2 ajax-get
sunke d2b1a474fb ajax-get
sunke 52dafe9ed3 remit
sunke 4fff44e0f8 汇款证明下载
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
chenxiaojun d57e4a211f 推广平台->财务管理->提现记录->结算单--更新
ELF 6f4ec4ff30 Merge branch 'feature/promote' into dev
sunke 4ea2029976 大小写
sunke 1d7597d468 修改大小写文件
chenxiaojun 93b2c65db5 推广平台->财务管理->提现记录->汇款证明--更新
ELF f049d4834c Merge branch 'feature/promote' into dev
ELF 1eebbeff5d 修改菜单
ELF 68d39bb3c9 Merge branch 'feature/promote' into dev
sunke e8d2879218 下载中心内容补充
sunke f948bfbb7d 下载器内容
ELF ad15ac9d1b 修改页面
ELF 1fed7cdfc6 修改
ELF 070cc2e7c2 修改bug
ELF 12016f1b34 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 679acf6cf1 修改分包
chenxiaojun c81abece71 推广后台->财务管理->结算明细--更新
chenxiaojun a29015937a 推广后台->财务管理->提现记录->结算单--更新
chenxiaojun e1fd669aa8 推广后台->财务管理->提现记录->结算单--新增
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 9abb4ebb2c 修改
jbrazz 9300280f78 merge feture/ylw
ELF e0d542b5f6 解决冲突
ELF f056143dee 修改bug
chenxiaojun 02d862cb7a 推广后台->安全密码--样式调整
ELF 1e1eb99b85 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 387e019db7 删除无用代码
chenxiaojun 3f7fd8c3c7 推广后台->结算明细|分成比例--样式调整
ELF 38c2efdd08 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 08774a0954 完善添加推广员
chenxiaojun 0cd7206f24 推广后台->数据管理->每日概况--bug修复
chenxiaojun 9b65745ee5 推广后台->验证安全密码--更新
chenxiaojun 265aa20a60 推广后台->验证安全密码--更新
chenxiaojun b731b827e1 推广后台->验证安全密码--更新
chenxiaojun 43eaaf67c6 推广后台->验证安全密码--更新
chenxiaojun f5d6bd27ab 推广后台->验证安全密码--更新
chenxiaojun 03cbc66d92 推广后台->验证安全密码--更新
chenxiaojun 1561e71977 推广后台->验证安全密码--更新
chenxiaojun 8ae754f74a 推广后台->财务管理->结算明细--更新
ELF 71feea26fb 修改bug
ELF 89b243930d 落地页下载页优化
chenxiaojun a32565e2e1 推广后台->数据管理->数据汇总|每日概况--更新
chenxiaojun 7220247ecd 推广后台->数据管理->数据汇总|每日概况--更新
chenxiaojun 43603cf493 推广后台->数据管理->数据汇总--更新
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级修改
sunke 372ec046d0 安全中心
zyx 3d8ed52daf 推广后台首页条件修改
ELF ae44fc79bd 修改
chenzhi 2a7d4a435c Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 18be299b4c 同步dev
jbrazz 48b1cdf66f upt
jbrazz a8125bf377 upt
zyx 71b2287647 测试资源日志管理修改
chenxiaojun b6a62e2df1 推广后台->数据管理->每日概况 -- 更新
chenxiaojun 81ed43afdd 推广后台->数据管理->每日概况|数据汇总 -- 更新
zyx b6080180ab 测试资源bug修正
elf@home fc1cef9ec1 修改落地页/下载页
ELF b4168a23f1 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
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 修改
sunke 8633efd7d6 增加部门长分级
chenxiaojun 381a2e0a67 推广后台->数据管理->每日概况|数据汇总 -- 更新
chenxiaojun bf7c353692 推广后台->数据管理->每日概况|数据汇总 -- 更新
ELF 00966dc9e4 修改
ELF 22dcca566b 修改
chenxiaojun a14b18f54f 推广后台->数据管理->每日概况|数据汇总 -- 更新
zhengchanglong e69bc5f459 Merge branch 'dev_zyx' into dev
sunke 9844d5a740 订单查询
sunke f15c6e68eb 注册明细,订单查询 修改等级结构
chenxiaojun 750a6dc596 推广后台->数据管理->每日概况|数据汇总 -- 更新
chenxiaojun fffbdb739b 推广后台->数据管理->每日概况|数据汇总 -- 更新
ELF 6d68ddfe07 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 3abbe94774 修改bug
jbrazz 459b722c1c upt
chenxiaojun 9c1eeb2448 推广后台->游戏管理->专服管理|混服管理 -- 更新
ELF 5b62b99765 三级变四级
chenxiaojun 9169a2084b 推广后台->数据管理->每日概况|数据汇总->合计更新
zyx 224c745ba8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi a3d0c81d4b 修改
chenzhi f5ac904a49 优化扶持
zyx d7c9744872 扶持号时间格式修改
zyx 5c435bad74 公用文件添加排序
zyx ecc93af47c 测试资源排序添加
chenxiaojun 032e5de877 推广平台->注册明细->bug修复
chenxiaojun 8b2e384fb6 推广平台->注册明细->bug修复
zyx 7e37560efe 公告计数负数问题改正
zyx 56deca114f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 2f2158dbe0 详情页公告提示修正
chenxiaojun 1ec9c156cf 推广平台->数据汇总|每日概况->bug修复
chenxiaojun 27665e5b14 推广平台->数据汇总|每日概况->bug修复
zyx b0411e3704 详情页公告提示修正
zyx 0ffbc8aff9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 048e37fdd7 详情页公告提示修正
chenxiaojun 37188cb085 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
chenxiaojun 36b9b51817 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
zyx 95731bba09 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 387f729773 首页公告提示修正
ELF 390974a557 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 4917458099 Merge branch 'hotfix/query' into dev
ELF c6a52282d5 修改bug
zyx 5637b496e9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 36de2e17c5 扶持号js逻辑修正