chenzhi
|
422728ed11
|
聚合财务编辑
|
5 years ago |
zhengyongxing
|
0ebde4cb17
|
导出权限修正
|
5 years ago |
|
chenzhi
|
bf7c7ed14f
|
审核
|
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 |
|
zhengyongxing
|
63e4789069
|
游戏编辑支付宝 汇付宝添加
|
5 years ago |
 ELF
|
0af6a53ba7
|
后台arpu功能优化
|
5 years ago |
|
zhengyongxing
|
a5554f7fa3
|
推广员业务配置功能添加
|
5 years ago |
|
zhengyongxing
|
295ca2d803
|
推广员业务配置功能添加
|
5 years ago |
|
zhengyongxing
|
1a0b2dbaba
|
推广员游戏列表查看全选问题
|
5 years ago |
|
zhengyongxing
|
fcc7bf2aaa
|
管理后台-财务管理-游戏统计-添加元素
|
5 years ago |
|
zhengyongxing
|
322b4b6cee
|
管理后台导出权限添加
|
5 years ago |
|
zhengyongxing
|
001e9e70f8
|
管理后台导出权限添加
|
5 years ago |
|
廖金灵
|
7ab6c8ad68
|
Merge branch 'feature/fix_work_order' of wmtx/platform into release
修复问题
|
5 years ago |
yulingwei
|
2ac6f7ebee
|
upt
|
5 years ago |
|
廖金灵
|
820885f3dd
|
Merge branch 'feature/platform_rule' 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
|
0758921bfe
|
平台
|
5 years ago |
|
sunke
|
848eb6c294
|
平台
|
5 years ago |
|
sunke
|
b6649a7b9d
|
平台币
|
5 years ago |
|
yulingwei
|
ac83e556ff
|
upt
|
5 years ago |
|
yulingwei
|
f1428a8fe7
|
upt
|
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
|
e462305587
|
upt
|
5 years ago |
|
sunke
|
c1168740b6
|
平台币
|
5 years ago |
|
sunke
|
253c956794
|
平台币
|
5 years ago |
|
sunke
|
2adcb68c06
|
平台币新增需求
|
5 years ago |
|
sunke
|
1fe794b597
|
平台规则样式优化
|
5 years ago |
|
sunke
|
bdb688c985
|
编辑规则
|
5 years ago |
|
zhengyongxing
|
2a54b0ed08
|
汇付宝添加支付宝与微信
|
5 years ago |
|
ELF
|
94575cae29
|
修改会长押金编辑付款人付款账号非必填
|
5 years ago |
|
yulingwei
|
c1d03cc526
|
upt
|
5 years ago |
|
zhengyongxing
|
541ec17db5
|
隐藏威富通添加汇付宝
|
5 years ago |
|
yulingwei
|
007374e121
|
upt
|
5 years ago |
|
廖金灵
|
8dc7adb539
|
Merge branch 'feature/giftbag_tf' of wmtx/platform into release
添加tf礼包
|
5 years ago |
|
sunke
|
15f6cb19a3
|
渠道支付顺序
|
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 |
|
廖金灵
|
86a90467ff
|
Merge branch 'feature/president_apply' of wmtx/platform into release
修改会长押金需求
|
5 years ago |
|
zhengyongxing
|
d4aafd2983
|
支付渠道测试订单录入bug修正，支付意愿统计功能优化
|
5 years ago |
|
yulingwei
|
6f7d285f9f
|
修复资源工单完成情况
|
5 years ago |
|
chenzhi
|
c0df7f23c3
|
优化高亮
|
5 years ago |
|
zhengyongxing
|
dc5437d7cb
|
支付渠道测试订单录入bug修正，支付意愿统计功能优化
|
5 years ago |
chenzhi
|
d4a498baba
|
优化用户登录时间为0时为暂无登录
|
5 years ago |
|
chenzhi
|
5ddf75a600
|
财务对比ok
|
5 years ago |
|
chenzhi
|
b2ad4e8b6e
|
财务对比 v1
|
5 years ago |
|
chenzhi
|
a2db46d1c0
|
财务对比首页
|
5 years ago |
|
zhengyongxing
|
f37cdc596d
|
支付渠道测试订单录入bug修正，支付意愿统计功能优化
|
5 years ago |
|
chenzhi
|
79f4719dec
|
财务对比7
|
5 years ago |
|
chenzhi
|
c4eb963cfe
|
财务比对5
|
5 years ago |
|
zhengyongxing
|
de646044c2
|
支付渠道详情检索修正
|
5 years ago |
|
zhengyongxing
|
e7e7df569b
|
支付渠道统计bug修改
|
5 years ago |
|
chenzhi
|
202f9a45d1
|
财务对比4
|
5 years ago |
|
chenzhi
|
effe6c572e
|
财务比较3
|
5 years ago |
|
zhengyongxing
|
96eee4f9f5
|
支付渠道统计bug修改
|
5 years ago |
|
zhengyongxing
|
ab01c02606
|
支付渠道意愿统计修改
|
5 years ago |
|
chenzhi
|
33be2ba05b
|
优化游戏统计平台币直充搜索后数据不符合问题
|
5 years ago |
|
chenzhi
|
def286ec80
|
财务比较2
|
5 years ago |
|
廖金灵
|
bab7fec46d
|
Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release
游戏名称不含设备类型优化
|
5 years ago |
|
chenzhi
|
eaa51463e5
|
公会统计
|
5 years ago |
|
chenzhi
|
ea69ecb086
|
财务比较2
|
5 years ago |
|
张谷诚
|
13c352a924
|
Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿a标签悬停变成手势
|
5 years ago |
|
chenzhi
|
e0c946e67c
|
工会统计2
|
5 years ago |
|
chenzhi
|
b36515a720
|
工会统计
|
5 years ago |
|
chenzhi
|
48e5e4d824
|
财务对比1
|
5 years ago |
|
zhengyongxing
|
4361b3c3ba
|
支付渠道意愿a标签悬停变成手势
|
5 years ago |
|
廖金灵
|
d781d6825c
|
Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计文字修改，及排序方式修正
|
5 years ago |
|
zhengyongxing
|
674e727921
|
支付渠道意愿统计文字修改
|
5 years ago |
|
张谷诚
|
170b116333
|
Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计bug上传
|
5 years ago |
|
zhengyongxing
|
9eff370801
|
支付渠道意愿统计bug上传
|
5 years ago |
|
张谷诚
|
e42281bdfe
|
Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计bug上传
|
5 years ago |
|
zhengyongxing
|
f40bd57698
|
支付渠道意愿统计bug上传
|
5 years ago |
|
廖金灵
|
985fdab851
|
Merge branch 'feature/limit_pay' of wmtx/platform into release
支付限额
|
5 years ago |
|
张谷诚
|
b9f466f73c
|
Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付意向
支付限额白名单
|
5 years ago |
|
zhengyongxing
|
f7c9730153
|
市场结算管理优化
|
5 years ago |
|
sunke
|
163ad97d60
|
支付限额
|
5 years ago |
|
sunke
|
817b39c391
|
支付限额
|
5 years ago |
|
sunke
|
56b5144440
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/limit_pay
|
5 years ago |
|
廖金灵
|
9222d99127
|
Merge branch 'feature/change_company_belong' of wmtx/platform into release
推广员内外团归属优化
|
5 years ago |
|
sunke
|
68572d10e6
|
支付限额
|
5 years ago |
|
chenzhi
|
d6e44d32dc
|
优化推广员申请游戏名称及选择样式
|
5 years ago |
|
chenzhi
|
84fe51efef
|
支付渠道/测试订单 游戏名字优化
|
5 years ago |
|
chenzhi
|
6d3f1b67e2
|
支付渠道统计-首页 名称优化
|
5 years ago |
|
sunke
|
ab1c99d95a
|
时间
|
5 years ago |
|
sunke
|
dfb83d35d0
|
时间样式
|
5 years ago |
|
ELF
|
ef56ea2180
|
修改
|
5 years ago |
|
ELF
|
a512fb224e
|
修改bug
|
5 years ago |
|
ELF
|
fb6a00859e
|
修改会长押金需求
|
5 years ago |
|
sunke
|
098caeaa90
|
时间样式
|
5 years ago |
|
sunke
|
4f98f9fabe
|
样式控制
|
5 years ago |
|
chenzhi
|
cc966711d1
|
公会统计 游戏名称与设备名称分开
|
5 years ago |
|
zhengyongxing
|
4ce89ee670
|
支付白名单列表功能完善
|
5 years ago |
|
zhengyongxing
|
6b8f9a47d0
|
Merge branch 'feature/user_paywhite_list' of 47.111.118.107:wmtx/platform into feature/pay_white_list
|
5 years ago |
|
zyx
|
fc9fa629ae
|
游戏充值bug修改
|
5 years ago |
|
sunke
|
fa70a3c77a
|
限制规则
|
5 years ago |
|
zhengyongxing
|
ad08aeeace
|
支付意向统计代码提交
|
5 years ago |
|
sunke
|
ac54bb41a4
|
支付限额导出
|
5 years ago |
|
sunke
|
5c8221d9dc
|
支付限额
|
5 years ago |
|
chenzhi
|
9064fc7c58
|
游戏统计 游戏名称不含设备类型优化
|
5 years ago |
|
chenzhi
|
121fc02f18
|
推广员内外团归属优化2
|
5 years ago |
|
chenzhi
|
55d49e8b4b
|
优化推广公会列表导出
|
5 years ago |
|
chenzhi
|
61d0418340
|
推广公司管理 修改内外团影响底下
|
5 years ago |
|
chenzhi
|
1761d37b5c
|
推广公会列表 适配新内外团规则
|
5 years ago |
|
chenzhi
|
d7662eb305
|
推广员现在归属于公司团体
|
5 years ago |
|
chenzhi
|
dd86a85485
|
推广公会归属管理 改为公会归属不可选择
|
5 years ago |
|
yulingwei
|
82620c9ae6
|
merge
|
5 years ago |
|
yulingwei
|
bec210c158
|
修复会员层级关系检索问题
|
5 years ago |
|
chenzhi
|
d7737291ed
|
暂存1
|
5 years ago |
|
廖金灵
|
43562f6746
|
Merge branch 'feature/download_type_list' of wmtx/platform into release
修复检索问题
|
5 years ago |
|
yulingwei
|
c40f5dda26
|
upt
|
5 years ago |
|
sunke
|
797102a556
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/PlatFormCoinData
|
5 years ago |
|
sunke
|
5b74e65585
|
统计
|
5 years ago |
|
zhengyongxing
|
6249b6cf81
|
Merge branches 'feature/fee_form' and 'release' of 47.111.118.107:wmtx/platform into feature/fee_form
Conflicts:
Application/Admin/Controller/FinanceController.class.php
|
5 years ago |
|
zhengyongxing
|
87b1b04040
|
充值财务管理金额保留小数点
|
5 years ago |
|
廖金灵
|
4c8cb3c171
|
Merge branch 'feature/IOSdata' of wmtx/platform into release
修改bug
|
5 years ago |
|
sunke
|
fea5f4d2d7
|
ios
|
5 years ago |
|
廖金灵
|
bf80a2d99a
|
Merge branch 'feature/download_type_list' of wmtx/platform into release
问题修复
|
5 years ago |
|
yulingwei
|
132dee220a
|
fix
|
5 years ago |
|
sunke
|
7194cd49ae
|
平台币
|
5 years ago |
|
廖金灵
|
21bf9744fb
|
Merge branch 'feature/ip_forbit' of wmtx/platform into release
ip限制白名单苹果内购限制总开关去除
|
5 years ago |
|
zhengyongxing
|
6ac97fa7b1
|
ip限制白名单页面去除内购总开关
|
5 years ago |
|
廖金灵
|
112134ec93
|
Merge branch 'feature/work_order' of wmtx/platform into release
修改样式问题
|
5 years ago |
|
廖金灵
|
e8282fc00c
|
Merge branch 'feature/ip_forbit' of wmtx/platform into release
ip白名单页面问题修正
|
5 years ago |
|
zhengyongxing
|
bd181dab51
|
ip限制白名单页面修改
|
5 years ago |
|
yulingwei
|
3415ef8336
|
修改样式问题
|
5 years ago |
|
sunke
|
fd815ef5a6
|
html平台币
|
5 years ago |
|
zhengyongxing
|
2adbd95bfb
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/ip_forbit
Conflicts:
Data/update.sql
|
5 years ago |
|
sunke
|
e94c64a881
|
平台币统计
|
5 years ago |
|
廖金灵
|
3be1bd78ed
|
Merge branch 'feature/work_order' of wmtx/platform into release
工单管理
|
5 years ago |
|
yulingwei
|
26f89f3c64
|
merge
|
5 years ago |
|
廖金灵
|
aae20bce96
|
Merge branch 'feature/download_type_list' of wmtx/platform into release
修改下载统计bug
|
5 years ago |
|
yulingwei
|
f34975478b
|
upt
|
5 years ago |
|
廖金灵
|
a1f3c6e205
|
Merge branch 'feature/download_type_list' of wmtx/platform into release
iOS下载统计
|
5 years ago |
|
廖金灵
|
e2a32b11dc
|
Merge branch 'fix/member_user_info' of wmtx/platform into release
玩家列表新增去重数据栏
|
5 years ago |
|
zhengyongxing
|
e7aa7885e8
|
ip限制白名单提示语修改
|
5 years ago |
|
zhengyongxing
|
1d27db663a
|
ip限制白名单提示语修改
|
5 years ago |
|
zhengyongxing
|
5f815370e8
|
ip限制白名单提交
|
5 years ago |
|
sunke
|
41f6797e97
|
表格样式
|
5 years ago |
|
sunke
|
7da471b6ee
|
支付时间
|
5 years ago |
|
yulingwei
|
4afce87caa
|
upt
|
5 years ago |
|
yulingwei
|
b56ba0b882
|
upt
|
5 years ago |
|
yulingwei
|
823062c0f6
|
upt
|
5 years ago |
|
yulingwei
|
adf11e2b60
|
upt
|
5 years ago |
|
yulingwei
|
175502e384
|
fix
|
5 years ago |
|
yulingwei
|
b10717e8b6
|
upt
|
5 years ago |
|
chenzhi
|
bfee0578d0
|
玩家列表新增去重数据栏
|
5 years ago |
|
yulingwei
|
18b0c3024d
|
upt
|
5 years ago |
|
yulingwei
|
ead4a8598e
|
upt
|
5 years ago |
|
yulingwei
|
d9c338acd8
|
upt
|
5 years ago |
|
chenzhi
|
381327ae21
|
优化游戏统计
|
5 years ago |
|
chenzhi
|
45cad05508
|
优化用户列表统计数据
|
5 years ago |
|
chenzhi
|
44afe1f65d
|
优化玩家列表统计方式及回退去重功能
|
5 years ago |
|
yulingwei
|
fa41426908
|
upt
|
5 years ago |
|
yulingwei
|
1e3533720b
|
utp
|
5 years ago |
|
yulingwei
|
b8fda2417a
|
工单管理
|
5 years ago |
|
sunke
|
389ef7e967
|
bug修复
|
5 years ago |
|
zhengyongxing
|
48239c0f13
|
测试订单bug修改
|
5 years ago |
|
sunke
|
2ecb05d924
|
支付渠道统计
|
5 years ago |
|
sunke
|
3edb0640ed
|
新增管理后台测试订单导出功能
|
5 years ago |
|
chenzhi
|
0344471659
|
Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
cfbbf8e76b
|
优化默认公司名称为海南万盟天下科技
|
5 years ago |
|
chenzhi
|
50b21f45ab
|
Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
7fa400a0a5
|
优化公会统计统计栏样式
|
5 years ago |
|
zhengyongxing
|
443abed206
|
Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
|
5 years ago |
|
zhengyongxing
|
19d85f3717
|
测试资源可用余额接口修改
|
5 years ago |
|
zhengyongxing
|
caddcd1543
|
日志管理删除url开启
|
5 years ago |
|
zhengyongxing
|
14c3d365e3
|
Merge branch 'feature/user_repeat' into release
|
5 years ago |
|
zhengyongxing
|
ffd6238bc1
|
测试订单bug修正
|
5 years ago |
|
chenzhi
|
cc3552b862
|
Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
d0f07315da
|
操作日志前端检索名词修改
|
5 years ago |
|
chenzhi
|
62c8c1e54d
|
Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
dd0f930105
|
游戏预告-操作日志
|
5 years ago |
|
zhengyongxing
|
0443871173
|
用户列表去除重复行
|
5 years ago |
|
zhengyongxing
|
77ddb1eded
|
Merge branch 'feature/operation_log' into release
|
5 years ago |
|
zhengyongxing
|
31948abdf4
|
操作日志bug修正
|
5 years ago |
liuweiwen
|
969bf4dc8a
|
Merge branch 'feature/yibao_company' into release
# Conflicts:
# Application/Admin/Common/extend.php
|
5 years ago |
|
liuweiwen
|
5d596094a6
|
增加易宝支付
|
5 years ago |
|
liuweiwen
|
3b415976eb
|
增加易宝支付
|
5 years ago |
|
liuweiwen
|
aa7e6fa0ec
|
推广公司新增与编辑减少必填项
|
5 years ago |
|
chenzhi
|
31a0a174bd
|
后台发放-操作日志
|
5 years ago |
|
liuweiwen
|
c9d69414ba
|
Merge branch 'hotfix/game_recharge_stat' into release
|
5 years ago |
|
liuweiwen
|
22aa120ad6
|
去掉多余的换行
|
5 years ago |
|
liuweiwen
|
1a4bf752c4
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
zhengyongxing
|
04f2b0c8df
|
Merge branch 'feature/operation_log' into release
# Conflicts:
# Application/Admin/Common/extend.php
# Data/update.sql
|
5 years ago |
|
liuweiwen
|
b081544805
|
Merge branch 'hotfix/game_recharge_stat' into release
|
5 years ago |
|
liuweiwen
|
4a45103650
|
平台币充值汇总补一列
|
5 years ago |
|
zhengyongxing
|
5224eec9f2
|
上游结算单管理日志添加
|
5 years ago |
|
liuweiwen
|
9221b18955
|
游戏统计汇总权限
|
5 years ago |
|
zhengyongxing
|
5e794bd785
|
推广员日志记录添加
|
5 years ago |
|
zhengyongxing
|
8aae878cf8
|
游戏统计修改
|
5 years ago |
zhanglingsheng
|
9c39b731fd
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |