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
|
490197a490
|
移除合作方合同时间限制
|
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 |
|
廖金灵
|
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 |
|
ELF
|
e5a21b9224
|
修改
|
4 years ago |
|
zhengyongxing
|
825fba2d8b
|
用户数据权限bug修复,筛选bug修复
|
4 years ago |
|
zhengyongxing
|
e680289742
|
用户数据权限bug修复
|
4 years ago |
|
yulingwei
|
0472fe9cbc
|
upt
|
4 years ago |
|
chenzhi
|
819137054e
|
新增查询
|
4 years ago |
|
zhengyongxing
|
ac42c54bf8
|
用户数据权限bug修复
|
4 years ago |
|
chenzhi
|
69bbf347ab
|
打款配置
|
4 years ago |
|
chenzhi
|
29a502d0f5
|
新增打款结算列表
|
4 years ago |
|
chenzhi
|
6929f53e6e
|
新增打款列表
|
4 years ago |
|
chenzhi
|
7fca54d94c
|
新增打款新域名
|
4 years ago |
|
chenzhi
|
c7c67f279a
|
打款信息查看
|
4 years ago |
|
chenzhi
|
3ef24c2c57
|
新增打款信息编辑
|
4 years ago |
|
chenzhi
|
1f155020d4
|
新增是否允许打款
|
4 years ago |
|
zhengyongxing
|
9aed64f46d
|
推广员充值汇总优化，补单功能添加
|
4 years ago |
|
ELF
|
486b5e1f83
|
优化curl
|
4 years ago |
|
ELF
|
dc85bdb631
|
添加批量删除推广限制功能
|
4 years ago |
|
ELF
|
69b09c582f
|
添加落地页限制规则
|
4 years ago |
|
chenzhi
|
79a9a8c68c
|
新增重算
|
4 years ago |
|
chenzhi
|
d05d6e2159
|
新增导出
|
4 years ago |
|
chenzhi
|
3b8d6eb128
|
新增导出
|
4 years ago |
|
yulingwei
|
93601a3302
|
upt
|
4 years ago |
|
chenzhi
|
88c70c29db
|
新增0不查看
|
4 years ago |
|
yulingwei
|
e6c8b51127
|
upt
|
4 years ago |
|
chenzhi
|
547b512ead
|
暂存
|
4 years ago |
|
yulingwei
|
bbb7cb23f6
|
upt
|
4 years ago |
|
yulingwei
|
02f52412c1
|
upt
|
4 years ago |
|
yulingwei
|
3530456cfa
|
upt
|
4 years ago |
|
yulingwei
|
af5b215f8b
|
upt
|
4 years ago |
|
chenzhi
|
0f632f386b
|
下游个人聚合
|
4 years ago |
|
yulingwei
|
f969802c26
|
upt
|
4 years ago |
|
廖金灵
|
a4d86b4fdd
|
Merge branch 'feature/promote_statistics' of wmtx/platform into master
推广员充值统计添加默认时间
|
4 years ago |
|
chenzhi
|
7d3e90514f
|
新增个人聚合
|
4 years ago |
|
chenzhi
|
f2ce52ada5
|
暂存
|
4 years ago |
|
zhengyongxing
|
711f98ef86
|
推广员充值统计添加默认时间
|
4 years ago |
|
廖金灵
|
22e5fe8d76
|
Merge branch 'hotfix/pack_package' of wmtx/platform into release
优化打包
|
4 years ago |
|
ELF
|
1c3bb3604e
|
优化打包
|
4 years ago |
|
廖金灵
|
6a8f1a517f
|
Merge branch 'hotfix/pack_package' of wmtx/platform into release
优化打包
|
4 years ago |
|
ELF
|
4f8f18a680
|
优化打包
|
4 years ago |
|
廖金灵
|
154a0115dc
|
Merge branch 'hotfix/pack_package' of wmtx/platform into release
优化打包
|
4 years ago |
|
ELF
|
29595ff5d9
|
优化打包
|
4 years ago |
|
廖金灵
|
8f35271925
|
Merge branch 'hotfix/pack_package' of wmtx/platform into master
优化打包
|
5 years ago |
|
zhengyongxing
|
4352b0c733
|
将官方渠道修改为江息网络
|
5 years ago |
|
廖金灵
|
bd8842759e
|
Merge branch 'hotfix/pack_package' of wmtx/platform into release
优化打包
|
5 years ago |
|
ELF
|
02259ae330
|
修改bug
|
5 years ago |
|
ELF
|
769193883d
|
修改bug
|
5 years ago |
|
ELF
|
d5d6c255b0
|
优化打包
|
5 years ago |
|
yulingwei
|
6ada5711ab
|
upt
|
5 years ago |
|
zhengyongxing
|
4ff957d0f1
|
将官方渠道修改为江息网络
|
5 years ago |
|
chenzhi
|
dff3542fdd
|
新增个人信息获取
|
5 years ago |
|
zhengyongxing
|
6da0ec1607
|
用户列表修改提交
|
5 years ago |
|
chenzhi
|
c6f4149d6a
|
修改下游个人聚合
|
5 years ago |