“用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 |
|
Your Name
|
f9eac7138f
|
OA获取信息
|
5 years ago |
|
ELF
|
e0d542b5f6
|
解决冲突
|
5 years ago |
|
“用lww
|
63d99584ed
|
Merge branch 'dev' into dev_lww
|
5 years ago |
|
ELF
|
eb15fc7dfc
|
Merge branch 'feature/pack' into feature/promote
|
5 years ago |
|
ELF
|
2f4cd4c101
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
ELF
|
f056143dee
|
修改bug
|
5 years ago |
|
chenzhi
|
9a6c75b41d
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
chenzhi
|
a653b46f0e
|
优化月份统计接口新增事务
|
5 years ago |
|
jbrazz
|
8a2c99681a
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
chenzhi
|
c2e686c38e
|
123
|
5 years ago |
|
chenzhi
|
537ed0857a
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
chenzhi
|
9d09fa4665
|
4角色聚合
|
5 years ago |
|
Your Name
|
90105716d5
|
OA获取信息修改
|
5 years ago |
|
Your Name
|
93bbc57ef2
|
OA获取信息修改
|
5 years ago |
|
Your Name
|
94480951cb
|
OA获取信息修改
|
5 years ago |
|
“用lww
|
631a635dfe
|
还原新版本
|
5 years ago |
|
“用lww
|
4edd0bac4a
|
修改
|
5 years ago |
|
zyx
|
5eca14b69e
|
Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
zyx
|
9e9d742275
|
导出添加引号
|
5 years ago |
|
zhengchanglong
|
943564f82d
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
d5a90238ec
|
导出加大默认内存
|
5 years ago |
|
chenxiaojun
|
02d862cb7a
|
推广后台->安全密码--样式调整
|
5 years ago |
|
jbrazz
|
c66c35b686
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
jbrazz
|
68df391d9c
|
upt
|
5 years ago |
|
ELF
|
d79da20c28
|
Merge branch 'hotfix/media' into dev
|
5 years ago |
|
ELF
|
3d88a82794
|
回滚官网
|
5 years ago |
|
zhengchanglong
|
0223ecb125
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
35e1b2631a
|
导出添加游戏订单号
|
5 years ago |
|
zhengchanglong
|
945ea1173a
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
a307bf343e
|
游戏详情查看导出，按日期分成多个sheet
|
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 |
|
“用lww
|
322aed6379
|
官网-游戏详情
|
5 years ago |
|
“用lww
|
fb99dc3389
|
官网
|
5 years ago |
|
chenxiaojun
|
3f7fd8c3c7
|
推广后台->结算明细|分成比例--样式调整
|
5 years ago |
|
zhengchanglong
|
4dd2ab92f3
|
Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
“用lww
|
320ebf1b6e
|
新增分支dev_lww
|
5 years ago |
|
zhengchanglong
|
2d67812f90
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
7e4aaf0a2e
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
zyx
|
266202c06b
|
游戏详情查看导出，按日期分成多个sheet
|
5 years ago |
|
Your Name
|
330216e20e
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
Your Name
|
51701a485d
|
SDK菜单添加平台选型
|
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 |
|
“用lww
|
bde48df713
|
官网-商务合作
|
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 |
|
zyx
|
602e53e82f
|
合并分支dev_zyx财务部分的代码
|
5 years ago |
|
chenxiaojun
|
8ae754f74a
|
推广后台->财务管理->结算明细--更新
|
5 years ago |
|
ELF
|
71feea26fb
|
修改bug
|
5 years ago |
|
ELF
|
89b243930d
|
落地页下载页优化
|
5 years ago |
|
zhengchanglong
|
561b183bec
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
chenzhi
|
a9bc64a4b2
|
优化统计逻辑
|
5 years ago |
|
zhengchanglong
|
78e23d19b2
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
8fd435a324
|
月结统计，游戏查看名称修改
|
5 years ago |
|
chenxiaojun
|
a32565e2e1
|
推广后台->数据管理->数据汇总|每日概况--更新
|
5 years ago |
|
chenxiaojun
|
7220247ecd
|
推广后台->数据管理->数据汇总|每日概况--更新
|
5 years ago |
|
zhengchanglong
|
e5c834e054
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
4dfec50ba5
|
月结统计修改
|
5 years ago |
|
chenxiaojun
|
43603cf493
|
推广后台->数据管理->数据汇总--更新
|
5 years ago |
|
chenzhi
|
0ae24bf2cd
|
优化财务聚合接口2
|
5 years ago |
|
chenzhi
|
58c405e914
|
优化财务聚合接口
|
5 years ago |
|
ELF
|
c3502c6120
|
打包添加ios13兼容
|
5 years ago |
|
chenzhi
|
0df9045e67
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
chenzhi
|
f54305911c
|
优化api暂存
|
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 |
|
chenzhi
|
eacdea6f9b
|
暂存修改
|
5 years ago |
|
chenzhi
|
a9b7b22a4b
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
chenzhi
|
81192f36c8
|
xiufu
|
5 years ago |
|
sunke
|
372ec046d0
|
安全中心
|
5 years ago |
|
zyx
|
3d8ed52daf
|
推广后台首页条件修改
|
5 years ago |
|
chenzhi
|
6c45b4dd3f
|
修改获取下级函数
|
5 years ago |
|
ELF
|
ae44fc79bd
|
修改
|
5 years ago |
|
zhengchanglong
|
879accf9f5
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
f44a11a915
|
月结统计提示语修改
|
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 |
|
zhengchanglong
|
78846c699f
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
9539b38e86
|
月结统计提示语修改
|
5 years ago |
|
jbrazz
|
48b1cdf66f
|
upt
|
5 years ago |
|
zhengchanglong
|
3c3a13c068
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
f0559c3576
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
Conflicts:
Application/Admin/View/Finance/index.html
|
5 years ago |
|
zyx
|
cfa33d3e42
|
月结统计提示语修改
|
5 years ago |
|
jbrazz
|
a8125bf377
|
upt
|
5 years ago |
|
zhengchanglong
|
9dd5a34bf7
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
a850cfa048
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
50c775a78b
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
zyx
|
71b2287647
|
测试资源日志管理修改
|
5 years ago |
|
chenzhi
|
f9397efebf
|
修改总流水统计方式
|
5 years ago |
|
chenxiaojun
|
b6a62e2df1
|
推广后台->数据管理->每日概况 -- 更新
|
5 years ago |
|
zhengchanglong
|
6dcd1549d0
|
Merge branch 'dev_zyx' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zyx
|
5a7432ef40
|
月结统计新增平台比收入字段，将平台币流水改为平台币支出
|
5 years ago |
|
chenzhi
|
c8da11a12e
|
新增平台币流水充值
|
5 years ago |
|
chenxiaojun
|
81ed43afdd
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
|
zyx
|
b6080180ab
|
测试资源bug修正
|
5 years ago |
|
chenzhi
|
b4c9f60ac9
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
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 |
|
ELF
|
edc40b8a1b
|
ss
|
5 years ago |
|
chenzhi
|
8212b4ecaf
|
4级推广申请资源修正
|
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 |