 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
|
b52eee941b
|
优化
|
5 years ago |
|
chenzhi
|
3098558fe0
|
lww代码合并
|
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 |
|
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 |
|
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 |
|
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 |