zhengyongxing
|
4e06af0acf
|
登录sdk，跳转至购买超级签，无需重新登陆
|
5 years ago |
zhengchanglong
|
286febdff6
|
Merge branch 'dev_lww' into dev
|
5 years ago |
zhanglingsheng
|
fb85d32c87
|
合并分支
|
5 years ago |
chenzhi
|
0649501b8a
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
c211c493ed
|
1
|
5 years ago |
sunke
|
275c0a8022
|
下载提交方式修改
|
5 years ago |
|
chenzhi
|
4ebba110d9
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
90253ddcf6
|
优化回调
|
5 years ago |
|
sunke
|
0688a046d3
|
修改bug
|
5 years ago |
|
chenzhi
|
995ea3f9a5
|
验证签名
|
5 years ago |
|
zhengchanglong
|
5d9d6542ad
|
Merge branch 'dev_lww' into dev_zcl
|
5 years ago |
|
chenzhi
|
fd53bdda15
|
解决回掉
|
5 years ago |
|
zhanglingsheng
|
a685e7340e
|
礼包列表过滤超级签
|
5 years ago |
“用lww
|
8076110f31
|
手机注册-修改账号密码验证规则
|
5 years ago |
|
“用lww
|
ba506916d0
|
复制兑换码提示框修改
|
5 years ago |
|
chenzhi
|
8191f5a50f
|
提示测试
|
5 years ago |
yulingwei
|
a11c07c7a6
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
38680ddb05
|
更新
|
5 years ago |
|
zhengyongxing
|
1626123074
|
数据统计7日平均时长修正
|
5 years ago |
|
zhengchanglong
|
f8008a4b5e
|
Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
# Data/update.sql
|
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 |
|
yulingwei
|
24d3e6ab07
|
修改bug
|
5 years ago |
|
yulingwei
|
046beee6be
|
修改bug
|
5 years ago |
|
zhengchanglong
|
a4dc55f4e3
|
Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengchanglong
|
65014bb66a
|
Merge branch 'dev_lww' into dev_zcl
|
5 years ago |
|
zhengchanglong
|
974a9d93e4
|
Merge branch 'dev-cz' into dev_zcl
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
f4cb9a98c8
|
数据管理启动机型代码优化
|
5 years ago |
|
zhengyongxing
|
2fb1effdcd
|
后台数据分析应用概况优化
|
5 years ago |
|
“用lww
|
c1b5569213
|
手机官网-手机注册与账号注册修改，昵称自动生成
|
5 years ago |
|
sunke
|
05bb9b4aa3
|
推广业绩导出修复
|
5 years ago |
|
chenxiaojun
|
232a6f7918
|
修改冲突
|
5 years ago |
|
chenxiaojun
|
5d2f499cfd
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengchanglong
|
aa8e612ead
|
超级签测试金额修改
|
5 years ago |
 ELF
