zhengchanglong
|
1b37ec3d37
|
Merge branch 'feature/add_promote_company' into release
|
5 years ago |
chenzhi
|
f5529fc2dd
|
优化推广公司首页样式
|
5 years ago |
liuweiwen
|
5544bb1797
|
合作方列表样式调整
|
5 years ago |
|
liuweiwen
|
4cb88be352
|
数据权限
|
5 years ago |
|
zhengchanglong
|
26038f379e
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
zhengchanglong
|
8bd26b36c0
|
玩家账号信息权限设置
|
5 years ago |
yulingwei
|
d349c4223d
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
yulingwei
|
0652c31664
|
upt
|
5 years ago |
|
yulingwei
|
25e66d84ff
|
修改问题
|
5 years ago |
|
liuweiwen
|
87de8d2717
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
liuweiwen
|
32f5137ac6
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
liuweiwen
|
04bb4a7bb7
|
合作方
|
5 years ago |
sunke
|
790d56c638
|
Merge branch 'feature/add_promote_company' of 47.111.118.107:wmtx/platform into feature/add_promote_company
|
5 years ago |
|
yulingwei
|
e26f517df1
|
冲突解决
|
5 years ago |
|
yulingwei
|
747bba16b0
|
汇总结算单管理
|
5 years ago |
zhengyongxing
|
00a5fed6fd
|
游戏统计新增设备类型
|
5 years ago |
|
chenzhi
|
4eaa92f0fb
|
优化导出银行卡变科学计数
|
5 years ago |
|
liuweiwen
|
52668ace85
|
合作方导出优化
|
5 years ago |
|
yulingwei
|
47d01e0aff
|
upt
|
5 years ago |
 ELF
