Commit Graph

1216 Commits (748ec401f343d2740aee945f01151eb9dbec636b)

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