chenzhi
|
372958f45d
|
优化添加关系的开票内容
|
4 years ago |
 廖金灵
|
0665e8265a
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
市场结算管理bug修正
|
4 years ago |
zhengyongxing
|
22961561d4
|
充值订单充值状态增加
|
4 years ago |
|
chenzhi
|
0fd5bc7fe8
|
优化汇总时间显示
|
4 years ago |
|
chenzhi
|
b9567f6faf
|
优化时间戳模式
|
4 years ago |
|
chenzhi
|
a90149b31b
|
隐藏会长结算方式
|
4 years ago |
|
chenzhi
|
12f232219c
|
优化下游个人查看
|
4 years ago |
|
chenzhi
|
71d0d2c9d1
|
优化个人显示支付方式
|
4 years ago |
|
chenzhi
|
52345e4eb1
|
优化导出新增支付宝信息
|
4 years ago |
|
廖金灵
|
8c942dbcbc
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币增加商户
|
4 years ago |
|
zyx
|
3c8f637240
|
平台币导出增加商户
|
4 years ago |
|
zyx
|
896cdd92b9
|
平台币增加商户
|
4 years ago |
yulingwei
|
9cdab21db9
|
repair search
|
4 years ago |
陈志
|
890499ce59
|
Merge branch 'fix/change_statement_time' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
4a44604047
|
优化渠道汇总
|
4 years ago |
郑永星
|
c55b798bb4
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
|
4 years ago |
|
zhengyongxing
|
1f6c96e3a9
|
bug修改
|
4 years ago |
|
廖金灵
|
613b50eb63
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
|
4 years ago |
|
zyx
|
2a236849b8
|
充值信息查看权限默认开启
|
4 years ago |
|
zhengyongxing
|
f18db12d69
|
支付渠道跳转增加
|
4 years ago |
|
廖金灵
|
c8af2d79ff
|
Merge branch 'feature/deposit' of wmtx/platform into release
修改时间问题
|
4 years ago |
|
廖金灵
|
a2474aaa0b
|
Merge branch 'feature/reward' of wmtx/platform into release
修改时间
|
4 years ago |
|
yulingwei
|
b1a91339cb
|
Merge branch 'feature/deposit' of 47.111.118.107:wmtx/platform into feature/deposit
|
4 years ago |
|
yulingwei
|
1634f14fb2
|
upt
|
4 years ago |
|
yulingwei
|
a01beb9bc6
|
upt
|
4 years ago |
|
郑永星
|
f01030ffaa
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
|
4 years ago |
|
zhengyongxing
|
d9d66dc5bf
|
支付渠道跳转增加
|
4 years ago |
|
陈志
|
575c074c39
|
Merge branch 'fix/change_statement_time' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
b63369cdba
|
优化结算方式查询
|
4 years ago |
|
chenzhi
|
c6b3d1948e
|
优化打款剔除后显示
|
4 years ago |
|
廖金灵
|
86b8682d02
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
|
4 years ago |
|
zhengyongxing
|
0c4f1f05bd
|
支付渠道跳转增加
|
4 years ago |
|
廖金灵
|
fc7284de94
|
Merge branch 'feature/reward' of wmtx/platform into release
奖罚样式问题
|
4 years ago |
|
陈志
|
f63985ece1
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场结算管理bug修改
|
4 years ago |
|
zhengyongxing
|
9a722d5b45
|
市场结算管理bug修改
|
4 years ago |
|
yulingwei
|
9e53db53cd
|
upt
|
4 years ago |
|
yulingwei
|
de0fc5e074
|
upt
|
4 years ago |
|
chenzhi
|
aabc0703df
|
优化结算时间选择
|
4 years ago |
|
chenzhi
|
8b8b0721b3
|
优化结算时间
|
4 years ago |
|
廖金灵
|
782f2ae51b
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付商户bug修改
|
4 years ago |
|
廖金灵
|
3c4cf05a72
|
Merge branch 'feature/reward' of wmtx/platform into release
列表样式
|
4 years ago |
|
zhengyongxing
|
eb66cfd5d4
|
支付商户bug修改
|
4 years ago |
|
yulingwei
|
d46fa808c0
|
upt
|
4 years ago |
|
陈志
|
67dc1b58e6
|
Merge branch 'fix/change_statement_time' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
0f284cf9b3
|
优化游戏绑定，已经绑定不出现
|
4 years ago |
|
廖金灵
|
4b6218f1aa
|
Merge branch 'feature/reward' of wmtx/platform into release
修改选择样式
|
4 years ago |
|
廖金灵
|
bd00e90c26
|
Merge branch 'feature/payment_merchant' of wmtx/platform into release
修改文字bug
|
4 years ago |
|
ELF
|
bc193e648e
|
修改
|
4 years ago |
|
yulingwei
|
f598b19957
|
Merge branch 'feature/reward' of 47.111.118.107:wmtx/platform into feature/reward
|
4 years ago |
|
yulingwei
|
b995ba34d9
|
upt
|
4 years ago |
|
zhengyongxing
|
19f59d6482
|
菜单栏修改
|
4 years ago |
|
zhengyongxing
|
eebb38dc8c
|
商户列表字段名称修改
|
4 years ago |
|
zhengyongxing
|
9d28947f9b
|
商户bug修改
|
4 years ago |
|
zhengyongxing
|
a960e0a7e4
|
商户bug修改
|
4 years ago |
|
zhengyongxing
|
9a202a393e
|
商户bug修改
|
4 years ago |
|
zhengyongxing
|
ee5fc4c7c8
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Application/Admin/View/Spend/lists.html
|
4 years ago |
|
zhengyongxing
|
9670bf86b6
|
商户bug修改
|
4 years ago |
|
廖金灵
|
6faa6e0a33
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
优化订单列表长cp订单显示
|
4 years ago |
|
chenzhi
|
2a99226dd7
|
优化订单列表长cp订单显示
|
4 years ago |
|
廖金灵
|
47c565e31c
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
下游公司字段与上游公司字段一致
|
4 years ago |
|
zhengyongxing
|
57903e8a13
|
下游公司字段与上游公司字段一致
|
4 years ago |
|
ELF
|
edb090feca
|
解决冲突
|
4 years ago |
|
ELF
|
004b540a63
|
解决冲突
|
4 years ago |
|
ELF
|
0803b686c3
|
解决冲突
|
4 years ago |
|
廖金灵
|
9e3de695ca
|
Merge branch 'feature/plateform_statistics' of wmtx/platform into release
市场部统计修改
|
4 years ago |
|
廖金灵
|
e4ab39bf64
|
Merge branch 'feature/ip_search' of wmtx/platform into release
IP查询
|
4 years ago |
|
zhengyongxing
|
ea2683716f
|
下游公司字段与上游公司字段一致
|
4 years ago |
|
廖金灵
|
54ad7191b1
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
聚合公司及增加手机登录功能
|
4 years ago |
|
廖金灵
|
949570abf4
|
Merge branch 'feature/game_agg' of wmtx/platform into release
游戏统计显示聚合数据
|
4 years ago |
|
ELF
|
e0f71b67c5
|
处理
|
4 years ago |
|
zhengyongxing
|
4f681f7d72
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
09629a12a8
|
下游公司字段与上游公司字段一致
|
4 years ago |
|
zhengyongxing
|
11ff884e6a
|
Merge branch 'feature/cp_juhe_company' into hotfix/market_percentage
# Conflicts:
# Application/Admin/Common/extend.php
# Application/Admin/Controller/AggregateFinanceSetController.class.php
# Application/Admin/Controller/CpJuheCompanyController.class.php
# Application/Admin/View/CpJuheCompany/detail.html
# Application/Admin/View/CpJuheCompany/export.html
# Data/update.sql
|
4 years ago |
|
zhengyongxing
|
91178308f9
|
下游公司字段与上游公司字段一致
|
4 years ago |
|
陈志
|
e01c7e4e01
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
|
4 years ago |
|
ELF
|
56282658fc
|
解决冲突
|
4 years ago |
|
ELF
|
0206a422f9
|
解决冲突
|
4 years ago |
|
chenzhi
|
fb9deff8b7
|
优化新增生效的默认时间
|
4 years ago |
|
chenzhi
|
0f023bed36
|
优化结算提示
|
4 years ago |
|
chenzhi
|
e2bd47ac2d
|
优化按钮太挤
|
4 years ago |
|
chenzhi
|
b9604c162a
|
优化操作时间判断
|
4 years ago |
|
chenzhi
|
8de452c8f7
|
优化名称显示
|
4 years ago |
chenzhi
|
f4be3972b2
|
优化结算单确认
|
4 years ago |
|
chenzhi
|
b7409ab069
|
优化导出
|
4 years ago |
|
chenzhi
|
eb311348a8
|
优化检索
|
4 years ago |
|
chenzhi
|
4d65542338
|
优化结算包名文字
|
4 years ago |
|
chenzhi
|
2a303cf0f5
|
优化审核流程
|
4 years ago |
|
chenzhi
|
0aac0cfad7
|
新增结算类型
|
4 years ago |
|
chenzhi
|
31b1c771a1
|
新增全量查看
|
4 years ago |
|
chenzhi
|
a69b21dd14
|
汇总单新增周月结审核
|
4 years ago |
|
chenzhi
|
b0034d5f19
|
优化推广公司游戏申请不审核
|
4 years ago |
|
chenzhi
|
a948986b41
|
优化上游导出
|
4 years ago |
|
chenzhi
|
62f2bc350d
|
优化时间控件
|
4 years ago |
|
chenzhi
|
5c857840a2
|
分成比例新增生效检索
|
4 years ago |
|
chenzhi
|
94a3057013
|
新增游戏分成比例导出
|
4 years ago |
|
chenzhi
|
ac65098827
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement723
|
4 years ago |
|
廖金灵
|
5f0917220c
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
推广分成特殊申请
|
4 years ago |
|
chenzhi
|
8e4541cb01
|
推广分成特殊申请
|
4 years ago |
|
廖金灵
|
762c93d89e
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化电话不限制
|
4 years ago |
|
chenzhi
|
b1790a8897
|
优化手机不限制
|
4 years ago |
|
廖金灵
|
c67cbc61c2
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化电话不限制
|
4 years ago |
|
chenzhi
|
1e3b1dad66
|
优化排序
|
4 years ago |
|
廖金灵
|
4869d650d9
|
Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
时间格式修正，导出格式修改
|
4 years ago |
|
zhengyongxing
|
815e2e3b88
|
时间格式修正，导出格式修改
|
4 years ago |
|
chenzhi
|
6024ae342c
|
优化顺序及导出
|
4 years ago |
|
zhengyongxing
|
08e221a53c
|
商户专员隐藏
|
4 years ago |
|
chenzhi
|
8ded1f3169
|
优化游戏模板显示
|
4 years ago |
|
chenzhi
|
4460f8e7cf
|
新增结算包名
|
4 years ago |
|
chenzhi
|
3ff79ce6c1
|
优化公会检索
|
4 years ago |
|
chenzhi
|
832f531d20
|
优化审核通过
|
4 years ago |
|
ELF
|
557f0203ac
|
解决冲突
|
4 years ago |
|
廖金灵
|
5d809ae9b8
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化合同期限查询
|
4 years ago |
|
chenzhi
|
eaa6762935
|
优化模板错误
|
4 years ago |
|
ELF
|
62d7f15fdc
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign
|
4 years ago |
|
zhengyongxing
|
68f8bb1ce0
|
聚合公司详情详细地址修改
|
4 years ago |
|
chenzhi
|
3ad0d447d4
|
优化显示
|
4 years ago |
|
chenzhi
|
5a962e1b73
|
新增分成优化
|
4 years ago |
|
zhengyongxing
|
26f13922a1
|
聚合公司时间修正
|
4 years ago |
|
chenzhi
|
0237e0ff63
|
优化导出
|
4 years ago |
|
chenzhi
|
6181059faf
|
优化搜索
|
4 years ago |
|
chenzhi
|
10e56211ce
|
优化导出提示
|
4 years ago |
|
chenzhi
|
1ec951d344
|
优化空值显示
|
4 years ago |
|
chenzhi
|
61e6d8131c
|
新增支付宝真实名称只能是中文验证
|
4 years ago |
|
chenzhi
|
f66bce14b2
|
优化下游列表显示及导出
|
4 years ago |
|
chenzhi
|
d015bce440
|
优化推广下游查看
|
4 years ago |
|
chenzhi
|
80e8477b51
|
新增检索
|
4 years ago |
|
chenzhi
|
a3f28b67a5
|
新增游戏搜索
|
4 years ago |
|
zhengyongxing
|
2fe7c864df
|
聚合公司功能提交
|
4 years ago |
|
zhengyongxing
|
420723f593
|
商户充值汇总更改名称
|
4 years ago |
|
zhengyongxing
|
4c3112b70e
|
充值信息查看权限添加
|
4 years ago |
|
zhengyongxing
|
837358f86b
|
支付商户统计字段展示修改
|
4 years ago |
|
chenzhi
|
d91d8346b9
|
优化下游导出
|
4 years ago |
|
ELF
|
27ccee9b20
|
修改
|
4 years ago |
|
yulingwei
|
6c23a3ee52
|
upt
|
4 years ago |
|
yulingwei
|
9a380d7756
|
upt
|
4 years ago |
|
chenzhi
|
8ac604be33
|
优化导出
|
4 years ago |
|
chenzhi
|
6bb398bcc3
|
优化下游显示
|
4 years ago |
|
yulingwei
|
7b9bb91e16
|
upt
|
4 years ago |
|
zhengyongxing
|
a09da4a184
|
聚合下游公司列表导出修正
|
4 years ago |
|
zhengyongxing
|
1ff82cce20
|
聚合下游公司列表添加
|
4 years ago |
|
chenzhi
|
5367ea4aae
|
优化前端
|
4 years ago |
|
ELF
|
f3b323bda8
|
修改
|
4 years ago |
|
yulingwei
|
e5996b47cc
|
upt
|
4 years ago |
|
yulingwei
|
0a9e7ed3ef
|
upt
|
4 years ago |
|
yulingwei
|
e789c941ed
|
upt
|
4 years ago |
|
yulingwei
|
7830cef93d
|
upt
|
4 years ago |
|
chenzhi
|
bffbd6a2b1
|
优化ok
|
4 years ago |
|
chenzhi
|
2619e598e8
|
合并marster
|
4 years ago |
|
chenzhi
|
22a65f8404
|
优化下游支付宝导出
|
4 years ago |
|
yulingwei
|
e0d74cbffd
|
upt
|
4 years ago |
|
yulingwei
|
066610f236
|
upt
|
4 years ago |
|
yulingwei
|
877a53e892
|
upt
|
5 years ago |
|
yulingwei
|
f373bd2025
|
upt
|
5 years ago |
|
yulingwei
|
deac7da5ff
|
upt
|
5 years ago |
|
yulingwei
|
25dec010be
|
upt
|
5 years ago |
|
yulingwei
|
28a44019e4
|
upt
|
5 years ago |
|
yulingwei
|
eaa25ebcda
|
feature/desposit
|
5 years ago |
|
zhengyongxing
|
cacb1e4cf4
|
商户统计结算功能添加
|
5 years ago |
|
ELF
|
096e32d581
|
商户配置
|
5 years ago |
|
yulingwei
|
2fbea72d26
|
up
|
5 years ago |
|
chenzhi
|
b4c6f4316a
|
优化显示
|
5 years ago |
|
chenzhi
|
afac0376be
|
新增下游审批
|
5 years ago |
|
chenzhi
|
7d404c6904
|
优化查看
|
5 years ago |
|
chenzhi
|
cafdc39f2a
|
优化添加
|
5 years ago |
|
chenzhi
|
d662c89b7e
|
zancun
|
5 years ago |
|
zhengyongxing
|
960903a31c
|
新功能添加
|
5 years ago |
|
chenzhi
|
f731a417bd
|
优化工会关系
|
5 years ago |
|
chenzhi
|
d9d55a3bcb
|
优化新增下游公司
|
5 years ago |
|
zhengyongxing
|
1abaa7c646
|
支付渠道名称修改
|
5 years ago |
|
ELF
|
e8a925b64c
|
游戏统计添加聚合充值数据
|
5 years ago |
|
chenzhi
|
69adcbabf8
|
优化推广公司
|
5 years ago |
|
chenzhi
|
5aa7427504
|
新增公司信息编辑
|
5 years ago |
|
chenzhi
|
c708fb6d11
|
优化CP搜索
|
5 years ago |
|
yulingwei
|
dda43c7289
|
Merge branch 'feature/deposit' of 47.111.118.107:wmtx/platform into feature/deposit
|
5 years ago |
|
yulingwei
|
555fd052fe
|
upt
|
5 years ago |
|
chenzhi
|
35f2fe3f05
|
优化公司显示
|
5 years ago |
|
yulingwei
|
e337ecac5e
|
upt
|
5 years ago |
|
yulingwei
|
c8bd476a60
|
upt
|
5 years ago |
|
chenzhi
|
f7d90780aa
|
新增CP公司审核
|
5 years ago |
|
chenzhi
|
33cf2cf8a6
|
新增审核列表
|
5 years ago |
|
yulingwei
|
adc3acd992
|
upt
|
5 years ago |
|
yulingwei
|
33049f5a9f
|
upt
|
5 years ago |
|
chenzhi
|
0c2e2db65d
|
新增税费费率
|
5 years ago |
|
zhengyongxing
|
288f121955
|
添加手机登录的功能
|
5 years ago |
|
yulingwei
|
e155c92ed6
|
1
|
5 years ago |
|
zhengyongxing
|
114e51ebe2
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
|
5 years ago |
|
chenzhi
|
58c8508ce4
|
新增cp导出
|
5 years ago |
|
ELF
|
c87b61d94b
|
修改发票类型
|
5 years ago |
|
ELF
|
0f0d52c78f
|
修改
|
5 years ago |
|
ELF
|
b448f0829e
|
修改公司绑定默认值
|
5 years ago |
|
yulingwei
|
98413791aa
|
repair
|
5 years ago |
|
ELF
|
15d0b454a4
|
修改
|
5 years ago |
万盟天下
|
72115a9ede
|
Merge branch 'feature/promote_statistics' of wmtx/platform into release
推广员统计修改
|
5 years ago |
|
yulingwei
|
6390d680ec
|
upt
|
5 years ago |
|
zhengyongxing
|
2220a6cfec
|
财务支付时间修改，增加手机登录验证，及开发推广员列表名称
|
5 years ago |
|
yulingwei
|
51a1c9c707
|
upt
|
5 years ago |
|
yulingwei
|
b9dfe08177
|
upt
|
5 years ago |
|
yulingwei
|
1119e8faf9
|
upt
|
5 years ago |
|
chenzhi
|
2f9269f29f
|
取消默认选择时间
|
5 years ago |
|
yulingwei
|
80597c4894
|
upt
|
5 years ago |
|
yulingwei
|
5e5aa8ca3f
|
upt
|
5 years ago |
|
yulingwei
|
0b54c71cb0
|
upt
|
5 years ago |
|
chenzhi
|
d6ec8e0248
|
新增导出
|
5 years ago |
|
廖金灵
|
420c3454fc
|
Merge branch 'hotfix/fan_promote' of wmtx/platform into master
优化公会统计
|
5 years ago |
|
廖金灵
|
3095270a84
|
Merge branch 'hotfix/fan_promote' of wmtx/platform into release
修改工会统计
|
5 years ago |
|
ELF
|
f167d63c4a
|
修改
|
5 years ago |
|
zhengyongxing
|
039b496b28
|
市场专员筛选，月份跳转，及时间筛选修正
|
5 years ago |
|
zhengyongxing
|
96f68c4f50
|
市场专员筛选，月份跳转，及时间筛选修正
|
5 years ago |
|
廖金灵
|
98dab102f4
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
跳转汇总结算单跳转修正，添加筛选发放状态的代码
|
5 years ago |
|
zhengyongxing
|
ced9d51845
|
跳转汇总结算单跳转修正，添加筛选发放状态的代码
|
5 years ago |
|
廖金灵
|
6af9e39ec9
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
重算展示权限添加
|
5 years ago |
|
zhengyongxing
|
dae421270f
|
重算展示权限添加
|
5 years ago |
|
廖金灵
|
262940a42f
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
列表全部开发给市场专员，其他人员的数据隐
|
5 years ago |
|
zhengyongxing
|
53979941a0
|
列表全部开发给市场专员，其他人员的数据隐藏
|
5 years ago |
|
廖金灵
|
c008157b0a
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成bug修改
|
5 years ago |
|
zhengyongxing
|
0c5e857ca2
|
市场业绩提成bug修改
|
5 years ago |
|
廖金灵
|
6deed99b79
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成bug修改
|
5 years ago |
|
zhengyongxing
|
5ab96edd8f
|
市场业绩提成bug修改
|
5 years ago |
|
zhengyongxing
|
8f4505205b
|
市场业绩提成优时间大小判断
|
5 years ago |
|
廖金灵
|
b58f66f9b8
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成优化
|
5 years ago |
|
zhengyongxing
|
b64e5858ea
|
市场业绩提成优化
|
5 years ago |
|
廖金灵
|
886c70665c
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成优化
|
5 years ago |
|
zhengyongxing
|
2975b9fe35
|
市场业绩提成优化
|
5 years ago |
|
廖金灵
|
31de395c6e
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
提现汇总表时间检索bug修正
|
5 years ago |
|
zhengyongxing
|
cbb0e82db1
|
提现汇总表时间检索bug修正
|
5 years ago |
|
廖金灵
|
aebc8b9f70
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
编辑汇率时间控件修改
|
5 years ago |
|
zhengyongxing
|
a1df3c547e
|
编辑汇率时间控件修改
|
5 years ago |
|
廖金灵
|
7576434beb
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
时间控件修改
|
5 years ago |
|
zhengyongxing
|
5dc5222091
|
时间控件修改
|
5 years ago |
|
郑永星
|
7608fb3b99
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
|
5 years ago |
|
zhengyongxing
|
c637d7a1d7
|
离职发放发放完成隐藏
|
5 years ago |
|
廖金灵
|
6d6ec065b2
|
Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改导出bug
|
5 years ago |
|
ELF
|
a17bb698dc
|
修改bug
|
5 years ago |
|
zhengyongxing
|
a6dd2a9830
|
市场专员业绩导出公式添加
|
5 years ago |
|
zhengyongxing
|
f4789a1534
|
市场专员业绩提成bug修正
|
5 years ago |
|
zhengyongxing
|
e4d1ced122
|
市场专员业绩提成bug修正
|
5 years ago |
|
zhengyongxing
|
0ca629518d
|
市场专员业绩结算结构修改
|
5 years ago |
|
zhengyongxing
|
4bfa0dfa2f
|
市场专员业绩结算结构修改
|
5 years ago |
|
chenzhi
|
2a4541569d
|
优化列表显示
|
5 years ago |
|
zhengyongxing
|
2303c439aa
|
市场专员业绩计页面修改
|
5 years ago |
|
chenzhi
|
04e13844c3
|
zancun
|
5 years ago |
|
zhengyongxing
|
962d140d80
|
Merge branch 'hotfix/pay_channel_modify' into feature/market_percentage
|
5 years ago |
|
zhengyongxing
|
9a23b5588b
|
市场专员业绩计算修正
|
5 years ago |
|
zhengyongxing
|
97161900ac
|
市场专员业绩管理bug修改
|
5 years ago |
|
chenzhi
|
c9d6b9859d
|
合并热更
|
5 years ago |
|
zhengyongxing
|
bdeacbd718
|
市场专员业绩管理 重算调用脚本命令修改
|
5 years ago |
|
zhengyongxing
|
c96340afa9
|
市场专员业绩管理bug修改
|
5 years ago |
|
chenzhi
|
587d7913ca
|
优化检索
|
5 years ago |
|
zhengyongxing
|
1e80004e3e
|
市场专员业绩管理bug修改
|
5 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
|
5 years ago |
|
zhengyongxing
|
83717b64ae
|
市场专员业绩管理优化
|
5 years ago |
|
chenzhi
|
5fc03a14a4
|
优化cp添加
|
5 years ago |
|
chenzhi
|
0dda3b1c61
|
优化合同不需要限制时间
|
5 years ago |
|
chenzhi
|
490197a490
|
移除合作方合同时间限制
|
5 years ago |
|
chenzhi
|
03f4130e9e
|
新增上游合作
|
5 years ago |
|
zhengyongxing
|
06bd0bf848
|
市场专员业绩管理代码提交
|
5 years ago |
|
chenzhi
|
d52ab03714
|
新增推广公司游戏选择
|
5 years ago |
|
廖金灵
|
4a755d2269
|
Merge branch 'feature/market_admin' of wmtx/platform into release
修改换绑bug
|
5 years ago |
|
ELF
|
ecc228409d
|
修改
|
5 years ago |
|
zhengyongxing
|
acc45f5911
|
江息网络漏掉的修改
|
5 years ago |
|
chenzhi
|
bc75da8c14
|
解决冲突
|
5 years ago |
|
chenzhi
|
f62cfca22b
|
隐藏推广公司分成比例
|
5 years ago |
|
zhengyongxing
|
2bc4bf79d9
|
市场结算管理公司税率提交
|
5 years ago |
|
ELF
|
990a2bd206
|
解决冲突
|
5 years ago |
|
chenzhi
|
91ae987c3c
|
优化游戏比例分成无需大于
|
5 years ago |
|
chenzhi
|
9dd4a507e9
|
隐藏模板批量操作
|
5 years ago |
|
chenzhi
|
f1824fd7b3
|
优化新增名称
|
5 years ago |
|
zhengyongxing
|
682ce333b1
|
市场结算管理公司税率提交
|
5 years ago |
|
chenzhi
|
c76cf038cd
|
己方公司
|
5 years ago |
|
zhengyongxing
|
ca5c68d078
|
推广公司编辑添加合并错误去除
|
5 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
|
5 years ago |
|
zhengyongxing
|
2fae4219df
|
公会统计去除
|
5 years ago |
|
zhengyongxing
|
a8f4f16349
|
Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
# Application/Admin/View/PromoteCompany/view.html
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
379716298a
|
市场专员结算代码上传
|
5 years ago |
|
ELF
|
e3b53e7df1
|
修改
|
5 years ago |
|
ELF
|
34691d6baa
|
修改
|
5 years ago |
|
ELF
|
76fcfec7c2
|
修改
|
5 years ago |
|
ELF
|
5f5a6ee1af
|
修改
|
5 years ago |
|
zhengyongxing
|
a2408407b7
|
上传市场专员结算代码
|
5 years ago |
|
廖金灵
|
c1163e7b22
|
Merge branch 'release' of wmtx/platform into master
版本更新2020.06.24
|
5 years ago |
|
zhengyongxing
|
c3956f7ed2
|
平台币金额解释添加
|
5 years ago |
|
廖金灵
|
1907985e7b
|
Merge branch 'feature/ylw-06-10' of wmtx/platform into release
新增公司选择默认模板
|
5 years ago |
|
yulingwei
|
ff9b2249b8
|
新增公司默认选择默认模板
|
5 years ago |
|
廖金灵
|
db32f11215
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
取消测试的虚拟验证码
|
5 years ago |
|
chenzhi
|
95d9f45612
|
新增检索
|
5 years ago |
|
yulingwei
|
c8924779c4
|
Merge branch 'release' into feature/ylw-06-17
|
5 years ago |
|
yulingwei
|
8c18f2aa1d
|
1
|
5 years ago |
|
ELF
|
2d872ed710
|
解决冲突
|
5 years ago |
|
ELF
|
2589806e62
|
解决冲突
|
5 years ago |
|
yulingwei
|
3f4406a1ee
|
Merge branch 'release' into feature/ylw-06-17
|
5 years ago |
|
yulingwei
|
0decb03cb1
|
merge
|
5 years ago |
|
ELF
|
a153fb9a0e
|
修改
|
5 years ago |
|
chenzhi
|
ad801a37fb
|
优化前端
|
5 years ago |
|
yulingwei
|
b2b28bce07
|
upt
|
5 years ago |
|
yulingwei
|
5b604ab073
|
upt
|
5 years ago |
|
chenzhi
|
ca551b9c50
|
己方公司新增搜索项目
|
5 years ago |
|
chenzhi
|
e0b588be11
|
新加加载load
|
5 years ago |
|
chenzhi
|
26ccc9c450
|
优化导出权限
|
5 years ago |
|
chenzhi
|
40940b4536
|
优化比例
|
5 years ago |
|
zhengyongxing
|
25ae6a03a4
|
Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
|
5 years ago |
|
zhengyongxing
|
b664ba46ad
|
汇总单代码提交
|
5 years ago |
|
chenzhi
|
53b9513935
|
新增结算
|
5 years ago |
|
chenzhi
|
53004adf5d
|
新增打款
|
5 years ago |
|
zhengyongxing
|
9d43914b17
|
汇总单结算代码上传
|
5 years ago |
|
chenzhi
|
fdccc92c43
|
新增只支持脚本访问
|
5 years ago |
|
chenzhi
|
38ab488cd0
|
修复搜索错误
|
5 years ago |
|
chenzhi
|
261e63b898
|
取消未结算的导出
|
5 years ago |
|
chenzhi
|
0312c1bc75
|
修复常见bug
|
5 years ago |
|
chenzhi
|
b28231d12f
|
优化己方公司返回
|
5 years ago |
|
chenzhi
|
31ef129b2d
|
修复己方公司不能删除
|
5 years ago |
|
chenzhi
|
ffee256f93
|
优化bug1
|
5 years ago |
|
chenzhi
|
fb0edbe752
|
新增支付备注
|
5 years ago |
|
chenzhi
|
d5aeb21b33
|
新增结算周期读取
|
5 years ago |
|
chenzhi
|
553d9b0f91
|
新增分成生效模板
|
5 years ago |
|
chenzhi
|
3611e4855d
|
合并冲突
|
5 years ago |
|
zhengyongxing
|
825fba2d8b
|
用户数据权限bug修复,筛选bug修复
|
5 years ago |
|
zhengyongxing
|
e680289742
|
用户数据权限bug修复
|
5 years ago |
|
yulingwei
|
0472fe9cbc
|
upt
|
5 years ago |
|
zhengyongxing
|
ac42c54bf8
|
用户数据权限bug修复
|
5 years ago |
|
chenzhi
|
6929f53e6e
|
新增打款列表
|
5 years ago |
|
chenzhi
|
c7c67f279a
|
打款信息查看
|
5 years ago |
|
chenzhi
|
3ef24c2c57
|
新增打款信息编辑
|
5 years ago |
|
chenzhi
|
1f155020d4
|
新增是否允许打款
|
5 years ago |
|
ELF
|
486b5e1f83
|
优化curl
|
5 years ago |
|
ELF
|
dc85bdb631
|
添加批量删除推广限制功能
|
5 years ago |
|
ELF
|
69b09c582f
|
添加落地页限制规则
|
5 years ago |
|
chenzhi
|
d05d6e2159
|
新增导出
|
5 years ago |
|
chenzhi
|
3b8d6eb128
|
新增导出
|
5 years ago |
|
yulingwei
|
93601a3302
|
upt
|
5 years ago |
|
chenzhi
|
88c70c29db
|
新增0不查看
|
5 years ago |
|
yulingwei
|
e6c8b51127
|
upt
|
5 years ago |
|
yulingwei
|
02f52412c1
|
upt
|
5 years ago |
|
chenzhi
|
0f632f386b
|
下游个人聚合
|
5 years ago |
|
yulingwei
|
f969802c26
|
upt
|
5 years ago |
|
chenzhi
|
f2ce52ada5
|
暂存
|
5 years ago |
|
zhengyongxing
|
4ff957d0f1
|
将官方渠道修改为江息网络
|
5 years ago |
|
chenzhi
|
a3633ea52e
|
新增下游查看导出
|
5 years ago |
|
廖金灵
|
b62eb3be7c
|
Merge branch 'hotfix/hide_promote_phone' of wmtx/platform into release
隐藏市场总监电话
|
5 years ago |
|
chenzhi
|
7ac118c024
|
下游公司查看
|
5 years ago |
|
chenzhi
|
427d6457fc
|
上游查看及导出
|
5 years ago |
|
chenzhi
|
eeec8b13f2
|
cp查看
|
5 years ago |
|
chenzhi
|
4e4da92420
|
优化比例
|
5 years ago |
|
chenzhi
|
2cf0fdf905
|
新增公会归属编辑规则修改
|
5 years ago |
|
chenzhi
|
22aa5d3dd4
|
暂存
|
5 years ago |
|
zhengyongxing
|
f08c0cec9b
|
苹果beta包添加测试ip白名单
|
5 years ago |
|
chenzhi
|
a9e0b303dd
|
推广公司新增支付宝账号
|
5 years ago |
|
chenzhi
|
bf24f9bc9d
|
开户网点该帐户名
|
5 years ago |
|
chenzhi
|
f7d67ff4c4
|
新增合作方阿里账号及用户
|
5 years ago |
|
zhengyongxing
|
1e4a1aef4e
|
苹果beta包添加第三方支付名单
|
5 years ago |
|
chenzhi
|
e1d624fe8b
|
优化导出并聚合数据
|
5 years ago |