chenzhi
|
876952f3b4
|
公会统计新增内外团检索
|
5 years ago |
chenxiaojun
|
89965bd8fb
|
导出
|
5 years ago |
|
chenxiaojun
|
631c23568d
|
上传汇款证明--调整
|
5 years ago |
|
chenxiaojun
|
c074b5fb86
|
结算管理--更新
|
5 years ago |
|
chenzhi
|
836eccfa78
|
支付渠道新增支付渠道比
|
5 years ago |
|
chenzhi
|
07f6e9919d
|
区服列表 区服名称改区服id
|
5 years ago |
|
chenzhi
|
0f7134c838
|
游戏充值 区服名称改区服id
|
5 years ago |
|
chenzhi
|
3bf288fa41
|
优化登陆记录区服名称为区服id
|
5 years ago |
|
chenzhi
|
5e08bda6c2
|
优化行为日志区服名称为区服id
|
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 |
|
chenxiaojun
|
0baf97f717
|
会长提现--更新
|
5 years ago |
|
chenxiaojun
|
a12c3ecf9e
|
会长提现--更新
|
5 years ago |
|
chenxiaojun
|
e884214546
|
会长提现|公会分成管理--更新
|
5 years ago |
|
chenzhi
|
4d0606d6fc
|
新增渠道查看公司联动
|
5 years ago |
|
chenzhi
|
f594e3bb14
|
公会统计新增公司联动
|
5 years ago |
 elf@home
