chenzhi
|
4ebe2780cc
|
优化空值修改4
|
5 years ago |
廖金灵
|
548ca893d3
|
Merge branch 'fix/admin_second_optimization' of wmtx/platform into release
优化空值3
|
5 years ago |
chenzhi
|
644e38fd1f
|
优化空值3
|
5 years ago |
廖金灵
|
7649327b2b
|
Merge branch 'fix/admin_second_optimization' of wmtx/platform into release
优化空值修改2
|
5 years ago |
chenzhi
|
644100dc3b
|
优化空值修改2
|
5 years ago |
廖金灵
|
cd53b69c64
|
Merge branch 'fix/admin_second_optimization' of wmtx/platform into release
优化可以为空填写
|
5 years ago |
chenzhi
|
3b6f8c70cc
|
优化可以为空填写
|
5 years ago |
chenzhi
|
ba9468fedc
|
新增打款配置
|
5 years ago |
廖金灵
|
d99db944c5
|
Merge branch 'fix/admin_second_optimization' of wmtx/platform into master
bug修复及cp下游接口添加
|
5 years ago |
chenzhi
|
748ec401f3
|
新增打款配置1
|
5 years ago |
sunke
|
55a6b20f6e
|
手机号绑定
|
5 years ago |
sunke
|
bb9654f09f
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/loginInfo
|
5 years ago |
廖金灵
|
08f068b553
|
Merge branch 'fix/admin_second_optimization' of wmtx/platform into release
修改查看
|
5 years ago |
chenzhi
|
6c4319cfe2
|
Revert "暂存"
This reverts commit a685c14e23 .
|
5 years ago |
chenzhi
|
42a17754e4
|
修改查看
|
5 years ago |
zhengyongxing
|
8746d68493
|
cp下游接口添加
|
5 years ago |
chenzhi
|
c886b508f9
|
Merge branch 'fix/admin_second_optimization' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization
|
5 years ago |
chenzhi
|
bb995ab355
|
合并
|
5 years ago |
chenzhi
|
a685c14e23
|
暂存
|
5 years ago |
廖金灵
|
e39ab6806e
|
Merge branch 'fix/admin_second_optimization' of wmtx/platform into release
bug修复及cp合作方获取接口添加
|
5 years ago |
zhengyongxing
|
7a96d4b6c0
|
Merge branch 'feature/modify_bug' into fix/admin_second_optimization
|
5 years ago |
ELF
|
c871575e23
|
修改打包失败提示
|
5 years ago |
zhengyongxing
|
c10e05e688
|
cp合作方获取接口添加
|
5 years ago |
chenzhi
|
ec4d180287
|
优化公会更改
|
5 years ago |
chenzhi
|
09e71420e0
|
优化推广员归属审核
|
5 years ago |
sunke
|
2a017bfb45
|
loginmodel
|
5 years ago |
sunke
|
9ea29c2371
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/loginInfo
|
5 years ago |
chenzhi
|
e1e431804c
|
优化审批
|
5 years ago |
chenzhi
|
6557938e53
|
优化聚合渠道财务结算单
|
5 years ago |
chenzhi
|
5ebdda1c85
|
修改合作方可为空
|
5 years ago |
sunke
|
44c969ac0c
|
登陆
|
5 years ago |
sunke
|
51c4656da6
|
denglu
|
5 years ago |
zhengyongxing
|
1f0cfca3ce
|
管理后台推广公司管理及合作方管理部分文字修改
|
5 years ago |
zhengyongxing
|
742d3b5470
|
管理后台推广公司管理及合作方管理部分文字修改
|
5 years ago |
chenzhi
|
50462e3470
|
优化合作方必填项
|
5 years ago |
chenzhi
|
e770a00cbb
|
优化推广公司必填项目
|
5 years ago |
chenzhi
|
9f7e15caac
|
优化推广公司检验规则
|
5 years ago |
chenzhi
|
c3f01ede43
|
推广公司新增信息填写无效修复
|
5 years ago |
sunke
|
0b82acf19d
|
登录
|
5 years ago |
sunke
|
177d8b4538
|
登陆
|
5 years ago |
sunke
|
8694412609
|
登陆
|
5 years ago |
sunke
|
a29365fed8
|
登陆
|
5 years ago |
zhengyongxing
|
2933d2d223
|
管理后台文字修正
|
5 years ago |
chenzhi
|
5a89280915
|
隐藏平台币充值
|
5 years ago |
chenzhi
|
5deb4a798b
|
隐藏超级签入口
|
5 years ago |
chenzhi
|
35d8e379d8
|
优化操作行为日志隐藏玩家
|
5 years ago |
chenzhi
|
673e3fb5cd
|
角色权限修改状态提醒优化
|
5 years ago |
chenzhi
|
6885ec61fc
|
优化公会统计平台币收回提醒
|
5 years ago |
chenzhi
|
289b99c293
|
合作方管理页面文字错误
|
5 years ago |
chenzhi
|
c93a8577c4
|
合并
|
5 years ago |
chenzhi
|
22f0039cb3
|
预发布官网平台币展示
|
5 years ago |
张谷诚
|
bb833deb98
|
Merge branch 'hotfix/test_resource_search' of wmtx/platform into master
测试资源搜索功能添加
|
5 years ago |
chenzhi
|
ae4c58b6fd
|
修改推广员流水可选填
|
5 years ago |
zhengyongxing
|
132b601f74
|
测试资源搜索功能添加
|
5 years ago |
zhengyongxing
|
878414aeb2
|
测试资源搜索修正
|
5 years ago |
张谷诚
|
c5f9a25a9e
|
Merge branch 'feature/export_authority' of wmtx/platform into release
导出bug修改
|
5 years ago |
zyx
|
ee9f53ce0b
|
导出权限bug修改
|
5 years ago |
zhengyongxing
|
301a5a7f5a
|
导出bug修改
|
5 years ago |
zhengyongxing
|
5e71728097
|
导出bug修改
|
5 years ago |
chenzhi
|
450ef803d6
|
合并
|
5 years ago |
chenzhi
|
3e7778df35
|
优化零元问题
|
5 years ago |
chenzhi
|
861fd07965
|
优化检索
|
5 years ago |
chenzhi
|
834dbe0867
|
优化导出支付信息不记录
|
5 years ago |
廖金灵
|
52b483356d
|
Merge branch 'feature/export_authority' of wmtx/platform into release
游戏统计bug修改
|
5 years ago |
zhengyongxing
|
6081e088db
|
游戏统计bug修改
|
5 years ago |
chenzhi
|
0dab114f1e
|
优化操作提醒
|
5 years ago |
廖金灵
|
44a49a1b2e
|
Merge branch 'feature/export_authority' of wmtx/platform into release
游戏统计导出修改
|
5 years ago |
廖金灵
|
5d0b9d65ed
|
Merge branch 'feature/ylw-4-27' of wmtx/platform into release
市场专员新增合作团队可自动匹配到市场总监
|
5 years ago |
廖金灵
|
3e43b8cb7c
|
Merge branch 'hotfix/company_bank' of wmtx/platform into release
优化银行信息不记录
|
5 years ago |
chenzhi
|
14efc9650f
|
优化银行信息不记录
|
5 years ago |
zhengyongxing
|
1659c55ef2
|
用户行为日志修改
|
5 years ago |
zhengyongxing
|
0ca2f2a064
|
游戏统计导出修改
|
5 years ago |
chenzhi
|
2ad89c2fb6
|
优化导出时间
|
5 years ago |
chenzhi
|
5a9fc76374
|
申请编辑信息遮罩不关闭
|
5 years ago |
zhengyongxing
|
4d43e877a1
|
Merge branches 'feature/export_authority' and 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
Conflicts:
Data/update.sql
|
5 years ago |
zhengyongxing
|
acaebe0217
|
Merge branches 'feature/export_authority' and 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
Conflicts:
Data/update.sql
|
5 years ago |
zhengyongxing
|
60c0c8ee39
|
Merge branches 'feature/promote_data_config' and 'release' of 47.111.118.107:wmtx/platform into feature/promote_data_config
Conflicts:
Data/update.sql
|
5 years ago |
chenzhi
|
22dc7a62ce
|
优化游戏统计导出游戏类型不识别
|
5 years ago |
chenzhi
|
496d6a27bb
|
优化推广员选择后驻留问题
|
5 years ago |
chenzhi
|
7fa6baf860
|
玩家登陆显示优化
|
5 years ago |
zhengyongxing
|
c58cdd31af
|
用户行为日志导出修正
|
5 years ago |
zhengyongxing
|
613d60e4a7
|
数据权限配置修改
|
5 years ago |
zhengyongxing
|
057a51dbeb
|
游戏统计bug修正
|
5 years ago |
廖金灵
|
e88867abe5
|
Merge branch 'feature/aggregate_finance' of wmtx/platform into release
新增权限不验证
|
5 years ago |
zhengyongxing
|
81bd79ecf8
|
游戏统计bug修正
|
5 years ago |
chenzhi
|
973f7ca394
|
现在权限不验证
|
5 years ago |
廖金灵
|
ff5b2e3483
|
Merge branch 'feature/aggregate_finance' of wmtx/platform into release
聚合财务结算单
|
5 years ago |
zhengyongxing
|
4b63c7b786
|
游戏统计bug修正
|
5 years ago |
chenzhi
|
21a985ae82
|
聚合财务结算单ok
|
5 years ago |
zhengyongxing
|
4f88cd025e
|
绑币导出修正
|
5 years ago |
chenzhi
|
8137778ec1
|
新增聚合操作日志
|
5 years ago |
zhengyongxing
|
38f478d63d
|
数据调整修改
|
5 years ago |
zhengyongxing
|
8d7dbe5469
|
测试资源修改
|
5 years ago |
zhengyongxing
|
727b335b45
|
测试资源修改
|
5 years ago |
chenzhi
|
63f5354dc3
|
优化重算
|
5 years ago |
zhengyongxing
|
5dbd0eb8fa
|
业绩配置修改
|
5 years ago |
zhengyongxing
|
a9ce0585cc
|
测试资源配置
|
5 years ago |
chenzhi
|
2a28cf9008
|
聚合财务优化权限
|
5 years ago |
zhengyongxing
|
014c7541f3
|
落地页下载页面更新行为日志
|
5 years ago |
zhengyongxing
|
b768d41935
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
Conflicts:
Application/Home/Controller/PackageController.class.php
|
5 years ago |
chenzhi
|
fe662ce160
|
审核子操作ok
|
5 years ago |
zhengyongxing
|
b6b97c130d
|
测试资源代码修正
|
5 years ago |
chenzhi
|
16d9813e18
|
聚合财务重算
|
5 years ago |
zhengyongxing
|
a9e6dafad3
|
行为日志修正
|
5 years ago |
zhengyongxing
|
b698495dbb
|
游戏统计添加元素修正
|
5 years ago |
chenzhi
|
253b47b2a9
|
聚合财务子操作
|
5 years ago |
chenzhi
|
990c62b06a
|
批注增删改查
|
5 years ago |
chenzhi
|
6b5f60f8e6
|
新增凭证增删改查
|
5 years ago |
chenzhi
|
afd362d847
|
聚合结算单导出优化3
|
5 years ago |
chenzhi
|
2fc38b25b6
|
聚合结算单导出优化2
|
5 years ago |
chenzhi
|
ce4c938080
|
优化聚合结算导出
|
5 years ago |
chenzhi
|
cf9480eb89
|
聚合财务导出
|
5 years ago |
chenzhi
|
422728ed11
|
聚合财务编辑
|
5 years ago |
zhengyongxing
|
0ebde4cb17
|
导出权限修正
|
5 years ago |
chenzhi
|
bf7c7ed14f
|
审核
|
5 years ago |
ELF
|
4a92ab8543
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/web_register
|
5 years ago |
zhengyongxing
|
13232b3b04
|
获取用户账号接口
|
5 years ago |
zhengyongxing
|
e60b9b2edf
|
测试资源批量封号
|
5 years ago |
chenzhi
|
114cf4a503
|
聚合对账新增对账金额统计
|
5 years ago |
chenzhi
|
51322e3317
|
聚合财务2
|
5 years ago |
chenzhi
|
6d0e7c3a00
|
聚合对账1
|
5 years ago |
ELF
|
b217695c3f
|
修改分包oss文件上传
|
5 years ago |
ELF
|
d9cc82f73a
|
修改网站注册
|
5 years ago |
chenzhi
|
73ac725950
|
聚合脚本ok
|
5 years ago |
zhengyongxing
|
63e4789069
|
游戏编辑支付宝 汇付宝添加
|
5 years ago |
ELF
|
0af6a53ba7
|
后台arpu功能优化
|
5 years ago |
chenzhi
|
95cd9993e2
|
聚合财务1
|
5 years ago |
zhengyongxing
|
941f27e2e3
|
获取用户账号的方法添加
|
5 years ago |
yulingwei
|
bbc1f6b89a
|
upt
|
5 years ago |
万盟天下
|
744cbcf7ea
|
Merge branch 'hotfix/promote_game_bug' of wmtx/platform into master
修改游戏列表bug
|
5 years ago |
万盟天下
|
53269d56e9
|
Merge branch 'hotfix/promote_game_bug' of wmtx/platform into release
修改游戏列表bug
|
5 years ago |
zhengyongxing
|
4d938b85f4
|
导出账号权限修改配置
|
5 years ago |
ELF
|
99ac9965d9
|
修改bug
|
5 years ago |
ELF
|
a56d861053
|
修改游戏列表bug
|
5 years ago |
zhengyongxing
|
0482836a8e
|
导出账号权限添加
|
5 years ago |
ELF
|
ccfd01f70a
|
隐藏推广员指标
|
5 years ago |
zhengyongxing
|
a5554f7fa3
|
推广员业务配置功能添加
|
5 years ago |
zhengyongxing
|
295ca2d803
|
推广员业务配置功能添加
|
5 years ago |
万盟天下
|
aa663b3c02
|
Merge branch 'release' of wmtx/platform into master
优化游戏管理
|
5 years ago |
ELF
|
144e4e4ea7
|
计算ARPU
|
5 years ago |
万盟天下
|
c292e9ed6c
|
Merge branch 'feature/promote_all_check' of wmtx/platform into release
推广员游戏列表查看全选问题修正
|
5 years ago |
ELF
|
234d297272
|
恢复大笑隐藏
|
5 years ago |
ELF
|
4070302a7e
|
修改bug
|
5 years ago |
ELF
|
908722c5be
|
修改
|
5 years ago |
ELF
|
d09e06115f
|
大笑游戏名称修改
|
5 years ago |
zhengyongxing
|
1a0b2dbaba
|
推广员游戏列表查看全选问题
|
5 years ago |
zhengyongxing
|
fcc7bf2aaa
|
管理后台-财务管理-游戏统计-添加元素
|
5 years ago |
zhengyongxing
|
322b4b6cee
|
管理后台导出权限添加
|
5 years ago |
zhengyongxing
|
001e9e70f8
|
管理后台导出权限添加
|
5 years ago |
廖金灵
|
a6dffecaf9
|
Merge branch 'feature/fix_work_order' of wmtx/platform into release
修复统计问题
|
5 years ago |
yulingwei
|
8fc1199e79
|
upt
|
5 years ago |
yulingwei
|
70f3da8017
|
upt
|
5 years ago |
廖金灵
|
7ab6c8ad68
|
Merge branch 'feature/fix_work_order' of wmtx/platform into release
修复问题
|
5 years ago |
yulingwei
|
2ac6f7ebee
|
upt
|
5 years ago |
yulingwei
|
c3cb357e1c
|
upt
|
5 years ago |
廖金灵
|
ea301e6ea5
|
Merge branch 'feature/ios_Download' of wmtx/platform into release
删除渲染文本
|
5 years ago |
廖金灵
|
b09ccfc42d
|
Merge branch 'feature/fix_work_order' of wmtx/platform into release
修复问题
|
5 years ago |
yulingwei
|
872a76356d
|
upt
|
5 years ago |
sunke
|
9af4931a48
|
日志
|
5 years ago |
sunke
|
8114e691d2
|
ios 统计
|
5 years ago |
廖金灵
|
93a6e94075
|
Merge branch 'feature/ios_Download' of wmtx/platform into release
ios下载新增统计
|
5 years ago |
廖金灵
|
820885f3dd
|
Merge branch 'feature/platform_rule' of wmtx/platform into release
推广规则
|
5 years ago |
廖金灵
|
431bb24f32
|
Merge branch 'feature/president_modify' of wmtx/platform into release
落地页超级签注册添加设备识别
|
5 years ago |
ELF
|
a7173d9ec4
|
落地页超级签注册添加设备识别
|
5 years ago |
廖金灵
|
084ea5b11f
|
Merge branch 'feature/pfcoin_data' of wmtx/platform into release
平台币统计新增需求
|
5 years ago |
廖金灵
|
03722c4825
|
Merge branch 'hotfix/sumary_download' of wmtx/platform into release
汇总导出
|
5 years ago |
sunke
|
bde08adcc2
|
平台币
|
5 years ago |
廖金灵
|
8b2ae9d6da
|
Merge branch 'feature/fix_work_order' of wmtx/platform into release
工单统计及iOS下载数优化
|
5 years ago |
廖金灵
|
72d1d2f338
|
Merge branch 'feature/president_modify' of wmtx/platform into release
修改会长押金编辑付款人付款账号非必填
|
5 years ago |
sunke
|
163388e75c
|
平台币
|
5 years ago |
sunke
|
ae0e10166a
|
pt
|
5 years ago |
sunke
|
07c385e561
|
平台
|
5 years ago |
sunke
|
0758921bfe
|
平台
|
5 years ago |
sunke
|
aa14aa95a6
|
平台
|
5 years ago |
sunke
|
848eb6c294
|
平台
|
5 years ago |
sunke
|
b6649a7b9d
|
平台币
|
5 years ago |
yulingwei
|
ccc159d3b2
|
upt
|
5 years ago |
ELF
|
90f9e52ab4
|
修改官网轮播图
|
5 years ago |
ELF
|
801148e39a
|
修改
|
5 years ago |
yulingwei
|
42026e753a
|
upt
|
5 years ago |
yulingwei
|
7b3006f871
|
upt
|
5 years ago |
yulingwei
|
5009a327db
|
upt
|
5 years ago |
yulingwei
|
ac83e556ff
|
upt
|
5 years ago |
yulingwei
|
f1428a8fe7
|
upt
|
5 years ago |
sunke
|
faf5d7956e
|
规则
|
5 years ago |
sunke
|
562d589aea
|
规则
|
5 years ago |
sunke
|
031528411b
|
平台币
|
5 years ago |
sunke
|
5fa22cfa40
|
弹窗
|
5 years ago |
sunke
|
fee97bb00a
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/platform_rule
|
5 years ago |
yulingwei
|
dec978da7a
|
upt
|
5 years ago |
yulingwei
|
e462305587
|
upt
|
5 years ago |
yulingwei
|
312448c724
|
upt
|
5 years ago |
sunke
|
c1168740b6
|
平台币
|
5 years ago |
sunke
|
253c956794
|
平台币
|
5 years ago |
sunke
|
e8f4632f90
|
ios
|
5 years ago |
sunke
|
6e016f67e7
|
ios
|
5 years ago |
sunke
|
3423aff9dc
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/ios_Download
|
5 years ago |
sunke
|
2adcb68c06
|
平台币新增需求
|
5 years ago |
张谷诚
|
bf8c6603a0
|
Merge branch 'feature/payset_change' of wmtx/platform into release
汇付宝添加支付宝与微信
|
5 years ago |
sunke
|
97e8397d76
|
文件夹优化
|
5 years ago |
sunke
|
1fe794b597
|
平台规则样式优化
|
5 years ago |
sunke
|
ec309c2b6a
|
规则
|
5 years ago |
sunke
|
a9bd629e7a
|
规则
|
5 years ago |
sunke
|
731fbd1986
|
平台规则
|
5 years ago |
sunke
|
bdb688c985
|
编辑规则
|
5 years ago |
zhengyongxing
|
2a54b0ed08
|
汇付宝添加支付宝与微信
|
5 years ago |
sunke
|
76e2f87256
|
ios
|
5 years ago |
ELF
|
94575cae29
|
修改会长押金编辑付款人付款账号非必填
|
5 years ago |
yulingwei
|
c1d03cc526
|
upt
|
5 years ago |
sunke
|
1358bfee0a
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/ios_Download
|
5 years ago |
sunke
|
3a26f76a76
|
时间
|
5 years ago |
sunke
|
ff20ef3acb
|
汇总导出
|
5 years ago |
sunke
|
2c63e6e395
|
日志
|
5 years ago |
sunke
|
3ed5eedc07
|
平台规则
|
5 years ago |
廖金灵
|
4459021cb9
|
Merge branch 'hotfix/www_pay_change' of wmtx/platform into release
隐藏官网充值入口
|
5 years ago |
chenzhi
|
21a75dbd35
|
隐藏官网充值入口
|
5 years ago |
yulingwei
|
9d6bf8225a
|
upt
|
5 years ago |
sunke
|
7a392806bf
|
ios 下载新需求
|
5 years ago |
zhengyongxing
|
541ec17db5
|
隐藏威富通添加汇付宝
|
5 years ago |
ELF
|
7c25ecbcf8
|
修改
|
5 years ago |
ELF
|
80a5684871
|
修改
|
5 years ago |
ELF
|
173cd3a4b7
|
修改bug
|
5 years ago |
ELF
|
3be6a94286
|
修改bug
|
5 years ago |
ELF
|
34e1db7684
|
4.4哀悼日
|
5 years ago |
yulingwei
|
007374e121
|
upt
|
5 years ago |
廖金灵
|
bf701babb7
|
Merge branch 'feature/giftbag_tf' of wmtx/platform into release
隐藏礼包数量
|
5 years ago |
ELF
|
2ea55acfd1
|
隐藏礼包数量
|
5 years ago |
ELF
|
41e1801550
|
修改手机登录bug
|
5 years ago |
廖金灵
|
24bf141b66
|
Merge branch 'feature/giftbag_tf' of wmtx/platform into release
修改bug
|
5 years ago |
ELF
|
ce89c87e31
|
修改bug
|
5 years ago |
廖金灵
|
e39baa2cbc
|
Merge branch 'feature/giftbag_tf' of wmtx/platform into release
落地页样式
|
5 years ago |
ELF
|
f3f1fd15fd
|
修改bug
|
5 years ago |
廖金灵
|
8dc7adb539
|
Merge branch 'feature/giftbag_tf' of wmtx/platform into release
添加tf礼包
|
5 years ago |
sunke
|
ce2408576c
|
充值方式统计匹配支付渠道
|
5 years ago |
sunke
|
6cc33a7fe8
|
导出顺序
|
5 years ago |
sunke
|
15f6cb19a3
|
渠道支付顺序
|
5 years ago |
ELF
|
c134f55248
|
调试
|
5 years ago |
ELF
|
dba4fb4e6e
|
调试
|
5 years ago |
ELF
|
71e736b27d
|
调试
|
5 years ago |
ELF
|
303e471d0b
|
修改bug
|
5 years ago |
ELF
|
ed19727f91
|
修改bug
|
5 years ago |
ELF
|
2a2e5f0d31
|
添加tf礼包问题
|
5 years ago |
sunke
|
b4e66dcd40
|
隐藏推广配置
|
5 years ago |
张谷诚
|
c5af3c29d7
|
Merge branch 'hotfix/finance_game_name_change_2' of wmtx/platform into release
支付渠道测试订单录入bug修正,支付意愿统计功能优化
|
5 years ago |
廖金灵
|
9f202c3991
|
Merge branch 'feature/finance_compare' of wmtx/platform into release
财务导入对比
|
5 years ago |
chenzhi
|
9237bc3cc8
|
优化选择
|
5 years ago |
chenzhi
|
abf43566e4
|
调整参数
|
5 years ago |
廖金灵
|
86a90467ff
|
Merge branch 'feature/president_apply' of wmtx/platform into release
修改会长押金需求
|
5 years ago |
ELF
|
17f493ed7b
|
隐藏推广员指标目录
|
5 years ago |
zhengyongxing
|
d4aafd2983
|
支付渠道测试订单录入bug修正,支付意愿统计功能优化
|
5 years ago |