zyx
|
6b0de87280
|
未结算接口修改
|
4 years ago |
chenzhi
|
2bc72f9ae2
|
优化个人补点不修改公式
|
4 years ago |
|
chenzhi
|
8d1f77537a
|
优化订单列表新增列
|
4 years ago |
|
chenzhi
|
a741e8d37d
|
订单新增设备类型
|
4 years ago |
|
chenzhi
|
0b979d9b68
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/st_mange_20201202
|
4 years ago |
|
chenzhi
|
8d156ffb64
|
新增结算公式
|
4 years ago |
tping
|
31ce7b071c
|
1211
|
4 years ago |
 ELF
|
88402dfac0
|
修改
|
4 years ago |
|
廖金灵
|
9483e4b7b3
|
Merge branch 'feature/add_item' of wmtx/platform into master
编辑页面调整,及多个编辑错误修正
|
4 years ago |
|
zhengyongxing
|
7c5c67a87c
|
编辑页面调整,及多个编辑错误修正
|
4 years ago |
|
ELF
|
b28e00b9f2
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
|
4 years ago |
|
chenzhi
|
d06cc0ea10
|
优化去除同公司奖罚
|
4 years ago |
|
廖金灵
|
401ad97cbc
|
Merge branch 'feature/add_item' of wmtx/platform into master
编辑扣款旧的验证添加
|
4 years ago |
|
zhengyongxing
|
bb0d37bb53
|
编辑扣款旧的验证添加
|
4 years ago |
|
zhengyongxing
|
10ddadece7
|
js字符类型修改成数字类型
|
4 years ago |
|
廖金灵
|
470bcdfebf
|
Merge branch 'feature/add_item' of wmtx/platform into master
11月bug修复
|
4 years ago |
|
chenzhi
|
943d63faac
|
优化财务汇总
|
4 years ago |
|
zhengyongxing
|
0572fde5ad
|
11bug修复
|
4 years ago |
|
chenzhi
|
2890f3e820
|
优化订单查看
|
4 years ago |
|
chenzhi
|
147cac3a9e
|
优化公会统计
|
4 years ago |
|
chenzhi
|
b9b497e255
|
优化公会结算
|
4 years ago |
|
chenzhi
|
9803de1edb
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/game_change_statement_20201125
|
4 years ago |
|
chenzhi
|
74d9d6ed18
|
优化充值操作
|
4 years ago |
陈志
|
ff23d13c54
|
Merge branch 'feature/game_select_bug' of wmtx/platform into release
|
4 years ago |
万盟天下
|
8482cd9382
|
Merge branch 'feature/elf_version_1117' of wmtx/platform into release
修改游戏统计bug
|
4 years ago |
|
ELF
|
e46cc5b52e
|
修改bug
|
4 years ago |
|
tping
|
43c62c05d7
|
Merge branch 'release' into feature/zgc_1126
# Conflicts:
# Application/Admin/View/PromoteCompany/add.html
# Application/Admin/View/PromoteCompany/edit.html
|
4 years ago |
|
万盟天下
|
4557b3dc2f
|
Merge branch 'feature/elf_version_1117' of wmtx/platform into release
修改游戏统计bug
|
4 years ago |
|
ELF
|
47fcab323b
|
修改游戏统计bug
|
4 years ago |
|
万盟天下
|
41ab9703a9
|
Merge branch 'feature/add_item' of wmtx/platform into release
11月功能提交
|
4 years ago |
|
万盟天下
|
82cf73ede5
|
Merge branch 'feature/elf_version_1117' of wmtx/platform into release
游戏统计/后台登录时间修改
|
4 years ago |
|
zhengyongxing
|
b32f5efd91
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_others
Conflicts:
Data/update.sql
|
4 years ago |
|
chenzhi
|
9da9941c9f
|
优化支付数据查看
|
4 years ago |
|
廖金灵
|
5c23366b73
|
Merge branch 'feature/promote_tg_dm' of wmtx/platform into master
根据推广公司配置推广后台
|
4 years ago |
|
zhengyongxing
|
9b87b9c4a1
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
41e9820d83
|
11月功能提交
|
4 years ago |
|
tping
|
dd786dc27f
|
1126 批量上下架
|
4 years ago |
|
tping
|
b722175785
|
1126 权限
|
4 years ago |
|
tping
|
033cd00aee
|
1126
|
4 years ago |
|
zhengyongxing
|
c749df4936
|
11月功能提交
|
4 years ago |
|
tping
|
d8924dc8be
|
1126 客服qq
|
4 years ago |
|
zhengyongxing
|
5add29fa6b
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
2040991894
|
11月功能提交
|
4 years ago |
|
ELF
|
ef8334dd18
|
添加域名前缀限制
|
4 years ago |
|
zhengyongxing
|
f3a45dfac6
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
a6263b2205
|
11月功能提交
|
4 years ago |
|
tping
|
103acdd15d
|
支付通知 小数点后面.00
|
4 years ago |
|
tping
|
0d52dc7d61
|
1126
|
4 years ago |
|
chenzhi
|
56681580dd
|
合并
|
4 years ago |
|
chenzhi
|
6d4fce53eb
|
优化线下打款
|
4 years ago |
|
chenzhi
|
bd125be3dd
|
优化汇总审核流程
|
4 years ago |
|
ELF
|
c339623c78
|
优化
|
4 years ago |
|
elf@home
|
dd66846e68
|
根据推广公司配置推广后台
|
4 years ago |
|
zhengyongxing
|
1626640066
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
4eff2f0aaa
|
11月功能提交
|
4 years ago |
|
tping
|
025d90f5fa
|
1126
|
4 years ago |
|
chenzhi
|
ad1d4e65a5
|
优化游戏汇总
|
4 years ago |
|
chenzhi
|
bea27fd5de
|
优化游戏汇总
|
4 years ago |
|
tping
|
c75d73c9f7
|
1126
|
4 years ago |
|
ELF
|
6a50654045
|
游戏统计/后台登录时间修改
|
4 years ago |
|
chenzhi
|
7f9bb248dd
|
优化推广员统计
|
4 years ago |
|
chenzhi
|
1f694ef47b
|
优化推广员充值
|
4 years ago |
|
chenzhi
|
a6f9d82245
|
优化推广员累计注册
|
4 years ago |
|
chenzhi
|
7a876e01ab
|
优化新增推广员汇总
|
4 years ago |
|
zhengyongxing
|
f49cd75e86
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
6811eb806c
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/add_item
Conflicts:
Application/Admin/Controller/CompanyStatementPoolController.class.php
Application/Admin/Controller/CompanyStatementSetController.class.php
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
3656c555d1
|
11月功能提交
|
4 years ago |
|
ELF
|
89332c0d54
|
解决冲突
|
4 years ago |
|
ELF
|
c550846454
|
修改
|
4 years ago |
|
zhengyongxing
|
4526b5b741
|
11月功能提交
|
4 years ago |
|
ELF
|
d0b2e5f459
|
优化
|
4 years ago |
|
ELF
|
07f7bca3ee
|
修改
|
4 years ago |
|
ELF
|
47ca2f2b9e
|
修改
|
4 years ago |
|
chenzhi
|
cdd1cd7d7f
|
优化页面页数
|
4 years ago |
|
ELF
|
dd71ccdf83
|
修改
|
4 years ago |
|
廖金灵
|
648cde1eff
|
Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release
推广员信息显示通过权限控制
|
4 years ago |
|
ELF
|
53f3ad6864
|
优化
|
4 years ago |
|
廖金灵
|
38dc6c0c56
|
Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release
市场专员信息显示通过权限控制
|
4 years ago |
|
ELF
|
dfdc31f4dc
|
市场专员信息显示通过权限控制
|
4 years ago |
|
zhengyongxing
|
6021f91604
|
公会订单添加所属商户
|
4 years ago |
|
zhengyongxing
|
3f04fa1507
|
公会统计商户名称修改
|
4 years ago |
|
zhengyongxing
|
58ff5ad1ed
|
公会统计--订单详情 新增所属商户展示
|
4 years ago |
|
zhengyongxing
|
0155111706
|
特殊比例申请比例限制提交
|
4 years ago |
张谷诚
|
b642f671c7
|
Merge branch 'hotfix/orderquery' of wmtx/platform into release
|
4 years ago |
|
tping
|
e6ae117fd7
|
1,隐藏删除按钮（后台->推广->游戏分包）
2,推广后台增加下单时间查询
|
4 years ago |
|
zhengyongxing
|
bb5547fb6f
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_other
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
80b148d6c5
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
859f5b58c9
|
汇总功能还原修正
|
4 years ago |
|
zhengyongxing
|
f450df3265
|
汇总功能修正
|
4 years ago |
|
zhengyongxing
|
54a0fde480
|
汇总公司与上游回退
|
4 years ago |
|
zhengyongxing
|
27c95792ff
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
def69bf6aa
|
外团推广功能修正提交
|
4 years ago |
|
zhengyongxing
|
823e241f2e
|
外团推广功能bug修正
|
4 years ago |
|
zhengyongxing
|
5c497b94dc
|
分成比例导出修正
|
4 years ago |
|
zhengyongxing
|
2dbb4a7940
|
市场部提示语修改
|
4 years ago |
|
zhengyongxing
|
c1b556b0b1
|
市场业绩排序修改
|
4 years ago |
|
zhengyongxing
|
6ac5c1d524
|
比例逻辑修改
|
4 years ago |
|
zhengyongxing
|
0c69c8f662
|
汇总结算结算时间位置修改
|
4 years ago |
|
zhengyongxing
|
40664b5f8d
|
市场业绩功能修改，将不结算毛利以日来统计
|
4 years ago |
|
zhengyongxing
|
ba6323203a
|
模板比例bug修改提交
|
4 years ago |
|
zhengyongxing
|
2848f0ce90
|
外团推广游戏功能高亮显示
|
4 years ago |
|
zhengyongxing
|
2914f9964c
|
汇总编辑结算金额总计添加
|
4 years ago |
|
zhengyongxing
|
f0cbe3cafb
|
周结算金额bug修改
|
4 years ago |
|
zhengyongxing
|
86769746ef
|
外团可申请游戏bug修改
|
4 years ago |
|
zhengyongxing
|
e30cd2fea7
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
5c57abc794
|
历史流水比例修正
|
4 years ago |
|
zhengyongxing
|
f8a7d53ac8
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
a00834e4e5
|
外团推广功能不结算提交
|
4 years ago |
|
zhengyongxing
|
9c49d8bedc
|
外团推广功能提交
|
4 years ago |
|
ELF
|
47ff398bf4
|
修改
|
4 years ago |
|
ELF
|
ffad0d78c5
|
修改
|
4 years ago |
|
ELF
|
62d2eaef72
|
去除商户规则配置删除功能
|
4 years ago |
|
zhengyongxing
|
9bf3c89659
|
特殊比例与模板比例添加流水类型
|
4 years ago |
|
万盟天下
|
f7bd731ead
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into master
测试资源功能提交
|
4 years ago |
|
zhengyongxing
|
68ba764d72
|
Merge branch 'hotfix/modify_special_piont' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
6b47baf59a
|
汇总编辑前端修改
|
4 years ago |
|
ELF
|
ae3e49b95f
|
修改
|
4 years ago |
|
ELF
|
f77505925f
|
修改
|
4 years ago |
|
ELF
|
f3771dfd2d
|
修改
|
4 years ago |
|
ELF
|
a10bb888da
|
修改bug
|
4 years ago |
|
zhengyongxing
|
4f35cacbab
|
汇总模板修改提交
|
4 years ago |
|
ELF
|
18c3e95f30
|
修改
|
4 years ago |
|
ELF
|
8e4ba0e20e
|
修改
|
4 years ago |
|
ELF
|
c5fe80639f
|
修改
|
4 years ago |
|
ELF
|
06bd640c79
|
修改
|
4 years ago |
|
ELF
|
263e35c097
|
初步提交
|
4 years ago |
|
廖金灵
|
662efdb613
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合结算单导出bug修正
|
4 years ago |
|
zhengyongxing
|
3f90e1d9ee
|
汇总审批重算状态修正
|
4 years ago |
|
zhengyongxing
|
723b3c9fa2
|
汇总重算提示语修正
|
4 years ago |
|
zhengyongxing
|
e7b64f27f2
|
汇总重算提示语修正
|
4 years ago |
郑永星
|
6cbc8e0102
|
Merge branch 'feature/add_item' of wmtx/platform into release
聚合汇总导出bug修改
|
4 years ago |
|
zhengyongxing
|
1f31244d10
|
聚合汇总导出bug修改
|
4 years ago |
|
郑永星
|
37dd11369e
|
Merge branch 'feature/add_item' of wmtx/platform into release
聚合结算单导出bug修正
|
4 years ago |
|
zhengyongxing
|
ac5c1a199c
|
聚合结算单导出bug修正
|
4 years ago |
|
廖金灵
|
a2a9625933
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司汇总公司添加，公司绑定编辑开放
|
4 years ago |
|
郑永星
|
d7edb41f44
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
01df95637a
|
汇总bug修正
|
4 years ago |
|
郑永星
|
b69bc8ef6a
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
3f78880f7d
|
汇总bug修正
|
4 years ago |
|
chenzhi
|
f311da5208
|
优化银行卡号不限制
|
4 years ago |
|
zyx
|
5bec0ba91c
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
c99cad808c
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
041006e1b4
|
汇总状态的操作修改
|
4 years ago |
|
zhengyongxing
|
ef0c4427ce
|
Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
4210bb7bf0
|
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
b4bdcd24fc
|
汇总bug流程修正
|
4 years ago |
|
万盟天下
|
9db2434d10
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司绑定流程优化
|
4 years ago |
|
zhengyongxing
|
2b4ed15a30
|
聚合公司绑定流程优化
|
4 years ago |
|
万盟天下
|
1cb13ebb4c
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合汇总bug修正
|
4 years ago |
|
zhengyongxing
|
a2b085562d
|
聚合汇总bug修正
|
4 years ago |