|
6e354fe3b3
|
优化链接归属查询
|
5 years ago |
|
liuweiwen
|
c44e5ee1a7
|
编辑推广员时，只允许会长修改推广公司，同时更改底下推广员的公司
|
5 years ago |
zhanglingsheng
|
34020fd725
|
超级签统计--样式
|
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 |
|
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 |
yulingwei
|
f4495f93a9
|
ltv修改
|
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
|
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
|
7d1808a7bf
|
Merge branch 'hotfix/ltv' into dev
|
5 years ago |
|
chenzhi
|
ff46ab04ca
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
chenzhi
|
f580b44289
|
优化推广员统计区服选择
|
5 years ago |
|
zhengyongxing
|
e49ed7aa30
|
支付渠道统计计添加平台币直充金额说明
|
5 years ago |
|
sunke
|
dcf7efad6f
|
下载链接菜单显示bug
|
5 years ago |
|
chenzhi
|
1d69c616d6
|
优化公会统计页面跳转问题
|
5 years ago |
|
chenzhi
|
c590b948ef
|
优化推广员充值统计导出
|
5 years ago |
|
chenzhi
|
0a006bbcc2
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
chenzhi
|
fd23b640ea
|
优化推广员充值优化代码
|
5 years ago |
|
zhengyongxing
|
7c7971d48e
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
|
5 years ago |
|
zhengyongxing
|
13f5128dd8
|
支付渠道统计导出bug修正,游戏充值充值方式检索修正
|
5 years ago |
|
zhanglingsheng
|
162e2fe19c
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
zhanglingsheng
|
5b81f89308
|
游戏编辑
|
5 years ago |
|
zhanglingsheng
|
eabf59d3e3
|
超级签统计
|
5 years ago |
|
zhengyongxing
|
b5c06df195
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
|
5 years ago |
|
zhengyongxing
|
4e3206a5c1
|
支付渠道统计bug修正
|
5 years ago |
|
zhanglingsheng
|
1c2bb7e584
|
超级签统计
|
5 years ago |
|
zhanglingsheng
|
ae2b498e45
|
超级签统计
|
5 years ago |
|
zhanglingsheng
|
9b65fbaabb
|
超级签统计
|
5 years ago |
|
zhanglingsheng
|
244e036a21
|
超级签统计
|
5 years ago |
|
zhanglingsheng
|
153c397cf6
|
超级签统计
|
5 years ago |
|
zhengyongxing
|
b0899f3fc9
|
支付渠道统计bug修正，官网与推广后台充值计入平台币
|
5 years ago |
|
ELF
|
9b5697a859
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
ELF
|
1fcbe2dd65
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
zhanglingsheng
|
59709fa295
|
游戏--添加支付方式渠道配置
|
5 years ago |
|
zhanglingsheng
|
669baefe5e
|
游戏--添加支付方式渠道配置
|
5 years ago |
|
chenzhi
|
0ec79e6cb9
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
chenzhi
|
24c2ea0031
|
优化区服预告的区服选择
|
5 years ago |
|
ELF
|
8a2f36b5a3
|
Merge branch 'dev' into release-1.0.0
|
5 years ago |
|
yulingwei
|
fe8a99b0ec
|
Merge branch 'feature/ltv' into dev
|
5 years ago |
|
yulingwei
|
931893640a
|
修改问题
|
5 years ago |
|
chenzhi
|
fe06fded2a
|
优化区服列表，隐藏操作，新增id
|
5 years ago |
|
zhengyongxing
|
e8313dd92b
|
支付渠道统计时间筛选历史记录去除
|
5 years ago |
|
ELF
|
bf5ad7aa85
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
ELF
|
7f6730a562
|
修改留存率bug
|
5 years ago |
|
chenzhi
|
901d780165
|
优化公会弹框游戏选择
|
5 years ago |
|
liuweiwen
|
8615caa33f
|
游戏统计-搜索
|
5 years ago |
|
zhengyongxing
|
7ed0be2a29
|
支付渠道统计bug修正
|
5 years ago |
|
liuweiwen
|
69013539cd
|
修改excel路径,自动跳过excel为空的行
|
5 years ago |
|
liuweiwen
|
1def746be4
|
修改excel路径
|
5 years ago |
|
chenzhi
|
469db01864
|
优化玩家列表说明
|
5 years ago |
|
chenzhi
|
2433844bf2
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
d3ccc3bb5b
|
暂存
|
5 years ago |
|
yulingwei
|
d172b0ec8b
|
Merge branch 'feature/ltv' into dev
|
5 years ago |
|
yulingwei
|
2f36d3eb1c
|
新增bata链接和开关
|
5 years ago |
|
liuweiwen
|
600ac3fd9e
|
添加推广员时推广公司必填
|
5 years ago |
|
zhanglingsheng
|
39f1ea9d0c
|
超级签统计--样式
|
5 years ago |
|
chenzhi
|
c602946088
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
12966e83bd
|
优化玩家列表数据显示规则
|
5 years ago |
|
zhanglingsheng
|
35375a0c01
|
超级签统计--JS
|
5 years ago |
|
zhanglingsheng
|
6ffd20525d
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
zhanglingsheng
|
3a3afa739c
|
超级签统计--搜索修改
|
5 years ago |
|
zhengyongxing
|
237faf5956
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
zhengyongxing
|
5f4b02b9c5
|
超级签订单菜单修正
|
5 years ago |
|
liuweiwen
|
3244238849
|
修改文字
|
5 years ago |
|
liuweiwen
|
82c76cbbba
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
ea3cdf26d8
|
游戏统计搜索合作公司与游戏联动
直充支出明细多条数据可滚动
|
5 years ago |
|
chenzhi
|
44407cdb89
|
优化游戏选择公司联动
|
5 years ago |
|
chenzhi
|
e1ad428dfe
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
795c1983ad
|
优化官方渠道没有渠道查看
|
5 years ago |
|
liuweiwen
|
adaa402a14
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
1291009a02
|
游戏统计搜索时间范围
|
5 years ago |
|
chenzhi
|
a6ad40b45a
|
公会统计新增返回按钮
|
5 years ago |
|
chenzhi
|
6288e5e64e
|
优化游戏列表搜索推广员没掉问题
|
5 years ago |
|
chenzhi
|
43ba5afd45
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
9549812c41
|
修复第二页数据不显示问题
|
5 years ago |
|
zhengyongxing
|
65e13bbcc5
|
测试白名单bug修正
|
5 years ago |
|
zhengyongxing
|
80ebdc7f80
|
支付渠道统计添加权限
|
5 years ago |
|
chenzhi
|
5bbe0c1dcd
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
9d89be4527
|
优化公司游戏名游戏类型关系检索
|
5 years ago |
|
liuweiwen
|
aaabd0a07f
|
游戏统计搜索时间范围
|
5 years ago |
|
chenzhi
|
d1cca460be
|
优化公会统计游戏搜索框
|
5 years ago |
|
zhanglingsheng
|
93123b3b95
|
订单记录
|
5 years ago |
|
ELF
|
de81412aef
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
ELF
|
88c1cdcd1b
|
解决冲突
|
5 years ago |
tping
|
5af705c2f9
|
通知到账
|
5 years ago |
|
liuweiwen
|
26726f32bf
|
游戏统计下拉框改为select2
|
5 years ago |
|
zhengyongxing
|
e4f49e91c2
|
Merge branch 'dev_statistics' into dev
|
5 years ago |
|
zhengyongxing
|
7eb430f746
|
渠道统计bug修正
|
5 years ago |
|
ELF
|
67dd874ccf
|
修改
|
5 years ago |
zhengchanglong
|
616c7f583f
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
chenzhi
|
116dc2c86f
|
优化三角色说明
|
5 years ago |
|
chenzhi
|
1f4490733a
|
优化推广员注册用户
|
5 years ago |
|
chenzhi
|
8c577ec4af
|
新增平台统计说明
|
5 years ago |
|
chenzhi
|
7a82b930bf
|
优化区服选择不响应问题
|
5 years ago |
|
ELF
|
8d934c8d88
|
修改
|
5 years ago |
|
chenxiaojun
|
92b0bc2c87
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
ec273ab157
|
公会分成管理--更新
|
5 years ago |
|
chenzhi
|
4dc8a8cb6d
|
优化导出为新开一个窗口
|
5 years ago |
|
zhengchanglong
|
ab5f7267e5
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
zhengyongxing
|
792906e448
|
平台币充值功能添加
|
5 years ago |
|
zhengyongxing
|
eb187fa8d8
|
超级签详情链接添加
|
5 years ago |
|
zhengchanglong
|
dba78c08cd
|
非管理员数据导出隐藏
|
5 years ago |
|
zhengchanglong
|
a45fde72dd
|
非管理员数据导出隐藏
|
5 years ago |
|
chenzhi
|
0ef4241570
|
合并statistcs
|
5 years ago |
|
zhengyongxing
|
09924a5cc3
|
超级签详情链接添加
|
5 years ago |
|
liuweiwen
|
8a512aedc9
|
Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
|
5 years ago |
|
liuweiwen
|
ab27c53da4
|
修改提示
|
5 years ago |
|
zhengyongxing
|
a7e747e639
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
|
5 years ago |
|
zhengyongxing
|
ac6f980d03
|
角色权限返回样式调整
|
5 years ago |
|
zhengchanglong
|
484972e9f2
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
zhengchanglong
|
01c79143b1
|
Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
|
5 years ago |
|
zhengchanglong
|
42542ff640
|
非管理员数据加密显示
|
5 years ago |
|
liuweiwen
|
eb6c65522d
|
修改提示
|
5 years ago |
|
zhengyongxing
|
17e4084192
|
角色权限返回调整
|
5 years ago |
|
liuweiwen
|
cc1e3ccbb3
|
推广员账号已存在判断
|
5 years ago |
|
liuweiwen
|
dfa5316ef1
|
推广员状态默认为待审核
|
5 years ago |
|
liuweiwen
|
ec4c820057
|
Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
|
5 years ago |
|
liuweiwen
|
86dd4a2952
|
【用户】-【玩家组】-【登录记录】-选择会长只显示这个会长的登录记录
改为展示这个会长及其所属推广员的登录记录
|
5 years ago |
|
zhengchanglong
|
1ca183b547
|
非管理员数据加密显示
|
5 years ago |
|
zhengchanglong
|
c6b8f99b6e
|
非管理员数据加密显示
|
5 years ago |
|
zhengchanglong
|
9a2a7df2e6
|
非管理员数据加密显示
|
5 years ago |
|
chenzhi
|
700114cb4c
|
Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
|
5 years ago |
|
chenzhi
|
ae3e5d4048
|
公会导出结束
|
5 years ago |
|
zhengchanglong
|
cc6d095a1c
|
非管理员数据加密显示
|
5 years ago |
|
chenzhi
|
2651a94408
|
公会导出2
|
5 years ago |
|
zhengyongxing
|
10aa8cf81c
|
月结统计导出添加
|
5 years ago |
|
zhengchanglong
|
4968ace29d
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Common/function.php
# Application/Home/Controller/DownloadController.class.php
|
5 years ago |
|
zhengchanglong
|
dbaf93b630
|
非管理员数据加密显示
|
5 years ago |
|
liuweiwen
|
e32491c108
|
bug修复，解决点击搜索框后下拉显示异常
|
5 years ago |
|
chenzhi
|
ba6947987b
|
Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
|
5 years ago |
|
chenzhi
|
e414013f8b
|
优化导出2
|
5 years ago |
|
zhengyongxing
|
0a8865e335
|
菜单修正
|
5 years ago |
|
zhengyongxing
|
b8d736c337
|
Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
|
5 years ago |
|
zhengyongxing
|
00f33befa2
|
平台币收回修正
|
5 years ago |
|
chenzhi
|
c5dc3b4f22
|
优化会长统计导出1
|
5 years ago |
|
sunke
|
5b7a0ad8b2
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
zhengchanglong
|
39b6e98f3b
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Controller/BehaviorLogController.class.php
# Application/Admin/Controller/ExportController.class.php
# Data/update.sql
|
5 years ago |
|
chenzhi
|
7c81377095
|
Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
|
5 years ago |
|
chenzhi
|
cb99c63223
|
公会统计6
|
5 years ago |
|
zhengchanglong
|
88fde815d4
|
非管理员数据加密显示和隐藏导出按钮
|
5 years ago |
|
zhengyongxing
|
5daf1eb565
|
支付渠道查询修改
|
5 years ago |
|
sunke
|
2f83a85690
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
liuweiwen
|
546a7029cd
|
bug修复：游戏充值-》补单没权限提示内容为空的问题
|
5 years ago |
|
liuweiwen
|
69e3843a56
|
修改文字
|
5 years ago |
|
zhengyongxing
|
d465be8969
|
数据权限提交
|
5 years ago |
|
chenzhi
|
c6f2794a3b
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
chenzhi
|
f480cd6b7a
|
优化给推广员发放平台币时菜单问题
|
5 years ago |
|
liuweiwen
|
21e90e6cb3
|
Merge branch 'dev_permission' into release-1.0.0
|
5 years ago |
|
liuweiwen
|
fe5ae6a499
|
搜索的推广员数据权限
|
5 years ago |
|
zhengyongxing
|
153f731b55
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
|
5 years ago |
|
zhengyongxing
|
e8c3f021b6
|
角色查询导出修改
|
5 years ago |
|
chenxiaojun
|
410a3cda1b
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
liuweiwen
|
4fca3e8288
|
修改返回按钮样式
|
5 years ago |
|
chenzhi
|
b97a956cbc
|
公会统计5
|
5 years ago |
|
liuweiwen
|
511b780f72
|
返回跳转
|
5 years ago |
|
liuweiwen
|
ee2fc154a4
|
推广公司
|
5 years ago |
|
sunke
|
f3d91e5a11
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
904b707cf4
|
公会统计5
|
5 years ago |
|
chenxiaojun
|
5034cb863b
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
788a2415e3
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
aa5e404188
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
chenzhi
|
9104c0865c
|
公会统计5
|
5 years ago |
|
zhengyongxing
|
69ad354ff7
|
数据权限bug修正
|
5 years ago |
|
zhengchanglong
|
e08a2eb3ce
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Controller/access_data_foldline.txt
# Data/update.sql
|
5 years ago |
|
zhengchanglong
|
7c7ec4fc1d
|
Merge branch 'dev_permission' into release-1.0.0
# Conflicts:
# Application/Admin/Common/function.php
# Application/Admin/Controller/BehaviorLogController.class.php
# Application/Admin/Controller/ExportController.class.php
|
5 years ago |
|
chenzhi
|
1450d05677
|
公会统计5
|
5 years ago |
|
liuweiwen
|
96bf040f98
|
导出数据权限
|
5 years ago |
|
chenxiaojun
|
14d4c71a7f
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
3e439715c1
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
chenzhi
|
c05698e991
|
公会统计4
|
5 years ago |
|
liuweiwen
|
4bf6352f9d
|
导出添加数据权限
|
5 years ago |
|
chenzhi
|
6e97bd3bbe
|
Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics
|
5 years ago |
|
chenzhi
|
b94fb8d794
|
公会统计4
|
5 years ago |
|
sunke
|
5f24c670b8
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
883dd449e0
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |