 ELF
|
56a97f7eef
|
修改bug
|
5 years ago |
|
ELF
|
e8a0975981
|
解决冲突
|
5 years ago |
|
ELF
|
6993d164a3
|
解决冲突
|
5 years ago |
|
ELF
|
d3a3b8cdb7
|
修改
|
5 years ago |
sunke
|
0e0c1798f4
|
推广导入空数据初始化
|
5 years ago |
yulingwei
|
ac8d7300ad
|
Merge branch 'feature/game_divide_warn' into dev
|
5 years ago |
|
yulingwei
|
33a19fbb6a
|
upt
|
5 years ago |
|
yulingwei
|
f0109e9554
|
合并请求
|
5 years ago |
|
sunke
|
b9ddc1aafb
|
推广配置
|
5 years ago |
zhengchanglong
|
9961448831
|
Merge branch 'release' into dev
|
5 years ago |
|
yulingwei
|
6daf38aa43
|
upt
|
5 years ago |
|
yulingwei
|
dfd274a667
|
Merge branch 'release' into feature/game_divide_warn
|
5 years ago |
|
yulingwei
|
0ebe11027e
|
upt
|
5 years ago |
chenzhi
|
56617b1e25
|
Merge branch 'feature/ghcount_change' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
fa784fac8a
|
优化游戏订单导出
|
5 years ago |
|
chenzhi
|
54f2e0abcd
|
游戏统计新增会长和公司
|
5 years ago |
zhengyongxing
|
ef41dbfcee
|
下游输出错误修改
|
5 years ago |
|
zhengyongxing
|
561e6bd84c
|
下游输出错误修改
|
5 years ago |
|
sunke
|
d2b7e91a64
|
推广配置
|
5 years ago |
liuweiwen
|
490b6a3369
|
工会归属隐藏导出
|
5 years ago |
|
ELF
|
0d45be780f
|
解决冲突
|
5 years ago |
chenxiaojun
|
5a75ea406a
|
更新
|
5 years ago |
|
liuweiwen
|
ccca9fb0bd
|
管理后台-》推广员列表可关键内外团搜索
|
5 years ago |
|
yulingwei
|
076b4393eb
|
upt
|
5 years ago |
|
yulingwei
|
aafc877e71
|
merghe
|
5 years ago |
|
yulingwei
|
d33d0c3f46
|
upt
|
5 years ago |
|
chenxiaojun
|
6e05546db6
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
258e10c9d1
|
结算管理--更新
|
5 years ago |
|
zhengyongxing
|
4c42ee90e3
|
市场结算生成下游对账单代码优化
|
5 years ago |
|
zhengyongxing
|
136f565f9f
|
市场结算管理设备类型条件修正
|
5 years ago |
|
yulingwei
|
23f2334e45
|
新增充值权限查看
|
5 years ago |
|
zhengyongxing
|
f86265d38c
|
市场结算管理设备类型条件修正
|
5 years ago |
|
sunke
|
9152a3ef59
|
推广配置导入功能
|
5 years ago |
|
zhengchanglong
|
d054e70c73
|
Merge branch 'release' into dev
# Conflicts:
# Application/Admin/Controller/MemberController.class.php
# Application/Admin/View/Promote/belong_edit.html
|
5 years ago |
|
zhengyongxing
|
16814af0d2
|
市场结算管理总流水弹窗优化
|
5 years ago |
|
zhengyongxing
|
3559d91a32
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
zhengyongxing
|
7770fc13c8
|
市场结算管理总流水弹窗优化
|
5 years ago |
|
liuweiwen
|
d1022c85fd
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
5a633ccb49
|
工会归属申请时间日期格式化
|
5 years ago |
|
zhengyongxing
|
8cbf3574e3
|
市场结算管理总流水弹窗优化
|
5 years ago |
|
liuweiwen
|
822ec35ff8
|
Merge branch 'feature/group_type' into release
|
5 years ago |
|
liuweiwen
|
2b3099a2d8
|
工会归属会长不可编辑
|
5 years ago |
|
ELF
|
a31e42b7c4
|
Merge branch 'hotfix/link_info' into release
|
5 years ago |
|
ELF
|
b0bc4c0496
|
解决冲突
|
5 years ago |
|
ELF
|
0f44d9e95c
|
解决冲突
|
5 years ago |
|
liuweiwen
|
7431072bbf
|
从dev复制代码
|
5 years ago |
|
chenzhi
|
dff83c73d0
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
33be79e5cf
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
f34b71114f
|
优化数字提示
|
5 years ago |
|
zhengyongxing
|
ec027503cc
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
13d1da8733
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
zhengyongxing
|
63b44a78ff
|
下游订单生成bug修正
|
5 years ago |
|
chenzhi
|
fd36d6e674
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
ee5330bfc9
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
e5d8710f0a
|
优化罚款保存后数据不对
|
5 years ago |
|
chenxiaojun
|
02ccf125dc
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
365a276b95
|
公会分成管理--更新
|
5 years ago |
|
zhengyongxing
|
1a52a129f2
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
122a27634b
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
e73d795ace
|
生成下游结算单下拉选项框优化
|
5 years ago |
|
chenzhi
|
ef0b3c86f0
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
liuweiwen
|
6caf99e984
|
对账系统登录界面修改
|
5 years ago |
|
zhengyongxing
|
c09c3a591e
|
结算单bug修正
|
5 years ago |
|
chenzhi
|
b566a2352a
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
cdb0b10c9a
|
结算列表新增对账单地址
|
5 years ago |
|
chenzhi
|
fd18ed01fe
|
合并
|
5 years ago |
|
chenzhi
|
dbc0e00132
|
合并
|
5 years ago |
|
chenzhi
|
d889bef13d
|
优化上游时间选择提示
|
5 years ago |
|
chenzhi
|
c3848e5b55
|
优化上游信息提示
|
5 years ago |
|
zhengyongxing
|
8965fe8201
|
Merge branch 'feature/group_type' into dev
# Conflicts:
# Application/Admin/Controller/QueryController.class.php
|
5 years ago |
|
zhengyongxing
|
a2ce005497
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
71f2d75b8e
|
市场结算管理总流水点击查看各个渠道的流水
|
5 years ago |
|
liuweiwen
|
bbc1b05e1c
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
liuweiwen
|
b8e36847a3
|
cp对账系统退出
|
5 years ago |
|
zhengyongxing
|
a51291216a
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
f36202486d
|
生成上游订单修改
|
5 years ago |
|
zhengyongxing
|
abfc54a0af
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
2f1d5fbd38
|
生成上游订单修改
|
5 years ago |
|
chenzhi
|
0f8da4afac
|
优化页面显示
|
5 years ago |
|
chenzhi
|
9c1cb95290
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
41421a9b10
|
优化页面显示
|
5 years ago |
|
liuweiwen
|
0fa27e9c03
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
liuweiwen
|
ed706c1b86
|
公司信息管理加提示
|
5 years ago |
|
liuweiwen
|
af28ff9155
|
工会归属查询
|
5 years ago |
|
zhengyongxing
|
e637c90021
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
a4b53c4e9a
|
结算单管理字段名修正
|
5 years ago |
|
zhengyongxing
|
72455ab625
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
4d6a45657c
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
zhengyongxing
|
73578f1b64
|
生成下游订单修改
|
5 years ago |
|
chenzhi
|
96466100bb
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
864e8d693a
|
优化前端浮点数计算
|
5 years ago |
|
zhengyongxing
|
135cba359e
|
菜单高亮修改
|
5 years ago |
|
zhengchanglong
|
73fb719628
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
c27518b988
|
市场结算添加编辑添加户名
|
5 years ago |
|
zhengchanglong
|
868fde2d07
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
26c7190654
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
zhengyongxing
|
ef53562d06
|
市场结算添加编辑添加户名
|
5 years ago |
|
liuweiwen
|
21ee77609c
|
cp/工会对账系统
|
5 years ago |
|
zhengchanglong
|
1c00290da9
|
Merge branch 'feature/group_type' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
chenxiaojun
|
d995675829
|
更新
|
5 years ago |
|
chenxiaojun
|
1594500eca
|
资质认证--更新
|
5 years ago |
|
zhengyongxing
|
547b0439e3
|
市场结算添加编辑添加户名
|
5 years ago |
|
chenzhi
|
1275c740d5
|
新增cp对账单删除
|
5 years ago |
|
zhengyongxing
|
b74ac306ae
|
市场结算添加编辑添加户名
|
5 years ago |
|
chenzhi
|
1bb038db4e
|
优化查看2
|
5 years ago |
|
chenzhi
|
f06cddc093
|
优化查看
|
5 years ago |
|
chenzhi
|
cba3fc898c
|
新增查看
|
5 years ago |
|
liuweiwen
|
fc5db0b298
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
# Conflicts:
# Application/Admin/Controller/AjaxController.class.php
# Data/update.sql
|
5 years ago |
|
liuweiwen
|
394a3e4bb5
|
cp/工会对账系统
|
5 years ago |
|
zhengyongxing
|
ad901c31db
|
市场结算管理代码编辑完善
|
5 years ago |
|
zhengyongxing
|
99f23254ed
|
市场结算管理代码提交
|
5 years ago |
|
zhengyongxing
|
68312cc277
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
71b1498c71
|
市场结算管理代码提交
|
5 years ago |
|
chenzhi
|
25240227e4
|
新增编辑
|
5 years ago |
|
yulingwei
|
b5d71ae215
|
Merge branch 'feature/pop_rules' into dev
|
5 years ago |
|
yulingwei
|
7ea2a465bf
|
修复问题
|
5 years ago |
|
chenzhi
|
ea6d820408
|
优化页面显示
|
5 years ago |
|
chenxiaojun
|
009842c218
|
更新
|
5 years ago |
|
chenxiaojun
|
4286817dea
|
推广提现--更新
|
5 years ago |
|
zhengchanglong
|
9952029e6c
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
dddd640f9f
|
结算单管理列表修改
|
5 years ago |
|
chenzhi
|
d484c96744
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
cccbc3bfa8
|
新增cp结算单判断是否已经有交叉时间
|
5 years ago |
|
zhengchanglong
|
10f2caefca
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
b34eec98ee
|
游戏分成比例设定体验优化
|
5 years ago |
|
chenxiaojun
|
2d0143a378
|
更新
|
5 years ago |
|
chenxiaojun
|
dcea6b7e05
|
推广提现--更新
|
5 years ago |
|
zhengchanglong
|
89d9b79930
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
5ac23b6a5b
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
zhengchanglong
|
de8386c0cb
|
游戏用户锁定备注显示
|
5 years ago |
|
chenzhi
|
0934cd472a
|
新增cp结算单到列表中
|
5 years ago |
|
zhengyongxing
|
2154899a6a
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
f87026a32c
|
结算单管理生成下游订单
|
5 years ago |
|
chenzhi
|
cda9d0c1a8
|
合并
|
5 years ago |
|
chenzhi
|
cd427a9409
|
新增添加cp上游对账单
|
5 years ago |
|
zhengchanglong
|
437800b30b
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
87096e180e
|
游戏用户锁定备注显示
|
5 years ago |
|
zhengchanglong
|
7e1b90fc19
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
93fe724c15
|
游戏用户锁定备注显示
|
5 years ago |
|
zhengchanglong
|
ba4d2a4a2e
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
941978bb07
|
【游戏】-【合作方管理】，联系人改为必填项，必填项前面加红色※号
|
5 years ago |
|
zhengchanglong
|
8144e3c50f
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
e914fde68d
|
玩家列表账号锁定添加备注
|
5 years ago |
|
chenxiaojun
|
3a9a7177fe
|
推广结算--更新
|
5 years ago |
|
chenxiaojun
|
ad80923bed
|
更新
|
5 years ago |
|
chenxiaojun
|
114cb2f7a5
|
更新
|
5 years ago |
|
chenxiaojun
|
f244b42ab7
|
推广结算--更新
|
5 years ago |
|
yulingwei
|
5cb129e95f
|
修复冲突
|
5 years ago |
|
yulingwei
|
e3f0a24e43
|
弹窗推广后台更新
|
5 years ago |
|
zhengchanglong
|
505e12beab
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengchanglong
|
326d9e5a12
|
管理后台-游戏-游戏编辑：参数配置-新增CP游戏分成比例
|
5 years ago |
|
liuweiwen
|
602fb33fcc
|
新增需求：管理后台-》系统-》扩展工具-》公司信息管理
|
5 years ago |
|
yulingwei
|
249044b0de
|
Merge branch 'feature/pop_rules' into dev
|
5 years ago |
|
yulingwei
|
5542994e36
|
upt
|
5 years ago |
|
zhengyongxing
|
7adb991d0e
|
市场结算管理上传
|
5 years ago |
|
chenzhi
|
377bdaee72
|
合并gt
|
5 years ago |
|
zhengyongxing
|
5e14eaf4c9
|
新增市场结算管理完善
|
5 years ago |
|
liuweiwen
|
50320be1d2
|
新增需求：管理后台-》推广公会归属管理，列表，新增，编辑，审批
|
5 years ago |
|
chenxiaojun
|
f2e0cec5aa
|
更新
|
5 years ago |
|
chenxiaojun
|
0927417ce9
|
推广结算--更新
|
5 years ago |
|
chenzhi
|
dfdad21d8e
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
0039431ccb
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
1295857697
|
优化工会统计各级检索条件结束
|
5 years ago |
|
chenzhi
|
0561d8ff15
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
f95d23b091
|
优化公会统计各级条件展示
|
5 years ago |
|
liuweiwen
|
4892db340e
|
管理后台-》游戏-》合作方管理-》列表增加字段联系人，联系电话，邮寄地址。公司税号，收款方名称，银行账号，开户行
|
5 years ago |
|
chenzhi
|
9e2eb46904
|
公会统计游戏统计新增多重搜索
|
5 years ago |
|
chenxiaojun
|
09f2ca4ab6
|
更新
|
5 years ago |
|
chenxiaojun
|
962c284467
|
推广结算--更新
|
5 years ago |
|
liuweiwen
|
fa3adf2e0b
|
新增合作方时，新增录入内容
新增联系人，联系电话，邮寄地址。公司税号，收款方名称，
银行账号，开户行
|
5 years ago |
|
chenzhi
|
bb7e1c269c
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
876952f3b4
|
公会统计新增内外团检索
|
5 years ago |
|
chenxiaojun
|
89965bd8fb
|
导出
|
5 years ago |
|
chenxiaojun
|
a636c2dcf6
|
导出
|
5 years ago |
|
chenxiaojun
|
ba1f6565cc
|
更新
|
5 years ago |
|
chenxiaojun
|
631c23568d
|
上传汇款证明--调整
|
5 years ago |
|
chenxiaojun
|
461e80bd30
|
结算管理--更新
|
5 years ago |
|
chenxiaojun
|
c074b5fb86
|
结算管理--更新
|
5 years ago |
|
chenxiaojun
|
4721e60d32
|
推广员资质认证
|
5 years ago |
|
chenxiaojun
|
0ff9f77181
|
推广员资质认证
|
5 years ago |
|
zhengchanglong
|
7c1593e0e1
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
chenzhi
|
836eccfa78
|
支付渠道新增支付渠道比
|
5 years ago |
|
chenzhi
|
07f6e9919d
|
区服列表 区服名称改区服id
|
5 years ago |
|
chenzhi
|
0f7134c838
|
游戏充值 区服名称改区服id
|
5 years ago |
|
ELF
|
4fb2c35495
|
Merge branch 'hotfix/link_info' into dev
|
5 years ago |
|
chenzhi
|
3bf288fa41
|
优化登陆记录区服名称为区服id
|
5 years ago |
|
chenzhi
|
5e08bda6c2
|
优化行为日志区服名称为区服id
|
5 years ago |
|
zhengchanglong
|
10c0b3a18a
|
Merge branch 'feature/group_type' into dev
# Conflicts:
# Application/Admin/Controller/PromoteController.class.php
# Data/update.sql
|
5 years ago |
zhanglingsheng
|
5ea753b595
|
支付宝设置添加公钥私钥
|
5 years ago |
|
liuweiwen
|
4addf4c281
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
liuweiwen
|
0b3ae062b1
|
优化：推广员新增与编辑的推广公司增加万盟天下科技
新增需求：推广员增加工会归属和工会关系属性
|
5 years ago |
|
zhengyongxing
|
10f6caddfa
|
工会统计新增内外团占比
|
5 years ago |
|
chenxiaojun
|
6054b5f6c0
|
更新
|
5 years ago |
|
chenxiaojun
|
0baf97f717
|
会长提现--更新
|
5 years ago |
|
zhengyongxing
|
0068a0d1c4
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
zhengyongxing
|
f324567258
|
平台币充值添加推广员充值搜索修改，玩家列表时间检索非必填
|
5 years ago |
|
zhengyongxing
|
346bbaa117
|
平台币充值添加推广员充值搜索修改，玩家列表时间检索非必填
|
5 years ago |
|
chenxiaojun
|
5930642f8b
|
更新
|
5 years ago |
|
chenxiaojun
|
a12c3ecf9e
|
会长提现--更新
|
5 years ago |
|
chenxiaojun
|
e884214546
|
会长提现|公会分成管理--更新
|
5 years ago |