zhengchanglong
|
24d1366d0a
|
Merge branch 'hotfix/recharge_statistics' into release
|
5 years ago |
liuweiwen
|
b94bf93823
|
0点游戏统计
|
5 years ago |
chenzhi
|
29618ce878
|
Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize
|
5 years ago |
|
chenzhi
|
58eb6a0e12
|
新增cp公司优化奖罚自动获取
|
5 years ago |
|
liuweiwen
|
2b51122d13
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
liuweiwen
|
9e9a925429
|
奖罚记录管理
|
5 years ago |
chenxiaojun
|
a7891d6b57
|
管理后台>推广员>结算管理>推广提现--部分功能优化
|
5 years ago |
|
chenxiaojun
|
065821a2d9
|
推广平台>财务管理>结算中心--更新
|
5 years ago |
jbRotk
|
72cfd9ec64
|
新增渠道费率
|
5 years ago |
|
zhengchanglong
|
4aeaf8f74c
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
liuweiwen
|
51d2d91671
|
验证手机号码格式修改
|
5 years ago |
sk
|
edf8d07a4e
|
充值明细条件更变
|
5 years ago |
|
chenzhi
|
7657db3b18
|
财务分类-支付渠道/支付类型
|
5 years ago |
|
jbRotk
|
c84cde9567
|
Merge branch 'feature/ylw' into feature/admin_optimize
|
5 years ago |
|
jbRotk
|
5f510cd4d9
|
新增奖惩时间
|
5 years ago |
|
liuweiwen
|
289fd24ab6
|
内部公司信息管理
|
5 years ago |
|
liuweiwen
|
b444a3546b
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
# Conflicts:
# Data/update.sql
|
5 years ago |
|
liuweiwen
|
c92fa425d2
|
内部公司信息管理
|
5 years ago |
|
chenzhi
|
cb4e457ace
|
财务汇总-按合作方类型
|
5 years ago |
|
jbRotk
|
c968e54cf8
|
解决冲突
|
5 years ago |
|
jbRotk
|
94afe49b0c
|
upt
|
5 years ago |
 廖金灵
