1242 Commits (6eac7b017e9fe44a5b13fcdf16f283ea5f3ed897)

Author SHA1 Message Date
廖金灵 aae20bce96 Merge branch 'feature/download_type_list' of wmtx/platform into release
修改下载统计bug
5 years ago
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
liuweiwen 52668ace85 合作方导出优化 5 years ago
yulingwei 47d01e0aff upt 5 years ago
ELF 35b267027c Merge branch 'hotfix/download_name' into release 5 years ago
ELF 129a1103e2 修改beta版下载名称 5 years ago
zhengchanglong 858c028faf Merge branch 'feature/add_promote_company' into release
# Conflicts:
#	Data/update.sql
5 years ago
zhengyongxing e6d136410d Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen e15460b08f 合作方 5 years ago
chenzhi f507dde70b 新增推广公司导出功能 5 years ago
yulingwei dfe52865bd upt 5 years ago
zhengyongxing 64122ca8c7 Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing 3b47c94b1e Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zhengyongxing 2589a76603 生成下游个人结算单bug修改 5 years ago
zhengchanglong ec2c929450 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zhengchanglong 5f5abce2ec 玩家信息数据显示权限BUG修复 5 years ago
zhengyongxing 0b7327bc4e Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing c8f333fa9a 生成下游个人结算单bug修改 5 years ago
zhengyongxing 46ccf0e3ce Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zhengyongxing 71dabfae53 生成下游个人结算单bug修改 5 years ago
chenzhi 31deafcb3c 优化合作公司列表页面 5 years ago
ELF 055e246f70 修改bug 5 years ago
liuweiwen 6d13be7863 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
liuweiwen 7da5e25e16 合作方 5 years ago
zhengchanglong c066620128 Merge branch 'feature/admin_optimize' into release 5 years ago
yulingwei 469a037b0f merge 5 years ago
chenzhi 5cea54585f 优化上游结算单选择后初始值变动 5 years ago
chenzhi 8c25f55c6e 修复不能cp公司选择无效问题 5 years ago
zhengchanglong 99f62f3c14 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
5 years ago
chenzhi 44a34bc89f 新增推广公司删除 5 years ago
chenzhi 4e28b39999 新增推广公司编辑功能 5 years ago
chenzhi 6ea7a581f5 推广公司查看 5 years ago
chenzhi f218544e7f 优化推广公司添加 5 years ago
chenzhi da2e3a769c 推广列表查看 5 years ago
liuweiwen a1c3ad8fb3 数据展示权限 5 years ago
liuweiwen 4b480e6f94 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
liuweiwen 8462f80777 合作方 5 years ago
zhengchanglong 4ce9af39e5 Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing fb14c5888a Merge branch 'hotfix/test_order' into release 5 years ago
zhengyongxing 2d0d59c0a5 Merge branch 'hotfix/test_order' of 47.111.118.107:wmtx/platform into hotfix/test_order
 Conflicts:
	Application/Admin/Controller/TestOrderController.class.php
5 years ago
zhengyongxing 12903ef3cd 测试订单列表与录入bug修改 5 years ago
zhengyongxing 6f48940e21 生成下游个人结算单回退功能添加 5 years ago
zhengyongxing 8dd5f7bf5c 结算单管理添加 5 years ago
chenzhi 92929b1db7 优化推广公司添加 5 years ago
chenzhi 84f5ff2e95 优化添加推广公司结构 5 years ago
liuweiwen ada2913cdc 奖罚记录管理根据公司类型搜索 5 years ago
chenzhi 1f1e75e736 新增推广公司添加 5 years ago
chenzhi 6a612565c6 扩展推广公司添加 5 years ago
zhengyongxing 0cbd58862e Merge branch 'release' of 47.111.118.107:wmtx/platform into release
 Conflicts:
	Data/update.sql