|
35b267027c
|
Merge branch 'hotfix/download_name' into release
|
5 years ago |
|
ELF
|
129a1103e2
|
修改beta版下载名称
|
5 years ago |
|
zhengchanglong
|
858c028faf
|
Merge branch 'feature/add_promote_company' into release
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
e6d136410d
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
liuweiwen
|
e15460b08f
|
合作方
|
5 years ago |
chenzhi
|
f507dde70b
|
新增推广公司导出功能
|
5 years ago |
|
yulingwei
|
dfe52865bd
|
upt
|
5 years ago |
|
zhengyongxing
|
64122ca8c7
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
zhengyongxing
|
3b47c94b1e
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
zhengyongxing
|
2589a76603
|
生成下游个人结算单bug修改
|
5 years ago |
|
zhengchanglong
|
ec2c929450
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
zhengchanglong
|
5f5abce2ec
|
玩家信息数据显示权限BUG修复
|
5 years ago |
|
zhengyongxing
|
0b7327bc4e
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
zhengyongxing
|
c8f333fa9a
|
生成下游个人结算单bug修改
|
5 years ago |
|
zhengyongxing
|
46ccf0e3ce
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
zhengyongxing
|
71dabfae53
|
生成下游个人结算单bug修改
|
5 years ago |
|
chenzhi
|
31deafcb3c
|
优化合作公司列表页面
|
5 years ago |
|
ELF
|
055e246f70
|
修改bug
|
5 years ago |
|
liuweiwen
|
6d13be7863
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
liuweiwen
|
7da5e25e16
|
合作方
|
5 years ago |
|
zhengchanglong
|
c066620128
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
yulingwei
|
469a037b0f
|
merge
|
5 years ago |
|
chenzhi
|
5cea54585f
|
优化上游结算单选择后初始值变动
|
5 years ago |
|
chenzhi
|
8c25f55c6e
|
修复不能cp公司选择无效问题
|
5 years ago |
|
zhengchanglong
|
99f62f3c14
|
Merge branch 'feature/admin_optimize' into release
# Conflicts:
# Data/update.sql
|
5 years ago |
|
chenzhi
|
44a34bc89f
|
新增推广公司删除
|
5 years ago |
|
chenzhi
|
4e28b39999
|
新增推广公司编辑功能
|
5 years ago |
|
chenzhi
|
6ea7a581f5
|
推广公司查看
|
5 years ago |
|
chenzhi
|
f218544e7f
|
优化推广公司添加
|
5 years ago |
|
chenzhi
|
da2e3a769c
|
推广列表查看
|
5 years ago |
|
liuweiwen
|
a1c3ad8fb3
|
数据展示权限
|
5 years ago |
|
liuweiwen
|
4b480e6f94
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
liuweiwen
|
8462f80777
|
合作方
|
5 years ago |
|
zhengchanglong
|
4ce9af39e5
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
zhengyongxing
|
fb14c5888a
|
Merge branch 'hotfix/test_order' into release
|
5 years ago |
|
zhengyongxing
|
2d0d59c0a5
|
Merge branch 'hotfix/test_order' of 47.111.118.107:wmtx/platform into hotfix/test_order
Conflicts:
Application/Admin/Controller/TestOrderController.class.php
|
5 years ago |
|
zhengyongxing
|
12903ef3cd
|
测试订单列表与录入bug修改
|
5 years ago |
|
zhengyongxing
|
6f48940e21
|
生成下游个人结算单回退功能添加
|
5 years ago |
|
zhengyongxing
|
8dd5f7bf5c
|
结算单管理添加
|
5 years ago |
|
chenzhi
|
92929b1db7
|
优化推广公司添加
|
5 years ago |
|
chenzhi
|
84f5ff2e95
|
优化添加推广公司结构
|
5 years ago |
|
liuweiwen
|
ada2913cdc
|
奖罚记录管理根据公司类型搜索
|
5 years ago |
|
chenzhi
|
1f1e75e736
|
新增推广公司添加
|
5 years ago |
|
chenzhi
|
6a612565c6
|
扩展推广公司添加
|
5 years ago |
|
zhengyongxing
|
0cbd58862e
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
Conflicts:
Data/update.sql
|
5 years ago |
|
zhengyongxing
|
031d40dc22
|
生成个人结算单编辑的功能模板
|
5 years ago |
|
zhengyongxing
|
955a1917b3
|
生成个人结算单的功能完成
|
5 years ago |
|
zhengchanglong
|
9b43cc90b4
|
Merge branch 'hotfix/test_order' into release
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengchanglong
|
282033afe7
|
测试订单录入添加分页
|
5 years ago |
|
yulingwei
|
e670dfcf7c
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
yulingwei
|
e35f20ee70
|
游戏预警
|
5 years ago |
|
zhengchanglong
|
cb5cef678d
|
Merge branch 'hotfix/test_order' into release
|
5 years ago |
|
zhengchanglong
|
d0de91e89d
|
测试订单查询修改
|
5 years ago |
|
zhengchanglong
|
2b99184273
|
Merge remote-tracking branch 'origin/hotfix/test_order' into hotfix/test_order
# Conflicts:
# Application/Admin/View/TestOrder/lists.html
|
5 years ago |
|
zhengchanglong
|
53b9573d71
|
测试订单查询修改
|
5 years ago |
|
zhengyongxing
|
8aba8728f0
|
测试订单录入功能提交
|
5 years ago |
|
zhengyongxing
|
56ecea6998
|
下游个人结算单生成代码上传
|
5 years ago |
|
zhengchanglong
|
284f42b315
|
测试订单录入
|
5 years ago |
|
zhengchanglong
|
fc0bb831a7
|
测试订单录入
|
5 years ago |
|
zhengchanglong
|
254d29f3f2
|
测试订单录入
|
5 years ago |
chenxiaojun
|
89c7855337
|
管理后台>推广员>结算管理>公会分成管理--更新
|
5 years ago |
|
sunke
|
8db53afc8b
|
电子文档及公司录入信息
|
5 years ago |
|
liuweiwen
|
319dde1090
|
奖罚记录管理根据公司类型搜索
|
5 years ago |
|
ELF
|
bc2f5dd117
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
ELF
|
bbb31890f6
|
未收押金会长禁用落地页/下载页
|
5 years ago |
|
sunke
|
7f169dc211
|
渠道流水计算
|
5 years ago |
|
ELF
|
ed25d54dc8
|
解决冲突
|
5 years ago |
|
ELF
|
501b8099d4
|
解决冲突
|
5 years ago |
|
chenzhi
|
2fe965749e
|
财务汇总ok
|
5 years ago |
|
chenxiaojun
|
b7d2931106
|
管理后台--更新
|
5 years ago |
|
chenxiaojun
|
e9dae29deb
|
管理后台>推广员>推广员管理>推广员列表--新增资质认证
|
5 years ago |
|
chenxiaojun
|
e9581a2e04
|
管理后台>推广员>结算管理>推广提现--更新
|
5 years ago |
|
sunke
|
56981a0acc
|
渠道计算
|
5 years ago |
|
yulingwei
|
2cd5574de7
|
新增审核时间
|
5 years ago |
|
ELF
|
69185016a0
|
修改
|
5 years ago |
|
liuweiwen
|
dfd198e9b7
|
对账系统增加奖罚数据
|
5 years ago |
|
liuweiwen
|
2ba96aa424
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
chenxiaojun
|
2c52bccaf7
|
管理后台>推广员>结算管理>推广提现>自动审核管理--更新
|
5 years ago |
|
liuweiwen
|
2ed47500f0
|
Merge branch 'hotfix/recharge_statistics' into feature/admin_optimize
|
5 years ago |
|
liaojinling
|
e596d11cee
|
会长押金
|
5 years ago |
|
liuweiwen
|
2bffe498bf
|
奖罚记录管理优化
|
5 years ago |
|
zyx
|
0aad9c4735
|
下游结算单生成功能上传
|
5 years ago |
|
jbRotk
|
a6b1194be0
|
解决冲突
|
5 years ago |
|
jbRotk
|
5d315d4182
|
添加工会类型
|
5 years ago |
|
chenzhi
|
1f5944c0a4
|
优化奖罚符号问题
|
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 |
|
jbRotk
|
72cfd9ec64
|
新增渠道费率
|
5 years ago |
|
zhengchanglong
|
4aeaf8f74c
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
jbRotk
|
c84cde9567
|
Merge branch 'feature/ylw' into feature/admin_optimize
|
5 years ago |
|
jbRotk
|
5f510cd4d9
|
新增奖惩时间
|
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 |
|
jbRotk
|
c968e54cf8
|
解决冲突
|
5 years ago |
|
jbRotk
|
94afe49b0c
|
upt
|
5 years ago |
|
jbRotk
|
35b6d25ebc
|
upt
|
5 years ago |
|
chenxiaojun
|
cbe40d4b0f
|
管理后台更新
|
5 years ago |
|
chenxiaojun
|
f1b454627e
|
管理后台更新
|
5 years ago |
|
chenxiaojun
|
a8008fbe05
|
管理后台>推广员>结算管理>公会分成管理--规则修改
|
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 |
|
chenxiaojun
|
10665cc869
|
管理后台>推广员>结算管理>公会分成管理--更新
|
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
|
ce9faf7271
|
公司录入
|
5 years ago |
|
jbRotk
|
65461ff200
|
c
|
5 years ago |
|
liuweiwen
|
0fba64c6f1
|
数据展示权限：勾选权限时，*号屏蔽的地方要开放，另没数据权限的地方补上
|
5 years ago |
|
ELF
|
56a97f7eef
|
修改bug
|
5 years ago |
|
ELF
|
e8a0975981
|
解决冲突
|
5 years ago |
|
ELF
|
6993d164a3
|
解决冲突
|
5 years ago |
|
ELF
|
d3a3b8cdb7
|
修改
|
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 |
|
sunke
|
b9ddc1aafb
|
推广配置
|
5 years ago |
|
zhengchanglong
|
9961448831
|
Merge branch 'release' into dev
|
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 |