|
5d281e4647
|
Merge branch 'hotfix/close_promote_register' of wmtx/platform into master
清除推广员注册代码
|
5 years ago |
|
liaojinling
|
b02ca653b2
|
Merge branch 'hotfix/close_promote_register' into release
|
5 years ago |
|
liaojinling
|
6cecac4862
|
清除推广员注册代码
|
5 years ago |
|
liaojinling
|
d789a175f8
|
推广员/组长添加备注
|
5 years ago |
|
chenxiaojun
|
4e1d6938f8
|
推广平台>数据管理>订单查询--bug修复
|
5 years ago |
|
sk
|
d98bfa04b9
|
资质认证电子文档
|
5 years ago |
|
chenzhi
|
993bedc98f
|
收入类型-测试收入
|
5 years ago |
|
chenxiaojun
|
f1fda49e9e
|
推广平台>财务管理--更新
|
5 years ago |
|
chenzhi
|
39c43c1bee
|
优化游戏分成比例获取函数备注
|
5 years ago |
zyx
|
b0c225591f
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
zyx
|
414d36c373
|
cp分成比例方法修正
|
5 years ago |
|
chenzhi
|
f95b084f88
|
Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize
|
5 years ago |
|
chenzhi
|
8c756d61d9
|
cp分成增加符号后上游比例获取修正
|
5 years ago |
|
zyx
|
782de31ca8
|
cp分成比例方法添加
|
5 years ago |
|
zyx
|
f58f05d00d
|
cp分成比例方法修正
|
5 years ago |
|
jbRotk
|
35b6d25ebc
|
upt
|
5 years ago |
|
chenzhi
|
5eaadd974a
|
财务分类汇总-按收入类型1
|
5 years ago |
|
chenzhi
|
aba7ed22d1
|
财务汇总分类脚本-按收入类型
|
5 years ago |
|
zyx
|
4be5b1ba2c
|
cp分成比例方法添加
|
5 years ago |
|
chenxiaojun
|
cbe40d4b0f
|
管理后台更新
|
5 years ago |
|
chenxiaojun
|
f1b454627e
|
管理后台更新
|
5 years ago |
|
sk
|
c612fbc5fd
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company
|
5 years ago |
|
chenxiaojun
|
37ab08b9be
|
管理后台>推广员>结算管理>公会分成管理--规则修改
|
5 years ago |
|
chenxiaojun
|
a8008fbe05
|
管理后台>推广员>结算管理>公会分成管理--规则修改
|
5 years ago |
|
zhengchanglong
|
58bd9414d6
|
Merge branch 'hotfix/recharge_statistics' into release
|
5 years ago |
|
liuweiwen
|
b5a2ddba3c
|
游戏订单查看，查询时0点属于当天
|
5 years ago |
|
chenxiaojun
|
73f1055303
|
管理后台>推广员>结算管理>推广提现--增加自动审核功能
|
5 years ago |
|
zhengchanglong
|
72d222a64a
|
CP分成比例修改
|
5 years ago |
|
chenzhi
|
29868a6331
|
Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize
|
5 years ago |
|
chenzhi
|
158c56d543
|
优化甲方可以自由选择
|
5 years ago |
|
zyx
|
07279467ca
|
管理后台部分限制规则修改 / 开放甲乙方都能为万盟天下后，无法检索出万盟天下
|
5 years ago |
|
chenzhi
|
332ff4c3c4
|
优化生成上游对账单手机及银行卡验证规则
|
5 years ago |
|
zyx
|
fea720339b
|
结算单功能优化 / 下游结算单：列表展示游戏不区分安卓IOS，直接展示汇总信息
|
5 years ago |
|
chenxiaojun
|
10665cc869
|
管理后台>推广员>结算管理>公会分成管理--更新
|
5 years ago |
|
廖金灵
|
f66c6505d1
|
Merge branch 'hotfix/testWhileList' of wmtx/platform into master
测试外网充值白名单设置BUG修复
|
5 years ago |
|
sk
|
636aabb5a0
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company
|
5 years ago |
|
zyx
|
d4850b60be
|
Merge branch 'hotfix/testWhiteList' into release
|
5 years ago |
|
zyx
|
2ad5017fae
|
测试白名单编辑修改成删除
|
5 years ago |
|
sk
|
f93c9c569d
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company
|
5 years ago |
xxxx
|
a85c217c6b
|
OA管理员绑定
|
5 years ago |
|
zyx
|
aac1d6f7b5
|
Merge branch 'hotfix/testWhiteList' into release
|
5 years ago |
|
zyx
|
7beb0938e3
|
测试白名单修改
|
5 years ago |
|
sk
|
ce9faf7271
|
公司录入
|
5 years ago |
|
jbRotk
|
65461ff200
|
c
|
5 years ago |
liuweiwen
|
0fba64c6f1
|
数据展示权限：勾选权限时，*号屏蔽的地方要开放，另没数据权限的地方补上
|
5 years ago |
|
ELF
|
9ab7688056
|
调试
|
5 years ago |
|
ELF
|
7928282e99
|
调试
|
5 years ago |
|
ELF
|
b79ab76a39
|
调试
|
5 years ago |
|
ELF
|
8ff17d9872
|
修改bug
|
5 years ago |
|
ELF
|
13cb680955
|
修改bug
|
5 years ago |
|
ELF
|
56a97f7eef
|
修改bug
|
5 years ago |
|
ELF
|
d0e700d2e8
|
优化程序
|
5 years ago |
|
ELF
|
e8a0975981
|
解决冲突
|
5 years ago |
|
ELF
|
8136bff2f9
|
优化查询
|
5 years ago |
|
ELF
|
6993d164a3
|
解决冲突
|
5 years ago |
sunke
|
8b82e03328
|
下载刷新
|
5 years ago |
|
sunke
|
5b6e9da5d8
|
获取区服名
|
5 years ago |
|
ELF
|
0f5e3944c0
|
财务管理加入权限判断
|
5 years ago |
|
ELF
|
2b039e2b8a
|
优化程序
|
5 years ago |
|
ELF
|
709094c5be
|
修改bug
|
5 years ago |
|
ELF
|
b7cf4c28a7
|
修改
|
5 years ago |
|
ELF
|
3af87434b9
|
权限判断修改
|
5 years ago |
|
ELF
|
526bbc1556
|
添加ios下载控制功能
|
5 years ago |
|
sunke
|
5974047e1c
|
推广员指标下载
|
5 years ago |
|
ELF
|
d3a3b8cdb7
|
修改
|
5 years ago |
|
yulingwei
|
22addc182c
|
修改检索问题
|
5 years ago |
|
sunke
|
0e0c1798f4
|
推广导入空数据初始化
|
5 years ago |
|
yulingwei
|
ac8d7300ad
|
Merge branch 'feature/game_divide_warn' into dev
|
5 years ago |
|
yulingwei
|
33a19fbb6a
|
upt
|
5 years ago |
|
yulingwei
|
f0109e9554
|
合并请求
|
5 years ago |
|
yulingwei
|
45b3c27292
|
upt
|
5 years ago |
|
sunke
|
b9ddc1aafb
|
推广配置
|
5 years ago |
|
yulingwei
|
eef229d22d
|
Merge branch 'feature/sms_up' of 47.111.118.107:wmtx/platform into feature/sms_up
|
5 years ago |
|
chenxiaojun
|
8c43defff3
|
推广员指标管理--更新
|
5 years ago |
|
chenxiaojun
|
784f416ad5
|
推广员指标管理--更新
|
5 years ago |
|
chenxiaojun
|
5fbe482fba
|
推广员指标管理--更新
|
5 years ago |
|
ELF
|
2195bb4c55
|
修改短信发送
|
5 years ago |
|
zhengchanglong
|
e6f3329ac8
|
内外团归属BUG修复
|
5 years ago |
|
chenxiaojun
|
47b7dc0d2f
|
市场总监联系方式
|
5 years ago |
|
chenxiaojun
|
4dd5967be9
|
推广员指标管理
|
5 years ago |
|
chenxiaojun
|
8780b57f45
|
推广员指标管理--更新
|
5 years ago |
|
chenxiaojun
|
30c40d004b
|
推广员指标管理--更新
|
5 years ago |
|
chenxiaojun
|
9a4a50fb9c
|
市场总监联系方式
|
5 years ago |
|
chenxiaojun
|
cd13156221
|
市场部联系方式
|
5 years ago |
|
ELF
|
79f9801351
|
修改落地页/下载页
|
5 years ago |
|
chenxiaojun
|
535f185e37
|
推广员指标管理
|
5 years ago |
|
zhengchanglong
|
9961448831
|
Merge branch 'release' into dev
|
5 years ago |
|
yulingwei
|
55ef999729
|
upt
|
5 years ago |
|
yulingwei
|
6daf38aa43
|
upt
|
5 years ago |
|
yulingwei
|
dfd274a667
|
Merge branch 'release' into feature/game_divide_warn
|
5 years ago |
|
yulingwei
|
0ebe11027e
|
upt
|
5 years ago |
chenzhi
|
56617b1e25
|
Merge branch 'feature/ghcount_change' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
fa784fac8a
|
优化游戏订单导出
|
5 years ago |
|
chenzhi
|
54f2e0abcd
|
游戏统计新增会长和公司
|
5 years ago |
|
zhengyongxing
|
ef41dbfcee
|
下游输出错误修改
|
5 years ago |
|
zhengyongxing
|
561e6bd84c
|
下游输出错误修改
|
5 years ago |
|
sunke
|
d2b7e91a64
|
推广配置
|
5 years ago |
|
liuweiwen
|
490b6a3369
|
工会归属隐藏导出
|
5 years ago |
|
ELF
|
9c493dd8ef
|
Merge branch 'release' into dev
|
5 years ago |
|
ELF
|
0d45be780f
|
解决冲突
|
5 years ago |
|
ELF
|
c01b0f1083
|
发送短信添加ip地址
|
5 years ago |
|
chenxiaojun
|
5a75ea406a
|
更新
|
5 years ago |
|
liuweiwen
|
ccca9fb0bd
|
管理后台-》推广员列表可关键内外团搜索
|
5 years ago |
|
liuweiwen
|
38c64f5430
|
管理后台-》推广员列表可关键内外团搜索
|
5 years ago |
|
yulingwei
|
076b4393eb
|
upt
|
5 years ago |
|
yulingwei
|
aafc877e71
|
merghe
|
5 years ago |
|
yulingwei
|
d33d0c3f46
|
upt
|
5 years ago |
|
liuweiwen
|
92900a57f0
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
323facd599
|
管理后台推广员添加时手机号码不可重复
|
5 years ago |
|
sunke
|
10f3f8609d
|
手机号去重
|
5 years ago |
|
zhengyongxing
|
d727794e0a
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
zhengyongxing
|
46a3028fc9
|
输出删除
|
5 years ago |
|
chenxiaojun
|
cf66e4323e
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
c58e1c57de
|
财务管理--更新
|
5 years ago |
|
chenxiaojun
|
29789f5ef6
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
b7dd9c5b45
|
财务管理--更新
|
5 years ago |
|
sunke
|
dbf04c25c5
|
错误修改
|
5 years ago |
|
zhengyongxing
|
75f2d09b10
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
zhengyongxing
|
3fca3c89ad
|
短信验证码提交
|
5 years ago |
|
chenxiaojun
|
b367b4a8d3
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
df97ff401a
|
财务管理--更新
|
5 years ago |
|
sunke
|
126c7755db
|
资料填写地址默认
|
5 years ago |
|
chenxiaojun
|
693f8c9991
|
财务管理--更新
|
5 years ago |
|
zhengyongxing
|
3741b0d27f
|
市场结算修正
|
5 years ago |
|
chenxiaojun
|
42e07d0f2f
|
结算管理--更新
|
5 years ago |
|
chenxiaojun
|
66a238dfd4
|
结算管理--更新
|
5 years ago |
|
ELF
|
5c0a38c02a
|
Merge branch 'feature/site_sms' into release
|
5 years ago |
|
ELF
|
1e232e827b
|
Merge branch 'feature/site_sms' into dev
|
5 years ago |
|
ELF
|
9b3f105e5a
|
修改bug
|
5 years ago |
|
ELF
|
1f5dfac6d2
|
Merge branch 'feature/site_sms' into dev
|
5 years ago |
|
ELF
|
14e65c8314
|
修改短信发送bug
|
5 years ago |
|
zhengyongxing
|
1ba566a02c
|
市场结算修正
|
5 years ago |
|
zhengyongxing
|
a68858d4ed
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
ELF
|
32c689df21
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
ELF
|
04742809f2
|
Merge branch 'feature/site_sms' into dev
|
5 years ago |
|
zhengyongxing
|
9d5b877220
|
市场结算生成下游代码修改
|
5 years ago |
|
ELF
|
828252cee9
|
修改短信发送bug
|
5 years ago |
|
chenxiaojun
|
6e05546db6
|
公会分成管理--更新
|
5 years ago |
|
sunke
|
7ac22521dd
|
姓名只留姓
|
5 years ago |
|
chenxiaojun
|
71e02a4add
|
结算管理--更新
|
5 years ago |
|
ELF
|
70ade1c071
|
Merge branch 'feature/site_sms' into dev
|
5 years ago |
|
ELF
|
afa7aa8988
|
修改短信服务bug
|
5 years ago |
|
chenxiaojun
|
28897755c9
|
结算管理--更新
|
5 years ago |
|
ELF
|
33ebc763e6
|
Merge branch 'feature/site_sms' into dev
|
5 years ago |
|
ELF
|
f6eb5d8008
|
修改bug
|
5 years ago |
|
chenxiaojun
|
258e10c9d1
|
结算管理--更新
|
5 years ago |
|
zhengyongxing
|
4c42ee90e3
|
市场结算生成下游对账单代码优化
|
5 years ago |
|
liuweiwen
|
ef975943bb
|
针对admin的后台账号对游戏充值和角色查询做完全访问权限，没完全访问权限时必须通过搜索才显示结果
|
5 years ago |
|
sunke
|
4793665896
|
充值信息根据会长权限显示导出部分
|
5 years ago |
|
zhengyongxing
|
136f565f9f
|
市场结算管理设备类型条件修正
|
5 years ago |
|
ELF
|
c4b768879e
|
Merge branch 'feature/site_sms' into dev
|
5 years ago |
|
chenxiaojun
|
4f63f45374
|
推广平台>数据管理>每日概况|数据汇总--更新
|
5 years ago |
|
yulingwei
|
569fc37e40
|
Merge branch 'feature/promote_perm' of 47.111.118.107:wmtx/platform into feature/promote_perm
|
5 years ago |
|
yulingwei
|
23f2334e45
|
新增充值权限查看
|
5 years ago |
|
ELF
|
7a1cd5bc94
|
添加完整的权限判断
|
5 years ago |
|
zhengyongxing
|
f86265d38c
|
市场结算管理设备类型条件修正
|
5 years ago |
|
ELF
|
f0acbc1c24
|
充值信息根据会长权限显示
|
5 years ago |
|
sunke
|
9152a3ef59
|
推广配置导入功能
|
5 years ago |
|
zhengchanglong
|
d054e70c73
|
Merge branch 'release' into dev
# Conflicts:
# Application/Admin/Controller/MemberController.class.php
# Application/Admin/View/Promote/belong_edit.html
|
5 years ago |
|
zhengyongxing
|
38cea3f972
|
用户列表导出锁定备注bug修正
|
5 years ago |
|
chenxiaojun
|
63d947f754
|
推广提现--更新
|
5 years ago |
|
chenxiaojun
|
517d4ec05f
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
48ca90bbf3
|
公会分成管理--更新
|
5 years ago |
|
liuweiwen
|
cdfa8e4eee
|
admin权限
|
5 years ago |
|
liuweiwen
|
1b2cf94c9b
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
21806993d4
|
admin权限
|
5 years ago |
|
chenzhi
|
5fdb7946cc
|
新增登陆记录列表统计权限
|
5 years ago |
|
chenzhi
|
07e4fb2e56
|
优化列表和统计权限函数
|
5 years ago |
|
ELF
|
e4daff1be8
|
修改短信接口
|
5 years ago |
|
zhengyongxing
|
43a335bc28
|
市场结算管理总流水弹窗优化
|
5 years ago |
|
liuweiwen
|
c8b184b877
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
86fe5f1f9f
|
工会归属admin不加密推广员账号
|
5 years ago |
|
chenzhi
|
4e1567f013
|
新增玩家列表列表及统计权限
|
5 years ago |
|
zhengyongxing
|
16814af0d2
|
市场结算管理总流水弹窗优化
|
5 years ago |
|
zhengyongxing
|
3559d91a32
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
zhengyongxing
|
7770fc13c8
|
市场结算管理总流水弹窗优化
|
5 years ago |
|
liuweiwen
|
d1022c85fd
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
5a633ccb49
|
工会归属申请时间日期格式化
|
5 years ago |
|
zhengyongxing
|
8cbf3574e3
|
市场结算管理总流水弹窗优化
|
5 years ago |
|
zhengyongxing
|
f4b6fa4738
|
用户信息小号隐藏
|
5 years ago |
|
zhengyongxing
|
076daf0d4e
|
query冲突解决
|
5 years ago |
|
liuweiwen
|
822ec35ff8
|
Merge branch 'feature/group_type' into release
|
5 years ago |
|
liuweiwen
|
2b3099a2d8
|
工会归属会长不可编辑
|
5 years ago |
|
ELF
|
b38eed342f
|
Merge branch 'release' into dev
|
5 years ago |
|
ELF
|
c6d99af7a1
|
Merge branch 'hotfix/shift_player_selle' into release
|
5 years ago |
|
ELF
|
a31e42b7c4
|
Merge branch 'hotfix/link_info' into release
|
5 years ago |
|
ELF
|
f27728b9dd
|
Merge branch 'hotfix/change_btn_color' into release
|
5 years ago |
|
ELF
|
f7a53c7562
|
Merge branch 'feature/account_safe' into release
|
5 years ago |
|
ELF
|
c4934613ae
|
解决冲突
|
5 years ago |
|
ELF
|
1ba77738f3
|
解决冲突
|
5 years ago |
|
ELF
|
b0bc4c0496
|
解决冲突
|
5 years ago |
|
ELF
|
0f44d9e95c
|
解决冲突
|
5 years ago |
|
zhengchanglong
|
bb08c723a3
|
Merge branch 'feature/group_type' into release-1.0.1
|
5 years ago |
|
ELF
|
152ccbc210
|
修改落地页按钮颜色
|
5 years ago |
|
liuweiwen
|
08f8c518a6
|
从dev复制代码
|
5 years ago |
|
liuweiwen
|
7431072bbf
|
从dev复制代码
|
5 years ago |
|
chenzhi
|
dff83c73d0
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
33be79e5cf
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
f34b71114f
|
优化数字提示
|
5 years ago |
|
zhengyongxing
|
ec027503cc
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
13d1da8733
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
zhengyongxing
|
63b44a78ff
|
下游订单生成bug修正
|
5 years ago |
|
chenzhi
|
fd36d6e674
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
ee5330bfc9
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
e5d8710f0a
|
优化罚款保存后数据不对
|
5 years ago |
|
liuweiwen
|
16d8dd6dcb
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
2d060e6e72
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
liuweiwen
|
a26b0ab53f
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
liuweiwen
|
6f7dcb9ca5
|
修改上下游对账单导出文件名
|
5 years ago |
|
chenxiaojun
|
6d215bda63
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
6012fdbdf1
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
02ccf125dc
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
365a276b95
|
公会分成管理--更新
|
5 years ago |
|
zhengyongxing
|
1a52a129f2
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
122a27634b
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
e73d795ace
|
生成下游结算单下拉选项框优化
|
5 years ago |
|
chenzhi
|
7ff7758df2
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
ef0b3c86f0
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
ce92602ca0
|
优化生成上游订单重复提醒
|
5 years ago |
|
liuweiwen
|
9b026796f2
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
liuweiwen
|
6caf99e984
|
对账系统登录界面修改
|
5 years ago |
|
zhengyongxing
|
c07167e784
|
结算单bug修正
|
5 years ago |
|
zhengyongxing
|
943969bddd
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
c09c3a591e
|
结算单bug修正
|
5 years ago |
|
chenzhi
|
b566a2352a
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
cdb0b10c9a
|
结算列表新增对账单地址
|
5 years ago |
|
chenzhi
|
fd18ed01fe
|
合并
|
5 years ago |
|
chenzhi
|
dbc0e00132
|
合并
|
5 years ago |
|
chenzhi
|
d889bef13d
|
优化上游时间选择提示
|
5 years ago |
|
chenzhi
|
c3848e5b55
|
优化上游信息提示
|
5 years ago |
|
zhengyongxing
|
8965fe8201
|
Merge branch 'feature/group_type' into dev
# Conflicts:
# Application/Admin/Controller/QueryController.class.php
|
5 years ago |
|
zhengyongxing
|
a2ce005497
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
71f2d75b8e
|
市场结算管理总流水点击查看各个渠道的流水
|
5 years ago |
|
sunke
|
5f6611fc30
|
资质认证
|
5 years ago |
|
chenxiaojun
|
ba9b5e33d1
|
更新
|
5 years ago |
|
chenxiaojun
|
d615a1402f
|
公会分成管理--更新
|
5 years ago |
|
liuweiwen
|
bbc1b05e1c
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
liuweiwen
|
b8e36847a3
|
cp对账系统退出
|
5 years ago |
|
liuweiwen
|
f480c20fb7
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
liuweiwen
|
57a1d8ed8c
|
对账系统
|
5 years ago |
|
zhengyongxing
|
a51291216a
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
f36202486d
|
生成上游订单修改
|
5 years ago |
|
zhengyongxing
|
abfc54a0af
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
2f1d5fbd38
|
生成上游订单修改
|
5 years ago |
|
chenzhi
|
0f8da4afac
|
优化页面显示
|
5 years ago |
|
chenzhi
|
9c1cb95290
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
41421a9b10
|
优化页面显示
|
5 years ago |
|
liuweiwen
|
0fa27e9c03
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
liuweiwen
|
ed706c1b86
|
公司信息管理加提示
|
5 years ago |
|
zhengyongxing
|
b735706006
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
7f99dafb2c
|
市场结算管理 上游结算流水bug修正
|
5 years ago |
|
liuweiwen
|
af28ff9155
|
工会归属查询
|
5 years ago |
|
liuweiwen
|
c7b9e2a7d6
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
liuweiwen
|
a7e9f62367
|
对账系统自动登录
|
5 years ago |
|
liuweiwen
|
3f5791ff3f
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
liuweiwen
|
51844a824e
|
工会归属会长必填
|
5 years ago |
|
liuweiwen
|
e2095af7a8
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
liuweiwen
|
49e0e19cc8
|
推广员与合作公司只能看到自己的公司的对账记录
|
5 years ago |
|
zhengchanglong
|
a67ffa18d6
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
6e405febc1
|
设置分成比例安卓IOS同步更新
|
5 years ago |
zhanglingsheng
|
4043cc04e6
|
支付设置--添加支付限额
|
5 years ago |
|
zhengyongxing
|
ae2ad86247
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
8b4c641f02
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
zhengyongxing
|
3c9a828537
|
市场结算官方渠道检索修正
|
5 years ago |
|
chenzhi
|
4cd3d5b618
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
5996b5f45e
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
cc653c2d2d
|
优化tp1.id错误
|
5 years ago |
|
zhengyongxing
|
a4b53c4e9a
|
结算单管理字段名修正
|
5 years ago |
|
zhengyongxing
|
0c403ddf57
|
结算单管理字段名修正
|
5 years ago |
|
zhengyongxing
|
4d6a45657c
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
zhengyongxing
|
73578f1b64
|
生成下游订单修改
|
5 years ago |
|
chenzhi
|
96466100bb
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
864e8d693a
|
优化前端浮点数计算
|
5 years ago |
|
liuweiwen
|
64cdea78a3
|
工会归属管理
|
5 years ago |
|
zhengyongxing
|
6baba8db28
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
liuweiwen
|
5d593cf266
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
135cba359e
|
菜单高亮修改
|
5 years ago |
|
liuweiwen
|
7f0dbe1112
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
liuweiwen
|
1e4b7f69d5
|
cp/工会对账系统
|
5 years ago |
|
zhengchanglong
|
73fb719628
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
c27518b988
|
市场结算添加编辑添加户名
|
5 years ago |
|
zhengchanglong
|
868fde2d07
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
26c7190654
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
zhengyongxing
|
ef53562d06
|
市场结算添加编辑添加户名
|
5 years ago |
|
chenzhi
|
8ff8d1dab8
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
ac0405329f
|
优化编辑
|
5 years ago |
|
liuweiwen
|
21ee77609c
|
cp/工会对账系统
|
5 years ago |
|
zhengchanglong
|
1c00290da9
|
Merge branch 'feature/group_type' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
chenxiaojun
|
6a8e58325c
|
更新
|
5 years ago |
|
chenxiaojun
|
bfc93e0626
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
d995675829
|
更新
|
5 years ago |
|
chenxiaojun
|
1594500eca
|
资质认证--更新
|
5 years ago |
|
zhengyongxing
|
547b0439e3
|
市场结算添加编辑添加户名
|
5 years ago |
|
chenzhi
|
1275c740d5
|
新增cp对账单删除
|
5 years ago |
|
zhengyongxing
|
da420ceb5c
|
市场结算添加编辑添加户名
|
5 years ago |
|
zhengyongxing
|
b74ac306ae
|
市场结算添加编辑添加户名
|
5 years ago |
|
chenzhi
|
1bb038db4e
|
优化查看2
|
5 years ago |
|
chenzhi
|
89d21c6218
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
f06cddc093
|
优化查看
|
5 years ago |
|
zhengyongxing
|
2b335ec910
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
45ea27fd1f
|
市场结算列表删除操作
|
5 years ago |
|
chenzhi
|
cba3fc898c
|
新增查看
|
5 years ago |
|
liuweiwen
|
fc5db0b298
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
# Conflicts:
# Application/Admin/Controller/AjaxController.class.php
# Data/update.sql
|
5 years ago |
|
liuweiwen
|
394a3e4bb5
|
cp/工会对账系统
|
5 years ago |
|
zhengyongxing
|
6bda9fe842
|
市场结算管理代码编辑完善
|
5 years ago |
|
zhengyongxing
|
ad901c31db
|
市场结算管理代码编辑完善
|
5 years ago |
|
chenxiaojun
|
c42e0be4cd
|
更新
|
5 years ago |
|
chenxiaojun
|
7550bafdf7
|
充值玩家--更新
|
5 years ago |
|
zhengyongxing
|
99f23254ed
|
市场结算管理代码提交
|
5 years ago |
|
zhengyongxing
|
68312cc277
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
71b1498c71
|
市场结算管理代码提交
|
5 years ago |
|
chenzhi
|
25240227e4
|
新增编辑
|
5 years ago |
|
chenxiaojun
|
4a53915c22
|
更新
|
5 years ago |
|
chenxiaojun
|
82784f9da9
|
推广提现--更新
|
5 years ago |
|
sunke
|
4c4f46ed4b
|
添加条件 过滤
|
5 years ago |
|
yulingwei
|
34debb1287
|
Merge branch 'feature/pop_rules' into dev
|
5 years ago |
|
yulingwei
|
9910485523
|
修改
|
5 years ago |
|
sunke
|
c5febf0b9a
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
yulingwei
|
9fe9a47b6f
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenxiaojun
|
56956d90de
|
更新
|
5 years ago |
|
chenxiaojun
|
9b47108400
|
推广提现--更新
|
5 years ago |
|
sunke
|
10fb1aec73
|
过滤规则
|
5 years ago |
|
sunke
|
5cd760bb7a
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into feature/newFunc
|
5 years ago |
|
chenxiaojun
|
a6b9e5e39f
|
更新
|
5 years ago |
|
chenxiaojun
|
843c54ced5
|
推广提现--更新
|
5 years ago |
|
yulingwei
|
b5d71ae215
|
Merge branch 'feature/pop_rules' into dev
|
5 years ago |
|
yulingwei
|
7ea2a465bf
|
修复问题
|
5 years ago |
|
chenzhi
|
72405e45f5
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
ea6d820408
|
优化页面显示
|
5 years ago |
|
chenxiaojun
|
009842c218
|
更新
|
5 years ago |
|
chenxiaojun
|
4286817dea
|
推广提现--更新
|
5 years ago |
|
zhengchanglong
|
9952029e6c
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
066fe46064
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
zhengchanglong
|
eb114b33b3
|
游戏分成比例设定体验优化
|
5 years ago |
|
zhengyongxing
|
dddd640f9f
|
结算单管理列表修改
|
5 years ago |
|
chenzhi
|
d484c96744
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
cccbc3bfa8
|
新增cp结算单判断是否已经有交叉时间
|
5 years ago |
|
sunke
|
5b5c7876d2
|
会长权限
|
5 years ago |
|
zhengchanglong
|
10f2caefca
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
b34eec98ee
|
游戏分成比例设定体验优化
|
5 years ago |
|
chenxiaojun
|
2d0143a378
|
更新
|
5 years ago |
|
chenxiaojun
|
dcea6b7e05
|
推广提现--更新
|
5 years ago |
|
zhengchanglong
|
89d9b79930
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
5ac23b6a5b
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
zhengchanglong
|
de8386c0cb
|
游戏用户锁定备注显示
|
5 years ago |
|
chenzhi
|
0934cd472a
|
新增cp结算单到列表中
|
5 years ago |
|
zhengyongxing
|
2154899a6a
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
f87026a32c
|
结算单管理生成下游订单
|
5 years ago |
|
chenzhi
|
cda9d0c1a8
|
合并
|
5 years ago |
|
chenzhi
|
cd427a9409
|
新增添加cp上游对账单
|
5 years ago |
|
zhengchanglong
|
437800b30b
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
87096e180e
|
游戏用户锁定备注显示
|
5 years ago |
|
zhengchanglong
|
7e1b90fc19
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
93fe724c15
|
游戏用户锁定备注显示
|
5 years ago |
|
zhengchanglong
|
ba4d2a4a2e
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
941978bb07
|
【游戏】-【合作方管理】，联系人改为必填项，必填项前面加红色※号
|
5 years ago |
|
chenxiaojun
|
a0bcdb2c04
|
更新
|
5 years ago |
|
chenxiaojun
|
08dd26f942
|
推广提现--更新
|
5 years ago |
|
zhengchanglong
|
8144e3c50f
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
e914fde68d
|
玩家列表账号锁定添加备注
|
5 years ago |
|
chenxiaojun
|
0732ff3d6d
|
开服预告正序显示
|
5 years ago |
|
chenxiaojun
|
b3ba4f0edf
|
更新
|
5 years ago |
|
chenxiaojun
|
cf0680eddf
|
开服预告正序显示
|
5 years ago |
|
yulingwei
|
808a901d7f
|
Merge branch 'feature/pop_rules' into dev
|
5 years ago |
|
yulingwei
|
56b0216ff0
|
修改问题
|
5 years ago |
|
chenxiaojun
|
864b200561
|
更新
|
5 years ago |
|
chenxiaojun
|
0c0d59dd43
|
财务管理--更新
|
5 years ago |
|
chenxiaojun
|
3a9a7177fe
|
推广结算--更新
|
5 years ago |
|
chenxiaojun
|
ad80923bed
|
更新
|
5 years ago |
|
chenxiaojun
|
114cb2f7a5
|
更新
|
5 years ago |
|
chenxiaojun
|
f244b42ab7
|
推广结算--更新
|
5 years ago |
|
yulingwei
|
95ed53de77
|
修复部分问题
|
5 years ago |
|
yulingwei
|
37156e0dce
|
Merge branch 'feature/pop_rules' into dev
|
5 years ago |
|
yulingwei
|
ed9ddd2d67
|
修复检索问题
|
5 years ago |
|
yulingwei
|
5cb129e95f
|
修复冲突
|
5 years ago |
|
yulingwei
|
e3f0a24e43
|
弹窗推广后台更新
|
5 years ago |
|
zhengchanglong
|
505e12beab
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
326d9e5a12
|
管理后台-游戏-游戏编辑：参数配置-新增CP游戏分成比例
|
5 years ago |
|
zhengyongxing
|
ea140a430f
|
导出模板方法上传
|
5 years ago |