751 Commits (f596288f319012f929a0160ece349a9dcf8a9a58)

Author SHA1 Message Date
sunke 7d080f9d73 基础信息 5 years ago
sunke 0b8f3450c6 审核后台 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
“用lww 176aa70c8d 去除vbs代码 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 8df42a80c1 bug 5 years ago
sunke 486be7e3ed 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
zhengyongxing 392c42f356 数据管理玩家充值玩家账号加密 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
sunke 787d7573f0 bug 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
zhengyongxing 0b15e9edd5 推广后台管理中心修正 5 years ago
chenxiaojun 6ad8277aa0 管理后台--更新 5 years ago
chenxiaojun 2e7ecfa53c 管理后台--更新 5 years ago
zhengyongxing 0b93ee2db9 推广后台订单查询隐藏操作 5 years ago
zhengyongxing 110d88d76f 推广后台角色查询玩家账号加密 5 years ago
zhengyongxing 1528d0488b 推广后台首页当月新增金额修正 5 years ago
zhengyongxing 77da9cf429 推广后台bug修正 5 years ago
chenxiaojun c68716bbae 推广平台->数据管理->每日概况|数据汇总--区服检索更新 5 years ago
chenxiaojun cd1f93e394 推广平台->数据管理->每日概况|数据汇总--区服检索更新 5 years ago
zhengchanglong e7985f366b 管理中心菜单权限开放 5 years ago
zhengchanglong 531494029f 管理中心菜单权限开放 5 years ago
zhengyongxing aa5eadaa02 扶持号管理更名为测试号管理 5 years ago
zhengyongxing e5d425cd47 订单查询订单信息隐藏,扶持号管理更名为测试号管理 5 years ago
sunke 165718170a 平台币按钮权限 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
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 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
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
ELF c1d05093e1 修改bug 5 years ago
sunke f6ab43f3f7 平台币转移 5 years ago
ELF 4f41651654 修改bug 5 years ago
sunke 1f34a3a0ce 平台币明细,sdk菜单图片上传 5 years ago
chenxiaojun 731d7cb482 推广平台->平台币管理->我的平台币->检索样式调整 5 years ago
ELF 219aae771e Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 2c608a73c9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 1a0175e583 修改结构 5 years ago
chenxiaojun f8abfa9995 推广平台--日期检索调整 5 years ago
zhengchanglong 5a56b41330 Merge branch 'feature/promote' into dev 5 years ago
chenxiaojun db249a776e 推广平台->财务管理->提现记录->提现明细--检索调整 5 years ago
chenxiaojun fa2efa0431 推广平台->游戏管理->我的游戏--检索样式调整 5 years ago
sunke f61585967b achieve 5 years ago
sunke e28a33f6e6 设置同意协议 5 years ago
zhengchanglong 16d54e6add Merge branch 'feature/promote' into dev 5 years ago
sunke 5bba1e5df4 游戏推广协议 5 years ago
chenxiaojun ee97f42261 推广平台->数据管理->数据汇总--检索更新 5 years ago
chenxiaojun e2fa14c1c8 推广平台->数据管理->数据汇总->合计--更新 5 years ago
sunke 97a973079a charge 5 years ago
ELF 175e38f712 修改bug 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
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
zyx 102013e527 部长数据统计修正 5 years ago
sunke 3a109a6444 bug修改 5 years ago
dev_lww 584a228fb4 手机官网 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 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 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
chenxiaojun 467b193037 推广平台->退出登录--更新 5 years ago
sunke e75907ed07 隐藏用户信息 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 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 784de48bf9 修改bug 5 years ago
zhengchanglong d2f547eb9c Merge branch 'feature/promote' into dev 5 years ago
sunke 3b0a6a5479 promote 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
sunke c918864264 safeCSS 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
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
chenxiaojun d57e4a211f 推广平台->财务管理->提现记录->结算单--更新 5 years ago
ELF 6f4ec4ff30 Merge branch 'feature/promote' into dev 5 years ago
sunke 4ea2029976 大小写 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
sunke e8d2879218 下载中心内容补充 5 years ago
sunke f948bfbb7d 下载器内容 5 years ago
ELF ad15ac9d1b 修改页面 5 years ago
ELF 1fed7cdfc6 修改 5 years ago
ELF 070cc2e7c2 修改bug 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
chenxiaojun a29015937a 推广后台->财务管理->提现记录->结算单--更新 5 years ago
chenxiaojun e1fd669aa8 推广后台->财务管理->提现记录->结算单--新增 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 9abb4ebb2c 修改 5 years ago
jbrazz 9300280f78 merge feture/ylw 5 years ago
ELF e0d542b5f6 解决冲突 5 years ago
ELF f056143dee 修改bug 5 years ago
chenxiaojun 02d862cb7a 推广后台->安全密码--样式调整 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
chenxiaojun 3f7fd8c3c7 推广后台->结算明细|分成比例--样式调整 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
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
chenxiaojun 8ae754f74a 推广后台->财务管理->结算明细--更新 5 years ago
ELF 71feea26fb 修改bug 5 years ago
ELF 89b243930d 落地页下载页优化 5 years ago
chenxiaojun a32565e2e1 推广后台->数据管理->数据汇总|每日概况--更新 5 years ago
chenxiaojun 7220247ecd 推广后台->数据管理->数据汇总|每日概况--更新 5 years ago
chenxiaojun 43603cf493 推广后台->数据管理->数据汇总--更新 5 years ago
chenxiaojun 3e2d027910 推广后台->财务管理->结算明细--更新 5 years ago
chenxiaojun fba89ccb48 推广后台->财务管理->结算明细--更新 5 years ago
chenxiaojun 1d6ce31515 推广后台->财务管理->结算明细--更新 5 years ago
chenxiaojun 30aff2bd38 推广后台->财务管理->新增->结算明细 5 years ago
ELF dbf113d9d4 修改bug 5 years ago
ELF 6c6b3b54aa Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 7547e867bb 三级变四级修改 5 years ago
ELF fc89281a48 3级变4级修改 5 years ago
sunke 372ec046d0 安全中心 5 years ago
zyx 3d8ed52daf 推广后台首页条件修改 5 years ago
ELF ae44fc79bd 修改 5 years ago
chenzhi 2a7d4a435c Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi 18be299b4c 同步dev 5 years ago
jbrazz 48b1cdf66f upt 5 years ago
jbrazz a8125bf377 upt 5 years ago
zyx 71b2287647 测试资源日志管理修改 5 years ago
chenxiaojun b6a62e2df1 推广后台->数据管理->每日概况 -- 更新 5 years ago
chenxiaojun 81ed43afdd 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
zyx b6080180ab 测试资源bug修正 5 years ago
elf@home fc1cef9ec1 修改落地页/下载页 5 years ago
ELF b4168a23f1 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi 498de9ab75 同步dev 5 years ago
chenzhi ab2252375d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi c8fb1bb207 修改 5 years ago
chenxiaojun 681c401686 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
chenxiaojun 42d330bbc4 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
chenxiaojun b1b10645fc 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
ELF 689cc08b69 修改 5 years ago
sunke 8633efd7d6 增加部门长分级 5 years ago
chenxiaojun 381a2e0a67 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
chenxiaojun bf7c353692 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
ELF 00966dc9e4 修改 5 years ago
ELF 22dcca566b 修改 5 years ago
chenxiaojun a14b18f54f 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
zhengchanglong e69bc5f459 Merge branch 'dev_zyx' into dev 5 years ago
sunke 9844d5a740 订单查询 5 years ago
sunke f15c6e68eb 注册明细,订单查询 修改等级结构 5 years ago
chenxiaojun 750a6dc596 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
chenxiaojun fffbdb739b 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
ELF 6d68ddfe07 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 3abbe94774 修改bug 5 years ago
jbrazz 459b722c1c upt 5 years ago
chenxiaojun 9c1eeb2448 推广后台->游戏管理->专服管理|混服管理 -- 更新 5 years ago
ELF 5b62b99765 三级变四级 5 years ago
chenxiaojun 9169a2084b 推广后台->数据管理->每日概况|数据汇总->合计更新 5 years ago
zyx 224c745ba8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenzhi a3d0c81d4b 修改 5 years ago
chenzhi f5ac904a49 优化扶持 5 years ago
zyx d7c9744872 扶持号时间格式修改 5 years ago
zyx 5c435bad74 公用文件添加排序 5 years ago
zyx ecc93af47c 测试资源排序添加 5 years ago
chenxiaojun 032e5de877 推广平台->注册明细->bug修复 5 years ago
chenxiaojun 8b2e384fb6 推广平台->注册明细->bug修复 5 years ago