5 years ago
zhengyongxing 031d40dc22 生成个人结算单编辑的功能模板 5 years ago
zhengyongxing 955a1917b3 生成个人结算单的功能完成 5 years ago
zhengchanglong 9b43cc90b4 Merge branch 'hotfix/test_order' into release
# Conflicts:
#	Data/update.sql
5 years ago
zhengchanglong 282033afe7 测试订单录入添加分页 5 years ago
yulingwei e670dfcf7c Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei e35f20ee70 游戏预警 5 years ago
zhengchanglong cb5cef678d Merge branch 'hotfix/test_order' into release 5 years ago
zhengchanglong d0de91e89d 测试订单查询修改 5 years ago
zhengchanglong 2b99184273 Merge remote-tracking branch 'origin/hotfix/test_order' into hotfix/test_order
# Conflicts:
#	Application/Admin/View/TestOrder/lists.html
5 years ago
zhengchanglong 53b9573d71 测试订单查询修改 5 years ago
zhengyongxing 8aba8728f0 测试订单录入功能提交 5 years ago
zhengyongxing 56ecea6998 下游个人结算单生成代码上传 5 years ago
zhengchanglong 284f42b315 测试订单录入 5 years ago
zhengchanglong fc0bb831a7 测试订单录入 5 years ago
zhengchanglong 254d29f3f2 测试订单录入 5 years ago
chenxiaojun 89c7855337 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
sunke 8db53afc8b 电子文档及公司录入信息 5 years ago
liuweiwen 319dde1090 奖罚记录管理根据公司类型搜索 5 years ago
ELF bc2f5dd117 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
ELF bbb31890f6 未收押金会长禁用落地页/下载页 5 years ago
sunke 7f169dc211 渠道流水计算 5 years ago
ELF ed25d54dc8 解决冲突 5 years ago
ELF 501b8099d4 解决冲突 5 years ago
chenzhi 2fe965749e 财务汇总ok 5 years ago
chenxiaojun b7d2931106 管理后台--更新 5 years ago
chenxiaojun e9dae29deb 管理后台>推广员>推广员管理>推广员列表--新增资质认证 5 years ago
chenxiaojun e9581a2e04 管理后台>推广员>结算管理>推广提现--更新 5 years ago
sunke 56981a0acc 渠道计算 5 years ago
yulingwei 2cd5574de7 新增审核时间 5 years ago
ELF 69185016a0 修改 5 years ago
liuweiwen dfd198e9b7 对账系统增加奖罚数据 5 years ago
liuweiwen 2ba96aa424 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
chenxiaojun 2c52bccaf7 管理后台>推广员>结算管理>推广提现>自动审核管理--更新 5 years ago
liuweiwen 2ed47500f0 Merge branch 'hotfix/recharge_statistics' into feature/admin_optimize 5 years ago
liaojinling e596d11cee 会长押金 5 years ago
liuweiwen 2bffe498bf 奖罚记录管理优化 5 years ago
zyx 0aad9c4735 下游结算单生成功能上传 5 years ago
jbRotk a6b1194be0 解决冲突 5 years ago
jbRotk 5d315d4182 添加工会类型 5 years ago
chenzhi 1f5944c0a4 优化奖罚符号问题 5 years ago
chenzhi 29618ce878 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize 5 years ago
chenzhi 58eb6a0e12 新增cp公司优化奖罚自动获取 5 years ago
liuweiwen 2b51122d13 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
liuweiwen 9e9a925429 奖罚记录管理 5 years ago
chenxiaojun a7891d6b57 管理后台>推广员>结算管理>推广提现--部分功能优化 5 years ago
jbRotk 72cfd9ec64 新增渠道费率 5 years ago
zhengchanglong 4aeaf8f74c Merge branch 'feature/admin_optimize' into release 5 years ago
jbRotk c84cde9567 Merge branch 'feature/ylw' into feature/admin_optimize 5 years ago
jbRotk 5f510cd4d9 新增奖惩时间 5 years ago
liuweiwen b444a3546b Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
# Conflicts:
#	Data/update.sql
5 years ago
liuweiwen c92fa425d2 内部公司信息管理 5 years ago
jbRotk c968e54cf8 解决冲突 5 years ago