郑永星
|
7608fb3b99
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
|
4 years ago |
zhengyongxing
|
c637d7a1d7
|
离职发放发放完成隐藏
|
4 years ago |
 廖金灵
|
6d6ec065b2
|
Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改导出bug
|
4 years ago |
|
ELF
|
a17bb698dc
|
修改bug
|
4 years ago |
|
廖金灵
|
39af00fe0e
|
Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改bug
|
4 years ago |
|
ELF
|
2dadc11d09
|
修改bug
|
4 years ago |
|
廖金灵
|
578087e50e
|
Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改留存率
|
4 years ago |
|
ELF
|
fa4de7ece5
|
修改
|
4 years ago |
|
zhengyongxing
|
585f523984
|
arpu分析bug修正
|
4 years ago |
|
zhengyongxing
|
a6dd2a9830
|
市场专员业绩导出公式添加
|
4 years ago |
|
zhengyongxing
|
f4789a1534
|
市场专员业绩提成bug修正
|
4 years ago |
|
zhengyongxing
|
3603f5fa21
|
市场专员业绩提成bug修正
|
4 years ago |
|
zhengyongxing
|
944a424b3c
|
市场专员业绩提成bug修正
|
4 years ago |
chenzhi
|
8d32b5104e
|
新增excel打款
|
4 years ago |
|
zhengyongxing
|
44feb6957d
|
市场专员业绩提成bug修正
|
4 years ago |
|
zhengyongxing
|
e4d1ced122
|
市场专员业绩提成bug修正
|
4 years ago |
|
zhengyongxing
|
b9255647f7
|
市场专员业绩提成汇总单检索
修正
|
4 years ago |
|
zhengyongxing
|
0ca629518d
|
市场专员业绩结算结构修改
|
4 years ago |
|
zhengyongxing
|
5c76d1180d
|
市场专员业绩结算结构修改
|
4 years ago |
|
zhengyongxing
|
4bfa0dfa2f
|
市场专员业绩结算结构修改
|
4 years ago |
|
zhengyongxing
|
d40ce89901
|
市场专员业绩结算发放时间选项修改
|
4 years ago |
|
zhengyongxing
|
8053806801
|
市场专员业绩bug修改
|
4 years ago |
|
zhengyongxing
|
f7c11991ca
|
市场专员业绩bug修改
|
4 years ago |
|
chenzhi
|
2a4541569d
|
优化列表显示
|
4 years ago |
|
zhengyongxing
|
2303c439aa
|
市场专员业绩计页面修改
|
4 years ago |
|
chenzhi
|
c11266291f
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/change_cp_time
|
4 years ago |
|
chenzhi
|
63054ac0d8
|
优化订单校验
|
4 years ago |
|
zhengyongxing
|
de3d7d52b7
|
市场专员业绩计bug修正
|
4 years ago |
|
chenzhi
|
04e13844c3
|
zancun
|
4 years ago |
|
zhengyongxing
|
962d140d80
|
Merge branch 'hotfix/pay_channel_modify' into feature/market_percentage
|
4 years ago |
|
zhengyongxing
|
043ee29f54
|
市场专员业绩计bug修正
|
4 years ago |
|
zhengyongxing
|
8430444b8e
|
市场专员业绩计bug修正
|
4 years ago |
|
zhengyongxing
|
2da9821caf
|
市场专员业绩计算修正
|
4 years ago |
|
zhengyongxing
|
9a23b5588b
|
市场专员业绩计算修正
|
4 years ago |
|
zhengyongxing
|
ea21948984
|
支付渠道bug修改
|
4 years ago |
|
zhengyongxing
|
97161900ac
|
市场专员业绩管理bug修改
|
4 years ago |
|
chenzhi
|
c9d6b9859d
|
合并热更
|
4 years ago |
|
chenzhi
|
c18eb439c5
|
优化游戏获取逻辑
|
4 years ago |
|
zhengyongxing
|
1c535ee74b
|
市场专员业绩管理 重算调用脚本命令修改
|
4 years ago |
|
zhengyongxing
|
bdeacbd718
|
市场专员业绩管理 重算调用脚本命令修改
|
4 years ago |
|
zhengyongxing
|
c96340afa9
|
市场专员业绩管理bug修改
|
4 years ago |
|
chenzhi
|
048931ce9e
|
优化搜索3
|
4 years ago |
|
chenzhi
|
35380ae9b0
|
优化搜索2
|
4 years ago |
|
chenzhi
|
587d7913ca
|
优化检索
|
4 years ago |
|
zhengyongxing
|
1e80004e3e
|
市场专员业绩管理bug修改
|
4 years ago |
|
zhengyongxing
|
17ff8d9029
|
市场专员业绩管理模板指定
|
4 years ago |
|
zhengyongxing
|
70d6c3c7bf
|
市场专员业绩管理权限判断
|
4 years ago |
|
zhengyongxing
|
80dc2b860c
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/market_percentage
Conflicts:
Application/Admin/Common/extend.php
Application/Admin/Controller/TimingController.class.php
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
83717b64ae
|
市场专员业绩管理优化
|
4 years ago |
|
chenzhi
|
5fc03a14a4
|
优化cp添加
|
4 years ago |
|
chenzhi
|
0dda3b1c61
|
优化合同不需要限制时间
|
4 years ago |
|
chenzhi
|
490197a490
|
移除合作方合同时间限制
|
4 years ago |
|
chenzhi
|
03f4130e9e
|
新增上游合作
|
4 years ago |
|
廖金灵
|
89edac1fee
|
Merge branch 'hotfix/market_name' of wmtx/platform into master
市场专员识别
|
4 years ago |
|
廖金灵
|
56619e58b7
|
Merge branch 'hotfix/market_name' of wmtx/platform into release
市场专员识别
|
4 years ago |
|
ELF
|
3f42d2967c
|
修改
|
4 years ago |
|
ELF
|
70c9e26ce4
|
修改bug
|
4 years ago |
|
zhengyongxing
|
06bd0bf848
|
市场专员业绩管理代码提交
|
4 years ago |
|
chenzhi
|
d52ab03714
|
新增推广公司游戏选择
|
4 years ago |
|
廖金灵
|
4a755d2269
|
Merge branch 'feature/market_admin' of wmtx/platform into release
修改换绑bug
|
4 years ago |
|
ELF
|
ecc228409d
|
修改
|
4 years ago |
|
廖金灵
|
ed9d193531
|
Merge branch 'feature/promote_statistics' of wmtx/platform into release
推广员充值换榜定时器优化
|
4 years ago |
|
zhengyongxing
|
3128c079d3
|
推广员充值换榜定时器优化
|
4 years ago |
|
zhengyongxing
|
ef8d16fc6e
|
推广员充值换榜定时器优化
|
4 years ago |
|
zhengyongxing
|
acc45f5911
|
江息网络漏掉的修改
|
4 years ago |
|
chenzhi
|
bc75da8c14
|
解决冲突
|
4 years ago |
|
zhengyongxing
|
15b9efcd7e
|
江息网络漏掉的修改
|
4 years ago |
|
zhengyongxing
|
1234349844
|
市场专员业绩计算修改
|
4 years ago |
|
chenzhi
|
f62cfca22b
|
隐藏推广公司分成比例
|
4 years ago |
|
zhengyongxing
|
dbad9a08db
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_statistics
Conflicts:
Application/Admin/Common/function.php
Application/Admin/Controller/TimingController.class.php
|
4 years ago |
|
chenzhi
|
21a738054a
|
隐藏推广公司比例
|
4 years ago |
|
zhengyongxing
|
39e2bce6dd
|
推广员充值统计提交
|
4 years ago |
|
zhengyongxing
|
2bc4bf79d9
|
市场结算管理公司税率提交
|
4 years ago |
|
ELF
|
990a2bd206
|
解决冲突
|
4 years ago |
|
chenzhi
|
a020cb26df
|
新增不验证手机 己方
|
4 years ago |
|
chenzhi
|
91ae987c3c
|
优化游戏比例分成无需大于
|
4 years ago |
|
chenzhi
|
9dd4a507e9
|
隐藏模板批量操作
|
4 years ago |
|
chenzhi
|
f1824fd7b3
|
优化新增名称
|
4 years ago |
|
ELF
|
7c3a001e25
|
修改
|
4 years ago |
|
chenzhi
|
4fde001d4e
|
优化游戏分成比例不受档位限制
|
4 years ago |
|
zhengyongxing
|
682ce333b1
|
市场结算管理公司税率提交
|
4 years ago |
|
ELF
|
102e77267d
|
修改bug
|
4 years ago |
|
chenzhi
|
c76cf038cd
|
己方公司
|
4 years ago |
|
ELF
|
e94b6418f1
|
修改
|
4 years ago |
|
ELF
|
8224cfb362
|
修改
|
4 years ago |
|
ELF
|
77c692c44d
|
修改
|
4 years ago |
|
zhengyongxing
|
ca5c68d078
|
推广公司编辑添加合并错误去除
|
4 years ago |
|
zhengyongxing
|
f63b115641
|
Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
# Application/Admin/View/PromoteCompany/add.html
# Application/Admin/View/PromoteCompany/edit.html
|
4 years ago |
|
zhengyongxing
|
2fae4219df
|
公会统计去除
|
4 years ago |
|
zhengyongxing
|
a8f4f16349
|
Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
# Application/Admin/View/PromoteCompany/view.html
# Data/update.sql
|
4 years ago |
|
zhengyongxing
|
cd0d9e295f
|
市场专员结算代码上传
|
4 years ago |
|
zhengyongxing
|
379716298a
|
市场专员结算代码上传
|
4 years ago |
|
ELF
|
e3b53e7df1
|
修改
|
4 years ago |
|
ELF
|
73f5f4f5ea
|
修改
|
4 years ago |
|
ELF
|
38c10a0f7a
|
修改
|
4 years ago |
|
ELF
|
10aed50db7
|
修改
|
4 years ago |
|
ELF
|
f9b054e1cb
|
修改
|
4 years ago |
|
ELF
|
34691d6baa
|
修改
|
4 years ago |
|
ELF
|
f0a8b6bc3b
|
修改
|
4 years ago |
|
ELF
|
6f2f588617
|
优化
|
4 years ago |
yulingwei
|
2680f92079
|
1
|
4 years ago |
|
yulingwei
|
4058eb3963
|
1
|
4 years ago |
|
ELF
|
76fcfec7c2
|
修改
|
4 years ago |
|
yulingwei
|
22ac6bf293
|
修复问题
|
4 years ago |
|
ELF
|
5f5a6ee1af
|
修改
|
4 years ago |
|
zhengyongxing
|
a2408407b7
|
上传市场专员结算代码
|
4 years ago |
|
廖金灵
|
c1163e7b22
|
Merge branch 'release' of wmtx/platform into master
版本更新2020.06.24
|
4 years ago |
|
廖金灵
|
4989deb7be
|
Merge branch 'feature/loginInfo' of wmtx/platform into release
验证码提示样式修改
|
4 years ago |
|
yulingwei
|
efe84158da
|
修改错误样式
|
4 years ago |
|
zhengyongxing
|
c3956f7ed2
|
平台币金额解释添加
|
4 years ago |
|
廖金灵
|
bc00b1112f
|
Merge branch 'feature/apply_game' of wmtx/platform into release
task440
|
4 years ago |
|
廖金灵
|
1907985e7b
|
Merge branch 'feature/ylw-06-10' of wmtx/platform into release
新增公司选择默认模板
|
4 years ago |
|
廖金灵
|
2fe024f696
|
Merge branch 'feature/loginInfo' of wmtx/platform into release
新增手机号限制
|
4 years ago |
|
yulingwei
|
ff9b2249b8
|
新增公司默认选择默认模板
|
4 years ago |
|
yulingwei
|
34df4e5a8e
|
upt
|
4 years ago |
|
廖金灵
|
db32f11215
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
取消测试的虚拟验证码
|
4 years ago |
|
chenzhi
|
7d8dca7421
|
取消测试的虚拟验证码
|
4 years ago |
|
chenzhi
|
95d9f45612
|
新增检索
|
4 years ago |
|
廖金灵
|
a808b86865
|
Merge branch 'feature/paytime_summary' of wmtx/platform into release
汇付宝
|
4 years ago |
|
廖金灵
|
20b401fe85
|
Merge branch 'feature/promote_withdraw' of wmtx/platform into release
结算中心提现总金额等4个功能隐藏
|
4 years ago |
|
zhengyongxing
|
bdc5d3a385
|
结算中心提现总金额等4个功能隐藏
|
4 years ago |
|
yulingwei
|
c8924779c4
|
Merge branch 'release' into feature/ylw-06-17
|
4 years ago |
|
yulingwei
|
8c18f2aa1d
|
1
|
4 years ago |
|
廖金灵
|
c4ec5753f0
|
Merge branch 'feature/loginInfo' of wmtx/platform into release
手机验证码登录推广后台
|
4 years ago |
|
ELF
|
2d872ed710
|
解决冲突
|
4 years ago |
|
ELF
|
2589806e62
|
解决冲突
|
4 years ago |
|
yulingwei
|
3f4406a1ee
|
Merge branch 'release' into feature/ylw-06-17
|
4 years ago |
|
yulingwei
|
0decb03cb1
|
merge
|
4 years ago |
|
ELF
|
a153fb9a0e
|
修改
|
4 years ago |
|
chenzhi
|
ad801a37fb
|
优化前端
|
4 years ago |
|
yulingwei
|
b2b28bce07
|
upt
|
4 years ago |
|
yulingwei
|
5b604ab073
|
upt
|
4 years ago |
|
yulingwei
|
cdf2d903cd
|
upt
|
4 years ago |
|
chenzhi
|
ca551b9c50
|
己方公司新增搜索项目
|
4 years ago |
|
chenzhi
|
e0b588be11
|
新加加载load
|
4 years ago |
|
chenzhi
|
c335c1f0b3
|
优化补点和月结集合
|
4 years ago |
|
chenzhi
|
bffc9a32f1
|
数据迁移
|
4 years ago |
|
chenzhi
|
26ccc9c450
|
优化导出权限
|
4 years ago |
|
yulingwei
|
e4a29b8bb4
|
upt
|
4 years ago |
|
chenzhi
|
b8610e3490
|
永星-优化提现提醒
|
4 years ago |
|
chenzhi
|
2229e16a9d
|
永星-优化前端请求
|
4 years ago |
|
chenzhi
|
a629654ccb
|
优化打款
|
4 years ago |
|
chenzhi
|
42dc519712
|
永星-打款中
|
4 years ago |
|
chenzhi
|
1da5da1ea5
|
永星-优化提现说明
|
4 years ago |
|
chenzhi
|
e96c6e8b52
|
公司获取优化
|
4 years ago |
|
chenzhi
|
40940b4536
|
优化比例
|
4 years ago |
|
chenzhi
|
d2a10e626d
|
永星-优化提现
|
4 years ago |
|
chenzhi
|
f321c6259d
|
永星合并
|
4 years ago |
|
zhengyongxing
|
0c4b96dd56
|
Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
|
4 years ago |
|
zhengyongxing
|
846264600e
|
Merge branch 'feature/promote_withdraw' into feature/platfrom_aggregate_finance
|
4 years ago |
|
zhengyongxing
|
5957ffddcf
|
汇总单代码提交
|
4 years ago |
|
chenzhi
|
511f53e83c
|
优化权限
|
4 years ago |
|
yulingwei
|
bd166bb5eb
|
upt
|
4 years ago |
|
chenzhi
|
c422b84df4
|
Merge branch 'feature/platfrom_aggregate_finance' of 47.111.118.107:wmtx/platform into feature/platfrom_aggregate_finance
|
4 years ago |
|
chenzhi
|
d845ab35a3
|
优化新增结算
|
4 years ago |
|
zhengyongxing
|
7c0294bb4c
|
Merge branch 'feature/promote_withdraw' into feature/platfrom_aggregate_finance
|
4 years ago |
|
zhengyongxing
|
b6026f1b32
|
汇总单代码提交
|
4 years ago |
|
zhengyongxing
|
25ae6a03a4
|
Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
|
4 years ago |
|
zhengyongxing
|
6a46df5a28
|
汇总单代码提交
|
4 years ago |
|
chenzhi
|
4b29d159e1
|
取消备注
|
4 years ago |
|
zhengyongxing
|
b664ba46ad
|
汇总单代码提交
|
4 years ago |
|
chenzhi
|
6c05756415
|
新增排序
|
4 years ago |
|
chenzhi
|
9d8ed80fcc
|
优化新增重算
|
4 years ago |
|
chenzhi
|
53b9513935
|
新增结算
|
4 years ago |
|
chenzhi
|
53004adf5d
|
新增打款
|
4 years ago |
chenzhi
|
a2454e0446
|
取消结算单下游个人导出
|
4 years ago |
|
zhengyongxing
|
61d12c2750
|
汇总单结算代码上传
|
4 years ago |
|
zhengyongxing
|
9d43914b17
|
汇总单结算代码上传
|
4 years ago |
|
chenzhi
|
0ba02069a0
|
优化补点计算方式
|
4 years ago |
|
chenzhi
|
ec641257b0
|
优化下游渠道结算
|
4 years ago |
|
chenzhi
|
fdccc92c43
|
新增只支持脚本访问
|
4 years ago |
|
chenzhi
|
38ab488cd0
|
修复搜索错误
|
4 years ago |
|
chenzhi
|
036a710f2f
|
修复不修改不重审
|
4 years ago |
|
chenzhi
|
a9723597f0
|
优化推广比例未修改重审
|
4 years ago |
|
zhengyongxing
|
f7f862fd83
|
官方渠道修改江息网络
|
4 years ago |
|
yulingwei
|
e09296d10d
|
upt
|
4 years ago |
|
chenzhi
|
265384f2c8
|
优化审核乱跳
|
4 years ago |
|
chenzhi
|
994ee29b1d
|
优化审核列表乱跳
|
4 years ago |
|
chenzhi
|
261e63b898
|
取消未结算的导出
|
4 years ago |
|
chenzhi
|
ffb60d80a9
|
修复多家公司合作问题
|
4 years ago |
|
chenzhi
|
701c421d0c
|
上级改为通知成功
|
4 years ago |
|
chenzhi
|
0312c1bc75
|
修复常见bug
|
4 years ago |
|
chenzhi
|
b28231d12f
|
优化己方公司返回
|
4 years ago |
|
chenzhi
|
31ef129b2d
|
修复己方公司不能删除
|
4 years ago |
|
chenzhi
|
ffee256f93
|
优化bug1
|
4 years ago |
|
chenzhi
|
fb0edbe752
|
新增支付备注
|
4 years ago |
|
chenzhi
|
d5aeb21b33
|
新增结算周期读取
|
4 years ago |
|
chenzhi
|
553d9b0f91
|
新增分成生效模板
|
4 years ago |
|
chenzhi
|
891f2b6a7f
|
新增首页跳转
|
4 years ago |
|
chenzhi
|
af1829c124
|
新增打款详情
|
4 years ago |
|
yulingwei
|
99fcc4cbbb
|
upt
|
4 years ago |
|
zhengyongxing
|
2ce274486d
|
官方渠道修改江息网络
|
4 years ago |
|
ELF
|
522f758bd5
|
修改
|
4 years ago |
|
chenzhi
|
4e2934d1e8
|
新增打款
|
4 years ago |
|
zhengyongxing
|
8dd071ecc7
|
市场结算定时器优化
|
4 years ago |
|
chenzhi
|
3611e4855d
|
合并冲突
|
4 years ago |
|
chenzhi
|
d9dd8975e4
|
备注
|
4 years ago |
|
chenzhi
|
a2fdc7c467
|
新增打款确认
|
4 years ago |
|
chenzhi
|
957c8bc2ba
|
新增查看
|
4 years ago |
|
zhengyongxing
|
edbd6f46a3
|
市场结算定时器找回
|
4 years ago |