郑永星
|
e179d507e8
|
Merge branch 'feature/add_item' of wmtx/platform into release
11月bug修复
|
4 years ago |
zhengyongxing
|
0572fde5ad
|
11bug修复
|
4 years ago |
陈志
|
dffb70f798
|
Merge branch 'feature/game_change_statement_20201125' of wmtx/platform into release
优化是否参与结算导出
|
4 years ago |
 廖金灵
|
3e27f09e7d
|
Merge branch 'feature/add_item' of wmtx/platform into master
特殊补点用户名修正
|
4 years ago |
chenzhi
|
a20285a42e
|
优化是否参与结算导出
|
4 years ago |
|
zhengyongxing
|
08dd238ca4
|
特殊补点用户名修正
|
4 years ago |
|
chenzhi
|
e7cd32b2a2
|
优化是否结算参数
|
4 years ago |
|
廖金灵
|
bfbac3b30a
|
Merge branch 'feature/add_item' of wmtx/platform into master
汇总刷新接口提交
|
4 years ago |
|
廖金灵
|
1b3a365409
|
Merge branch 'hotfix/promote_group_view_recharge' of wmtx/platform into release
雷雨等导量公会组长可以看到充值信息
|
4 years ago |
|
zhengyongxing
|
ef13761820
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item_others
|
4 years ago |
|
ELF
|
d43d0c2628
|
雷雨等导量公会组长可以看到充值信息
|
4 years ago |
|
zhengyongxing
|
d6b8fa208c
|
汇总刷新接口提交
|
4 years ago |
|
zhengyongxing
|
baca13a95e
|
换行字数修正
|
4 years ago |
|
ELF
|
1bb1b284e6
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
|
4 years ago |
|
chenzhi
|
2890f3e820
|
优化订单查看
|
4 years ago |
|
chenzhi
|
147cac3a9e
|
优化公会统计
|
4 years ago |
|
chenzhi
|
b9b497e255
|
优化公会结算
|
4 years ago |
|
chenzhi
|
9ddfb6f794
|
现在参与结算筛选
|
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
|
2d0bba8de5
|
优化修改推广游戏操作日志
|
4 years ago |
|
chenzhi
|
7e1d2fb879
|
优化日志
|
4 years ago |
|
chenzhi
|
5644570c1e
|
新增日志
|
4 years ago |
|
陈志
|
4da7fa623f
|
Merge branch 'feature/add_item' of wmtx/platform into release
优化新增仅单参与结算是结算
|
4 years ago |
|
chenzhi
|
5e9723b040
|
优化新增仅单参与结算是结算
|
4 years ago |
|
chenzhi
|
74d9d6ed18
|
优化充值操作
|
4 years ago |
|
郑永星
|
9a008d2bfc
|
Merge branch 'feature/add_item' of wmtx/platform into release
换行字数修正
|
4 years ago |
|
zhengyongxing
|
b54b37e99c
|
换行字数修正
|
4 years ago |
|
郑永星
|
4262b55a66
|
Merge branch 'feature/add_item' of wmtx/platform into release
市场业绩bug修正
|
4 years ago |
|
zhengyongxing
|
59ec6c28ca
|
市场业绩bug修正
|
4 years ago |
|
陈志
|
ff23d13c54
|
Merge branch 'feature/game_select_bug' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
73f8c16379
|
游戏统计修改bug
|
4 years ago |
|
郑永星
|
89909c10fd
|
Merge branch 'feature/add_item' of wmtx/platform into release
小数点保留
|
4 years ago |
|
zhengyongxing
|
ed8d1fee0a
|
小数点保留
|
4 years ago |
|
郑永星
|
d090b707dc
|
Merge branch 'feature/add_item' of wmtx/platform into release
小数点保留两位添加
|
4 years ago |
|
zhengyongxing
|
b54b2660d4
|
小数点保留两位添加
|
4 years ago |
|
郑永星
|
a866fd6b8d
|
Merge branch 'feature/add_item' of wmtx/platform into release
保留两位小数判断
|
4 years ago |
|
zhengyongxing
|
711992a287
|
保留两位小数判断
|
4 years ago |
|
chenzhi
|
eeb1821859
|
暂存
|
4 years ago |
|
郑永星
|
9b36a1c6bc
|
Merge branch 'feature/add_item' of wmtx/platform into release
保留两位小数
|
4 years ago |
|
zhengyongxing
|
c829c56956
|
保留两位小数
|
4 years ago |
|
郑永星
|
66902a13ec
|
Merge branch 'feature/add_item' of wmtx/platform into release
内团去除比例结束时间减1
|
4 years ago |
|
zhengyongxing
|
1717c2958b
|
最大值判断添加
|
4 years ago |
|
zhengyongxing
|
4dd097667f
|
内团去除比例结束时间减1
|
4 years ago |
|
郑永星
|
37d1419bb9
|
Merge branch 'feature/add_item' of wmtx/platform into release
最大值判断添加
|
4 years ago |
|
zhengyongxing
|
ff21751d31
|
最大值判断添加
|
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 |
|
zhengyongxing
|
640cb01bbb
|
12月功能提交
|
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 |
|
zhengyongxing
|
46f33b3d05
|
12月功能提交
|
4 years ago |
|
chenzhi
|
9da9941c9f
|
优化支付数据查看
|
4 years ago |
|
zhengyongxing
|
3d1ab70123
|
11月功能提交
|
4 years ago |
|
ELF
|
f95125892a
|
优化推广员后台汇总查询
|
4 years ago |
|
zhengyongxing
|
5c27c63835
|
11月功能提交
|
4 years ago |
|
廖金灵
|
5c23366b73
|
Merge branch 'feature/promote_tg_dm' of wmtx/platform into master
根据推广公司配置推广后台
|
4 years ago |
|
ELF
|
7468057834
|
推广员结算订单归属
|
4 years ago |
|
zhengyongxing
|
9b87b9c4a1
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
41e9820d83
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
e138517136
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
710439d8df
|
11月功能提交
|
4 years ago |
|
ELF
|
289783eecd
|
修改
|
4 years ago |
|
tping
|
dd786dc27f
|
1126 批量上下架
|
4 years ago |
|
tping
|
b722175785
|
1126 权限
|
4 years ago |
|
chenzhi
|
986065ab4b
|
优化名词
|
4 years ago |
|
tping
|
033cd00aee
|
1126
|
4 years ago |
|
zhengyongxing
|
c749df4936
|
11月功能提交
|
4 years ago |
|
tping
|
d8924dc8be
|
1126 客服qq
|
4 years ago |
|
zhengyongxing
|
36d40bc24e
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
5add29fa6b
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
8bce1bd12c
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
2040991894
|
11月功能提交
|
4 years ago |
|
ELF
|
a0f57749c4
|
优化当前域名获取
|
4 years ago |
|
ELF
|
ef8334dd18
|
添加域名前缀限制
|
4 years ago |
|
chenzhi
|
e7501be7c3
|
优化审核流程
|
4 years ago |
|
tping
|
ff4975bacb
|
1126
|
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
|
3471639489
|
支付通知 补单
|
4 years ago |
|
tping
|
103acdd15d
|
支付通知 小数点后面.00
|
4 years ago |
|
chenzhi
|
5bdc0e6f6e
|
优化汇总方案
|
4 years ago |
|
tping
|
0d52dc7d61
|
1126
|
4 years ago |
|
chenzhi
|
55dd67e34d
|
优化撤回
|
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 |
|
ELF
|
773068b57c
|
优化代码
|
4 years ago |
|
zhengyongxing
|
4eff2f0aaa
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
d6b1916a5d
|
11月功能提交
|
4 years ago |
|
ELF
|
dd7068e3ae
|
改用redis存储session
|
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
|
e896f5e649
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into fix/company_20201111
|
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 |
|
廖金灵
|
da2dc09690
|
Merge branch 'new_change' of wmtx/platform into master
汇总bug修改
|
4 years ago |
|
zhengyongxing
|
e098384635
|
汇总bug修改
|
4 years ago |
|
zhengyongxing
|
3656c555d1
|
11月功能提交
|
4 years ago |
|
chenzhi
|
ffd8c92940
|
优化奖罚
|
4 years ago |
|
ELF
|
89332c0d54
|
解决冲突
|
4 years ago |
|
ELF
|
eef296ea08
|
发放资源自动审核/发放优化
|
4 years ago |
|
ELF
|
b92f564a49
|
发放资源自动审核/发放优化
|
4 years ago |
|
ELF
|
c550846454
|
修改
|
4 years ago |
|
zhengyongxing
|
4526b5b741
|
11月功能提交
|
4 years ago |
|
ELF
|
977cfcba3c
|
修改
|
4 years ago |
|
ELF
|
c20d071817
|
修改
|
4 years ago |
|
ELF
|
40123f8c50
|
修改
|
4 years ago |
|
ELF
|
530dded4e7
|
优化
|
4 years ago |
|
ELF
|
ceadb8562f
|
新增60/90日留存率统计
|
4 years ago |
|
ELF
|
5253a76963
|
优化
|
4 years ago |
|
ELF
|
3a6b912399
|
优化
|
4 years ago |
|
ELF
|
afc95791d2
|
优化
|
4 years ago |
|
chenzhi
|
d0a61d3e87
|
游戏充值导出新增cp列
|
4 years ago |
|
ELF
|
d0b2e5f459
|
优化
|
4 years ago |
|
ELF
|
1f3eaa06da
|
修改
|
4 years ago |
|
ELF
|
07f7bca3ee
|
修改
|
4 years ago |
|
ELF
|
47ca2f2b9e
|
修改
|
4 years ago |
|
ELF
|
e1352fea1e
|
修改
|
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
|
deee3228dd
|
公会统计商户导出
|
4 years ago |
|
zhengyongxing
|
58ff5ad1ed
|
公会统计--订单详情 新增所属商户展示
|
4 years ago |
|
ELF
|
f490f10ee5
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/testing_resource_admin
|
4 years ago |
|
zhengyongxing
|
767ce5734d
|
市场业绩重算只重算上个月提交
|
4 years ago |
|
zhengyongxing
|
a3b86e9339
|
市场业绩提成修正
|
4 years ago |
|
zhengyongxing
|
d85ac9066d
|
市场业绩bug修改
|
4 years ago |
|
zhengyongxing
|
6c005f01f6
|
市场业绩比例永久判断bug修改
|
4 years ago |
|
廖金灵
|
f7eb64f6ba
|
Merge branch 'feature/add_item_other' of wmtx/platform into master
外团特殊比例自动审核通过
|
4 years ago |
|
zhengyongxing
|
48f4fef494
|
外团特殊比例自动审核通过
|
4 years ago |
|
zhengyongxing
|
02635cc6e9
|
外团特殊比例自动审核通过
|
4 years ago |