sunke
|
0688a046d3
|
修改bug
|
5 years ago |
zhengyongxing
|
64c059cccc
|
Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
Conflicts:
Data/update.sql
|
5 years ago |
chenxiaojun
|
366f5b9add
|
推广平台->游戏管理->专服|混服--样式调整
|
5 years ago |
|
chenxiaojun
|
b4a1a24dda
|
推广平台->游戏管理->专服|混服--样式调整
|
5 years ago |
|
sunke
|
05bb9b4aa3
|
推广业绩导出修复
|
5 years ago |
|
chenxiaojun
|
5d2f499cfd
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
“用lww
|
a13e8a5152
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
 ELF
|
270e24346d
|
修改bug
|
5 years ago |
|
ELF
|
e575e3107c
|
调试
|
5 years ago |
|
ELF
|
1fd7023c5f
|
代码优化
|
5 years ago |
|
sunke
|
158d8e8fc2
|
认证图片隐藏
|
5 years ago |
|
sunke
|
d941477d47
|
时间检索 资质认证
|
5 years ago |
|
chenxiaojun
|
de9a8d6eb8
|
推广平台->数据管理->订单查询|注册明细--更新
|
5 years ago |
|
chenxiaojun
|
d5d555bde2
|
推广平台->数据管理->订单查询|注册明细--更新
|
5 years ago |
|
chenxiaojun
|
0a075aed45
|
推广平台->数据管理->订单查询|注册明细--更新
|
5 years ago |
|
chenxiaojun
|
b606ee5765
|
推广平台->数据管理->订单查询|注册明细--更新
|
5 years ago |
|
chenxiaojun
|
d8acd44d08
|
推广平台->数据管理->数据汇总--更新
|
5 years ago |
|
chenxiaojun
|
67af68fc43
|
推广平台->数据管理->数据汇总--更新
|
5 years ago |
|
sunke
|
e31ad349ae
|
register get method
|
5 years ago |
|
sunke
|
dc35008201
|
资质认证
|
5 years ago |
|
sunke
|
fe3dc2f378
|
充值玩家导出默认时间
|
5 years ago |
|
sunke
|
60d1a4ced8
|
防错
|
5 years ago |
|
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 |