|
3ebaf13810
|
修改bug
|
5 years ago |
|
“用lww
|
ff976bb9eb
|
pc端问题反馈修改
|
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
|
b69699f5d0
|
代码还原
|
5 years ago |
|
ELF
|
1fd7023c5f
|
代码优化
|
5 years ago |
|
ELF
|
c75d1bf3ad
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
9e1c25a2a3
|
修改bug
|
5 years ago |
|
sunke
|
158d8e8fc2
|
认证图片隐藏
|
5 years ago |
|
chenzhi
|
255d830229
|
优化提示及输入ok
|
5 years ago |
|
chenzhi
|
16d1a28f67
|
优化提示2
|
5 years ago |
|
chenzhi
|
8be0cfb188
|
优化提示
|
5 years ago |
|
chenzhi
|
22b0738203
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
7149c94d19
|
测试
|
5 years ago |
|
sunke
|
d941477d47
|
时间检索 资质认证
|
5 years ago |
|
chenxiaojun
|
de9a8d6eb8
|
推广平台->数据管理->订单查询|注册明细--更新
|
5 years ago |
|
chenxiaojun
|
d5d555bde2
|
推广平台->数据管理->订单查询|注册明细--更新
|
5 years ago |
|
chenxiaojun
|
0a075aed45
|
推广平台->数据管理->订单查询|注册明细--更新
|
5 years ago |
|
chenzhi
|
6e522e08cd
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
a6f52ccdb8
|
优化注册管理员提示信息
|
5 years ago |
|
chenxiaojun
|
b606ee5765
|
推广平台->数据管理->订单查询|注册明细--更新
|
5 years ago |
|
zhanglingsheng
|
a514e5b5dc
|
支付方式添加快捷
|
5 years ago |
|
zhanglingsheng
|
e07e1ff2aa
|
支付方式添加快捷
|
5 years ago |
|
chenzhi
|
29d204bf97
|
修复添加管理员报错
|
5 years ago |
|
chenzhi
|
360cf3f3ba
|
优化前端展示
|
5 years ago |
|
chenxiaojun
|
d8acd44d08
|
推广平台->数据管理->数据汇总--更新
|
5 years ago |
|
chenxiaojun
|
67af68fc43
|
推广平台->数据管理->数据汇总--更新
|
5 years ago |
|
sunke
|
e31ad349ae
|
register get method
|
5 years ago |
|
chenzhi
|
04c5f17790
|
优化脚本
|
5 years ago |
|
ELF
|
b4afa5d8b2
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
065245d657
|
优化查询
|
5 years ago |
|
chenxiaojun
|
71fca054fd
|
推广平台->数据管理->每日概况|数据汇总--登录统计优化
|
5 years ago |
|
chenxiaojun
|
15373077b7
|
推广平台->数据管理->每日概况|数据汇总--登录统计优化
|
5 years ago |
|
sunke
|
b64882554a
|
管理后台增加资质审核检索
|
5 years ago |
|
chenxiaojun
|
9f94d3f3ab
|
推广平台->登录统计--暂时去除区服检索
|
5 years ago |
|
chenxiaojun
|
1c79152b5c
|
推广平台->登录统计--暂时去除区服检索
|
5 years ago |
|
chenxiaojun
|
304aca17df
|
推广平台->登录统计--暂时去除区服检索
|
5 years ago |
|
chenxiaojun
|
1cfa474b83
|
推广平台->登录统计--暂时去除区服检索
|
5 years ago |
|
chenzhi
|
37d8f72c6d
|
优化首页展示
|
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 |
|
zhengchanglong
|
e5c3ee02ae
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengchanglong
|
25b32a6036
|
官网监护提醒修改
|
5 years ago |
|
chenzhi
|
e1739209e3
|
1
|
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 |
|
chenzhi
|
521a343fc3
|
123
|
5 years ago |
|
“用lww
|
176aa70c8d
|
去除vbs代码
|
5 years ago |
|
chenzhi
|
39e682e69e
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
|
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
|
d2d211737f
|
bug
|
5 years ago |
|
sunke
|
eac235d498
|
身份认证后台
|
5 years ago |
|
sunke
|
8df42a80c1
|
bug
|
5 years ago |
|
sunke
|
486be7e3ed
|
bug
|
5 years ago |
|
ELF
|
afbdec3d5d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
a1c1cb44ae
|
修改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 |
|
chenxiaojun
|
e2b7d7edb0
|
管理后台->推广员->财务管理->推广提现--结算详情分
|
5 years ago |
|
chenxiaojun
|
232760c351
|
推广平台->数据管理->每日概况|数据汇总--sql优化
|
5 years ago |
|
zhengchanglong
|
cfe66517d5
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengyongxing
|
392c42f356
|
数据管理玩家充值玩家账号加密
|
5 years ago |
|
zhengchanglong
|
d95fd1b1a7
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
00858df9fb
|
PC官网修改
|
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 |
|
zhanglingsheng
|
d0a0068039
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
94cc0bacbf
|
SDK菜单链接修改
|
5 years ago |
|
chenxiaojun
|
9933463c70
|
管理后台->推广员->财务管理->推广提现--结算详情分页
|
5 years ago |
|
chenxiaojun
|
f9d26bab7c
|
管理后台->推广员->财务管理->推广提现--结算详情分页
|
5 years ago |
|
sunke
|
787d7573f0
|
bug
|
5 years ago |
|
zhanglingsheng
|
21b02ca200
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
f074ce853b
|
sdk菜单配置修改
|
5 years ago |
|
yulingwei
|
82bdfadb7d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
2e0a8d2ad0
|
更新统计数据
|
5 years ago |
|
zhanglingsheng
|
5b3c01e1ba
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
3453de757f
|
sdk菜单配置修改
|
5 years ago |
|
chenxiaojun
|
5e3cc42bc1
|
管理后台->推广员->推广员编辑--二级密码名词解释更改
|
5 years ago |
|
chenxiaojun
|
cc572ca66e
|
管理后台->推广员->推广员编辑--二级密码名词解释更改
|
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 |
|
chenxiaojun
|
f7d0109ee7
|
管理后台->充值->平台币订单->平台币回收--更新
|
5 years ago |
|
chenxiaojun
|
5caf75afb9
|
管理后台->充值->平台币订单->平台币回收--更新
|
5 years ago |
|
chenxiaojun
|
8ac33bb9e4
|
管理后台->充值->平台币订单->平台币回收--更新
|
5 years ago |
|
chenxiaojun
|
fd53997094
|
管理后台->充值->平台币订单->平台币回收--更新
|
5 years ago |
|
zhengchanglong
|
0b8dfcdc89
|
管理后台时时实时注册查询修改
|
5 years ago |
|
chenxiaojun
|
e96bd42ef6
|
管理后台->游戏--去除CP分成比例同步
|
5 years ago |
|
chenxiaojun
|
25b319f87c
|
管理后台->游戏--去除CP分成比例同步
|
5 years ago |
|
zhengyongxing
|
0b15e9edd5
|
推广后台管理中心修正
|
5 years ago |
|
chenxiaojun
|
6ad8277aa0
|
管理后台--更新
|
5 years ago |
|
chenxiaojun
|
2e7ecfa53c
|
管理后台--更新
|
5 years ago |
|
zhengyongxing
|
0b93ee2db9
|
推广后台订单查询隐藏操作
|
5 years ago |
|
zhengyongxing
|
1a29dddd0d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengyongxing
|
110d88d76f
|
推广后台角色查询玩家账号加密
|
5 years ago |
|
sunke
|
ee8a954566
|
查看消费记录滚动
|
5 years ago |
|
zhengyongxing
|
1528d0488b
|
推广后台首页当月新增金额修正
|
5 years ago |
|
zhengyongxing
|
77da9cf429
|
推广后台bug修正
|
5 years ago |
|
yulingwei
|
a7f6d8b7a4
|
upt
|
5 years ago |
|
elf@home
|
06486d458c
|
修改bug
|
5 years ago |
|
elf@home
|
1036589f3b
|
修改代码
|
5 years ago |
|
chenxiaojun
|
c68716bbae
|
推广平台->数据管理->每日概况|数据汇总--区服检索更新
|
5 years ago |
|
chenxiaojun
|
cd1f93e394
|
推广平台->数据管理->每日概况|数据汇总--区服检索更新
|
5 years ago |
|
ELF
|
2c24a9740b
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
3af8fe116d
|
修改bu
|
5 years ago |
|
zhengchanglong
|
e7985f366b
|
管理中心菜单权限开放
|
5 years ago |
|
zhengchanglong
|
531494029f
|
管理中心菜单权限开放
|
5 years ago |
|
zhengchanglong
|
ab46f9f6ec
|
Merge branch 'feature/promote' into dev
|
5 years ago |
|
chenxiaojun
|
83cbc45374
|
管理后台->游戏订单->游戏充值--日期检索更新
|
5 years ago |
|
chenxiaojun
|
a84ea0e679
|
管理后台->游戏订单->游戏充值--日期检索更新
|
5 years ago |
|
chenxiaojun
|
1bf12d3a6d
|
管理后台->游戏订单->游戏充值--日期检索更新
|
5 years ago |
|
chenxiaojun
|
55fe6a2c7d
|
管理后台->游戏订单->游戏充值--日期检索更新
|
5 years ago |
|
chenxiaojun
|
98c69ac360
|
管理后台->游戏订单->游戏充值--日期检索更新
|
5 years ago |
|
chenxiaojun
|
638ceba6cc
|
管理后台->游戏订单->游戏充值--日期检索更新
|
5 years ago |
|
zhengyongxing
|
21579a3e07
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengyongxing
|
aa5eadaa02
|
扶持号管理更名为测试号管理
|
5 years ago |
|
chenxiaojun
|
33f5cf9ac3
|
管理后台->游戏订单->游戏充值--更新
|
5 years ago |
|
chenxiaojun
|
9075730d83
|
管理后台->游戏订单->游戏充值--更新
|
5 years ago |
|
chenxiaojun
|
37aab8f279
|
管理后台->游戏订单->游戏充值--列表样式调整
|
5 years ago |
|
chenxiaojun
|
f473c0abc1
|
管理后台->游戏订单->游戏充值--列表样式调整
|
5 years ago |
|
zhengyongxing
|
e5d425cd47
|
订单查询订单信息隐藏，扶持号管理更名为测试号管理
|
5 years ago |
|
sunke
|
04e53e2329
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
sunke
|
165718170a
|
平台币按钮权限
|
5 years ago |
|
chenxiaojun
|
3250d05a01
|
管理后台->游戏订单->游戏充值--sql优化
|
5 years ago |
|
chenxiaojun
|
3fbdc9daa0
|
管理后台->游戏订单->游戏充值--sql优化
|
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 |
|
chenxiaojun
|
83e8427c8b
|
cs
|
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
|
8951a502c2
|
修改bug
|
5 years ago |
|
sunke
|
94bede9a41
|
平台币修改
|
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 |
|
ELF
|
1c11622eb2
|
修改bug
|
5 years ago |
|
ELF
|
3b681670df
|
上传
|
5 years ago |
|
ELF
|
b0b0056c43
|
修改bug
|
5 years ago |
|
ELF
|
e942f378c6
|
修改bug
|
5 years ago |
|
ELF
|
6cdee448c0
|
修改bug
|
5 years ago |
|
ELF
|
73cd26c1a4
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
1bffd62357
|
修改bug
|
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
|
82c45808f2
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
4f41651654
|
修改bug
|
5 years ago |
|
zhanglingsheng
|
656e9b7231
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
fb0808445f
|
悬浮球加类型
|
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 |
|
yulingwei
|
cf67739a9e
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
44954031bf
|
upt
|
5 years ago |
|
chenxiaojun
|
f8abfa9995
|
推广平台--日期检索调整
|
5 years ago |
|
zhengchanglong
|
5a56b41330
|
Merge branch 'feature/promote' into dev
|
5 years ago |
|
zyx
|
fd74d8d144
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
zyx
|
cbe9117e3d
|
充值界面bug修复
|
5 years ago |
|
chenxiaojun
|
db249a776e
|
推广平台->财务管理->提现记录->提现明细--检索调整
|
5 years ago |
|
yulingwei
|
0d258c1d8d
|
upt
|
5 years ago |
|
chenxiaojun
|
fa2efa0431
|
推广平台->游戏管理->我的游戏--检索样式调整
|
5 years ago |
|
zhengchanglong
|
2e5973cf3b
|
删除冗余文件
|
5 years ago |
|
zhengchanglong
|
c781a9c1be
|
Merge branch 'feature/promote' into dev
|
5 years ago |
|
zyx
|
2b012aad08
|
我的礼包界面功能完善
|
5 years ago |
|
sunke
|
f61585967b
|
achieve
|
5 years ago |
|
sunke
|
e28a33f6e6
|
设置同意协议
|
5 years ago |
|
zyx
|
0d090ded9b
|
礼包界面
|
5 years ago |
|
chenzhi
|
5d454e5429
|
我的游戏
|
5 years ago |
|
chenzhi
|
ad6eb5b0d7
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
chenzhi
|
bf728438d7
|
优化
|
5 years ago |
|
zhengchanglong
|
16d54e6add
|
Merge branch 'feature/promote' into dev
|
5 years ago |
|
zyx
|
938c4e9eda
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
zyx
|
8f0ae7dd8b
|
充值界面模板嵌套
|
5 years ago |
|
sunke
|
5bba1e5df4
|
游戏推广协议
|
5 years ago |
|
chenzhi
|
9764d361f1
|
123
|
5 years ago |
|
chenzhi
|
fbf8a76ec9
|
123
|
5 years ago |
|
ELF
|
17a7045036
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
9e83202467
|
修改bug
|
5 years ago |
|
chenzhi
|
40001277bc
|
login
|
5 years ago |
|
chenxiaojun
|
ee97f42261
|
推广平台->数据管理->数据汇总--检索更新
|
5 years ago |
|
chenxiaojun
|
e2fa14c1c8
|
推广平台->数据管理->数据汇总->合计--更新
|
5 years ago |
|
sunke
|
97a973079a
|
charge
|
5 years ago |
|
chenzhi
|
0cd21feb28
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
chenzhi
|
44e2623efe
|
123
|
5 years ago |
|
chenzhi
|
451ea9588e
|
base
|
5 years ago |
|
chenzhi
|
4b7d9202b7
|
123
|
5 years ago |
|
ELF
|
175e38f712
|
修改bug
|
5 years ago |
|
zyx
|
a0e27f9e7a
|
覆盖vbs脚本
|
5 years ago |
|
chenzhi
|
c3196b7be0
|
123
|
5 years ago |
|
chenzhi
|
b52eee941b
|
优化
|
5 years ago |
|
chenzhi
|
3098558fe0
|
lww代码合并
|
5 years ago |
|
chenzhi
|
4c2e1f294e
|
去vs
|
5 years ago |
|
chenzhi
|
68eead8d31
|
123
|
5 years ago |
|
chenzhi
|
63c5421d49
|
Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev_lww
|
5 years ago |
|
chenzhi
|
a28acf200d
|
个人中心
|
5 years ago |
|
zhengchanglong
|
5af7ab4e5e
|
Merge remote-tracking branch 'origin/dev_lww' into dev_lww
|
5 years ago |
|
zhengchanglong
|
d9e75cd4c0
|
充值
|
5 years ago |
|
chenzhi
|
71c1ad1437
|
Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev_lww
|
5 years ago |
|
chenzhi
|
737e7786e8
|
移动官网手机及账号注册
|
5 years ago |
|
chenxiaojun
|
3d9865f507
|
推广平台->财务管理->结算明细--检索调整
|
5 years ago |
|
zhengchanglong
|
0b188b12bb
|
充值
|
5 years ago |
|
ELF
|
5bfecf5fc6
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
chenzhi
|
2e610bc245
|
优化手机注册1
|
5 years ago |
|
ELF
|
e2d75ec2c6
|
修改推广后台首页
|
5 years ago |
|
chenzhi
|
8ad35726fb
|
账号注册ok
|
5 years ago |
|
chenzhi
|
ddad6f6bf4
|
优化注册
|
5 years ago |
|
ELF
|
16d458155a
|
修改打包日志
|
5 years ago |
|
ELF
|
ed82ea4103
|
添加打包日志记录
|
5 years ago |
|
ELF
|
f90a6a09fb
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
f2765313fd
|
优化打包
|
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 |
|
ELF
|
8968223dd2
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
6c636a92f5
|
修改
|
5 years ago |
|
zyx
|
102013e527
|
部长数据统计修正
|
5 years ago |
|
sunke
|
3a109a6444
|
bug修改
|
5 years ago |
|
zhengchanglong
|
2783890ac2
|
修改网页title
|
5 years ago |
dev_lww
|
c94dc6b3a5
|
手机官网
|
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
|
e56256ba1d
|
修改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
|
e4291c48b0
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
85e466c3fd
|
修改bug
|
5 years ago |
|
jbrazz
|
c8f072f983
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
jbrazz
|
2a6d9b7571
|
推广员名称
|
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 |
|
jbrazz
|
5deb0c2b05
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
jbrazz
|
8a513767dd
|
upt
|
5 years ago |
|
chenxiaojun
|
467b193037
|
推广平台->退出登录--更新
|
5 years ago |
|
sunke
|
e75907ed07
|
隐藏用户信息
|
5 years ago |
|
sunke
|
9e2bb1e809
|
安全管理admin后台
|
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
|
b2df7e0fe3
|
修改bug
|
5 years ago |
|
ELF
|
fbce375679
|
修改bug
|
5 years ago |
|
“用lww
|
fa69e8ba83
|
手机端官网修改
|
5 years ago |
|
ELF
|
d9419ae64e
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
ELF
|
3d46a55811
|
修改bug
|
5 years ago |
|
chenxiaojun
|
6307625efc
|
管理后台->推广员->结算管理->推广提现->--更新
|
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
|
84b36e2d78
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
784de48bf9
|
修改bug
|
5 years ago |
|
jbrazz
|
8be3ee9560
|
upt
|
5 years ago |
|
jbrazz
|
31948423e0
|
upt
|
5 years ago |
|
jbrazz
|
20c168a537
|
三级改四级配置
|
5 years ago |
|
zhengchanglong
|
d2f547eb9c
|
Merge branch 'feature/promote' into dev
|
5 years ago |
|
zhengchanglong
|
f1f7666e1e
|
Merge branch 'dev_lww' into feature/promote
|
5 years ago |
|
zhengchanglong
|
37bdcc60c8
|
Merge remote-tracking branch 'origin/feature/promote' into feature/promote
|
5 years ago |
|
sunke
|
3b0a6a5479
|
promote
|
5 years ago |
|
“用lww
|
c20f08f9b3
|
pc端官网修改
|
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 |
|
ELF
|
c2c8f11d01
|
修改
|
5 years ago |
|
sunke
|
c918864264
|
safeCSS
|
5 years ago |
|
zhengchanglong
|
20d8be8807
|
Merge branch 'dev_lww' into feature/promote
|
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 |
|
chenxiaojun
|
c8281d2bb2
|
管理后台->推广员->结算管理->推广提现->上传汇款证明--更新
|
5 years ago |
|
chenxiaojun
|
5afd0ffd63
|
管理后台->推广员->结算管理->推广提现->上传汇款证明--更新
|
5 years ago |
|
“用lww
|
7962cc62b4
|
pc端官网修改
|
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 |
|
“用lww
|
cf78ecd0cc
|
pc端官网修改
|
5 years ago |
|
“用lww
|
9ef65ced5c
|
Merge branch 'feature/promote' of D:\workspace\git\platform with conflicts.
|
5 years ago |
|
chenzhi
|
484216ae65
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
chenzhi
|
c11814f902
|
修改背景
|
5 years ago |
|
chenxiaojun
|
d57e4a211f
|
推广平台->财务管理->提现记录->结算单--更新
|
5 years ago |
|
ELF
|
6f4ec4ff30
|
Merge branch 'feature/promote' into dev
|
5 years ago |
|
ELF
|
f1625fec2d
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
ELF
|
afb6de56f8
|
添加3级变四级脚本
|
5 years ago |
|
chenxiaojun
|
c057c5cf47
|
管理后台->推广员->结算管理->推广提现->上传汇款证明--格式限制
|
5 years ago |
|
zhengchanglong
|
f21403a05b
|
Merge branch 'dev_lww' into feature/promote
|
5 years ago |
|
chenxiaojun
|
578d640524
|
管理后台->推广员->结算管理->推广提现--更新
|
5 years ago |
|
sunke
|
4ea2029976
|
大小写
|
5 years ago |
|
chenxiaojun
|
1c157d78b9
|
管理后台->推广员->结算管理->推广提现->订单详情--更新
|
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 |
|
“用lww
|
e019e23ca4
|
pc端官网修改
|
5 years ago |
|
jbrazz
|
14081fe0cc
|
Merge branch 'featurer/ylw_4.0' into dev
|
5 years ago |
|
jbrazz
|
3f1b2d34c2
|
upt
|
5 years ago |
|
sunke
|
e8d2879218
|
下载中心内容补充
|
5 years ago |
|
zyx
|
68e57ab1f5
|
导出链路问题修正
|
5 years ago |
|
chenxiaojun
|
0787c976ef
|
管理后台->推广员->结算管理->推广提现--更新
|
5 years ago |
|
chenxiaojun
|
895265a330
|
管理后台->推广员->结算管理->推广提现--更新
|
5 years ago |
|
sunke
|
f948bfbb7d
|
下载器内容
|
5 years ago |
|
ELF
|
ad15ac9d1b
|
修改页面
|
5 years ago |
|
ELF
|
e1115d6632
|
Merge branch 'feature/promote' into dev
|
5 years ago |
|
ELF
|
1fed7cdfc6
|
修改
|
5 years ago |
|
ELF
|
6bf4e10916
|
Merge branch 'hotfix/oa' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
Your Name
|
a9a95765e2
|
OA获取信息-手机系统变更消息推送
|
5 years ago |
|
ELF
|
f03fec9e43
|
Merge branch 'feature/promote' into dev
|
5 years ago |
|
ELF
|
ed2fbea24c
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
ELF
|
070cc2e7c2
|
修改bug
|
5 years ago |
|
jbrazz
|
e57dfd3fae
|
修改设备号查询
|
5 years ago |
|
jbrazz
|
f4a46335ca
|
upt
|
5 years ago |
|
jbrazz
|
7396e69a61
|
upt
|
5 years ago |
|
jbrazz
|
380c930686
|
Merge branch 'featurer/ylw_4.0' into dev
|
5 years ago |
|
jbrazz
|
52880f1a91
|
upt
|
5 years ago |
|
jbrazz
|
ea4c861559
|
upt
|
5 years ago |
|
zyx
|
97a1b634b9
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
0a819757cb
|
测试资源时间bug修正
|
5 years ago |
|
zyx
|
0ce8984c13
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
zyx
|
ce008b284e
|
月结统计bug修正
|
5 years ago |
|
jbrazz
|
b21df0a8f4
|
upt
|
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 |
|
jbrazz
|
0dcb2a2014
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
jbrazz
|
c9996e071c
|
fix grand_id
|
5 years ago |
|
ELF
|
09672d13b4
|
修改分包bug
|
5 years ago |
|
ELF
|
e853fc1c3e
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
ELF
|
c6627a53c2
|
将plist demo写入php文件
|
5 years ago |
|
chenxiaojun
|
a29015937a
|
推广后台->财务管理->提现记录->结算单--更新
|
5 years ago |
|
chenzhi
|
58db110844
|
合并
|
5 years ago |
|
chenzhi
|
115bafc067
|
新增补链日期及取消补链功能
|
5 years ago |
|
chenxiaojun
|
e1fd669aa8
|
推广后台->财务管理->提现记录->结算单--新增
|
5 years ago |
|
“用lww
|
0d83da8446
|
手机官网->首页->解决首页底部菜单由于引入bootstrap导致和其他页面不一致
|
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
|
edc6a7be73
|
修改冲突
|
5 years ago |
|
ELF
|
9abb4ebb2c
|
修改
|
5 years ago |
|
chenzhi
|
7e37f3a2df
|
优化迁移用户addshifttask
|
5 years ago |
|
jbrazz
|
9300280f78
|
merge feture/ylw
|
5 years ago |
|
jbrazz
|
2dd1372b78
|
upt
|
5 years ago |
|
jbrazz
|
db1ea1370a
|
upt
|
5 years ago |
|
jbrazz
|
5e9cfb023f
|
uypt
|
5 years ago |
|
Your Name
|
f642fb2c90
|
游戏充值订单添加CP订单号字段
|
5 years ago |
|
jbrazz
|
74be3407b1
|
upt
|
5 years ago |
|
“用lww
|
cb76357dae
|
Merge branch 'dev' into dev_lww
|
5 years ago |
|
ELF
|
a8bc52df33
|
修改
|
5 years ago |
|
“用lww
|
6d5bb2a9a1
|
手机官网-底部菜单高亮bug修复
|
5 years ago |
|
ELF
|
65866d7fa1
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
ELF
|
6f1e4551ac
|
修改bug
|
5 years ago |
|
zyx
|
cbfb286d53
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
zyx
|
5f673b346d
|
月结统计添加部长渠道
|
5 years ago |
|
Your Name
|
b54f73e4c2
|
OA获取信息
|
5 years ago |
|
Your Name
|
31e90a9dee
|
OA获取信息
|
5 years ago |