chenzhi
|
9ab8454970
|
优化结算汇总
|
4 years ago |
|
chenzhi
|
45d883e89c
|
优化渠道统计
|
4 years ago |
|
chenzhi
|
ad73fe03b3
|
优化上游结算
|
4 years ago |
|
chenzhi
|
3fdc14120f
|
优化首页折线
|
4 years ago |
|
chenzhi
|
29636f2922
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
|
4 years ago |
|
chenzhi
|
78451f0551
|
消除打印信息
|
4 years ago |
|
chenzhi
|
96ead18ff6
|
优化打印
|
4 years ago |
|
chenzhi
|
7abcd38f36
|
解决推广公司bug
|
4 years ago |
|
chenzhi
|
753098a85f
|
优化子站点配置
|
4 years ago |
|
chenzhi
|
f034698dbc
|
新增多库
|
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
|
7e1d2fb879
|
优化日志
|
4 years ago |
|
chenzhi
|
74d9d6ed18
|
优化充值操作
|
4 years ago |
zhengyongxing
|
b54b37e99c
|
换行字数修正
|
4 years ago |
|
zhengyongxing
|
1626640066
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
4526b5b741
|
11月功能提交
|
4 years ago |
 ELF
|
53f3ad6864
|
优化
|
4 years ago |
|
ELF
|
dfdc31f4dc
|
市场专员信息显示通过权限控制
|
4 years ago |
|
ELF
|
19c782b053
|
解决冲突
|
4 years ago |
|
zhengyongxing
|
5c65f356b2
|
市场业绩开发类型修正
|
4 years ago |
|
ELF
|
ad34536256
|
修改
|
4 years ago |
|
ELF
|
6fcaa1362c
|
重置权限缓存
|
4 years ago |
|
zhengyongxing
|
0631c22c93
|
上游导出修正
|
4 years ago |
|
chenzhi
|
bcdbb3d0a0
|
优化导出保留两位小数
|
4 years ago |
|
chenzhi
|
f73a9033b3
|
新增下游个人比例
|
4 years ago |
万盟天下
|
c60d7c6671
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
上游导出修正
|
4 years ago |
|
zhengyongxing
|
288078c959
|
上游导出修正
|
4 years ago |
陈志
|
0c696fd8a5
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
|
4 years ago |
|
zhengyongxing
|
5acd5197ae
|
小bug修改
|
4 years ago |
|
ELF
|
bdc23b7d90
|
修改
|
4 years ago |
|
zhengyongxing
|
a146dd820a
|
平台结算导出与列表选项修改
|
4 years ago |
|
chenzhi
|
d63edee6b3
|
优化结算单界面信息
|
4 years ago |
|
chenzhi
|
180e21be86
|
优化结算上游结算为一单
|
4 years ago |
|
chenzhi
|
5db1f7ce24
|
优化比例显示
|
4 years ago |
|
chenzhi
|
4143a67238
|
优化下游个人导出
|
4 years ago |
|
chenzhi
|
9ee69f9bd4
|
优化下游结算单导出
|
4 years ago |
|
chenzhi
|
82787ca561
|
优化上游结算单导出模板样式
|
4 years ago |
|
chenzhi
|
07fd53a6aa
|
优化上游导出文件格式及时间问题
|
4 years ago |
|
chenzhi
|
7ba9c25610
|
优化上游导出%
|
4 years ago |
|
廖金灵
|
6c8699dc1e
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币导出bug修正
|
4 years ago |
|
zyx
|
8c0646d2a0
|
平台币导出bug修正
|
4 years ago |
|
廖金灵
|
0665e8265a
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
市场结算管理bug修正
|
4 years ago |
|
zyx
|
5dcc25f97e
|
市场结算管理bug修正
|
4 years ago |
|
chenzhi
|
1ac4c280ad
|
优化其他导出
|
4 years ago |
|
chenzhi
|
54239b1f54
|
优化导出
|
4 years ago |
|
chenzhi
|
9d9eae85ec
|
优化上游比例获取
|
4 years ago |
|
廖金灵
|
d73ab9c4cd
|
Merge branch 'feature/payment_merchant' of wmtx/platform into release
完善支付商户操作日志
|
4 years ago |
|
ELF
|
a4d4a51a2c
|
完善支付商户操作日志
|
4 years ago |
|
chenzhi
|
205c6a83f8
|
优化上游结算
|
4 years ago |
|
zhengyongxing
|
a960e0a7e4
|
商户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 |
|
ELF
|
0803b686c3
|
解决冲突
|
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 |
|
ELF
|
557f0203ac
|
解决冲突
|
4 years ago |
|
chenzhi
|
0237e0ff63
|
优化导出
|
4 years ago |
|
chenzhi
|
1ec951d344
|
优化空值显示
|
4 years ago |
|
chenzhi
|
a3f28b67a5
|
新增游戏搜索
|
4 years ago |
|
zhengyongxing
|
341fa19b6f
|
聚合公司功能提交
|
4 years ago |
|
chenzhi
|
8ac604be33
|
优化导出
|
4 years ago |
|
zhengyongxing
|
1ff82cce20
|
聚合下游公司列表添加
|
4 years ago |
|
chenzhi
|
2619e598e8
|
合并marster
|
4 years ago |
|
zhengyongxing
|
cacb1e4cf4
|
商户统计结算功能添加
|
4 years ago |
yulingwei
|
2fbea72d26
|
up
|
4 years ago |
|
chenzhi
|
f731a417bd
|
优化工会关系
|
4 years ago |
|
chenzhi
|
35f2fe3f05
|
优化公司显示
|
4 years ago |
|
chenzhi
|
0c2e2db65d
|
新增税费费率
|
4 years ago |
|
zhengyongxing
|
53979941a0
|
列表全部开发给市场专员，其他人员的数据隐藏
|
4 years ago |
|
zhengyongxing
|
1acef89380
|
市场业绩提成市场总监管理组添加查看全部用户的权限
|
4 years ago |
|
zhengyongxing
|
2975b9fe35
|
市场业绩提成优化
|
4 years ago |
|
zhengyongxing
|
4bfa0dfa2f
|
市场专员业绩结算结构修改
|
4 years ago |
|
zhengyongxing
|
d40ce89901
|
市场专员业绩结算发放时间选项修改
|
4 years ago |
|
zhengyongxing
|
9a23b5588b
|
市场专员业绩计算修正
|
4 years ago |
|
zhengyongxing
|
97161900ac
|
市场专员业绩管理bug修改
|
4 years ago |
|
chenzhi
|
c9d6b9859d
|
合并热更
|
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 |
|
ELF
|
3f42d2967c
|
修改
|
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 |
|
ELF
|
990a2bd206
|
解决冲突
|
4 years ago |
|
ELF
|
8224cfb362
|
修改
|
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
|
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
|
f0a8b6bc3b
|
修改
|
4 years ago |
|
ELF
|
76fcfec7c2
|
修改
|
4 years ago |
|
ELF
|
5f5a6ee1af
|
修改
|
4 years ago |
|
廖金灵
|
a808b86865
|
Merge branch 'feature/paytime_summary' of wmtx/platform into release
汇付宝
|
4 years ago |
|
chenzhi
|
511f53e83c
|
优化权限
|
4 years ago |
|
chenzhi
|
0ba02069a0
|
优化补点计算方式
|
4 years ago |
|
zhengyongxing
|
9aed64f46d
|
推广员充值汇总优化，补单功能添加
|
4 years ago |
|
zhengyongxing
|
4ff957d0f1
|
将官方渠道修改为江息网络
|
5 years ago |
|
chenzhi
|
e1d624fe8b
|
优化导出并聚合数据
|
5 years ago |
|
chenzhi
|
c5e3d78835
|
新增导出
|
5 years ago |
|
chenzhi
|
e80d4eb539
|
新增确认
|
5 years ago |
|
chenzhi
|
93a8bb70e1
|
新增编辑
|
5 years ago |
tping
|
9fd06c27d3
|
Merge branch 'hotfix/alipaytoalipay' into feature/platfrom_aggregate_finance
# Conflicts:
# Data/update.sql
|
5 years ago |
|
chenzhi
|
6162f9f8a1
|
生成上下游结算单
|
5 years ago |