elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,120 Commits
1 Branch
0 Tags
154 MiB
Commit Graph

4473 Commits (825fba2d8be247dca2688722f75f7b5bdaed6a4b)

Author SHA1 Message Date
sunke 848eb6c294 平台
sunke b6649a7b9d 平台币
yulingwei ccc159d3b2 upt
ELF 90f9e52ab4 修改官网轮播图
ELF 801148e39a 修改
yulingwei 42026e753a upt
yulingwei 7b3006f871 upt
yulingwei 5009a327db upt
yulingwei ac83e556ff upt
yulingwei f1428a8fe7 upt
sunke faf5d7956e 规则
sunke 562d589aea 规则
sunke 031528411b 平台币
sunke 5fa22cfa40 弹窗
sunke fee97bb00a Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/platform_rule
yulingwei dec978da7a upt
yulingwei e462305587 upt
yulingwei 312448c724 upt
sunke c1168740b6 平台币
sunke 253c956794 平台币
sunke e8f4632f90 ios
sunke 6e016f67e7 ios
sunke 3423aff9dc Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/ios_Download
sunke 2adcb68c06 平台币新增需求
张谷诚 bf8c6603a0 Merge branch 'feature/payset_change' of wmtx/platform into release 
汇付宝添加支付宝与微信
sunke 97e8397d76 文件夹优化
sunke 1fe794b597 平台规则样式优化
sunke ec309c2b6a 规则
sunke a9bd629e7a 规则
sunke 731fbd1986 平台规则
sunke bdb688c985 编辑规则
zhengyongxing 2a54b0ed08 汇付宝添加支付宝与微信
sunke 76e2f87256 ios
ELF 94575cae29 修改会长押金编辑付款人付款账号非必填
yulingwei c1d03cc526 upt
sunke 1358bfee0a Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/ios_Download
sunke 3a26f76a76 时间
sunke ff20ef3acb 汇总导出
sunke 2c63e6e395 日志
sunke 3ed5eedc07 平台规则
廖金灵 4459021cb9 Merge branch 'hotfix/www_pay_change' of wmtx/platform into release 
隐藏官网充值入口
chenzhi 21a75dbd35 隐藏官网充值入口
yulingwei 9d6bf8225a upt
sunke 7a392806bf ios 下载新需求
zhengyongxing 541ec17db5 隐藏威富通添加汇付宝
ELF 7c25ecbcf8 修改
ELF 80a5684871 修改
ELF 173cd3a4b7 修改bug
ELF 3be6a94286 修改bug
ELF 34e1db7684 4.4哀悼日
yulingwei 007374e121 upt
廖金灵 bf701babb7 Merge branch 'feature/giftbag_tf' of wmtx/platform into release 
隐藏礼包数量
ELF 2ea55acfd1 隐藏礼包数量
ELF 41e1801550 修改手机登录bug
廖金灵 24bf141b66 Merge branch 'feature/giftbag_tf' of wmtx/platform into release 
修改bug
ELF ce89c87e31 修改bug
廖金灵 e39baa2cbc Merge branch 'feature/giftbag_tf' of wmtx/platform into release 
落地页样式
ELF f3f1fd15fd 修改bug
廖金灵 8dc7adb539 Merge branch 'feature/giftbag_tf' of wmtx/platform into release 
添加tf礼包
sunke ce2408576c 充值方式统计匹配支付渠道
sunke 6cc33a7fe8 导出顺序
sunke 15f6cb19a3 渠道支付顺序
ELF c134f55248 调试
ELF dba4fb4e6e 调试
ELF 71e736b27d 调试
ELF 303e471d0b 修改bug
ELF ed19727f91 修改bug
ELF 2a2e5f0d31 添加tf礼包问题
sunke b4e66dcd40 隐藏推广配置
张谷诚 c5af3c29d7 Merge branch 'hotfix/finance_game_name_change_2' of wmtx/platform into release 
支付渠道测试订单录入bug修正，支付意愿统计功能优化
廖金灵 9f202c3991 Merge branch 'feature/finance_compare' of wmtx/platform into release 
财务导入对比
chenzhi 9237bc3cc8 优化选择
chenzhi abf43566e4 调整参数
廖金灵 86a90467ff Merge branch 'feature/president_apply' of wmtx/platform into release 
修改会长押金需求
ELF 17f493ed7b 隐藏推广员指标目录
zhengyongxing d4aafd2983 支付渠道测试订单录入bug修正，支付意愿统计功能优化
yulingwei 6f7d285f9f 修复资源工单完成情况
chenzhi 14ffc00f86 优化权限处理
chenzhi c0df7f23c3 优化高亮
zhengyongxing dc5437d7cb 支付渠道测试订单录入bug修正，支付意愿统计功能优化
chenzhi d4a498baba 优化用户登录时间为0时为暂无登录
chenzhi b1701889c4 优化财务比较金额不符规则
chenzhi 5ddf75a600 财务对比ok
chenzhi b2ad4e8b6e 财务对比 v1
chenzhi a2db46d1c0 财务对比首页
zhengyongxing f37cdc596d 支付渠道测试订单录入bug修正，支付意愿统计功能优化
chenzhi 79f4719dec 财务对比7
chenzhi c4eb963cfe 财务比对5
zhengyongxing de646044c2 支付渠道详情检索修正
zhengyongxing 573e580778 支付渠道详情检索修正
zhengyongxing bba97196ec 支付渠道详情检索修正
zhengyongxing 2fab9d3ef9 支付渠道详情统计bug修改
zhengyongxing 45847a8194 支付渠道详情统计bug修改
zhengyongxing e51cad19eb Merge remote-tracking branch 'origin/hotfix/finance_game_name_change_2' into hotfix/finance_game_name_change_2
zhengyongxing e7e7df569b 支付渠道统计bug修改
chenzhi 6abef9385e 优化测试服订单导出
chenzhi 202f9a45d1 财务对比4
zhengyongxing e34c553358 支付渠道统计bug修改
zhengyongxing 8d742886a7 支付渠道统计bug修改
chenzhi effe6c572e 财务比较3
zhengyongxing 96eee4f9f5 支付渠道统计bug修改
zhengyongxing ab01c02606 支付渠道意愿统计修改
chenzhi f3a662324d 修正测试服订单检索错误问题
chenzhi 33be2ba05b 优化游戏统计平台币直充搜索后数据不符合问题
chenzhi def286ec80 财务比较2
廖金灵 bab7fec46d Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release 
游戏名称不含设备类型优化
chenzhi eaa51463e5 公会统计
chenzhi ea69ecb086 财务比较2
zhengyongxing a7838bb552 Merge remote-tracking branch 'origin/fix/fiancecount_gamename_change' into fix/fiancecount_gamename_change
zhengyongxing e445108eb6 支付渠道统计修改
ELF d5d7dcca6d 修改head meta 防蜘蛛抓取
张谷诚 13c352a924 Merge branch 'feature/pay_white_list' of wmtx/platform into release 
支付渠道意愿a标签悬停变成手势
chenzhi c45ca2942d 优化设备名称函数
chenzhi 6f7e0de83d 优化平台币设备，名称
chenzhi 6c8f935170 支付渠道
chenzhi 751357feef 优化导出
chenzhi e0c946e67c 工会统计2
chenzhi b36515a720 工会统计
chenzhi 48e5e4d824 财务对比1
chenzhi ce1d15c602 优化游戏订单导出
zhengyongxing 4361b3c3ba 支付渠道意愿a标签悬停变成手势
廖金灵 d781d6825c Merge branch 'feature/pay_white_list' of wmtx/platform into release 
支付渠道意愿统计文字修改，及排序方式修正
zhengyongxing 674e727921 支付渠道意愿统计文字修改
张谷诚 170b116333 Merge branch 'feature/pay_white_list' of wmtx/platform into release 
支付渠道意愿统计bug上传
zhengyongxing 9eff370801 支付渠道意愿统计bug上传
张谷诚 e42281bdfe Merge branch 'feature/pay_white_list' of wmtx/platform into release 
支付渠道意愿统计bug上传
zhengyongxing f40bd57698 支付渠道意愿统计bug上传
廖金灵 985fdab851 Merge branch 'feature/limit_pay' of wmtx/platform into release 
支付限额
张谷诚 b9f466f73c Merge branch 'feature/pay_white_list' of wmtx/platform into release 
支付意向
支付限额白名单
zhengyongxing f7c9730153 市场结算管理优化
sunke d31f5c8691 位数
sunke 55316d475f 限额
sunke 163ad97d60 支付限额
sunke 817b39c391 支付限额
sunke 56b5144440 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/limit_pay
廖金灵 9222d99127 Merge branch 'feature/change_company_belong' of wmtx/platform into release 
推广员内外团归属优化
sunke 19af71ce72 支付限额
sunke 68572d10e6 支付限额
sunke a30317be91 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/limit_pay
chenzhi d6e44d32dc 优化推广员申请游戏名称及选择样式
ELF 2c3d251e73 修改
chenzhi f0a19cfc99 优化设备名称为字典
chenzhi 84fe51efef 支付渠道/测试订单 游戏名字优化
chenzhi 2401acb9a0 优化公会统计bug
ELF 2ac122630c 测试
ELF ef76ed66e6 修改
ELF 3299266431 修改
chenzhi 6d3f1b67e2 支付渠道统计-首页 名称优化
sunke ab1c99d95a 时间
ELF 6d44aa9a14 修改bug
sunke dfb83d35d0 时间样式
ELF e05844ca5d 修改bug
ELF beae17d518 修改无图片显示
ELF ef56ea2180 修改
ELF a512fb224e 修改bug
ELF fb6a00859e 修改会长押金需求
sunke 098caeaa90 时间样式
ELF a0cfee5466 修改
sunke 4f98f9fabe 样式控制
chenzhi cc966711d1 公会统计 游戏名称与设备名称分开
zhengyongxing 4ce89ee670 支付白名单列表功能完善
zhengyongxing 6b8f9a47d0 Merge branch 'feature/user_paywhite_list' of 47.111.118.107:wmtx/platform into feature/pay_white_list
zyx fc9fa629ae 游戏充值bug修改
sunke fa70a3c77a 限制规则
zhengyongxing ad08aeeace 支付意向统计代码提交
sunke c8b3cb87d8 支付限额
sunke ac54bb41a4 支付限额导出
sunke 5c8221d9dc 支付限额
chenzhi 9064fc7c58 游戏统计 游戏名称不含设备类型优化
chenzhi 121fc02f18 推广员内外团归属优化2
chenzhi 2b7f434955 财务管理-游戏管理 游戏名称列表和导出优化
chenzhi 55d49e8b4b 优化推广公会列表导出
ELF 4a1ffd2955 解决冲突
chenzhi f2148320a8 新增公会旧数据归属刷新脚本
chenzhi 61d0418340 推广公司管理 修改内外团影响底下
chenzhi 1761d37b5c 推广公会列表 适配新内外团规则
chenzhi d7662eb305 推广员现在归属于公司团体
chenzhi dd86a85485 推广公会归属管理 改为公会归属不可选择
sunke 443bed3fa5 ios导出时间默认格式
sunke 7a79bc8dad ios
yulingwei 82620c9ae6 merge
yulingwei bec210c158 修复会员层级关系检索问题
廖金灵 09b04c502e Merge branch 'fix/member_user_info' of wmtx/platform into release 
优化游戏统计弹框时间错误问题
chenzhi 82aa4f762b 优化游戏统计弹框时间错误问题
sunke 377fdcf70f ios
chenzhi d7737291ed 暂存1
sunke e7397e38b9 ios
廖金灵 43562f6746 Merge branch 'feature/download_type_list' of wmtx/platform into release 
修复检索问题
yulingwei c40f5dda26 upt
廖金灵 f72220eeb0 Merge branch 'feature/fee_form' of wmtx/platform into release 
ios下载账号隐藏中间部分
zhengyongxing 1987fcd865 ios下载账号隐藏中间部分
sunke 49efb2e60f xiufu
sunke 0ffa97a1dd 修复
廖金灵 05444593b5 Merge branch 'feature/fee_form' of wmtx/platform into release 
ios下载账号隐藏中间部分
zhengyongxing b32910a79e ios下载账号隐藏中间部分
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 充值财务管理金额保留小数点
廖金灵 4a766dfec8 Merge branch 'feature/download_type_list' of wmtx/platform into release 
导出问题修复
yulingwei eca43f471d upt
廖金灵 dee22176f5 Merge branch 'feature/ip_forbit' of wmtx/platform into release 
测试资源bug修正
zhengyongxing 3b58c877c4 测试资源配置状态添加
廖金灵 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 9878ba45e5 取消平台转移
廖金灵 c2b57233a0 Merge branch 'feature/ip_forbit' of wmtx/platform into release 
测试资源定时脚本修正
sunke 7194cd49ae 平台币
zhengyongxing 61b5fb48b6 测试资源配置状态添加
廖金灵 21bf9744fb Merge branch 'feature/ip_forbit' of wmtx/platform into release 
ip限制白名单苹果内购限制总开关去除
chenzhi a5b73d82f5 回滚测试
zhengyongxing 6ac97fa7b1 ip限制白名单页面去除内购总开关
廖金灵 830f1485e9 Merge branch 'fix/member_user_info' of wmtx/platform into release 
优化超级签code获取情况
chenzhi a6a177ca0e 优化超级签code获取情况
chenzhi 887e7c891e 超级签售空提醒2
廖金灵 112134ec93 Merge branch 'feature/work_order' of wmtx/platform into release 
修改样式问题
廖金灵 5af865cf48 Merge branch 'fix/member_user_info' of wmtx/platform into release 
优化超级签售空提醒
chenzhi e6c83927fa 优化超级签售空提醒
廖金灵 e8282fc00c Merge branch 'feature/ip_forbit' of wmtx/platform into release 
ip白名单页面问题修正
zhengyongxing bd181dab51 ip限制白名单页面修改
yulingwei 3415ef8336 修改样式问题
廖金灵 df1ca85cf9 Merge branch 'fix/member_user_info' of wmtx/platform into release 
修改超级签价格为配置
chenzhi 1bff70297b 修改超级签价格为配置
chenzhi 95ce176bae 修改超级签价格为1分
廖金灵 7be530e5b3 Merge branch 'feature/download_type_list' of wmtx/platform into release 
iOS下载统计问题修复
yulingwei a2ab7b1c66 merge
yulingwei 1ad299ffbe 修复统计问题
sunke fd815ef5a6 html平台币
sunke 88109eb0cd Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/PlatFormCoinData
廖金灵 ff5ff3ee80 Merge branch 'feature/ip_forbit' of wmtx/platform into release 
ip限制白名单提示语修改
zhengyongxing 6f749fb99d Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_opertion_log 
 Conflicts:
	Application/Admin/Controller/FinancePromoteController.class.php
	Application/Common/Common/extend.php
zhengyongxing 2adbd95bfb Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/ip_forbit 
 Conflicts:
	Data/update.sql
sunke e0d8539ea0 ex
sunke 35f5cc03bb value_detail
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
廖金灵 eb9f84c5dd Merge branch 'feature/IOSdata' of wmtx/platform into release 
ios下载量数据统计
yulingwei f34975478b upt
廖金灵 a1f3c6e205 Merge branch 'feature/download_type_list' of wmtx/platform into release 
iOS下载统计
廖金灵 4ee8b21cd5 Merge branch 'feature/mark_repeat_user' of wmtx/platform into release 
用户重复标识-注册事件通知
廖金灵 e2a32b11dc Merge branch 'fix/member_user_info' of wmtx/platform into release 
玩家列表新增去重数据栏
sunke 3bdfbf8c0b ios下载量数据统计
zhengyongxing e7aa7885e8 ip限制白名单提示语修改
zhengyongxing 1d27db663a ip限制白名单提示语修改
zhengyongxing 5f815370e8 ip限制白名单提交
zhengyongxing c3adec70ec ip限制白名单提交