chenzhi
|
0039431ccb
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
zhengyongxing
|
f1a48fbdaa
|
权限分配 — 未给下级渠道分配（游戏充值）查看权限时，页面展示（游戏充值页面）修正
|
5 years ago |
|
chenzhi
|
1295857697
|
优化工会统计各级检索条件结束
|
5 years ago |
|
chenzhi
|
0561d8ff15
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
f95d23b091
|
优化公会统计各级条件展示
|
5 years ago |
 ELF
|
6b7d1b9b51
|
Merge branch 'feature/add_cdn' into dev
|
5 years ago |
|
ELF
|
fe68d8e8c9
|
修改oss上传返回结果
|
5 years ago |
liuweiwen
|
4892db340e
|
管理后台-》游戏-》合作方管理-》列表增加字段联系人，联系电话，邮寄地址。公司税号，收款方名称，银行账号，开户行
|
5 years ago |
|
ELF
|
b8f167788b
|
Merge branch 'feature/add_cdn' into dev
|
5 years ago |
|
ELF
|
e6c891a945
|
修改
|
5 years ago |
|
ELF
|
b220ac1c7f
|
Merge branch 'feature/add_cdn' into dev
|
5 years ago |
|
ELF
|
f472f5e9d3
|
文件保存改成cdn
|
5 years ago |
|
chenzhi
|
9e2eb46904
|
公会统计游戏统计新增多重搜索
|
5 years ago |
chenxiaojun
|
09f2ca4ab6
|
更新
|
5 years ago |
|
chenxiaojun
|
962c284467
|
推广结算--更新
|
5 years ago |
|
liuweiwen
|
fa3adf2e0b
|
新增合作方时，新增录入内容
新增联系人，联系电话，邮寄地址。公司税号，收款方名称，
银行账号，开户行
|
5 years ago |
|
chenzhi
|
c20d507df6
|
优化订单判断
|
5 years ago |
|
chenzhi
|
9faec272e3
|
优化订单判断
|
5 years ago |
|
chenzhi
|
3e54338685
|
取消多个推广员无法补链注释
|
5 years ago |
|
chenzhi
|
3f53bc266b
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
878badef43
|
换绑新增判断渠道是否已经结算
|
5 years ago |
|
ELF
|
166b21fcc0
|
Merge branch 'hotfix/shift_player_selle' into dev
|
5 years ago |
|
ELF
|
91d4c9f753
|
补链/玩家迁移排除已结算订单（cp结算）
|
5 years ago |
|
chenzhi
|
bb7e1c269c
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
876952f3b4
|
公会统计新增内外团检索
|
5 years ago |
|
chenxiaojun
|
89965bd8fb
|
导出
|
5 years ago |
|
chenxiaojun
|
a636c2dcf6
|
导出
|
5 years ago |
zhengchanglong
|
715abb2b3e
|
Merge branch 'hotfix/fix_get_gameist' into dev
|
5 years ago |
|
liuweiwen
|
fe0f308e54
|
财务管理下的ajax请求不判断权限
|
5 years ago |
|
chenxiaojun
|
ba1f6565cc
|
更新
|
5 years ago |
|
chenxiaojun
|
631c23568d
|
上传汇款证明--调整
|
5 years ago |
|
chenxiaojun
|
d792e34348
|
结算管理--更新
|
5 years ago |
|
chenxiaojun
|
90eed6f5ca
|
结算管理--更新
|
5 years ago |
|
chenxiaojun
|
461e80bd30
|
结算管理--更新
|
5 years ago |
|
chenxiaojun
|
3faf5db4f7
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenxiaojun
|
c074b5fb86
|
结算管理--更新
|
5 years ago |
|
chenzhi
|
3840959f05
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
a37d0d6ec4
|
优化推广员充值统计排序问题
|
5 years ago |
|
chenzhi
|
9cef29ebeb
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
43774e9099
|
推广员充值统计新增官方渠道统计
|
5 years ago |
|
chenxiaojun
|
4721e60d32
|
推广员资质认证
|
5 years ago |
|
chenzhi
|
4ba400fa78
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
14fa967f00
|
优化推广员统计数据
|
5 years ago |
|
chenxiaojun
|
0ff9f77181
|
推广员资质认证
|
5 years ago |
|
zhengchanglong
|
7c1593e0e1
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
302ee7a2ca
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
5343ef2162
|
工会统计新增内外团
|
5 years ago |
|
chenzhi
|
0caa548525
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
836eccfa78
|
支付渠道新增支付渠道比
|
5 years ago |
|
zhengyongxing
|
acd816c766
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
cc0f5a03c4
|
工会统计新增内外团导出
|
5 years ago |
|
chenzhi
|
07f6e9919d
|
区服列表 区服名称改区服id
|
5 years ago |
|
ELF
|
7c5b3bb5e7
|
Merge branch 'feature/account_safe' into dev
|
5 years ago |
|
chenzhi
|
0f7134c838
|
游戏充值 区服名称改区服id
|
5 years ago |
|
ELF
|
4fb2c35495
|
Merge branch 'hotfix/link_info' into dev
|
5 years ago |
|
chenzhi
|
3bf288fa41
|
优化登陆记录区服名称为区服id
|
5 years ago |
|
chenzhi
|
5e08bda6c2
|
优化行为日志区服名称为区服id
|
5 years ago |
|
ELF
|
0a0cedafd5
|
各个系统登录提示安全优化，sessionon_id变更
|
5 years ago |
|
zhengchanglong
|
10c0b3a18a
|
Merge branch 'feature/group_type' into dev
# Conflicts:
# Application/Admin/Controller/PromoteController.class.php
# Data/update.sql
|
5 years ago |
|
chenzhi
|
432c84ba01
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
e39c811da8
|
修改月结月份显示错误问题
|
5 years ago |
zhanglingsheng
|
5ea753b595
|
支付宝设置添加公钥私钥
|
5 years ago |
|
liuweiwen
|
4addf4c281
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
liuweiwen
|
0b3ae062b1
|
优化：推广员新增与编辑的推广公司增加万盟天下科技
新增需求：推广员增加工会归属和工会关系属性
|
5 years ago |
|
zhengyongxing
|
10f6caddfa
|
工会统计新增内外团占比
|
5 years ago |
|
ELF
|
8ab02a5e0b
|
还原补链限制
|
5 years ago |
|
廖金灵
|
b12b133a06
|
Merge branch 'hotfix/shift-player' of wmtx/platform into release
修改玩家迁移限制
|
5 years ago |
|
elf@home
|
0bc50cbf70
|
修改限制
|
5 years ago |
|
elf@home
|
e59a2f7350
|
添加玩家迁移只对同一推广员限制
|
5 years ago |
|
zhengyongxing
|
d842a5c468
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
zhengyongxing
|
e9ffc0af79
|
平台币充值添加推广员充值搜索修改，玩家列表时间检索非必填
|
5 years ago |
|
chenxiaojun
|
6054b5f6c0
|
更新
|
5 years ago |
|
chenxiaojun
|
0baf97f717
|
会长提现--更新
|
5 years ago |
|
zhengyongxing
|
0068a0d1c4
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
zhengyongxing
|
f324567258
|
平台币充值添加推广员充值搜索修改，玩家列表时间检索非必填
|
5 years ago |
|
zhengyongxing
|
346bbaa117
|
平台币充值添加推广员充值搜索修改，玩家列表时间检索非必填
|
5 years ago |
|
chenxiaojun
|
5930642f8b
|
更新
|
5 years ago |
|
chenxiaojun
|
a12c3ecf9e
|
会长提现--更新
|
5 years ago |
|
ELF
|
96efc54888
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/login_crontab
|
5 years ago |
yulingwei
|
c5f737cb0b
|
Merge branch 'hotfix/login_crontab' into dev
|
5 years ago |
|
yulingwei
|
25606949f5
|
修复登录统计问题
|
5 years ago |
|
chenxiaojun
|
e884214546
|
会长提现|公会分成管理--更新
|
5 years ago |
|
ELF
|
69e4c3fbd7
|
Merge branch 'release' into dev
|
5 years ago |
|
ELF
|
f1dc5f8920
|
推广员继承company_id
|
5 years ago |
|
zhengyongxing
|
8652c19f5c
|
平台币充值添加推广员充值搜索
|
5 years ago |
|
ELF
|
2efbeaf13f
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
chenxiaojun
|
c329ec09f4
|
更新
|
5 years ago |
|
chenxiaojun
|
731e4d29f7
|
会长提现--更新
|
5 years ago |
|
chenxiaojun
|
0758062837
|
会长提现--更新
|
5 years ago |
|
chenxiaojun
|
73537c120e
|
更新
|
5 years ago |
|
chenxiaojun
|
35ea788ed0
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
936240d06a
|
推广结算--更新
|
5 years ago |
|
chenxiaojun
|
15174f8547
|
推广结算--更新
|
5 years ago |
|
chenxiaojun
|
311aeffbb7
|
推广结算--更新
|
5 years ago |
|
chenxiaojun
|
053417f7f8
|
推广结算--更新
|
5 years ago |
|
chenxiaojun
|
cda8e4c1c0
|
推广结算--更新
|
5 years ago |
|
zhengchanglong
|
0e5be6e4a3
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
chenxiaojun
|
5a0769eb3b
|
更新
|
5 years ago |
|
chenxiaojun
|
e447159971
|
公会分成管理--更新
|
5 years ago |
万盟天下
|
23defe8174
|
Merge branch 'master_hotfix_20191228' of wmtx/platform into master
修改工会统计bug
|
5 years ago |
|
chenzhi
|
4d0606d6fc
|
新增渠道查看公司联动
|
5 years ago |
|
chenzhi
|
f594e3bb14
|
公会统计新增公司联动
|
5 years ago |
|
ELF
|
88c8bef83e
|
Merge branch 'hotfix/promote-status' into release-1.0.0
|
5 years ago |
|
ELF
|
87fb1f526e
|
修改推广员添加时初始默认状态
|
5 years ago |
|
elf@home
|
6e354fe3b3
|
优化链接归属查询
|
5 years ago |
|
liuweiwen
|
6625eaa4f7
|
工会统计
|
5 years ago |
|
liuweiwen
|
809e9d36f1
|
工会统计
|
5 years ago |
|
liuweiwen
|
28a1efe2f4
|
工会统计列表数据与搜索修复
|
5 years ago |
|
liuweiwen
|
b3e32506cc
|
工会统计搜索公司
|
5 years ago |
|
liuweiwen
|
c44e5ee1a7
|
编辑推广员时，只允许会长修改推广公司，同时更改底下推广员的公司
|
5 years ago |
|
zhanglingsheng
|
7a9fe4fb45
|
超级签统计--导出
|
5 years ago |
|
zhanglingsheng
|
34020fd725
|
超级签统计--样式
|
5 years ago |
|
yulingwei
|
9d5bfc5ef2
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
zhanglingsheng
|
e3ef73e7e3
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
zhanglingsheng
|
e709816781
|
补单记录
|
5 years ago |
|
yulingwei
|
75d3e87f89
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
yulingwei
|
899877e872
|
同步修改
|
5 years ago |
|
ELF
|
834115c213
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
ELF
|
561787a4ac
|
修改
|
5 years ago |
|
zhanglingsheng
|
8a9e0a9a8b
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
zhanglingsheng
|
ca401adbd0
|
补单记录
|
5 years ago |
|
ELF
|
a70c1aee21
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
ELF
|
0a86f3a33c
|
修改样式
|
5 years ago |
|
chenzhi
|
04c560312f
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
chenzhi
|
715a1a8a2c
|
优化推广统计区服问题
|
5 years ago |
|
ELF
|
6297ff7011
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
ELF
|
67caddeef0
|
修改落地页样式
|
5 years ago |
|
yulingwei
|
f4495f93a9
|
ltv修改
|
5 years ago |
|
yulingwei
|
3ec7ccc188
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
yulingwei
|
873c81605e
|
修复
|
5 years ago |
|
zhanglingsheng
|
908de1336f
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
zhanglingsheng
|
b88f395c9a
|
补单记录
|
5 years ago |
|
zhanglingsheng
|
6a28abedc0
|
补单记录
|
5 years ago |
|
ELF
|
8cdf259fdf
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
ELF
|
c054595a94
|
修改微信分享bug
|
5 years ago |
|
chenxiaojun
|
905769f922
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
chenxiaojun
|
9a0313b763
|
公会分成管理--更新
|
5 years ago |
sunke
|
453c0c3682
|
链接归属名词修改
|
5 years ago |
|
chenxiaojun
|
e66893dc7f
|
公会分成管理--更新
|
5 years ago |
|
yulingwei
|
8ccde7749a
|
Merge branch 'hotfix/ltv' into release-1.0.0
|
5 years ago |
|
yulingwei
|
3e11b4d0ad
|
更新
|
5 years ago |
|
yulingwei
|
1e3079870e
|
Merge branch 'hotfix/ltv' into release-1.0.0
|
5 years ago |
|
yulingwei
|
ee18eac375
|
修复
|
5 years ago |
|
yulingwei
|
b868b14273
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
yulingwei
|
21cc6865d5
|
Merge branch 'hotfix/ltv' into release-1.0.0
|
5 years ago |
|
yulingwei
|
2ed2117b6d
|
更新
|
5 years ago |
|
ELF
|
ad67717292
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
yulingwei
|
e2ed862130
|
Merge branch 'hotfix/ltv' into release-1.0.0
|
5 years ago |
|
yulingwei
|
7d1808a7bf
|
Merge branch 'hotfix/ltv' into dev
|
5 years ago |
|
yulingwei
|
12f00ad268
|
修复
|
5 years ago |