yulingwei
|
f34975478b
|
upt
|
5 years ago |
 廖金灵
|
a1f3c6e205
|
Merge branch 'feature/download_type_list' of wmtx/platform into release
iOS下载统计
|
5 years ago |
|
廖金灵
|
e2a32b11dc
|
Merge branch 'fix/member_user_info' of wmtx/platform into release
玩家列表新增去重数据栏
|
5 years ago |
zhengyongxing
|
e7aa7885e8
|
ip限制白名单提示语修改
|
5 years ago |
|
zhengyongxing
|
1d27db663a
|
ip限制白名单提示语修改
|
5 years ago |
|
zhengyongxing
|
5f815370e8
|
ip限制白名单提交
|
5 years ago |
sunke
|
41f6797e97
|
表格样式
|
5 years ago |
|
sunke
|
7da471b6ee
|
支付时间
|
5 years ago |
|
yulingwei
|
4afce87caa
|
upt
|
5 years ago |
|
yulingwei
|
b56ba0b882
|
upt
|
5 years ago |
|
yulingwei
|
823062c0f6
|
upt
|
5 years ago |
|
yulingwei
|
adf11e2b60
|
upt
|
5 years ago |
|
yulingwei
|
175502e384
|
fix
|
5 years ago |
|
yulingwei
|
b10717e8b6
|
upt
|
5 years ago |
chenzhi
|
bfee0578d0
|
玩家列表新增去重数据栏
|
5 years ago |
|
yulingwei
|
18b0c3024d
|
upt
|
5 years ago |
|
yulingwei
|
ead4a8598e
|
upt
|
5 years ago |
|
yulingwei
|
d9c338acd8
|
upt
|
5 years ago |
|
chenzhi
|
381327ae21
|
优化游戏统计
|
5 years ago |
|
chenzhi
|
45cad05508
|
优化用户列表统计数据
|
5 years ago |
|
chenzhi
|
44afe1f65d
|
优化玩家列表统计方式及回退去重功能
|
5 years ago |
|
yulingwei
|
fa41426908
|
upt
|
5 years ago |
|
yulingwei
|
1e3533720b
|
utp
|
5 years ago |
|
yulingwei
|
b8fda2417a
|
工单管理
|
5 years ago |
|
sunke
|
389ef7e967
|
bug修复
|
5 years ago |
|
zhengyongxing
|
48239c0f13
|
测试订单bug修改
|
5 years ago |
|
sunke
|
2ecb05d924
|
支付渠道统计
|
5 years ago |
|
sunke
|
3edb0640ed
|
新增管理后台测试订单导出功能
|
5 years ago |
|
chenzhi
|
0344471659
|
Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
cfbbf8e76b
|
优化默认公司名称为海南万盟天下科技
|
5 years ago |
|
chenzhi
|
50b21f45ab
|
Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
7fa400a0a5
|
优化公会统计统计栏样式
|
5 years ago |
|
zhengyongxing
|
443abed206
|
Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
|
5 years ago |
|
zhengyongxing
|
19d85f3717
|
测试资源可用余额接口修改
|
5 years ago |
|
zhengyongxing
|
caddcd1543
|
日志管理删除url开启
|
5 years ago |
|
zhengyongxing
|
14c3d365e3
|
Merge branch 'feature/user_repeat' into release
|
5 years ago |
|
zhengyongxing
|
ffd6238bc1
|
测试订单bug修正
|
5 years ago |
|
chenzhi
|
cc3552b862
|
Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
d0f07315da
|
操作日志前端检索名词修改
|
5 years ago |
|
chenzhi
|
62c8c1e54d
|
Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
dd0f930105
|
游戏预告-操作日志
|
5 years ago |
|
zhengyongxing
|
0443871173
|
用户列表去除重复行
|
5 years ago |
|
zhengyongxing
|
77ddb1eded
|
Merge branch 'feature/operation_log' into release
|
5 years ago |
|
zhengyongxing
|
31948abdf4
|
操作日志bug修正
|
5 years ago |
liuweiwen
|
969bf4dc8a
|
Merge branch 'feature/yibao_company' into release
# Conflicts:
# Application/Admin/Common/extend.php
|
5 years ago |
|
liuweiwen
|
5d596094a6
|
增加易宝支付
|
5 years ago |
|
liuweiwen
|
3b415976eb
|
增加易宝支付
|
5 years ago |
|
liuweiwen
|
aa7e6fa0ec
|
推广公司新增与编辑减少必填项
|
5 years ago |
|
chenzhi
|
31a0a174bd
|
后台发放-操作日志
|
5 years ago |
|
liuweiwen
|
c9d69414ba
|
Merge branch 'hotfix/game_recharge_stat' into release
|
5 years ago |
|
liuweiwen
|
22aa120ad6
|
去掉多余的换行
|
5 years ago |
|
liuweiwen
|
1a4bf752c4
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
zhengyongxing
|
04f2b0c8df
|
Merge branch 'feature/operation_log' into release
# Conflicts:
# Application/Admin/Common/extend.php
# Data/update.sql
|
5 years ago |
|
liuweiwen
|
b081544805
|
Merge branch 'hotfix/game_recharge_stat' into release
|
5 years ago |
|
liuweiwen
|
4a45103650
|
平台币充值汇总补一列
|
5 years ago |
|
zhengyongxing
|
5224eec9f2
|
上游结算单管理日志添加
|
5 years ago |
|
liuweiwen
|
9221b18955
|
游戏统计汇总权限
|
5 years ago |
|
zhengyongxing
|
5e794bd785
|
推广员日志记录添加
|
5 years ago |
|
zhengyongxing
|
8aae878cf8
|
游戏统计修改
|
5 years ago |
zhanglingsheng
|
9c39b731fd
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
zhanglingsheng
|
dbd1e6f070
|
易宝支付配置
|
5 years ago |
|
liuweiwen
|
94293b4bec
|
Merge branch 'feature/resource_config' into release
|
5 years ago |
|
liuweiwen
|
b4fafbe0bf
|
修改配置比例范围
|
5 years ago |
|
liuweiwen
|
fa9746342f
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
cc8e2149e0
|
最低额度，最高额度，比例数据格式校验
|
5 years ago |
zhengchanglong
|
ba96083bb5
|
录入测试订单 时间控件修改
|
5 years ago |
|
zhengyongxing
|
a6a29bf63a
|
统计日志添加
|
5 years ago |
|
chenzhi
|
55fd5d94e8
|
实名认证，防沉迷
|
5 years ago |
|
liuweiwen
|
7d879686af
|
自动审核规则调整，锁定显示红色字体
|
5 years ago |
|
chenzhi
|
50e4185d9c
|
操作日志-登陆记录
|
5 years ago |
|
liuweiwen
|
aa8d296dd8
|
推广后台-》测试资源申请-》符合规则的自动审核
|
5 years ago |
|
liuweiwen
|
02920aab8a
|
资源审核配置列表、新增、编辑、删除、锁定、解锁
|
5 years ago |
|
zhengyongxing
|
dd478e264f
|
行为日志按照原型修改完成
|
5 years ago |
|
zhengyongxing
|
d2867b4635
|
行为日志完成
|
5 years ago |
|
zhengchanglong
|
7d13703398
|
角色列表角色ID和角色名改为不受权限控制
|
5 years ago |
|
liuweiwen
|
ad48df6c91
|
数据展示权限
|
5 years ago |
|
liuweiwen
|
446e6f8176
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
3f5739c1d7
|
游戏充值和平台币充值数据展示权限
|
5 years ago |
|
zhanglingsheng
|
a1b79b57ae
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
zhanglingsheng
|
31466db00d
|
支付类型添加易宝支付
|
5 years ago |
|
zhengyongxing
|
009ef6719d
|
结算单管理审核状态bug修改
|
5 years ago |
|
zhengyongxing
|
601151718f
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
zhengyongxing
|
e01bcc236f
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
zhengyongxing
|
260ca6fe9e
|
结算单管理审核状态bug修改
|
5 years ago |
|
zhengchanglong
|
6b68ae8197
|
Merge branch 'feature/admin_optimize' into release
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengchanglong
|
eecd38e424
|
Merge branch 'fix/divide_test' into release
|
5 years ago |
|
liuweiwen
|
2cf7b7471f
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
305cbf34cd
|
导航高亮
|
5 years ago |
|
liuweiwen
|
941ba5628d
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
liuweiwen
|
c05b10cb87
|
对账单系统-》未审核不可确认
|
5 years ago |
|
ELF
|
7cd28cc7ce
|
删除多余代码
|
5 years ago |
|
ELF
|
dad83c8d38
|
押金付款方式添加选项
|
5 years ago |
|
zhengyongxing
|
4f65efad9b
|
结算单管理添加审核状态
|
5 years ago |
|
chenzhi
|
da454a9474
|
Merge branch 'feature/data_divide' of 47.111.118.107:wmtx/platform into fix/divide_test
|
5 years ago |
chenxiaojun
|
f5c1531b71
|
推广平台>财务管理>结算中心--更新
|
5 years ago |
|
chenxiaojun
|
23f38f6a07
|
推广平台>财务管理>结算中心--更新
|
5 years ago |
|
chenzhi
|
c52ba1cf99
|
Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
fa92868548
|
优化公会统计团体占比
|
5 years ago |
|
zhengyongxing
|
3c16659bf3
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
zhengyongxing
|
9edc77bead
|
生成下游个人结算单bug修改
|
5 years ago |
|
zhengyongxing
|
4d1cfb36ec
|
生成下游个人结算单bug修改
|
5 years ago |
|
chenzhi
|
1bfcade0a8
|
Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
5b45c4273c
|
优化公会统计选择游戏
|
5 years ago |
|
yulingwei
|
5468239cf3
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
yulingwei
|
e8e0af97bf
|
修复结算时间
|
5 years ago |
|
chenzhi
|
43a6a746b0
|
Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
f0d298c042
|
公会统计新增团体类型
|
5 years ago |
|
liuweiwen
|
077a770de7
|
奖罚记录管理-》奖罚时间为空判读，新增编辑判读
|
5 years ago |
|
liuweiwen
|
5b63a2fe84
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
f9fe74986c
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
liuweiwen
|
f6af63ca3e
|
合同期限为空时间格式，公司信息导航高亮
|
5 years ago |
|
zhengyongxing
|
5158b07d85
|
测试订单管理高亮添加
|
5 years ago |
|
zhanglingsheng
|
a26a02b36f
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
zhengchanglong
|
c6a0f87dfe
|
奖罚编辑部分字段只读
|
5 years ago |
|
zhanglingsheng
|
9afd27cdc6
|
Merge branch 'hosfix/tool_pay' into release
|
5 years ago |
|
liuweiwen
|
5949542b70
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
liuweiwen
|
6d91ec7c60
|
推广员-》奖罚记录管理-》上下游公司与公司类型联动，解决未显示下游公司问题
|
5 years ago |
|
zhengchanglong
|
e55bfcb2d8
|
奖罚编辑部分字段只读
|
5 years ago |
|
zhengchanglong
|
586dbf49e9
|
添加奖罚记录返回出现错误提示BUG修复
|
5 years ago |
|
liuweiwen
|
e243675bcc
|
将子窗口的方法转到ajax控制器
|
5 years ago |
|
liuweiwen
|
854ab9f509
|
合作方导出不打开新窗口
|
5 years ago |
|
liuweiwen
|
d50627e4fb
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
70c71abac1
|
隐藏我方分成比例
|
5 years ago |
|
chenzhi
|
07053d822e
|
Merge branch 'feature/add_promote_company' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
bb276f2bcc
|
优化推广公司列表
|
5 years ago |
|
liuweiwen
|
efe9d25988
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
d333b8d61e
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
liuweiwen
|
8dedae5587
|
公司性质
|
5 years ago |
|
chenzhi
|
43a3beae23
|
合并财务分类汇总
|
5 years ago |
|
liuweiwen
|
2ac78def85
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
liuweiwen
|
3bb3a8b45d
|
显示调整
|
5 years ago |
|
liuweiwen
|
70984bea99
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
48252d0f3a
|
合作方列表样式调整
|
5 years ago |
|
zhengchanglong
|
1b37ec3d37
|
Merge branch 'feature/add_promote_company' into release
|
5 years ago |
|
chenzhi
|
f5529fc2dd
|
优化推广公司首页样式
|
5 years ago |
|
liuweiwen
|
5544bb1797
|
合作方列表样式调整
|
5 years ago |
|
liuweiwen
|
4cb88be352
|
数据权限
|
5 years ago |
|
zhengchanglong
|
26038f379e
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
zhengchanglong
|
8bd26b36c0
|
玩家账号信息权限设置
|
5 years ago |
|
yulingwei
|
d349c4223d
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
yulingwei
|
0652c31664
|
upt
|
5 years ago |
|
yulingwei
|
25e66d84ff
|
修改问题
|
5 years ago |
|
liuweiwen
|
87de8d2717
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
liuweiwen
|
32f5137ac6
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
liuweiwen
|
04bb4a7bb7
|
合作方
|
5 years ago |
|
sunke
|
790d56c638
|
Merge branch 'feature/add_promote_company' of 47.111.118.107:wmtx/platform into feature/add_promote_company
|
5 years ago |
|
yulingwei
|
e26f517df1
|
冲突解决
|
5 years ago |
|
yulingwei
|
747bba16b0
|
汇总结算单管理
|
5 years ago |
|
zhengyongxing
|
00a5fed6fd
|
游戏统计新增设备类型
|
5 years ago |
|
chenzhi
|
4eaa92f0fb
|
优化导出银行卡变科学计数
|
5 years ago |