elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,587 Commits
1 Branch
0 Tags
173 MiB
Commit Graph

1441 Commits (9152a3ef59abd0dfb2756a1eede45128de1f19cd)

Author SHA1 Message Date
chenzhi 72405e45f5 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi ea6d820408 优化页面显示
chenxiaojun 4286817dea 推广提现--更新
zhengchanglong 066fe46064 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengchanglong eb114b33b3 游戏分成比例设定体验优化
zhengyongxing dddd640f9f 结算单管理列表修改
chenzhi d484c96744 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi cccbc3bfa8 新增cp结算单判断是否已经有交叉时间
zhengchanglong b34eec98ee 游戏分成比例设定体验优化
chenxiaojun dcea6b7e05 推广提现--更新
zhengchanglong 5ac23b6a5b Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengchanglong de8386c0cb 游戏用户锁定备注显示
chenzhi 0934cd472a 新增cp结算单到列表中
zhengyongxing 2154899a6a Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing f87026a32c 结算单管理生成下游订单
chenzhi cda9d0c1a8 合并
chenzhi cd427a9409 新增添加cp上游对账单
zhengchanglong 87096e180e 游戏用户锁定备注显示
zhengchanglong 93fe724c15 游戏用户锁定备注显示
zhengchanglong 941978bb07 【游戏】-【合作方管理】，联系人改为必填项，必填项前面加红色※号
chenxiaojun 08dd26f942 推广提现--更新
zhengchanglong e914fde68d 玩家列表账号锁定添加备注
chenxiaojun ad80923bed 更新
chenxiaojun f244b42ab7 推广结算--更新
yulingwei ed9ddd2d67 修复检索问题
yulingwei e3f0a24e43 弹窗推广后台更新
zhengchanglong 326d9e5a12 管理后台-游戏-游戏编辑：参数配置-新增CP游戏分成比例
zhengyongxing ea140a430f 导出模板方法上传
liuweiwen 602fb33fcc 新增需求：管理后台-》系统-》扩展工具-》公司信息管理
yulingwei 5542994e36 upt
zhengyongxing c6f798dc47 市场结算管理bug修正
zhengyongxing f124e4b7ff Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 7adb991d0e 市场结算管理上传
zhengyongxing ba158e6b9a 市场结算管理上传
ELF 500d0fdc2c 后台管理系统登录后改变session_id
chenzhi ff67974413 修复获取推广员统计bug
zhengyongxing 5e14eaf4c9 新增市场结算管理完善
liuweiwen 50320be1d2 新增需求：管理后台-》推广公会归属管理，列表，新增，编辑，审批
zhengyongxing 4fb2806656 新增市场结算管理
chenxiaojun f1e8811df3 推广结算--更新
chenzhi c711601fdf Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 216321f46b 优化换绑逻辑判断是否订单在审核中
zhengyongxing 89883d2005 新增市场结算管理
chenxiaojun 0927417ce9 推广结算--更新
万盟天下 e6d4304d74 Merge branch 'hotfix/shift-player' of wmtx/platform into release 
还原补链限制
chenzhi 414f326cf4 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing f1a48fbdaa 权限分配 — 未给下级渠道分配（游戏充值）查看权限时，页面展示（游戏充值页面）修正
chenzhi 1295857697 优化工会统计各级检索条件结束
chenzhi 0561d8ff15 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi f95d23b091 优化公会统计各级条件展示
ELF fe68d8e8c9 修改oss上传返回结果
liuweiwen 4892db340e 管理后台-》游戏-》合作方管理-》列表增加字段联系人，联系电话，邮寄地址。公司税号，收款方名称，银行账号，开户行
ELF f472f5e9d3 文件保存改成cdn
chenzhi 9e2eb46904 公会统计游戏统计新增多重搜索
chenxiaojun 962c284467 推广结算--更新
liuweiwen fa3adf2e0b 新增合作方时，新增录入内容 
新增联系人，联系电话，邮寄地址。公司税号，收款方名称，
银行账号，开户行
chenzhi c20d507df6 优化订单判断
chenzhi 878badef43 换绑新增判断渠道是否已经结算
chenzhi 876952f3b4 公会统计新增内外团检索
chenxiaojun 89965bd8fb 导出
chenxiaojun 631c23568d 上传汇款证明--调整
chenxiaojun 90eed6f5ca 结算管理--更新
chenxiaojun c074b5fb86 结算管理--更新
chenzhi a37d0d6ec4 优化推广员充值统计排序问题
chenzhi 43774e9099 推广员充值统计新增官方渠道统计
chenzhi 14fa967f00 优化推广员统计数据
zhengyongxing 302ee7a2ca Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 5343ef2162 工会统计新增内外团
chenzhi 0caa548525 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 836eccfa78 支付渠道新增支付渠道比
zhengyongxing acd816c766 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing cc0f5a03c4 工会统计新增内外团导出
chenzhi 07f6e9919d 区服列表 区服名称改区服id
chenzhi 0f7134c838 游戏充值 区服名称改区服id
chenzhi 3bf288fa41 优化登陆记录区服名称为区服id
chenzhi 5e08bda6c2 优化行为日志区服名称为区服id
ELF 0a0cedafd5 各个系统登录提示安全优化，sessionon_id变更
chenzhi 432c84ba01 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi e39c811da8 修改月结月份显示错误问题
liuweiwen 4addf4c281 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 0b3ae062b1 优化：推广员新增与编辑的推广公司增加万盟天下科技 
新增需求：推广员增加工会归属和工会关系属性
zhengyongxing 10f6caddfa 工会统计新增内外团占比
ELF 8ab02a5e0b 还原补链限制
廖金灵 b12b133a06 Merge branch 'hotfix/shift-player' of wmtx/platform into release 
修改玩家迁移限制
elf@home 0bc50cbf70 修改限制
chenxiaojun 0baf97f717 会长提现--更新
chenxiaojun a12c3ecf9e 会长提现--更新
yulingwei 25606949f5 修复登录统计问题
chenxiaojun e884214546 会长提现|公会分成管理--更新
chenzhi 4d0606d6fc 新增渠道查看公司联动
chenzhi f594e3bb14 公会统计新增公司联动
elf@home 6e354fe3b3 优化链接归属查询
liuweiwen 6625eaa4f7 工会统计
liuweiwen 809e9d36f1 工会统计
liuweiwen 28a1efe2f4 工会统计列表数据与搜索修复
liuweiwen b3e32506cc 工会统计搜索公司
liuweiwen c44e5ee1a7 编辑推广员时，只允许会长修改推广公司，同时更改底下推广员的公司
zhanglingsheng 7a9fe4fb45 超级签统计--导出
zhanglingsheng 34020fd725 超级签统计--样式
yulingwei 9d5bfc5ef2 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng e3ef73e7e3 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng e709816781 补单记录
yulingwei 75d3e87f89 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
yulingwei 899877e872 同步修改
ELF 834115c213 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 561787a4ac 修改
zhanglingsheng 8a9e0a9a8b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng ca401adbd0 补单记录
ELF a70c1aee21 Merge branch 'release-1.0.0' into dev
chenzhi 04c560312f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 715a1a8a2c 优化推广统计区服问题
yulingwei f4495f93a9 ltv修改
yulingwei 3ec7ccc188 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
yulingwei 873c81605e 修复
zhanglingsheng 908de1336f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng b88f395c9a 补单记录
zhanglingsheng 6a28abedc0 补单记录
chenxiaojun 905769f922 Merge remote-tracking branch 'origin/dev' into dev
chenxiaojun 9a0313b763 公会分成管理--更新
sunke 453c0c3682 链接归属名词修改
chenxiaojun e66893dc7f 公会分成管理--更新
yulingwei 8ccde7749a Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei 3e11b4d0ad 更新
yulingwei 1e3079870e Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei ee18eac375 修复
yulingwei b868b14273 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
yulingwei 21cc6865d5 Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei 2ed2117b6d 更新
ELF ad67717292 Merge branch 'release-1.0.0' into dev
yulingwei e2ed862130 Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei 7d1808a7bf Merge branch 'hotfix/ltv' into dev
yulingwei 12f00ad268 修复
chenzhi a5c926b2cd 优化区服预告区服选择
chenzhi ff46ab04ca Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi f580b44289 优化推广员统计区服选择
liuweiwen 2db651ae9c Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen bc28933369 游戏订单查看-》导出通知成功数据
zhengyongxing e055cc27d5 ajax游戏区服搜索设备非必填
zhengyongxing e49ed7aa30 支付渠道统计计添加平台币直充金额说明
sunke dcf7efad6f 下载链接菜单显示bug
liuweiwen 6dbfd09e91 编辑推广员时推广公司必填
zhengyongxing ea80b8fd44 游戏充值统计检索条件修正
zhengyongxing d59e8633c6 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing 2f25386518 游戏充值统计检索条件修正
ELF 841bf0c0b9 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 9bf45ae0d3 修改
zhengyongxing b96e65b8fe 游戏充值统计检索条件修正
chenzhi 1d69c616d6 优化公会统计页面跳转问题
chenzhi f38e007d80 优化渠道的公司检索
chenzhi 47595c81b8 优化公会统计公司